From: Larysa Zaremba <larysa.zaremba@intel.com>
To: bpf@vger.kernel.org
Cc: Larysa Zaremba <larysa.zaremba@intel.com>,
ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org,
martin.lau@linux.dev, song@kernel.org, yhs@fb.com,
john.fastabend@gmail.com, kpsingh@kernel.org, sdf@google.com,
haoluo@google.com, jolsa@kernel.org,
David Ahern <dsahern@gmail.com>, Jakub Kicinski <kuba@kernel.org>,
Willem de Bruijn <willemb@google.com>,
Jesper Dangaard Brouer <brouer@redhat.com>,
Anatoly Burakov <anatoly.burakov@intel.com>,
Alexander Lobakin <alexandr.lobakin@intel.com>,
Magnus Karlsson <magnus.karlsson@gmail.com>,
Maryam Tahhan <mtahhan@redhat.com>,
xdp-hints@xdp-project.net, netdev@vger.kernel.org,
Willem de Bruijn <willemdebruijn.kernel@gmail.com>,
Alexei Starovoitov <alexei.starovoitov@gmail.com>,
Simon Horman <simon.horman@corigine.com>
Subject: [xdp-hints] [PATCH bpf-next v4 21/21] selftests/bpf: check checksum state in xdp_metadata
Date: Fri, 28 Jul 2023 19:39:23 +0200 [thread overview]
Message-ID: <20230728173923.1318596-22-larysa.zaremba@intel.com> (raw)
In-Reply-To: <20230728173923.1318596-1-larysa.zaremba@intel.com>
Verify, whether kfunc in xdp_metadata test correctly returns partial
checksum status and offsets.
Signed-off-by: Larysa Zaremba <larysa.zaremba@intel.com>
---
.../selftests/bpf/prog_tests/xdp_metadata.c | 30 +++++++++++++++++++
.../selftests/bpf/progs/xdp_metadata.c | 6 ++++
2 files changed, 36 insertions(+)
diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_metadata.c b/tools/testing/selftests/bpf/prog_tests/xdp_metadata.c
index 61e1b073a4b2..6c3dd90b271b 100644
--- a/tools/testing/selftests/bpf/prog_tests/xdp_metadata.c
+++ b/tools/testing/selftests/bpf/prog_tests/xdp_metadata.c
@@ -46,6 +46,7 @@
#define XDP_RSS_TYPE_L4 BIT(3)
#define VLAN_VID_MASK 0xfff
+#define XDP_CHECKSUM_PARTIAL BIT(3)
struct xsk {
void *umem_area;
@@ -167,6 +168,32 @@ static void refill_rx(struct xsk *xsk, __u64 addr)
}
}
+struct partial_csum_info {
+ __u16 csum_start;
+ __u16 csum_offset;
+};
+
+static bool assert_checksum_ok(struct xdp_meta *meta)
+{
+ struct partial_csum_info *info;
+ u32 csum_start, csum_offset;
+
+ if (!ASSERT_EQ(meta->rx_csum_status, XDP_CHECKSUM_PARTIAL,
+ "rx_csum_status"))
+ return false;
+
+ csum_start = sizeof(struct ethhdr) + sizeof(struct iphdr);
+ csum_offset = offsetof(struct udphdr, check);
+ info = (void *)&meta->rx_csum_info;
+
+ if (!ASSERT_EQ(info->csum_start, csum_start, "rx csum_start"))
+ return false;
+ if (!ASSERT_EQ(info->csum_offset, csum_offset, "rx csum_offset"))
+ return false;
+
+ return true;
+}
+
static int verify_xsk_metadata(struct xsk *xsk)
{
const struct xdp_desc *rx_desc;
@@ -228,6 +255,9 @@ static int verify_xsk_metadata(struct xsk *xsk)
if (!ASSERT_EQ(meta->rx_vlan_proto, VLAN_PID, "rx_vlan_proto"))
return -1;
+ if (!assert_checksum_ok(meta))
+ return -1;
+
xsk_ring_cons__release(&xsk->rx, 1);
refill_rx(xsk, comp_addr);
diff --git a/tools/testing/selftests/bpf/progs/xdp_metadata.c b/tools/testing/selftests/bpf/progs/xdp_metadata.c
index f3db5cef4726..c99f7f4eb37d 100644
--- a/tools/testing/selftests/bpf/progs/xdp_metadata.c
+++ b/tools/testing/selftests/bpf/progs/xdp_metadata.c
@@ -26,6 +26,9 @@ extern int bpf_xdp_metadata_rx_hash(const struct xdp_md *ctx, __u32 *hash,
extern int bpf_xdp_metadata_rx_vlan_tag(const struct xdp_md *ctx,
__u16 *vlan_tci,
__be16 *vlan_proto) __ksym;
+extern int bpf_xdp_metadata_rx_csum(const struct xdp_md *ctx,
+ enum xdp_csum_status *csum_status,
+ union xdp_csum_info *csum_info) __ksym;
SEC("xdp")
int rx(struct xdp_md *ctx)
@@ -63,6 +66,9 @@ int rx(struct xdp_md *ctx)
bpf_xdp_metadata_rx_vlan_tag(ctx, &meta->rx_vlan_tci,
&meta->rx_vlan_proto);
+ bpf_xdp_metadata_rx_csum(ctx, &meta->rx_csum_status,
+ (void *)&meta->rx_csum_info);
+
return bpf_redirect_map(&xsk, ctx->rx_queue_index, XDP_PASS);
}
--
2.41.0
prev parent reply other threads:[~2023-07-28 17:44 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-28 15:44 [xdp-hints] (no subject) Larysa Zaremba
2023-07-28 17:39 ` [xdp-hints] [PATCH bpf-next v4 01/21] ice: make RX hash reading code more reusable Larysa Zaremba
2023-07-28 17:39 ` [xdp-hints] [PATCH bpf-next v4 02/21] ice: make RX HW timestamp " Larysa Zaremba
2023-07-28 17:39 ` [xdp-hints] [PATCH bpf-next v4 03/21] ice: make RX checksum checking " Larysa Zaremba
2023-07-28 17:39 ` [xdp-hints] [PATCH bpf-next v4 04/21] ice: Make ptype internal to descriptor info processing Larysa Zaremba
2023-07-28 17:39 ` [xdp-hints] [PATCH bpf-next v4 05/21] ice: Introduce ice_xdp_buff Larysa Zaremba
2023-07-28 17:39 ` [xdp-hints] [PATCH bpf-next v4 06/21] ice: Support HW timestamp hint Larysa Zaremba
2023-07-28 17:39 ` [xdp-hints] [PATCH bpf-next v4 07/21] ice: Support RX hash XDP hint Larysa Zaremba
2023-07-28 17:39 ` [xdp-hints] [PATCH bpf-next v4 08/21] ice: Support XDP hints in AF_XDP ZC mode Larysa Zaremba
2023-07-28 17:39 ` [xdp-hints] [PATCH bpf-next v4 09/21] xdp: Add VLAN tag hint Larysa Zaremba
2023-07-28 17:39 ` [xdp-hints] [PATCH bpf-next v4 10/21] ice: Implement " Larysa Zaremba
2023-07-28 17:39 ` [xdp-hints] [PATCH bpf-next v4 11/21] ice: use VLAN proto from ring packet context in skb path Larysa Zaremba
2023-07-28 17:39 ` [xdp-hints] [PATCH bpf-next v4 12/21] xdp: Add checksum hint Larysa Zaremba
2023-07-28 21:53 ` [xdp-hints] " Alexei Starovoitov
2023-07-29 16:15 ` Willem de Bruijn
2023-07-29 18:04 ` Alexei Starovoitov
2023-07-30 13:13 ` Willem de Bruijn
2023-07-31 10:52 ` Larysa Zaremba
2023-08-01 1:03 ` Alexei Starovoitov
2023-08-02 13:27 ` Willem de Bruijn
2023-08-07 15:03 ` Larysa Zaremba
2023-08-07 15:32 ` Larysa Zaremba
2023-08-07 17:06 ` Stanislav Fomichev
2023-07-31 16:43 ` Jakub Kicinski
2023-08-07 15:08 ` Larysa Zaremba
2023-07-28 17:39 ` [xdp-hints] [PATCH bpf-next v4 13/21] ice: Implement " Larysa Zaremba
2023-07-28 21:02 ` [xdp-hints] " kernel test robot
2023-07-28 21:02 ` kernel test robot
2023-07-28 17:39 ` [xdp-hints] [PATCH bpf-next v4 14/21] selftests/bpf: Allow VLAN packets in xdp_hw_metadata Larysa Zaremba
2023-07-28 17:39 ` [xdp-hints] [PATCH bpf-next v4 15/21] net, xdp: allow metadata > 32 Larysa Zaremba
2023-07-28 17:39 ` [xdp-hints] [PATCH bpf-next v4 16/21] selftests/bpf: Add flags and new hints to xdp_hw_metadata Larysa Zaremba
2023-07-28 17:39 ` [xdp-hints] [PATCH bpf-next v4 17/21] veth: Implement VLAN tag and checksum XDP hint Larysa Zaremba
2023-07-29 22:13 ` [xdp-hints] " kernel test robot
2023-07-28 17:39 ` [xdp-hints] [PATCH bpf-next v4 18/21] net: make vlan_get_tag() return -ENODATA instead of -EINVAL Larysa Zaremba
2023-07-28 17:39 ` [xdp-hints] [PATCH bpf-next v4 19/21] selftests/bpf: Use AF_INET for TX in xdp_metadata Larysa Zaremba
2023-07-28 17:39 ` [xdp-hints] [PATCH bpf-next v4 20/21] selftests/bpf: Check VLAN tag and proto " Larysa Zaremba
2023-07-28 17:39 ` Larysa Zaremba [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://lists.xdp-project.net/postorius/lists/xdp-hints.xdp-project.net/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230728173923.1318596-22-larysa.zaremba@intel.com \
--to=larysa.zaremba@intel.com \
--cc=alexandr.lobakin@intel.com \
--cc=alexei.starovoitov@gmail.com \
--cc=anatoly.burakov@intel.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=brouer@redhat.com \
--cc=daniel@iogearbox.net \
--cc=dsahern@gmail.com \
--cc=haoluo@google.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kpsingh@kernel.org \
--cc=kuba@kernel.org \
--cc=magnus.karlsson@gmail.com \
--cc=martin.lau@linux.dev \
--cc=mtahhan@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=sdf@google.com \
--cc=simon.horman@corigine.com \
--cc=song@kernel.org \
--cc=willemb@google.com \
--cc=willemdebruijn.kernel@gmail.com \
--cc=xdp-hints@xdp-project.net \
--cc=yhs@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox