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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id E50B1C433FE for ; Mon, 3 Oct 2022 17:25:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7FD548E0001; Mon, 3 Oct 2022 13:25:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7ADD46B0073; Mon, 3 Oct 2022 13:25:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 675348E0001; Mon, 3 Oct 2022 13:25:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 5624B6B0071 for ; Mon, 3 Oct 2022 13:25:32 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 1195B14050C for ; Mon, 3 Oct 2022 17:25:32 +0000 (UTC) X-FDA: 79980314904.02.CF9FAF7 Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by imf06.hostedemail.com (Postfix) with ESMTP id 8DDF9180008 for ; Mon, 3 Oct 2022 17:25:31 +0000 (UTC) Received: by mail-pg1-f180.google.com with SMTP id a23so2519547pgi.10 for ; Mon, 03 Oct 2022 10:25:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date; bh=Eh36TVWrbcXNFU55d3swU5YqNSMVT4Ta89oIyEc6Y9o=; b=N7a4hDzZn46LbJVuATRGzyfB6RwBF1mOFM0mklRAl7TOVEUSyocBhaLpJnm051gBwo fle2M9WiGXJs4C0aMaeXdJVPGYdhaA0bN+SEtbeksodSvWRca7Hc6Jm5fvUYvibggxIm F1xjrOQoSSvpcfL5mAvzxnJFDl+JRTHNY+Tvo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date; bh=Eh36TVWrbcXNFU55d3swU5YqNSMVT4Ta89oIyEc6Y9o=; b=D0Q3Ty192owgGNRuGZb2uci8imtYv8E8Dt1RK0WI/VtCZgU5l+LZZkHS4Zx8/OZjrF qmJWaq8KQ1jrmTbyJ/1dsNCBjbh7aUQZCe6gfD9WK/T+Q6sNMcLGfO5T73mVuAKQ5SzB MrAPn8B/ZfOfidXSWih5ISMVDB3cCv/u6THUDkANK7SDh1WlLvSAZhJSLQab32llMFVq 2kEWAAipcxDonITAXN+bnu/PYCLwz2X69WRvwc1NpGZmg1zYrXpf46O3FJb2sTenQvxq ne7qLynSFcGlqs4aKU7L/uoDd8Ex8JvXKjmyl8RdeERd9+Bnyuy1lnIFEE3e+6wLzfDQ edjw== X-Gm-Message-State: ACrzQf2E98vAnQ4YA/AQdJNfMQ+TyaAwfZEeg52nvonRaBYjhFTDPQim /8/NSX9DUuZC+DGAjbRqoggOCg== X-Google-Smtp-Source: AMsMyM7i2rD0qIEnUie8bKeDsdhqownDwDDyMyGPDS32Fdy80LrPI3HEbwUHGAjdWNZFLZFsk60kDw== X-Received: by 2002:a63:2a81:0:b0:43c:5fa6:1546 with SMTP id q123-20020a632a81000000b0043c5fa61546mr19683775pgq.43.1664817930407; Mon, 03 Oct 2022 10:25:30 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id i65-20020a626d44000000b0055f1db26b3csm5611281pfc.37.2022.10.03.10.25.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Oct 2022 10:25:29 -0700 (PDT) Date: Mon, 3 Oct 2022 10:25:28 -0700 From: Kees Cook To: Rick Edgecombe Cc: x86@kernel.org, "H . Peter Anvin" , Thomas Gleixner , Ingo Molnar , linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-api@vger.kernel.org, Arnd Bergmann , Andy Lutomirski , Balbir Singh , Borislav Petkov , Cyrill Gorcunov , Dave Hansen , Eugene Syromiatnikov , Florian Weimer , "H . J . Lu" , Jann Horn , Jonathan Corbet , Mike Kravetz , Nadav Amit , Oleg Nesterov , Pavel Machek , Peter Zijlstra , Randy Dunlap , "Ravi V . Shankar" , Weijiang Yang , "Kirill A . Shutemov" , joao.moreira@intel.com, John Allen , kcc@google.com, eranian@google.com, rppt@kernel.org, jamorris@linux.microsoft.com, dethoma@microsoft.com, Yu-cheng Yu Subject: Re: [PATCH v2 02/39] x86/cet/shstk: Add Kconfig option for Shadow Stack Message-ID: <202210031020.0E93C75F9@keescook> References: <20220929222936.14584-1-rick.p.edgecombe@intel.com> <20220929222936.14584-3-rick.p.edgecombe@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220929222936.14584-3-rick.p.edgecombe@intel.com> ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1664817931; a=rsa-sha256; cv=none; b=dE9NO4Nu9QnHQsSOv5V+JqjSlMmtu1B23sUy9ZKN2JySJ7xZ1g5aSGTNeTKDcXvUSBRdFB gFkGzFDPb18JZjaKSY8f8AebXSfxRqqsoqOHMV4rywPOZdwCVb3LqsKRitDAjXwlfNjxdn bBaYkrtdcfytS0kfjjOacCDlnbr9V+w= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=N7a4hDzZ; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf06.hostedemail.com: domain of keescook@chromium.org designates 209.85.215.180 as permitted sender) smtp.mailfrom=keescook@chromium.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1664817931; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Eh36TVWrbcXNFU55d3swU5YqNSMVT4Ta89oIyEc6Y9o=; b=8heG0sKZ1hhvvmWR8Zqhpl00WmLP8xox6Tvrj2HzBEvqTbmpO8IV7sRQ1Aosq4HdGmQ6ec 9O92p/TVYiiCHmMUPkrgnjfI1W83DmtzXDuovWLI84sEMaijt52hFU4/DQJIJ2b0reZbUS DJV+Ddvc23pqHmGxsFD1XMiTCX1aUu0= X-Rspam-User: Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=N7a4hDzZ; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf06.hostedemail.com: domain of keescook@chromium.org designates 209.85.215.180 as permitted sender) smtp.mailfrom=keescook@chromium.org X-Stat-Signature: 74xx736zoy4upqanwzax578y86phmxau X-Rspamd-Queue-Id: 8DDF9180008 X-Rspamd-Server: rspam09 X-HE-Tag: 1664817931-533713 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Thu, Sep 29, 2022 at 03:28:59PM -0700, Rick Edgecombe wrote: > From: Yu-cheng Yu > > Shadow Stack provides protection against function return address > corruption. It is active when the processor supports it, the kernel has > CONFIG_X86_SHADOW_STACK enabled, and the application is built for the > feature. This is only implemented for the 64-bit kernel. When it is > enabled, legacy non-Shadow Stack applications continue to work, but without > protection. > > Signed-off-by: Yu-cheng Yu > Co-developed-by: Rick Edgecombe > Signed-off-by: Rick Edgecombe > Cc: Kees Cook > > --- > > v2: > - Remove already wrong kernel size increase info (tlgx) > - Change prompt to remove "Intel" (tglx) > - Update line about what CPUs are supported (Dave) > > Yu-cheng v25: > - Remove X86_CET and use X86_SHADOW_STACK directly. > > Yu-cheng v24: > - Update for the splitting X86_CET to X86_SHADOW_STACK and X86_IBT. > > arch/x86/Kconfig | 18 ++++++++++++++++++ > arch/x86/Kconfig.assembler | 5 +++++ > 2 files changed, 23 insertions(+) > > diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig > index f9920f1341c8..b68eb75887b8 100644 > --- a/arch/x86/Kconfig > +++ b/arch/x86/Kconfig > @@ -26,6 +26,7 @@ config X86_64 > depends on 64BIT > # Options that are inherently 64-bit kernel only: > select ARCH_HAS_GIGANTIC_PAGE > + select ARCH_HAS_SHADOW_STACK > select ARCH_SUPPORTS_INT128 if CC_HAS_INT128 > select ARCH_USE_CMPXCHG_LOCKREF > select HAVE_ARCH_SOFT_DIRTY > @@ -1936,6 +1937,23 @@ config X86_SGX > > If unsure, say N. > > +config ARCH_HAS_SHADOW_STACK > + def_bool n > + > +config X86_SHADOW_STACK > + prompt "X86 Shadow Stack" > + def_bool n I hope we can switch this to "default y" soon, given it's a hardware feature that is disabled at runtime when not available. > + depends on ARCH_HAS_SHADOW_STACK Doesn't this depend on AS_WRUSS too? > + select ARCH_USES_HIGH_VMA_FLAGS > + help > + Shadow Stack protection is a hardware feature that detects function > + return address corruption. Today the kernel's support is limited to > + virtualizing it in KVM guests. > + > + CPUs supporting shadow stacks were first released in 2020. > + > + If unsure, say N. > + > config EFI > bool "EFI runtime service support" > depends on ACPI > diff --git a/arch/x86/Kconfig.assembler b/arch/x86/Kconfig.assembler > index 26b8c08e2fc4..00c79dd93651 100644 > --- a/arch/x86/Kconfig.assembler > +++ b/arch/x86/Kconfig.assembler > @@ -19,3 +19,8 @@ config AS_TPAUSE > def_bool $(as-instr,tpause %ecx) > help > Supported by binutils >= 2.31.1 and LLVM integrated assembler >= V7 > + > +config AS_WRUSS > + def_bool $(as-instr,wrussq %rax$(comma)(%rbx)) > + help > + Supported by binutils >= 2.31 and LLVM integrated assembler Otherwise, I don't see anything else using OCNFIG_AS_WRUSS: $ git grep AS_WRUSS arch/x86/Kconfig.assembler:config AS_WRUSS -Kees -- Kees Cook