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=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham 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 24E89C433FE for ; Mon, 7 Dec 2020 20:05:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E73222396D for ; Mon, 7 Dec 2020 20:05:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727114AbgLGUFT (ORCPT ); Mon, 7 Dec 2020 15:05:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36170 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725814AbgLGUFT (ORCPT ); Mon, 7 Dec 2020 15:05:19 -0500 Received: from mail-ej1-x641.google.com (mail-ej1-x641.google.com [IPv6:2a00:1450:4864:20::641]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E9502C061793 for ; Mon, 7 Dec 2020 12:04:38 -0800 (PST) Received: by mail-ej1-x641.google.com with SMTP id d17so21284077ejy.9 for ; Mon, 07 Dec 2020 12:04:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=message-id:subject:from:to:cc:date:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=1fLpHyStJBLv4aqDCL/7SVHpDLwiRrQzoRyrVsNBNNw=; b=jNsLsfeV2FkguEwqHIJLI4rYmYRF1wgUtiYqQqIWfatqST5/EFGHOcLs+JlHGF1sLJ 4JBP6HOQLZw7L8sCJYntHm+guWJwv5ev6HKQvgfw8ahmy27wZXtrUH6qjosvnA/oRqih CWOov84H1+Ujj81/cwqrSte8yOSjXq5VxD3ts= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=1fLpHyStJBLv4aqDCL/7SVHpDLwiRrQzoRyrVsNBNNw=; b=r72p44evR422mZ+XHb86u4cqmx5djWlfuPHH0clBpu+AeshCkNoKMGncFzxTgdFiSj VN9frW3jIaMd5ZCEEDAqigYZArbpX6/r2Uc4g1F8TbzfQKcO+EAGcCsQcr6TBlEFY5W7 W6+ph8R4xHCtFfkCeqHNFidrvvD+mCGffqGzCi9K7KqVAWbmmkbibnjn2y2naI+JHjSM FEUVwth4vTTCtTV+9cH07Ceyp6Hh6oCX/spWe7qywpFwqkEcp3q/2RApTHZe6UjzgOSI IN2p3J3REWcvHXoORSzjHIQnPVnv1zydZaGpHQE9FF26h0dzX6UMne6qbP4Vj+os/uCj fTDA== X-Gm-Message-State: AOAM532dhCSgKGq9Nf7DI/5+WynF1wzSLjZQT8dd2MKIHNs7WO6X0ppY fzemcUIA+r3a4XpCrMdNzwgl/w== X-Google-Smtp-Source: ABdhPJzC2Cp/8Sf+L1ff7VBAIICLIXnXpNa/LfTinUDha9V4CAAhbm1VDVmv3BRLiyb0CFIZG9yfDw== X-Received: by 2002:a17:907:20a4:: with SMTP id pw4mr20120451ejb.499.1607371477671; Mon, 07 Dec 2020 12:04:37 -0800 (PST) Received: from ?IPv6:2a04:ee41:4:1318:ea45:a00:4d43:48fc? ([2a04:ee41:4:1318:ea45:a00:4d43:48fc]) by smtp.gmail.com with ESMTPSA id e10sm13809540ejl.70.2020.12.07.12.04.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Dec 2020 12:04:37 -0800 (PST) Message-ID: Subject: Re: [PATCH bpf-next] bpf: Only call sock_from_file with CONFIG_NET From: Florent Revest To: bpf@vger.kernel.org Cc: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, kpsingh@chromium.org, rdunlap@infradead.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Date: Mon, 07 Dec 2020 21:04:36 +0100 In-Reply-To: <20201207195539.609787-1-revest@chromium.org> References: <20201207195539.609787-1-revest@chromium.org> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.36.4-2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 2020-12-07 at 20:55 +0100, Florent Revest wrote: > This avoids > ld: kernel/trace/bpf_trace.o: in function `bpf_sock_from_file': > bpf_trace.c:(.text+0xe23): undefined reference to `sock_from_file' > When compiling a kernel with BPF and without NET. > > Reported-by: Randy Dunlap > Signed-off-by: Florent Revest > --- > kernel/trace/bpf_trace.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c > index 0cf0a6331482..877123bae71f 100644 > --- a/kernel/trace/bpf_trace.c > +++ b/kernel/trace/bpf_trace.c > @@ -1272,7 +1272,11 @@ const struct bpf_func_proto > bpf_snprintf_btf_proto = { > > BPF_CALL_1(bpf_sock_from_file, struct file *, file) > { > +#ifdef CONFIG_NET > return (unsigned long) sock_from_file(file); > +#else > + return NULL; Ugh, and of course I messed up my fix... :) Now this causes a: ./include/linux/stddef.h:8:14: warning: returning ‘void *’ from a function with return type ‘u64’ {aka ‘long long unsigned int’} makes integer from pointer without a cast [-Wint-conversion] 8 | #define NULL ((void *)0) | ^ kernel/trace/bpf_trace.c:1278:9: note: in expansion of macro ‘NULL’ 1278 | return NULL; So I'm sending a v2!