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=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 178E1C606C1 for ; Mon, 8 Jul 2019 15:41:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EAE1B20651 for ; Mon, 8 Jul 2019 15:41:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391053AbfGHPlX (ORCPT ); Mon, 8 Jul 2019 11:41:23 -0400 Received: from www62.your-server.de ([213.133.104.62]:45366 "EHLO www62.your-server.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388894AbfGHP0s (ORCPT ); Mon, 8 Jul 2019 11:26:48 -0400 Received: from [78.46.172.2] (helo=sslproxy05.your-server.de) by www62.your-server.de with esmtpsa (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89_1) (envelope-from ) id 1hkVXP-0000jC-V5; Mon, 08 Jul 2019 17:26:44 +0200 Received: from [178.193.45.231] (helo=linux.home) by sslproxy05.your-server.de with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89) (envelope-from ) id 1hkVXP-000CEe-Mh; Mon, 08 Jul 2019 17:26:43 +0200 Subject: Re: [PATCH net-next 1/2] bpf: skip sockopt hooks without CONFIG_NET To: Yonghong Song , Arnd Bergmann , Alexei Starovoitov Cc: Andrii Nakryiko , Martin Lau , Stanislav Fomichev , Song Liu , Mauricio Vasquez B , Roman Gushchin , Matt Mullins , Willem de Bruijn , Andrey Ignatov , "netdev@vger.kernel.org" , "bpf@vger.kernel.org" , "linux-kernel@vger.kernel.org" References: <20190708125733.3944836-1-arnd@arndb.de> <0e7cf1b5-579f-5fcd-0966-8760148b00de@fb.com> From: Daniel Borkmann Message-ID: Date: Mon, 8 Jul 2019 17:26:42 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: <0e7cf1b5-579f-5fcd-0966-8760148b00de@fb.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Authenticated-Sender: daniel@iogearbox.net X-Virus-Scanned: Clear (ClamAV 0.100.3/25504/Mon Jul 8 10:05:57 2019) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 07/08/2019 05:06 PM, Yonghong Song wrote: > On 7/8/19 5:57 AM, Arnd Bergmann wrote: >> When CONFIG_NET is disabled, we get a link error: >> >> kernel/bpf/cgroup.o: In function `__cgroup_bpf_run_filter_setsockopt': >> cgroup.c:(.text+0x3010): undefined reference to `lock_sock_nested' >> cgroup.c:(.text+0x3258): undefined reference to `release_sock' >> kernel/bpf/cgroup.o: In function `__cgroup_bpf_run_filter_getsockopt': >> cgroup.c:(.text+0x3568): undefined reference to `lock_sock_nested' >> cgroup.c:(.text+0x3870): undefined reference to `release_sock' >> kernel/bpf/cgroup.o: In function `cg_sockopt_func_proto': >> cgroup.c:(.text+0x41d8): undefined reference to `bpf_sk_storage_delete_proto' >> >> None of this code is useful in this configuration anyway, so we can >> simply hide it in an appropriate #ifdef. >> >> Fixes: 0d01da6afc54 ("bpf: implement getsockopt and setsockopt hooks") >> Signed-off-by: Arnd Bergmann > > FYI. > > There is already a patch to fix the same issue, > https://lore.kernel.org/bpf/e9e489fe-feec-a211-82aa-5df0c6a308d1@huawei.com/T/#t > > which has been acked and not merged yet. Done now, and I've also applied patch 2/2 from here, thanks.