From nobody Wed Dec 17 07:59:14 2025 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 80F68C4332F for ; Tue, 31 Oct 2023 10:21:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343584AbjJaKVV (ORCPT ); Tue, 31 Oct 2023 06:21:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56714 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235003AbjJaKVT (ORCPT ); Tue, 31 Oct 2023 06:21:19 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD6AA83 for ; Tue, 31 Oct 2023 03:21:17 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4697FC433C7; Tue, 31 Oct 2023 10:21:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698747677; bh=gUeRSs5+yXnf0S9xCXa02DoNW17WbzA5LXC/a2PvNWs=; h=From:To:Cc:Subject:Date:From; b=jTufno9V3ryoUZgaMPBKh6Pqz1x6lKEIKqtD05wojBYkcK0XuphW2MGNmeNskeRxn KwV8BBq/WRwMe9M/zTcXhm9NJnTv8OAra9Pm1Ptl9MNXw4Bqg+Fw64LKzu9Z+8vD/q DLcw/ML+D27+ih/zb9E66nLwaRvTOuOlxfJUTCSH0/OXRhlfMxI/RuB7HeAN3X+C0X ZumIXgFablpFe3809dUhmuy5giuOa5Ta9CIXEe5Aa9F4OFSLhqyml8TuSHmKUYBXmv nJNE7bvvl5hQ6bZzE6ZVEvuEdKT/ldij+6q/1rlF6EqC0CeQ/0Ndg7tJ3/8F6tA751 0txdy0G0KMbdw== From: "Jiri Slaby (SUSE)" To: bp@alien8.de Cc: peterz@infradead.org, linux-kernel@vger.kernel.org, "Jiri Slaby (SUSE)" , Yu-cheng Yu , Rick Edgecombe , Dave Hansen , Kees Cook , Mike Rapoport , Pengfei Xu , John Allen , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org Subject: [PATCH] x86: Let AS_WRUSS depend on X86_64 Date: Tue, 31 Oct 2023 11:21:11 +0100 Message-ID: <20231031102111.32142-1-jirislaby@kernel.org> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Since commit 18e66b695e78 ("x86/shstk: Add Kconfig option for shadow stack"), AS_WRUSS is set even in 32-bit .configs. It is due to how Kbuild works. .config is not considered during make oldconfig (and other make *config), so standard (64-bit) gcc is invoked from 'as-instr' Kbuild tests. And such gcc indeed reports that wruss is supported, so AS_WRUSS=3Dy is set. Provided the wruss instruction is 64-bit only (and used in pure 64-bit X86_USER_SHADOW_STACK), it has little sense to have AS_WRUSS=3Dy set on 32-bit. Therefore, make the whole test dependent on X86_64 to ensure it's set only on 64-bit. Signed-off-by: Jiri Slaby (SUSE) Cc: Yu-cheng Yu Cc: Rick Edgecombe Cc: Dave Hansen Cc: Borislav Petkov (AMD) Cc: Kees Cook Cc: Mike Rapoport (IBM) Cc: Pengfei Xu Cc: John Allen Cc: Kees Cook Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: x86@kernel.org --- arch/x86/Kconfig.assembler | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/Kconfig.assembler b/arch/x86/Kconfig.assembler index 8ad41da301e5..a5b5241711e3 100644 --- a/arch/x86/Kconfig.assembler +++ b/arch/x86/Kconfig.assembler @@ -27,5 +27,6 @@ config AS_GFNI =20 config AS_WRUSS def_bool $(as-instr,wrussq %rax$(comma)(%rbx)) + depends on X86_64 help Supported by binutils >=3D 2.31 and LLVM integrated assembler --=20 2.42.0