[bpf-next,v2] net, xdp: allow metadata > 32

Commit Message

Larysa Zaremba Oct. 31, 2023, 5:57 p.m. UTC

32 bytes may be not enough for some custom metadata. 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 the upper limit is now 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 <[e-mail]>
Signed-off-by: Larysa Zaremba <[e-mail]>
---
v1->v2: replaced 'typeof(metalen)' with the actual type
This patch was previously a part of an old BTF-based hints RFC.
Then it was included into "XDP metadata via kfuncs for ice":
https://lore.kernel.org/bpf/[e-mail]/
It is not longer needed in the series, but presents a useful change on its own.

 include/linux/skbuff.h | 13 ++++++++-----
 include/net/xdp.h      |  7 ++++++-
 2 files changed, 14 insertions(+), 6 deletions(-)

Comments

Alexander Lobakin Nov. 3, 2023, 2:03 p.m. UTC | #1

From: Larysa Zaremba <[e-mail]>
Date: Tue, 31 Oct 2023 18:57:37 +0100

It doesn't have "From: Alexa..." here, so that you'll be the author once
this is applied. Is this intended? ^.^

> 32 bytes may be not enough for some custom metadata. 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 the upper limit is now is 255. Other important
> conditions, such as having enough space for xdp_frame building, are already
> checked in bpf_xdp_adjust_meta().

[...]

Thanks,
Olek

Larysa Zaremba Nov. 3, 2023, 2:34 p.m. UTC | #2

On Fri, Nov 03, 2023 at 03:03:14PM +0100, Alexander Lobakin wrote:
> From: Larysa Zaremba <[e-mail]>
> Date: Tue, 31 Oct 2023 18:57:37 +0100
> 
> It doesn't have "From: Alexa..." here, so that you'll be the author once
> this is applied. Is this intended? ^.^
>

No, I should probably resend.
 
> > 32 bytes may be not enough for some custom metadata. 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 the upper limit is now is 255. Other important
> > conditions, such as having enough space for xdp_frame building, are already
> > checked in bpf_xdp_adjust_meta().
> 
> [...]
> 
> Thanks,
> Olek

Alexei Starovoitov Nov. 9, 2023, 7:19 p.m. UTC | #3

On Fri, Nov 3, 2023 at 7:35 AM Larysa Zaremba <[e-mail]> wrote:
>
> On Fri, Nov 03, 2023 at 03:03:14PM +0100, Alexander Lobakin wrote:
> > From: Larysa Zaremba <[e-mail]>
> > Date: Tue, 31 Oct 2023 18:57:37 +0100
> >
> > It doesn't have "From: Alexa..." here, so that you'll be the author once
> > this is applied. Is this intended? ^.^
> >
>
> No, I should probably resend.

CI is failing as well.
Make sure to test your patches.
test_xdp_context_error:FAIL:bpf_prog_test_run unexpected success: 0

Patch

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 97bfef071255..a361a9b8767c 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -4232,10 +4232,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))
@@ -4255,11 +4258,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 349c36fb5fd8..5d3673afc037 100644
--- a/include/net/xdp.h
+++ b/include/net/xdp.h
@@ -369,7 +369,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);
+	unsigned long 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 {