Commit a7383cfb authored by Andrew Morton's avatar Andrew Morton
Browse files

Merge branch 'master' into mm-stable

parents 71f6861c 1b929c02
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
What:		/sys/kernel/oops_count
What:		/sys/kernel/warn_count
Date:		November 2022
Date:		November 2022
KernelVersion:	6.2.0
KernelVersion:	6.2.0
Contact:	Linux Kernel Hardening List <linux-hardening@vger.kernel.org>
Contact:	Linux Kernel Hardening List <linux-hardening@vger.kernel.org>
+30 −26
Original line number Original line Diff line number Diff line
@@ -34,13 +34,12 @@ bpf_sk_storage_get()


   void *bpf_sk_storage_get(struct bpf_map *map, void *sk, void *value, u64 flags)
   void *bpf_sk_storage_get(struct bpf_map *map, void *sk, void *value, u64 flags)


Socket-local storage can be retrieved using the ``bpf_sk_storage_get()``
Socket-local storage for ``map`` can be retrieved from socket ``sk`` using the
helper. The helper gets the storage from ``sk`` that is associated with ``map``.
``bpf_sk_storage_get()`` helper. If the ``BPF_LOCAL_STORAGE_GET_F_CREATE``
If the ``BPF_LOCAL_STORAGE_GET_F_CREATE`` flag is used then
flag is used then ``bpf_sk_storage_get()`` will create the storage for ``sk``
``bpf_sk_storage_get()`` will create the storage for ``sk`` if it does not
if it does not already exist. ``value`` can be used together with
already exist. ``value`` can be used together with
``BPF_LOCAL_STORAGE_GET_F_CREATE`` to initialize the storage value, otherwise
``BPF_LOCAL_STORAGE_GET_F_CREATE`` to initialize the storage value, otherwise it
it will be zero initialized. Returns a pointer to the storage on success, or
will be zero initialized. Returns a pointer to the storage on success, or
``NULL`` in case of failure.
``NULL`` in case of failure.


.. note::
.. note::
@@ -54,9 +53,9 @@ bpf_sk_storage_delete()


   long bpf_sk_storage_delete(struct bpf_map *map, void *sk)
   long bpf_sk_storage_delete(struct bpf_map *map, void *sk)


Socket-local storage can be deleted using the ``bpf_sk_storage_delete()``
Socket-local storage for ``map`` can be deleted from socket ``sk`` using the
helper. The helper deletes the storage from ``sk`` that is identified by
``bpf_sk_storage_delete()`` helper. Returns ``0`` on success, or negative
``map``. Returns ``0`` on success, or negative error in case of failure.
error in case of failure.


User space
User space
----------
----------
@@ -68,16 +67,20 @@ bpf_map_update_elem()


   int bpf_map_update_elem(int map_fd, const void *key, const void *value, __u64 flags)
   int bpf_map_update_elem(int map_fd, const void *key, const void *value, __u64 flags)


Socket-local storage for the socket identified by ``key`` belonging to
Socket-local storage for map ``map_fd`` can be added or updated locally to a
``map_fd`` can be added or updated using the ``bpf_map_update_elem()`` libbpf
socket using the ``bpf_map_update_elem()`` libbpf function. The socket is
function. ``key`` must be a pointer to a valid ``fd`` in the user space
identified by a `socket` ``fd`` stored in the pointer ``key``. The pointer
program. The ``flags`` parameter can be used to control the update behaviour:
``value`` has the data to be added or updated to the socket ``fd``. The type
and size of ``value`` should be the same as the value type of the map
definition.


- ``BPF_ANY`` will create storage for ``fd`` or update existing storage.
The ``flags`` parameter can be used to control the update behaviour:
- ``BPF_NOEXIST`` will create storage for ``fd`` only if it did not already

  exist, otherwise the call will fail with ``-EEXIST``.
- ``BPF_ANY`` will create storage for `socket` ``fd`` or update existing storage.
- ``BPF_EXIST`` will update existing storage for ``fd`` if it already exists,
- ``BPF_NOEXIST`` will create storage for `socket` ``fd`` only if it did not
  otherwise the call will fail with ``-ENOENT``.
  already exist, otherwise the call will fail with ``-EEXIST``.
- ``BPF_EXIST`` will update existing storage for `socket` ``fd`` if it already
  exists, otherwise the call will fail with ``-ENOENT``.


Returns ``0`` on success, or negative error in case of failure.
Returns ``0`` on success, or negative error in case of failure.


@@ -88,10 +91,10 @@ bpf_map_lookup_elem()


   int bpf_map_lookup_elem(int map_fd, const void *key, void *value)
   int bpf_map_lookup_elem(int map_fd, const void *key, void *value)


Socket-local storage for the socket identified by ``key`` belonging to
Socket-local storage for map ``map_fd`` can be retrieved from a socket using
``map_fd`` can be retrieved using the ``bpf_map_lookup_elem()`` libbpf
the ``bpf_map_lookup_elem()`` libbpf function. The storage is retrieved from
function. ``key`` must be a pointer to a valid ``fd`` in the user space
the socket identified by a `socket` ``fd`` stored in the pointer
program. Returns ``0`` on success, or negative error in case of failure.
``key``. Returns ``0`` on success, or negative error in case of failure.


bpf_map_delete_elem()
bpf_map_delete_elem()
~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~
@@ -100,9 +103,10 @@ bpf_map_delete_elem()


   int bpf_map_delete_elem(int map_fd, const void *key)
   int bpf_map_delete_elem(int map_fd, const void *key)


Socket-local storage for the socket identified by ``key`` belonging to
Socket-local storage for map ``map_fd`` can be deleted from a socket using the
``map_fd`` can be deleted using the ``bpf_map_delete_elem()`` libbpf
``bpf_map_delete_elem()`` libbpf function. The storage is deleted from the
function. Returns ``0`` on success, or negative error in case of failure.
socket identified by a `socket` ``fd`` stored in the pointer ``key``. Returns
``0`` on success, or negative error in case of failure.


Examples
Examples
========
========
+1 −1
Original line number Original line Diff line number Diff line
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: ROHM BD71828 Power Management Integrated Circuit LED driver
title: ROHM BD71828 Power Management Integrated Circuit LED driver


maintainers:
maintainers:
  - Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
  - Matti Vaittinen <mazziesaccount@gmail.com>


description: |
description: |
  This module is part of the ROHM BD71828 MFD device. For more details
  This module is part of the ROHM BD71828 MFD device. For more details
+1 −0
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ properties:
      - mediatek,mt8173-gce
      - mediatek,mt8173-gce
      - mediatek,mt8183-gce
      - mediatek,mt8183-gce
      - mediatek,mt8186-gce
      - mediatek,mt8186-gce
      - mediatek,mt8188-gce
      - mediatek,mt8192-gce
      - mediatek,mt8192-gce
      - mediatek,mt8195-gce
      - mediatek,mt8195-gce


+1 −0
Original line number Original line Diff line number Diff line
@@ -28,6 +28,7 @@ properties:
              - qcom,sc8180x-apss-shared
              - qcom,sc8180x-apss-shared
              - qcom,sdm660-apcs-hmss-global
              - qcom,sdm660-apcs-hmss-global
              - qcom,sdm845-apss-shared
              - qcom,sdm845-apss-shared
              - qcom,sm4250-apcs-hmss-global
              - qcom,sm6125-apcs-hmss-global
              - qcom,sm6125-apcs-hmss-global
              - qcom,sm6115-apcs-hmss-global
              - qcom,sm6115-apcs-hmss-global
              - qcom,sm8150-apss-shared
              - qcom,sm8150-apss-shared
Loading