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

[Matthieu Baerts]

Hi Randy,

On 14/11/2020 02:11, 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.

Thank you for looking at that!

I had the same issue and I was going to propose a similar fix with one 
small difference, please see below.

> --- 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_NET)
>   static inline void skb_set_kcov_handle(struct sk_buff *skb,
Should we have here CONFIG_SKB_EXTENSIONS instead of CONFIG_NET?

It is valid to use NET thanks to your commit 85ce50d337d1 ("net: kcov: 
don't select SKB_EXTENSIONS when there is no NET") that links 
SKB_EXTENSIONS with NET for KCOV but it looks strange to me to use a 
"non direct" dependence :)
I mean: here below, skb_ext_add() and skb_ext_find() are called but they 
are defined only if SKB_EXTENSIONS is enabled, not only NET.

But as I said, this patch fixes the issue. It's fine for me if we prefer 
to use CONFIG_NET.

> @@ -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_NET */

(Small detail if you post a v2: there is an extra space between "&&" and 
"CONFIG_NET")

Cheers,
Matt
--
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net