XDP hardware hints discussion mail archive
 help / color / mirror / Atom feed
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>,
	Aleksander Lobakin <aleksander.lobakin@intel.com>
Subject: [xdp-hints] [PATCH bpf-next v4 15/21] net, xdp: allow metadata > 32
Date: Fri, 28 Jul 2023 19:39:17 +0200	[thread overview]
Message-ID: <20230728173923.1318596-16-larysa.zaremba@intel.com> (raw)
In-Reply-To: <20230728173923.1318596-1-larysa.zaremba@intel.com>

From: Aleksander Lobakin <aleksander.lobakin@intel.com>

When using XDP hints, metadata sometimes has to be much bigger
than 32 bytes. Relax the restriction, allow metadata larger than 32 bytes
and make __skb_metadata_differs() work with bigger lengths.

Now size of metadata is only limited by the fact it is stored as u8
in skb_shared_info, so maximum possible value is 255. Other important
conditions, such as having enough space for xdp_frame building, are already
checked in bpf_xdp_adjust_meta().

The requirement of having its length aligned to 4 bytes is still
valid.

Signed-off-by: Aleksander Lobakin <aleksander.lobakin@intel.com>
Signed-off-by: Larysa Zaremba <larysa.zaremba@intel.com>
---
 include/linux/skbuff.h | 13 ++++++++-----
 include/net/xdp.h      |  7 ++++++-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index faaba050f843..5d553dcc1ceb 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -4217,10 +4217,13 @@ static inline bool __skb_metadata_differs(const struct sk_buff *skb_a,
 {
 	const void *a = skb_metadata_end(skb_a);
 	const void *b = skb_metadata_end(skb_b);
-	/* Using more efficient varaiant than plain call to memcmp(). */
-#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64
 	u64 diffs = 0;
 
+	if (!IS_ENABLED(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) ||
+	    BITS_PER_LONG != 64)
+		goto slow;
+
+	/* Using more efficient variant than plain call to memcmp(). */
 	switch (meta_len) {
 #define __it(x, op) (x -= sizeof(u##op))
 #define __it_diff(a, b, op) (*(u##op *)__it(a, op)) ^ (*(u##op *)__it(b, op))
@@ -4240,11 +4243,11 @@ static inline bool __skb_metadata_differs(const struct sk_buff *skb_a,
 		fallthrough;
 	case  4: diffs |= __it_diff(a, b, 32);
 		break;
+	default:
+slow:
+		return memcmp(a - meta_len, b - meta_len, meta_len);
 	}
 	return diffs;
-#else
-	return memcmp(a - meta_len, b - meta_len, meta_len);
-#endif
 }
 
 static inline bool skb_metadata_differs(const struct sk_buff *skb_a,
diff --git a/include/net/xdp.h b/include/net/xdp.h
index 7e6163e5002a..84667da5e7e7 100644
--- a/include/net/xdp.h
+++ b/include/net/xdp.h
@@ -370,7 +370,12 @@ xdp_data_meta_unsupported(const struct xdp_buff *xdp)
 
 static inline bool xdp_metalen_invalid(unsigned long metalen)
 {
-	return (metalen & (sizeof(__u32) - 1)) || (metalen > 32);
+	typeof(metalen) meta_max;
+
+	meta_max = type_max(typeof_member(struct skb_shared_info, meta_len));
+	BUILD_BUG_ON(!__builtin_constant_p(meta_max));
+
+	return !IS_ALIGNED(metalen, sizeof(u32)) || metalen > meta_max;
 }
 
 struct xdp_attachment_info {
-- 
2.41.0


  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 ` Larysa Zaremba [this message]
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 ` [xdp-hints] [PATCH bpf-next v4 21/21] selftests/bpf: check checksum state " Larysa Zaremba

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-16-larysa.zaremba@intel.com \
    --to=larysa.zaremba@intel.com \
    --cc=aleksander.lobakin@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