From patchwork Mon Nov 14 11:43:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 19751 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2098115wru; Mon, 14 Nov 2022 03:49:10 -0800 (PST) X-Google-Smtp-Source: AA0mqf7ahwt4WU8Eg4uw2sd/9ZBbjJnmlmRPOWR+JL4X9dvOqJX14CPp8V98XtEu/c0TQ4LHpOH0 X-Received: by 2002:aa7:d716:0:b0:461:cdfb:3072 with SMTP id t22-20020aa7d716000000b00461cdfb3072mr10992368edq.56.1668426550720; Mon, 14 Nov 2022 03:49:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668426550; cv=none; d=google.com; s=arc-20160816; b=CsbyxGOBifREOtahF/XbsdOJhS0C1Ilg4EHQG8Wxr+0rP1nanw5IiGQ4sQMZq9875t mUF7Lj/Khn2JMaDauTPuRv8tlaRkWaX/Dfba9JGz+0UJWtXkmSXjrVH77OKhGSVPyT/P gMkNletAGZVcb6eAdgI2SaZ984LuCjpHvoQhX15gEDomUXpae5hWqJXcC1XR/tudWjpI LDvrs3t+sbO0mOs8W/wvMVDs3RnKhzo6/tiKLCg1v42ABtf9UjIPMIK/w8zoSFUJ9IqC t0eXQBTN7NFShXH76FZD8AroUXX326nAPvUgYpl8cjtim2KsMTGU4McGfhxY3ryStI1P /njw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ojgDks7IkuPPdCcP8pjEdKvOlDmtTNpzIa6e09VNpp8=; b=MogzGiawmmsTWN3jqN+W9IuXIF3OnHj0l8jwhTxVI4MMGACRYslWJdxv9n8paJLnSo r8bclm44FoRrwn0LJVSqgwYXzSpstGnFyXwpsMMqEwpK7CEPkPGuWo2LgX5Kf4HJAhjY BoC9EJy/X4LPSqw9cfYHweyZEkpw4Yy4kEW5zGNqlzsDzu13Wt5bxLs/JhZzEEnXdfsS afIPc6huyJ1zNw5UXRPMtGUGYdmQ0i7kTCoVciFAbVSYcwIZs9ADSItMlvN8qjlYfTXM LMYBrKc+5OyNVAxPuuK/DFAR5eaYY+54rrc56mOnslAZDsUGLnoYs/MDBm49yCBYKSXk 2L4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="DJ8z/7Ce"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id nc33-20020a1709071c2100b0078d9db99f5esi9873245ejc.39.2022.11.14.03.48.45; Mon, 14 Nov 2022 03:49:10 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="DJ8z/7Ce"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236517AbiKNLqa (ORCPT + 99 others); Mon, 14 Nov 2022 06:46:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41082 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236722AbiKNLpp (ORCPT ); Mon, 14 Nov 2022 06:45:45 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 793FF22B3A; Mon, 14 Nov 2022 03:44:56 -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 C5ACC6106E; Mon, 14 Nov 2022 11:44:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E9126C433D7; Mon, 14 Nov 2022 11:44:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1668426295; bh=OSbGEYnUhjKa2m71ScF7KvfTEC1ATHNDn1CpUx6Hw/0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DJ8z/7CedpLvc+/MF3CZmnF65KarkQtOfm1yX5IFr/LmkkXS8OyiGK5D6LzuK4Mwa XoMpS5SsUhiHN8EntCQVS0aMN3JXNLtGIGn9JmXD9vi5XxwcfKeGIiS4xH7MxNI8t6 vH7kjHjE20tVD8aibkNSy3K52KyjWCH1iFbLzFn+bajePCfLOF8m0ZCazRzy7geM3l IVhKr+7koeeO6NdvAEFD6DO/3P47xTvTqcxey6Tldepdy+3IUwRzfAoFgp+p+ZpuSn FXWWZL6zaWeuMoxWy0bf01evM34QctoIH3I0saRBNn4hX3uT+AVmaq7no+BRMbr/1H tJh/RQSG7pzBA== From: "Jiri Slaby (SUSE)" To: linux-kernel@vger.kernel.org Cc: Andi Kleen , Alexei Starovoitov , Daniel Borkmann , John Fastabend , Andrii Nakryiko , Martin KaFai Lau , Song Liu , Yonghong Song , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , bpf@vger.kernel.org, Martin Liska , Jiri Slaby Subject: [PATCH 24/46] bpf, lto: mark interpreter jump table as __noreorder Date: Mon, 14 Nov 2022 12:43:22 +0100 Message-Id: <20221114114344.18650-25-jirislaby@kernel.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221114114344.18650-1-jirislaby@kernel.org> References: <20221114114344.18650-1-jirislaby@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749472038795186368?= X-GMAIL-MSGID: =?utf-8?q?1749472038795186368?= From: Andi Kleen gcc LTO has a problem that can cause static variables containing && labels to be put into a different LTO partition and then fail the build. This can happen with the jump table in the BPF interprer. Mark the interpreter function and the jump table as __noreorder, this guarantees they both end up in the first partition. Cc: Alexei Starovoitov Cc: Daniel Borkmann Cc: John Fastabend Cc: Andrii Nakryiko Cc: Martin KaFai Lau Cc: Song Liu Cc: Yonghong Song Cc: KP Singh Cc: Stanislav Fomichev Cc: Hao Luo Cc: Jiri Olsa Cc: bpf@vger.kernel.org Signed-off-by: Andi Kleen Signed-off-by: Martin Liska Signed-off-by: Jiri Slaby --- kernel/bpf/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c index 25a54e04560e..d40ce00622f6 100644 --- a/kernel/bpf/core.c +++ b/kernel/bpf/core.c @@ -1640,7 +1640,7 @@ u64 __weak bpf_probe_read_kernel(void *dst, u32 size, const void *unsafe_ptr) * * Return: whatever value is in %BPF_R0 at program exit */ -static u64 ___bpf_prog_run(u64 *regs, const struct bpf_insn *insn) +static u64 __noreorder ___bpf_prog_run(u64 *regs, const struct bpf_insn *insn) { #define BPF_INSN_2_LBL(x, y) [BPF_##x | BPF_##y] = &&x##_##y #define BPF_INSN_3_LBL(x, y, z) [BPF_##x | BPF_##y | BPF_##z] = &&x##_##y##_##z