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=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,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 71753C433E5 for ; Tue, 21 Jul 2020 10:07:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 521CE2073A for ; Tue, 21 Jul 2020 10:07:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=cloudflare.com header.i=@cloudflare.com header.b="PzoP31ht" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726415AbgGUKHV (ORCPT ); Tue, 21 Jul 2020 06:07:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41834 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729136AbgGUKHU (ORCPT ); Tue, 21 Jul 2020 06:07:20 -0400 Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 080B0C0619D8 for ; Tue, 21 Jul 2020 03:07:20 -0700 (PDT) Received: by mail-wm1-x343.google.com with SMTP id 22so2231338wmg.1 for ; Tue, 21 Jul 2020 03:07:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=oXGSZ0dsXv7x3pURvQ2cvr8DFxcIdAjKTYhBK5oO81A=; b=PzoP31ht8eD53sERMB43pFIWqbCNcNQsde32C1X0lOcGO4jxyvkDb4kzJofJoqB23Y awubkNA1+MX7CpcGelunh1YRBzU1nt0tAKpq+GNGN2N/+LCO7a6sK9bKNhBBD0uODo/n ehzrrhFfcU4JjbPaIqV5KgSADbO7HWrkaOq34= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=oXGSZ0dsXv7x3pURvQ2cvr8DFxcIdAjKTYhBK5oO81A=; b=c4BymVJsKSDyilPrI+RsZUV3OolmVXEHvZ2QJKiVQ/ANSKu79H5XzfIKA/PmIjJ1ub wnNArlNL/7sfoy/Qt2T98Yv+ke7J8zS+7ZID82xcmi8iy4yU1K6LRfT2xjGs5Fsk+R/Y E1SXzlgThNJ8Ddwqq4I4BB9EKT7iIZ3HMGDnlpHi8o8hk5FDTghWVEZe0rVwo10C3P7u 0RNpBQaQ+tI0/sv/iNiVcIivPxFCsbIjPPcP/2ECKAN2XU3/rEuxoxkXWJqnCPzpBLWD Uyq4gxfLVYG8FrGd49cDBGp7A7+TH7NPgvw3lWgFKSnGuzknFd1VhNlc6JzM97knVSKv XKTg== X-Gm-Message-State: AOAM5338YFhV+IPRajD58+uUuftVzZ9kWL/gHvcUU8wBCG1NIcf2NYg9 DYBPyvKa7ljyaN9er2/xUSQQY6N01jc= X-Google-Smtp-Source: ABdhPJy3Jlln+qsPyGP9sChkcbPXDeup2njSIU7yISiWeOUvZKr7crp5YYZMX0v1paGnfuZLG9zhYQ== X-Received: by 2002:a1c:7916:: with SMTP id l22mr3152439wme.115.1595326038161; Tue, 21 Jul 2020 03:07:18 -0700 (PDT) Received: from cloudflare.com ([2a02:a310:c262:aa00:b35e:8938:2c2a:ba8b]) by smtp.gmail.com with ESMTPSA id u1sm45504409wrb.78.2020.07.21.03.07.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jul 2020 03:07:17 -0700 (PDT) From: Jakub Sitnicki To: bpf@vger.kernel.org Cc: netdev@vger.kernel.org, kernel-team@cloudflare.com, Alexei Starovoitov , Daniel Borkmann , Randy Dunlap , Stephen Rothwell Subject: [PATCH bpf-next] bpf, netns: Fix build without CONFIG_INET Date: Tue, 21 Jul 2020 12:07:16 +0200 Message-Id: <20200721100716.720477-1-jakub@cloudflare.com> X-Mailer: git-send-email 2.25.4 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org When CONFIG_NET is set but CONFIG_INET isn't, build fails with: ld: kernel/bpf/net_namespace.o: in function `netns_bpf_attach_type_unneed': kernel/bpf/net_namespace.c:32: undefined reference to `bpf_sk_lookup_enabled' ld: kernel/bpf/net_namespace.o: in function `netns_bpf_attach_type_need': kernel/bpf/net_namespace.c:43: undefined reference to `bpf_sk_lookup_enabled' This is because without CONFIG_INET bpf_sk_lookup_enabled symbol is not available. Wrap references to bpf_sk_lookup_enabled with preprocessor conditionals. Fixes: 1559b4aa1db4 ("inet: Run SK_LOOKUP BPF program on socket lookup") Reported-by: Randy Dunlap Reported-by: Stephen Rothwell Signed-off-by: Jakub Sitnicki --- kernel/bpf/net_namespace.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kernel/bpf/net_namespace.c b/kernel/bpf/net_namespace.c index 4e1bcaa2c3cb..71405edd667c 100644 --- a/kernel/bpf/net_namespace.c +++ b/kernel/bpf/net_namespace.c @@ -28,9 +28,11 @@ DEFINE_MUTEX(netns_bpf_mutex); static void netns_bpf_attach_type_unneed(enum netns_bpf_attach_type type) { switch (type) { +#ifdef CONFIG_INET case NETNS_BPF_SK_LOOKUP: static_branch_dec(&bpf_sk_lookup_enabled); break; +#endif default: break; } @@ -39,9 +41,11 @@ static void netns_bpf_attach_type_unneed(enum netns_bpf_attach_type type) static void netns_bpf_attach_type_need(enum netns_bpf_attach_type type) { switch (type) { +#ifdef CONFIG_INET case NETNS_BPF_SK_LOOKUP: static_branch_inc(&bpf_sk_lookup_enabled); break; +#endif default: break; } -- 2.25.4