From mboxrd@z Thu Jan 1 00:00:00 1970 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=-5.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=no 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 CA627C63699 for ; Sat, 14 Nov 2020 08:02:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7BBFF22284 for ; Sat, 14 Nov 2020 08:02:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=tessares-net.20150623.gappssmtp.com header.i=@tessares-net.20150623.gappssmtp.com header.b="dSzJvr3+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726558AbgKNICA (ORCPT ); Sat, 14 Nov 2020 03:02:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726520AbgKNIB7 (ORCPT ); Sat, 14 Nov 2020 03:01:59 -0500 Received: from mail-ed1-x543.google.com (mail-ed1-x543.google.com [IPv6:2a00:1450:4864:20::543]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 000CDC0613D1 for ; Sat, 14 Nov 2020 00:01:58 -0800 (PST) Received: by mail-ed1-x543.google.com with SMTP id v22so13480884edt.9 for ; Sat, 14 Nov 2020 00:01:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares-net.20150623.gappssmtp.com; s=20150623; h=to:cc:references:from:subject:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=/fqG7c8M3pBdJnkPgVTe7wcFahJJ+uSB2RsTpRZEnLs=; b=dSzJvr3+fQAI4NT1Xr9rD6kEQgLMdvSeMpOimThvCfAeMFNlkjhhR5vIumbSSh4sH4 8pDNgiWLKGF2XVLuQ85dtv5kg/RF+3IMLTqgsKNIudE7qhqx0E/hl8C2Kzq1a7DWWv56 ELCG9ZtUjFrlH9U/7AhDlH1QP7djLp7pL3ur/cw/kV/aUuhoom+eTKVQZ9Hj4y+OdqP6 0vTBbFGPxhhwMEfPsuD2VNuIECrJ8ihloBGWNzr5GlFFIV3KdvVhWnwDoI3rESqp/8Ny psoVinFGq8Hytl3uMJsMPRUAw1OVfGFu6q5z6NF2Y2srYnvhfJAIYDFbxpv6izcn2EgJ Cbig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:references:from:subject:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=/fqG7c8M3pBdJnkPgVTe7wcFahJJ+uSB2RsTpRZEnLs=; b=SYmo2LpU3osYWF27r+g40Y119HjWvZK1rXdWsZZmz7Rn2riTVeAHZ4hNXYda2/Oddt trnbK0akDxyJEKG7zr1n1f+oeuA6TqQBZLhn2asKKp5gIYxVVeRt5e4rex2Wv7u+Zjx9 NJA1WzAuQZEEm123h+6WL2vVtGFxyHMhvtDGOYw+mSIsKLyH68FuJtMhxN19rQWrqjUz T3Q/32JnSK2XM8siWQgjiPZLwDI983W/73ljb9yFnpGoclktulAWK6y45zrYBOed3B0v y9y9nOzxpHV73Gbo86q2AqYeLbXPUmm4nTm6c6dr9oFsAJ7DRcj3Hgnn1O1WfFVg2M5t 7fRQ== X-Gm-Message-State: AOAM533EOVmzYolfPZ+QbLBjRzXFTjFY5J+MUvJq/BTCegnKb/AnEBr4 1V0BfSMPPfjBdZX/KzhGasrkhQ== X-Google-Smtp-Source: ABdhPJx/d6nrUq1YXjq87J3UuKPgmYDeIcWSxawnxMko26410wivJfg4UwLLWhjZcKSlNseXvHGhbQ== X-Received: by 2002:aa7:d591:: with SMTP id r17mr6738881edq.274.1605340916276; Sat, 14 Nov 2020 00:01:56 -0800 (PST) Received: from tsr-lap-08.nix.tessares.net ([2a02:578:85b0:e00:2233:3093:edf2:af28]) by smtp.gmail.com with ESMTPSA id j9sm5791221ejf.105.2020.11.14.00.01.55 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 14 Nov 2020 00:01:55 -0800 (PST) To: Randy Dunlap , linux-kernel@vger.kernel.org Cc: kernel test robot , Aleksandr Nogikh , Willem de Bruijn , Jakub Kicinski , linux-next@vger.kernel.org, netdev@vger.kernel.org References: <20201114011110.21906-1-rdunlap@infradead.org> From: Matthieu Baerts Subject: Re: [PATCH net-next] net: linux/skbuff.h: combine NET + KCOV handling Message-ID: <52502fe4-8f41-0630-5b9c-be2e07b6932c@tessares.net> Date: Sat, 14 Nov 2020 09:01:54 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.4.2 MIME-Version: 1.0 In-Reply-To: <20201114011110.21906-1-rdunlap@infradead.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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