Re: [PATCH net-next v4] net: linux/skbuff.h: combine SKB_EXTENSIONS + KCOV handling

2020-11-16 Thread Florian Westphal
Randy Dunlap wrote: > On 11/16/20 7:30 AM, Jakub Kicinski wrote: > > On Mon, 16 Nov 2020 15:31:21 +0100 Florian Westphal wrote: > @@ -4151,12 +4150,11 @@ enum skb_ext_id { > #if IS_ENABLED(CONFIG_MPTCP) > SKB_EXT_MPTCP, > #endif > -#if IS_ENABLED(CONFIG_KCOV)

Re: [PATCH net-next v4] net: linux/skbuff.h: combine SKB_EXTENSIONS + KCOV handling

2020-11-16 Thread Randy Dunlap
On 11/16/20 7:30 AM, Jakub Kicinski wrote: > On Mon, 16 Nov 2020 15:31:21 +0100 Florian Westphal wrote: @@ -4151,12 +4150,11 @@ enum skb_ext_id { #if IS_ENABLED(CONFIG_MPTCP) SKB_EXT_MPTCP, #endif -#if IS_ENABLED(CONFIG_KCOV) SKB_EXT_KCOV_HANDLE,

Re: [PATCH net-next v4] net: linux/skbuff.h: combine SKB_EXTENSIONS + KCOV handling

2020-11-16 Thread Jakub Kicinski
On Mon, 16 Nov 2020 15:31:21 +0100 Florian Westphal wrote: > > > @@ -4151,12 +4150,11 @@ enum skb_ext_id { > > > #if IS_ENABLED(CONFIG_MPTCP) > > > SKB_EXT_MPTCP, > > > #endif > > > -#if IS_ENABLED(CONFIG_KCOV) > > > SKB_EXT_KCOV_HANDLE, > > > -#endif > > > > I don't

Re: [PATCH net-next v4] net: linux/skbuff.h: combine SKB_EXTENSIONS + KCOV handling

2020-11-16 Thread Florian Westphal
Matthieu Baerts wrote: > > --- linux-next-20201113.orig/include/linux/skbuff.h > > +++ linux-next-20201113/include/linux/skbuff.h > > @@ -4137,7 +4137,6 @@ static inline void skb_set_nfct(struct s > > #endif > > } > > -#ifdef CONFIG_SKB_EXTENSIONS > > enum skb_ext_id { > > #if

Re: [PATCH net-next v4] net: linux/skbuff.h: combine SKB_EXTENSIONS + KCOV handling

2020-11-16 Thread Matthieu Baerts
Hi Randy, On 16/11/2020 04:17, Randy Dunlap 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 when KCOV is enabled but SKB_EXTENSIONS is not enabled, so fix those by combining those conditions in

[PATCH net-next v4] net: linux/skbuff.h: combine SKB_EXTENSIONS + KCOV handling

2020-11-15 Thread Randy Dunlap
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 when KCOV is enabled but SKB_EXTENSIONS is not enabled, so fix those by combining those conditions in the header file. Also, add stubs for skb_ext_add() and