From: Randy Dunlap <rdunlap@infradead•org>
To: linux-kernel@vger•kernel.org
Cc: Randy Dunlap <rdunlap@infradead•org>,
kernel test robot <lkp@intel•com>,
Aleksandr Nogikh <nogikh@google•com>,
Willem de Bruijn <willemb@google•com>,
Jakub Kicinski <kuba@kernel•org>,
linux-next@vger•kernel.org, netdev@vger•kernel.org,
Florian Westphal <fw@strlen•de>
Subject: [PATCH net-next v5] net: linux/skbuff.h: combine SKB_EXTENSIONS + KCOV handling
Date: Mon, 16 Nov 2020 13:21:08 -0800 [thread overview]
Message-ID: <20201116212108.32465-1-rdunlap@infradead.org> (raw)
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 */
next reply other threads:[~2020-11-16 21:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-16 21:21 Randy Dunlap [this message]
2020-11-17 6:36 ` [PATCH net-next v5] net: linux/skbuff.h: combine SKB_EXTENSIONS + KCOV handling Florian Westphal
2020-11-17 19:33 ` Jakub Kicinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201116212108.32465-1-rdunlap@infradead.org \
--to=rdunlap@infradead$(echo .)org \
--cc=fw@strlen$(echo .)de \
--cc=kuba@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=lkp@intel$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=nogikh@google$(echo .)com \
--cc=willemb@google$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox