From patchwork Sat Nov 14 01:11:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 11905271 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6702CC4742C for ; Sat, 14 Nov 2020 01:12:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2DD6422254 for ; Sat, 14 Nov 2020 01:12:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="kBmQ2iLC" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726357AbgKNBLT (ORCPT ); Fri, 13 Nov 2020 20:11:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47176 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726064AbgKNBLT (ORCPT ); Fri, 13 Nov 2020 20:11:19 -0500 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A5DBC0613D1; Fri, 13 Nov 2020 17:11:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:In-Reply-To:References; bh=KyvIJI3NYsbSLBCCLSp/r5FozbXe6DUDrCSrMc6HNfY=; b=kBmQ2iLCQrKZ/8pOBocGDz84VH GUwhykQprA6NUyuweh5WtmMpBae3Be9kd6yyqmLDhERoBScl+D20do+PaSjieyto9VscalqvMrloo LfPYFompuHjsvP85yGLIvgTMwLblI964WgFehPSq46MH3dwwdZv2gVtbVUntkwB8j2Rgcw9kOhitX DygHK/kJMqKslzPAquRdifbMEf2Wd46JCKKbHEXgimVNUPY8mJVZka/lLjZX5giV4T81fuKbHMC7W ro5WSPBlxQpexgMROTNamSOlaL5lbiEUYMC1/82HkTIZXk5uM3GVwirKWYQ+8Rtnz2w+N7Z0al7gm VWns5VDg==; Received: from [2601:1c0:6280:3f0::662d] (helo=smtpauth.infradead.org) by casper.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1kdk60-0001pd-2b; Sat, 14 Nov 2020 01:11:16 +0000 From: Randy Dunlap To: linux-kernel@vger.kernel.org Cc: Randy Dunlap , kernel test robot , Aleksandr Nogikh , Willem de Bruijn , Jakub Kicinski , linux-next@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH net-next] net: linux/skbuff.h: combine NET + KCOV handling Date: Fri, 13 Nov 2020 17:11:10 -0800 Message-Id: <20201114011110.21906-1-rdunlap@infradead.org> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org 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 NET 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 Reported-by: kernel test robot Cc: Aleksandr Nogikh Cc: Willem de Bruijn Cc: Jakub Kicinski Cc: linux-next@vger.kernel.org Cc: netdev@vger.kernel.org --- include/linux/skbuff.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- linux-next-20201113.orig/include/linux/skbuff.h +++ linux-next-20201113/include/linux/skbuff.h @@ -4151,7 +4151,7 @@ enum skb_ext_id { #if IS_ENABLED(CONFIG_MPTCP) SKB_EXT_MPTCP, #endif -#if IS_ENABLED(CONFIG_KCOV) +#if IS_ENABLED(CONFIG_KCOV) && IS_ENABLED(CONFIG_NET) SKB_EXT_KCOV_HANDLE, #endif SKB_EXT_NUM, /* must be last */ @@ -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, 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_NET */ #endif /* __KERNEL__ */ #endif /* _LINUX_SKBUFF_H */