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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 650AAC6FA8E for ; Sun, 26 Feb 2023 14:47:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229823AbjBZOrH (ORCPT ); Sun, 26 Feb 2023 09:47:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43388 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229795AbjBZOrF (ORCPT ); Sun, 26 Feb 2023 09:47:05 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8A1B8126C8; Sun, 26 Feb 2023 06:46:29 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id A13EE60C2D; Sun, 26 Feb 2023 14:45:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F1378C433EF; Sun, 26 Feb 2023 14:45:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677422719; bh=CIBDjaRJoMuMfExEyRgKQbnWA1vh/FpEjx1ld84jebs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ByVaD7+suux3+Roipg1g6VtFAZv/AUkxJ9a7gqEJXfP0Ys6/F5atDSkQairiUQLKU 1NvwH9p5Qe+lMmHyRRPB5R3qgMWhZuwPfE9mn71x0PZzT6vh9QRfP5gXt/URrh0Amp f6Kh3FmoK83CrtfJvN380tzV2hs3OE+OkyPocLqZM751hqUij06ya1e5S4Ls02C1/p KMutW+PmjAetVA5mON31QNhfOsMGlutrZTFVi+2tUCe1AZdVCHjQ2nVi02jgyYYc5v aiLs9NJD+o9L9MdwFhlxtx0TmCU4LUbNK1MJ/irgI1oEh+kRipBwpjxEuZ3/8jfA0R wzIL1Wly4vfrw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= , Daniel Borkmann , Quentin Monnet , Sasha Levin , ast@kernel.org, andrii@kernel.org, nathan@kernel.org, ndesaulniers@google.com, bpf@vger.kernel.org, llvm@lists.linux.dev Subject: [PATCH AUTOSEL 6.2 13/53] bpftool: Always disable stack protection for BPF objects Date: Sun, 26 Feb 2023 09:44:05 -0500 Message-Id: <20230226144446.824580-13-sashal@kernel.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230226144446.824580-1-sashal@kernel.org> References: <20230226144446.824580-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Holger Hoffstätte [ Upstream commit 878625e1c7a10dfbb1fdaaaae2c4d2a58fbce627 ] When the clang toolchain has stack protection enabled in order to be consistent with gcc - which just happens to be the case on Gentoo - the bpftool build fails: [...] clang \ -I. \ -I/tmp/portage/dev-util/bpftool-6.0.12/work/linux-6.0/tools/include/uapi/ \ -I/tmp/portage/dev-util/bpftool-6.0.12/work/linux-6.0/tools/bpf/bpftool/bootstrap/libbpf/include \ -g -O2 -Wall -target bpf -c skeleton/pid_iter.bpf.c -o pid_iter.bpf.o clang \ -I. \ -I/tmp/portage/dev-util/bpftool-6.0.12/work/linux-6.0/tools/include/uapi/ \ -I/tmp/portage/dev-util/bpftool-6.0.12/work/linux-6.0/tools/bpf/bpftool/bootstrap/libbpf/include \ -g -O2 -Wall -target bpf -c skeleton/profiler.bpf.c -o profiler.bpf.o skeleton/profiler.bpf.c:40:14: error: A call to built-in function '__stack_chk_fail' is not supported. int BPF_PROG(fentry_XXX) ^ skeleton/profiler.bpf.c:94:14: error: A call to built-in function '__stack_chk_fail' is not supported. int BPF_PROG(fexit_XXX) ^ 2 errors generated. [...] Since stack-protector makes no sense for the BPF bits just unconditionally disable it. Bug: https://bugs.gentoo.org/890638 Signed-off-by: Holger Hoffstätte Signed-off-by: Daniel Borkmann Acked-by: Quentin Monnet Link: https://lore.kernel.org/bpf/74cd9d2e-6052-312a-241e-2b514a75c92c@applied-asynchrony.com Signed-off-by: Sasha Levin --- tools/bpf/bpftool/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile index f610e184ce02a..270066aff8bf1 100644 --- a/tools/bpf/bpftool/Makefile +++ b/tools/bpf/bpftool/Makefile @@ -215,7 +215,8 @@ $(OUTPUT)%.bpf.o: skeleton/%.bpf.c $(OUTPUT)vmlinux.h $(LIBBPF_BOOTSTRAP) -I$(or $(OUTPUT),.) \ -I$(srctree)/tools/include/uapi/ \ -I$(LIBBPF_BOOTSTRAP_INCLUDE) \ - -g -O2 -Wall -target bpf -c $< -o $@ + -g -O2 -Wall -fno-stack-protector \ + -target bpf -c $< -o $@ $(Q)$(LLVM_STRIP) -g $@ $(OUTPUT)%.skel.h: $(OUTPUT)%.bpf.o $(BPFTOOL_BOOTSTRAP) -- 2.39.0