Hi all,
After merging the bpf-next tree, today's linux-next build (x86_64
allnoconfig) failed like this:
In file included from fs/select.c:32:
include/net/busy_poll.h: In function 'sk_mark_napi_id_once':
include/net/busy_poll.h:150:36: error: 'const struct sk_buff' has no member named 'napi_id'
150 | __sk_mark_napi_id_once_xdp(sk, skb->napi_id);
| ^~
Caused by commit
b02e5a0ebb17 ("xsk: Propagate napi_id to XDP socket Rx path")
sk_buff only has a napi_id if defined(CONFIG_NET_RX_BUSY_POLL) ||
defined(CONFIG_XPS).
I have applied the following patch for today.
From bd2a1a4a773c1f306460b4309b12cad245a5edad Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <[email protected]>
Date: Tue, 1 Dec 2020 19:02:58 +1100
Subject: [PATCH] fix for "xsk: Propagate napi_id to XDP socket Rx path"
Signed-off-by: Stephen Rothwell <[email protected]>
---
include/net/busy_poll.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/include/net/busy_poll.h b/include/net/busy_poll.h
index 45b3e04b99d3..07a88f592e72 100644
--- a/include/net/busy_poll.h
+++ b/include/net/busy_poll.h
@@ -147,7 +147,9 @@ static inline void __sk_mark_napi_id_once_xdp(struct sock *sk, unsigned int napi
static inline void sk_mark_napi_id_once(struct sock *sk,
const struct sk_buff *skb)
{
+#ifdef CONFIG_NET_RX_BUSY_POLL
__sk_mark_napi_id_once_xdp(sk, skb->napi_id);
+#endif
}
static inline void sk_mark_napi_id_once_xdp(struct sock *sk,
--
2.29.2
--
Cheers,
Stephen Rothwell
On 12/1/20 9:07 AM, Stephen Rothwell wrote:
> Hi all,
>
> After merging the bpf-next tree, today's linux-next build (x86_64
> allnoconfig) failed like this:
>
> In file included from fs/select.c:32:
> include/net/busy_poll.h: In function 'sk_mark_napi_id_once':
> include/net/busy_poll.h:150:36: error: 'const struct sk_buff' has no member named 'napi_id'
> 150 | __sk_mark_napi_id_once_xdp(sk, skb->napi_id);
> | ^~
>
> Caused by commit
>
> b02e5a0ebb17 ("xsk: Propagate napi_id to XDP socket Rx path")
>
Fixed it up in bpf-next, thanks for reporting!