From patchwork Wed Nov 23 09:15:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maryam Tahhan X-Patchwork-Id: 13053283 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 867FFC4332F for ; Wed, 23 Nov 2022 09:16:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237360AbiKWJQh (ORCPT ); Wed, 23 Nov 2022 04:16:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237361AbiKWJQT (ORCPT ); Wed, 23 Nov 2022 04:16:19 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 68726107E62 for ; Wed, 23 Nov 2022 01:15:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669194927; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oRXRsO8/e/+wD/x2i3+RJoWx0WjJz2M9yYxlaD5dpSA=; b=c+joJQdCIPcAUkFo2o9LKqlNNWg++OTqGnJGfRQVwtGnzF7r+vpUllPsZNwbx1YrK29ZSJ kaWu3gTgAWIx0NLfqqfDcez3LwpLdqb3QWvG+9TRK2JevT5Pf6f7kjmGRR8Xw78rSbO0/u jOl5mTc/LFZNjQ2cVRz1r6lHVoqGegc= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-29-P9ErqwqiPlK_TnLqJ__KbQ-1; Wed, 23 Nov 2022 04:15:26 -0500 X-MC-Unique: P9ErqwqiPlK_TnLqJ__KbQ-1 Received: by mail-wm1-f69.google.com with SMTP id h9-20020a1c2109000000b003cfd37aec58so9355121wmh.1 for ; Wed, 23 Nov 2022 01:15:26 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oRXRsO8/e/+wD/x2i3+RJoWx0WjJz2M9yYxlaD5dpSA=; b=6jD/1FY0BDzJEy0ds82yZQs4gJg66zEDLkWNrwsdzlBZbxpeAvUoTxMYgr9Enh4S9g G8H+o0TTYNkgdak+XxDJtWTDgAZRLP7BU1Bupyz2kHYHwJ1ozU0XkwY4RL09ZZtxzJNo iYDtav/SfZ7SXs5JZkPEbrv6L/Svg3WyTKgdcsZAadX11WWLq88DyDHHLxzcoBdF8wb5 jSiz01yozDmMSNDi3BaOFwC744G8W88abyyZbbzb1AF/wr/RVqVbcWTRZqt+YKivO62T gvaxhYXolw/VpXGuy9EKgsy7cqY1k6it7LTXZfPUTKpmiY261GN57G+rnjaUnuUTUuKd o9Rg== X-Gm-Message-State: ANoB5pk9IQOPhZbAxHCu2dbJlU6hqjMagvy5ILLo3GmODPIH1lVNkdOt dsQwQ0b9+5NyjgeFiQzcwJKxpBiLnIvVi1tfl7FQgNXvZDQEvySNfLJ9ZJ7JqCWudXFZ/NDFVtg yEjj5iHq4WD0A6exmZoC2Y23HdsuQTmckjFSKTJPNblG+DI9hn+zd2MBICCFoevI= X-Received: by 2002:adf:ef0c:0:b0:241:e4cc:f03d with SMTP id e12-20020adfef0c000000b00241e4ccf03dmr3882693wro.43.1669194925152; Wed, 23 Nov 2022 01:15:25 -0800 (PST) X-Google-Smtp-Source: AA0mqf78YyUnqWUmXurkk9eBK0p6XvhtGOBou0NH1pECyUrbB8XshQZzNOF44CUDFcWuiTYX0y3Y3w== X-Received: by 2002:adf:ef0c:0:b0:241:e4cc:f03d with SMTP id e12-20020adfef0c000000b00241e4ccf03dmr3882667wro.43.1669194924859; Wed, 23 Nov 2022 01:15:24 -0800 (PST) Received: from localhost.localdomain ([78.19.107.254]) by smtp.gmail.com with ESMTPSA id r13-20020a056000014d00b0024165454262sm16008369wrx.11.2022.11.23.01.15.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Nov 2022 01:15:24 -0800 (PST) From: mtahhan@redhat.com To: bpf@vger.kernel.org, linux-doc@vger.kernel.org Cc: jbrouer@redhat.com, thoiland@redhat.com, donhunte@redhat.com, akiyks@gmail.com, Maryam Tahhan , David Vernet Subject: [PATCH bpf-next v2 1/2] docs: fix sphinx warnings for cpumap Date: Wed, 23 Nov 2022 09:15:19 +0000 Message-Id: <20221123091520.87289-2-mtahhan@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221123091520.87289-1-mtahhan@redhat.com> References: <20221123091520.87289-1-mtahhan@redhat.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net From: Maryam Tahhan Sphinx version >=3.3 warns about duplicate function declarations in the CPUMAP documentation. This is because the function name is the same for kernel and user space BPF progs but the parameters and return types they take is what differs. This patch moves from using the ``c:function::`` directive to using the ``code-block:: c`` directive. The patches also fix the indentation for the text associated with the "new" code block delcarations. Signed-off-by: Maryam Tahhan Acked-by: David Vernet --- Documentation/bpf/map_cpumap.rst | 56 +++++++++++++++++++------------- 1 file changed, 34 insertions(+), 22 deletions(-) diff --git a/Documentation/bpf/map_cpumap.rst b/Documentation/bpf/map_cpumap.rst index 61a797a86342..923cfc8ab51f 100644 --- a/Documentation/bpf/map_cpumap.rst +++ b/Documentation/bpf/map_cpumap.rst @@ -30,29 +30,35 @@ Usage Kernel BPF ---------- -.. c:function:: +bpf_redirect_map() +^^^^^^^^^^^^^^^^^^ +.. code-block:: c + long bpf_redirect_map(struct bpf_map *map, u32 key, u64 flags) - Redirect the packet to the endpoint referenced by ``map`` at index ``key``. - For ``BPF_MAP_TYPE_CPUMAP`` this map contains references to CPUs. +Redirect the packet to the endpoint referenced by ``map`` at index ``key``. +For ``BPF_MAP_TYPE_CPUMAP`` this map contains references to CPUs. - The lower two bits of ``flags`` are used as the return code if the map lookup - fails. This is so that the return value can be one of the XDP program return - codes up to ``XDP_TX``, as chosen by the caller. +The lower two bits of ``flags`` are used as the return code if the map lookup +fails. This is so that the return value can be one of the XDP program return +codes up to ``XDP_TX``, as chosen by the caller. -Userspace ---------- +User space +---------- .. note:: CPUMAP entries can only be updated/looked up/deleted from user space and not from an eBPF program. Trying to call these functions from a kernel eBPF program will result in the program failing to load and a verifier warning. -.. c:function:: +bpf_map_update_elem() +^^^^^^^^^^^^^^^^^^^^^ +.. code-block:: c + int bpf_map_update_elem(int fd, const void *key, const void *value, __u64 flags); - CPU entries can be added or updated using the ``bpf_map_update_elem()`` - helper. This helper replaces existing elements atomically. The ``value`` parameter - can be ``struct bpf_cpumap_val``. +CPU entries can be added or updated using the ``bpf_map_update_elem()`` +helper. This helper replaces existing elements atomically. The ``value`` parameter +can be ``struct bpf_cpumap_val``. .. code-block:: c @@ -64,23 +70,29 @@ Userspace } bpf_prog; }; - The flags argument can be one of the following: +The flags argument can be one of the following: - BPF_ANY: Create a new element or update an existing element. - BPF_NOEXIST: Create a new element only if it did not exist. - BPF_EXIST: Update an existing element. -.. c:function:: +bpf_map_lookup_elem() +^^^^^^^^^^^^^^^^^^^^^ +.. code-block:: c + int bpf_map_lookup_elem(int fd, const void *key, void *value); - CPU entries can be retrieved using the ``bpf_map_lookup_elem()`` - helper. +CPU entries can be retrieved using the ``bpf_map_lookup_elem()`` +helper. + +bpf_map_delete_elem() +^^^^^^^^^^^^^^^^^^^^^ +.. code-block:: c -.. c:function:: int bpf_map_delete_elem(int fd, const void *key); - CPU entries can be deleted using the ``bpf_map_delete_elem()`` - helper. This helper will return 0 on success, or negative error in case of - failure. +CPU entries can be deleted using the ``bpf_map_delete_elem()`` +helper. This helper will return 0 on success, or negative error in case of +failure. Examples ======== @@ -141,8 +153,8 @@ The following code snippet shows how to declare a ``BPF_MAP_TYPE_CPUMAP`` called return bpf_redirect_map(&cpu_map, cpu_dest, 0); } -Userspace ---------- +User space +---------- The following code snippet shows how to dynamically set the max_entries for a CPUMAP to the max number of cpus available on the system. From patchwork Wed Nov 23 09:15:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maryam Tahhan X-Patchwork-Id: 13053285 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 60AB7C4332F for ; Wed, 23 Nov 2022 09:18:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237473AbiKWJSR (ORCPT ); Wed, 23 Nov 2022 04:18:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57756 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237388AbiKWJR5 (ORCPT ); Wed, 23 Nov 2022 04:17:57 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA46D10893C for ; Wed, 23 Nov 2022 01:16:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669194984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CWnd1irc68q6Hao6FJ5tfiG87wtoff6EE+eKHivxtgg=; b=WcqE1eDMnHxwDZJDH5F5/w9RAQkgR9xBxnvbiG3Tw1VI0lXuj71zELYt0UxbrPfMqyv8rZ dtjD3iVeDWNhdN2l8GY0lgq3zr+N5OkVkC22vR7ceEqsL0ujFODsqZcwJ65GG+JA0XInP9 FLnhvjsOW27P8e8Fk4ndGYSYVW9BFBw= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-623-FT1YEv6lOseIndm1IRTHEg-1; Wed, 23 Nov 2022 04:16:23 -0500 X-MC-Unique: FT1YEv6lOseIndm1IRTHEg-1 Received: by mail-wm1-f71.google.com with SMTP id c1-20020a7bc001000000b003cfe40fca79so585574wmb.6 for ; Wed, 23 Nov 2022 01:16:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CWnd1irc68q6Hao6FJ5tfiG87wtoff6EE+eKHivxtgg=; b=FRaVXG5Z5LyWO3ll/VffO5PW7Easb3ZgbZSWGIBk+QROojHntgZzU/zEeU/LvprC7r ZQUUvpsOQSO0pV/rlzZ69gbvcGDiRv6gYlNhzxc5JYSWqHb5NwMWpd31OsCAH/DMP+SG qVe47P4clzYl+Ob3EPhkp+brqwqhzGrrmwFQehchKGAPDt7qPHk6cK56HCt+Ans2+3LG 69zp+7qNXIqd6oO3FuN2xA8/lGqoEJpuN5nlKuRwUZhZ76uNmK1QzjH/vz4gF3hLXIPW EPXJd36ryxROtRzjM0Ni4agzCrVmKJY9bh+ffUoH7Nta3vLjXIzgk6kdcLSOqgLNJsgG jMEg== X-Gm-Message-State: ANoB5pmYhOJGcxHMdM8wksBhQC0hXU1XadMFDDALmOgkWcuVLlu9psSw wI3ot2/ef84uqpCZDXciQnzIeLJ14SqSafkcN+LniKwhmN6kphDv4y79t+tN0mNqcJuc/mS8j2l GC6Z/80guIZrBfqPzkCe7NE1L1wkqbfdc9hgAQ5A6n+vndVTGAivzrYhza10afAA= X-Received: by 2002:a5d:56c9:0:b0:236:5d8b:dd9c with SMTP id m9-20020a5d56c9000000b002365d8bdd9cmr8588682wrw.283.1669194981677; Wed, 23 Nov 2022 01:16:21 -0800 (PST) X-Google-Smtp-Source: AA0mqf767KSQolEcID7pbg6ywHT25xXeIs5tRpkwhd0Gmbfahq9HuFAVEg6+doTgZNyGHzX2guWoDw== X-Received: by 2002:a5d:56c9:0:b0:236:5d8b:dd9c with SMTP id m9-20020a5d56c9000000b002365d8bdd9cmr8588648wrw.283.1669194981278; Wed, 23 Nov 2022 01:16:21 -0800 (PST) Received: from localhost.localdomain ([78.19.107.254]) by smtp.gmail.com with ESMTPSA id r13-20020a056000014d00b0024165454262sm16008369wrx.11.2022.11.23.01.16.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Nov 2022 01:16:20 -0800 (PST) From: mtahhan@redhat.com To: bpf@vger.kernel.org, linux-doc@vger.kernel.org Cc: jbrouer@redhat.com, thoiland@redhat.com, donhunte@redhat.com, akiyks@gmail.com, Maryam Tahhan , David Vernet Subject: [PATCH bpf-next v2 2/2] docs: fix sphinx warnings for devmap Date: Wed, 23 Nov 2022 09:15:20 +0000 Message-Id: <20221123091520.87289-3-mtahhan@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221123091520.87289-1-mtahhan@redhat.com> References: <20221123091520.87289-1-mtahhan@redhat.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net From: Maryam Tahhan Sphinx version >=3.3 warns about duplicate function declarations in the DEVMAP documentation. This is because the function name is the same for kernel and user space BPF progs but the parameters and return types they take is what differs. This patch moves from using the ``c:function::`` directive to using the ``code-block:: c`` directive. The patches also fix the indentation for the text associated with the "new" code block delcarations. Signed-off-by: Maryam Tahhan Acked-by: David Vernet --- Documentation/bpf/map_devmap.rst | 68 ++++++++++++++++++++------------ 1 file changed, 42 insertions(+), 26 deletions(-) diff --git a/Documentation/bpf/map_devmap.rst b/Documentation/bpf/map_devmap.rst index f64da348dbfe..927312c7b8c8 100644 --- a/Documentation/bpf/map_devmap.rst +++ b/Documentation/bpf/map_devmap.rst @@ -29,8 +29,11 @@ Usage ===== Kernel BPF ---------- -.. c:function:: - long bpf_redirect_map(struct bpf_map *map, u32 key, u64 flags) +bpf_redirect_map() +^^^^^^^^^^^^^^^^^^ +.. code-block:: c + + long bpf_redirect_map(struct bpf_map *map, u32 key, u64 flags) Redirect the packet to the endpoint referenced by ``map`` at index ``key``. For ``BPF_MAP_TYPE_DEVMAP`` and ``BPF_MAP_TYPE_DEVMAP_HASH`` this map contains @@ -56,26 +59,32 @@ lower bits of the ``flags`` argument if the map lookup fails. More information about redirection can be found :doc:`redirect` -.. c:function:: +bpf_map_lookup_elem() +^^^^^^^^^^^^^^^^^^^^^ +.. code-block:: c + void *bpf_map_lookup_elem(struct bpf_map *map, const void *key) Net device entries can be retrieved using the ``bpf_map_lookup_elem()`` helper. -Userspace ---------- +User space +---------- .. note:: DEVMAP entries can only be updated/deleted from user space and not from an eBPF program. Trying to call these functions from a kernel eBPF program will result in the program failing to load and a verifier warning. -.. c:function:: +bpf_map_update_elem() +^^^^^^^^^^^^^^^^^^^^^ +.. code-block:: c + int bpf_map_update_elem(int fd, const void *key, const void *value, __u64 flags); - Net device entries can be added or updated using the ``bpf_map_update_elem()`` - helper. This helper replaces existing elements atomically. The ``value`` parameter - can be ``struct bpf_devmap_val`` or a simple ``int ifindex`` for backwards - compatibility. +Net device entries can be added or updated using the ``bpf_map_update_elem()`` +helper. This helper replaces existing elements atomically. The ``value`` parameter +can be ``struct bpf_devmap_val`` or a simple ``int ifindex`` for backwards +compatibility. .. code-block:: c @@ -87,35 +96,42 @@ Userspace } bpf_prog; }; - The ``flags`` argument can be one of the following: - +The ``flags`` argument can be one of the following: - ``BPF_ANY``: Create a new element or update an existing element. - ``BPF_NOEXIST``: Create a new element only if it did not exist. - ``BPF_EXIST``: Update an existing element. - DEVMAPs can associate a program with a device entry by adding a ``bpf_prog.fd`` - to ``struct bpf_devmap_val``. Programs are run after ``XDP_REDIRECT`` and have - access to both Rx device and Tx device. The program associated with the ``fd`` - must have type XDP with expected attach type ``xdp_devmap``. - When a program is associated with a device index, the program is run on an - ``XDP_REDIRECT`` and before the buffer is added to the per-cpu queue. Examples - of how to attach/use xdp_devmap progs can be found in the kernel selftests: +DEVMAPs can associate a program with a device entry by adding a ``bpf_prog.fd`` +to ``struct bpf_devmap_val``. Programs are run after ``XDP_REDIRECT`` and have +access to both Rx device and Tx device. The program associated with the ``fd`` +must have type XDP with expected attach type ``xdp_devmap``. +When a program is associated with a device index, the program is run on an +``XDP_REDIRECT`` and before the buffer is added to the per-cpu queue. Examples +of how to attach/use xdp_devmap progs can be found in the kernel selftests: - - ``tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c`` - - ``tools/testing/selftests/bpf/progs/test_xdp_with_devmap_helpers.c`` +- ``tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c`` +- ``tools/testing/selftests/bpf/progs/test_xdp_with_devmap_helpers.c`` + +bpf_map_lookup_elem() +^^^^^^^^^^^^^^^^^^^^^ +.. code-block:: c .. c:function:: int bpf_map_lookup_elem(int fd, const void *key, void *value); - Net device entries can be retrieved using the ``bpf_map_lookup_elem()`` - helper. +Net device entries can be retrieved using the ``bpf_map_lookup_elem()`` +helper. + +bpf_map_delete_elem() +^^^^^^^^^^^^^^^^^^^^^ +.. code-block:: c .. c:function:: int bpf_map_delete_elem(int fd, const void *key); - Net device entries can be deleted using the ``bpf_map_delete_elem()`` - helper. This helper will return 0 on success, or negative error in case of - failure. +Net device entries can be deleted using the ``bpf_map_delete_elem()`` +helper. This helper will return 0 on success, or negative error in case of +failure. Examples ========