* [PATCH net-next v5] net: linux/skbuff.h: combine SKB_EXTENSIONS + KCOV handling
@ 2020-11-16 21:21 Randy Dunlap
2020-11-17 6:36 ` Florian Westphal
0 siblings, 1 reply; 3+ messages in thread
From: Randy Dunlap @ 2020-11-16 21:21 UTC (permalink / raw)
To: linux-kernel
Cc: Randy Dunlap, kernel test robot, Aleksandr Nogikh,
Willem de Bruijn, Jakub Kicinski, linux-next, netdev,
Florian Westphal
The previous Kconfig patch led to some other build errors as
reported by the 0day bot and my own overnight build testing.
These are all in <linux/skbuff.h> when KCOV is enabled but
SKB_EXTENSIONS is not enabled, so fix those by combining those conditions
in the header file.
Fixes: 6370cc3bbd8a ("net: add kcov handle to skb extensions")
Fixes: 85ce50d337d1 ("net: kcov: don't select SKB_EXTENSIONS when there is no NET")
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Reported-by: kernel test robot <lkp@intel.com>
Cc: Aleksandr Nogikh <nogikh@google.com>
Cc: Willem de Bruijn <willemb@google.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: linux-next@vger.kernel.org
Cc: netdev@vger.kernel.org
Cc: Florian Westphal <fw@strlen.de>
---
v2: (as suggested by Matthieu Baerts <matthieu.baerts@tessares.net>)
drop an extraneous space in a comment;
use CONFIG_SKB_EXTENSIONS instead of CONFIG_NET;
v3, v4: dropped
v5: drop a redundant IS_ENABLED(CONFIG_SKB_EXTENSIONS) in an enum;
include/linux/skbuff.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- linux-next-20201113.orig/include/linux/skbuff.h
+++ linux-next-20201113/include/linux/skbuff.h
@@ -4608,7 +4608,7 @@ static inline void skb_reset_redirect(st
#endif
}
-#ifdef CONFIG_KCOV
+#if IS_ENABLED(CONFIG_KCOV) && IS_ENABLED(CONFIG_SKB_EXTENSIONS)
static inline void skb_set_kcov_handle(struct sk_buff *skb,
const u64 kcov_handle)
{
@@ -4636,7 +4636,7 @@ static inline u64 skb_get_kcov_handle(st
static inline void skb_set_kcov_handle(struct sk_buff *skb,
const u64 kcov_handle) { }
static inline u64 skb_get_kcov_handle(struct sk_buff *skb) { return 0; }
-#endif /* CONFIG_KCOV */
+#endif /* CONFIG_KCOV && CONFIG_SKB_EXTENSIONS */
#endif /* __KERNEL__ */
#endif /* _LINUX_SKBUFF_H */
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next v5] net: linux/skbuff.h: combine SKB_EXTENSIONS + KCOV handling
2020-11-16 21:21 [PATCH net-next v5] net: linux/skbuff.h: combine SKB_EXTENSIONS + KCOV handling Randy Dunlap
@ 2020-11-17 6:36 ` Florian Westphal
2020-11-17 19:33 ` Jakub Kicinski
0 siblings, 1 reply; 3+ messages in thread
From: Florian Westphal @ 2020-11-17 6:36 UTC (permalink / raw)
To: Randy Dunlap
Cc: linux-kernel, kernel test robot, Aleksandr Nogikh,
Willem de Bruijn, Jakub Kicinski, linux-next, netdev,
Florian Westphal
Randy Dunlap <rdunlap@infradead.org> wrote:
> The previous Kconfig patch led to some other build errors as
> reported by the 0day bot and my own overnight build testing.
>
> These are all in <linux/skbuff.h> when KCOV is enabled but
> SKB_EXTENSIONS is not enabled, so fix those by combining those conditions
> in the header file.
Thanks Randy.
Acked-by: Florian Westphal <fw@strlen.de>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next v5] net: linux/skbuff.h: combine SKB_EXTENSIONS + KCOV handling
2020-11-17 6:36 ` Florian Westphal
@ 2020-11-17 19:33 ` Jakub Kicinski
0 siblings, 0 replies; 3+ messages in thread
From: Jakub Kicinski @ 2020-11-17 19:33 UTC (permalink / raw)
To: Florian Westphal
Cc: Randy Dunlap, linux-kernel, kernel test robot, Aleksandr Nogikh,
Willem de Bruijn, linux-next, netdev
On Tue, 17 Nov 2020 07:36:26 +0100 Florian Westphal wrote:
> Randy Dunlap <rdunlap@infradead.org> wrote:
> > The previous Kconfig patch led to some other build errors as
> > reported by the 0day bot and my own overnight build testing.
> >
> > These are all in <linux/skbuff.h> when KCOV is enabled but
> > SKB_EXTENSIONS is not enabled, so fix those by combining those conditions
> > in the header file.
>
> Acked-by: Florian Westphal <fw@strlen.de>
Applied, thanks1
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-11-17 19:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-16 21:21 [PATCH net-next v5] net: linux/skbuff.h: combine SKB_EXTENSIONS + KCOV handling Randy Dunlap
2020-11-17 6:36 ` Florian Westphal
2020-11-17 19:33 ` Jakub Kicinski
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.