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 69AC6CF0438 for ; Tue, 8 Oct 2024 22:37:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A9C2F6B0085; Tue, 8 Oct 2024 18:37:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A4C126B0088; Tue, 8 Oct 2024 18:37:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8C58D6B0089; Tue, 8 Oct 2024 18:37:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 726FF6B0085 for ; Tue, 8 Oct 2024 18:37:53 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 2B933C0C75 for ; Tue, 8 Oct 2024 22:37:51 +0000 (UTC) X-FDA: 82651898784.20.365A3AE Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by imf15.hostedemail.com (Postfix) with ESMTP id 142F6A0016 for ; Tue, 8 Oct 2024 22:37:50 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=gnzzsIfV; spf=pass (imf15.hostedemail.com: domain of debug@rivosinc.com designates 209.85.210.173 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1728426935; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=pcb1JUl7nxyzCR2L+K51gN2ROJJ8XrFInAPZeivTlr8=; b=Kc/ofQpHBvNn6iodVPZ70HkVPEEDMvHs1G6HFim2np2m4Xiu5lz5zq9S+8ojJ/g+zKI4ga bmmFvO2zyOpZg5cYVnVAZkSuzVSqitZJo0AdIsjoVzdSdrtPN/dRjrhE3H/cHCMhKIdXMt D3ieEnlh3mSxQqzQ7tj7SvnkycEnI/M= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1728426935; a=rsa-sha256; cv=none; b=RxvvGSSCGLdx4TU+Y6VKcP64Spgvj+AIWUQd8oH7+hWoQz1qSrEl+OLeF4E86DKIaz4k4F f3kfpomgXH24sv+3mOkd8XTzbp/yfSjol9BDrygh/hbtEBU7Ha7b+3tBsR/16NZ194tCdF HysBWusE/YHlpA8nZ2WFD1VYuPBk3Aw= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=gnzzsIfV; spf=pass (imf15.hostedemail.com: domain of debug@rivosinc.com designates 209.85.210.173 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-71dfc250001so2440213b3a.2 for ; Tue, 08 Oct 2024 15:37:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1728427070; x=1729031870; darn=kvack.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=pcb1JUl7nxyzCR2L+K51gN2ROJJ8XrFInAPZeivTlr8=; b=gnzzsIfVWtyarQ+EH9jEPm8VUoG/QM+N9XrTNVwxdRLnOjTpmIQECrSTZmtCgcRva0 cqUPWByNytKApdj/a9ZWvLG+HRlcGeiqSC0UYZHdPsJ/SmqwVWjQSIHJ71PEjNN7IFv+ bHG3gVlEbfQBpGJHCPfwj+5Vf7ef/Pc277ZFJu86onUv4oDt5zLjggAIljmndc694yOI YXMFh56nfcth8H4gfMtxbiCLCJg1GR2OL0ETOD1lfcGF2/8iBfRfjfL2QqjJxG+XO+Z3 gsfSCCXsE0OgVf0mBiXGKscEMfJprCR/zUDbJfA1lxmZNngrhhCHsl5dIcvgqZA7NmSW VArg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728427070; x=1729031870; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pcb1JUl7nxyzCR2L+K51gN2ROJJ8XrFInAPZeivTlr8=; b=l93TI5Ywp5O1mOst+8yY9eWyOEiVnNHTEWgBQFUQ/FNsV634Qipl1SXJM3SGjGw9bF pGNzpu2HOgwaj4hEhYWJqhYiDmKuNlaZDhjPaoxhqDcsKvnkK6U5x3qlKrbbCzIsUPXr Xl0oTAeThlOqu3ybh70mipuICl0M8He4ECYDdmDIJeuHIIhHAqaxyCV9bigRMr3dinyd N7Vb8PNeWb+iBfNknyUPafaUyDuhzd5NHUiWEdvn/+WWuIlgoXvDyCkyh3MNm0+rmv7v 8Y/BaXxgn+S7MAjcFJLl7fvHmwcABzGPtMfLt70DZRcNjTPevs82JWbtlbILlxyW2WKX pz9w== X-Forwarded-Encrypted: i=1; AJvYcCWVucbjRcelnI3YwmH+HYOWvKF+cQBoWUk7+VS4i32TubD16neHl2AnnX+eX68AoehAQsXayuDsvw==@kvack.org X-Gm-Message-State: AOJu0Yxz+T7PMe6aWLLxtweAf+tirdqCTMpeoI5W0rEZhvyaulJ2Fh0J 1S1hSxWenEZUu+5e7eMEfwD7WrDh0RXl2bpSLOJUNuagu2O4yRqrBfTZ6NHuRxc= X-Google-Smtp-Source: AGHT+IE5CiqwVffKftT0HA19xNjp1IZD35v50IRAA/ePwNS8IKwtnn3GofL/f9wWS1jXg+8c2GVgUA== X-Received: by 2002:a05:6a00:a8c:b0:71e:210:be12 with SMTP id d2e1a72fcca58-71e1dbb87bdmr617949b3a.21.1728427069795; Tue, 08 Oct 2024 15:37:49 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71df0ccc4b2sm6591270b3a.45.2024.10.08.15.37.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Oct 2024 15:37:49 -0700 (PDT) From: Deepak Gupta Date: Tue, 08 Oct 2024 15:36:43 -0700 Subject: [PATCH v6 01/33] mm: Introduce ARCH_HAS_USER_SHADOW_STACK MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20241008-v5_user_cfi_series-v6-1-60d9fe073f37@rivosinc.com> References: <20241008-v5_user_cfi_series-v6-0-60d9fe073f37@rivosinc.com> In-Reply-To: <20241008-v5_user_cfi_series-v6-0-60d9fe073f37@rivosinc.com> To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Lorenzo Stoakes , Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Arnd Bergmann , Christian Brauner , Peter Zijlstra , Oleg Nesterov , Eric Biederman , Kees Cook , Jonathan Corbet , Shuah Khan Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, alistair.francis@wdc.com, richard.henderson@linaro.org, jim.shu@sifive.com, andybnac@gmail.com, kito.cheng@sifive.com, charlie@rivosinc.com, atishp@rivosinc.com, evan@rivosinc.com, cleger@rivosinc.com, alexghiti@rivosinc.com, samitolvanen@google.com, broonie@kernel.org, rick.p.edgecombe@intel.com, Deepak Gupta , David Hildenbrand , Carlos Bilbao X-Mailer: b4 0.14.0 X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 142F6A0016 X-Stat-Signature: qcytpt34zpaibit4fhsa6e74ktsdtj61 X-HE-Tag: 1728427070-128903 X-HE-Meta: U2FsdGVkX19Gtn7+fb8Ut3fAoEeKmUy9AyzF84n38nVySxnJcYdJGG0Tf+cJ9DSpkqawc0sODr5jkX+KgsGD2Qodt4s12lTLJ6APqodTgz3q4sOgm1VEuRGRL3/ZURiLAGCEE0x+hf+obVoY/ye5+9l+eFUBWsR59qPFJSwK3xpODzUaypFwZ9A17zV/OagPaMqJmqrSXL/IMI6iBWa1KS4TZRuyy+c8//jNU9JBvqa/4NOgNDGa44aBXmhhDAeewafsIhzf8roG1G0dTSNVM5SrLgM+/ZiN+91pUMfysK1ESZplOQLBdHSaInLfO+/Zqouud/OiIpz6jGeXMJbIqYZmT11U8dJvvvlPovCjqu3cQ4Actw+QygA9zBPn3uBZhbrPzDpiScF4ZhUT4nqDvFVchu+wiWB9v0NCIwkiUMkH9IYrd572rUVa3S4ERFS99vmE3gongU9DAGLo9TbCzhQLuO4QmWP60sJKNUfKeFRK4gOmAfNMnZvRYVF1H1P4WR9wc4LpIyQ7wEBXuC89gTvd7cuBuUqB3oeCUDhMiW7jmyanrF82wOkcmDsYM9Kc9KekPd8foSCqCwzS5eqrXhpZ3SCKm2/0fpHky2YTzc9XdgQ9SKlO6BPf+ZGRo30yY9H4IZxAJEv9PpgTCGgzDxDRi1WOxsTDEGkgA3Llfi9nJCEE9OwrUNx5DnjceT8toGKNDTTv3ZZeMaM2s8MZZnSogpcDLoQvE9mSfemL4O2i4ySVwlOaSzd6JQtaVe9o5bNRsJ81qRXq+ylH05Mqwk71Gq77xNZHHGHc8qgj3NaDSs+Khs9M1ob/RNUuYX8btJEev4t1gfYUSVTd7TYnzIlbyQGSx1Xg6Os641U+HR2rxIqkRJwEza81Sos0y2aU9k3ItLnAOM/YzOFy6Ay/8sI4zPYjRzKbZ3CLCvmmZ6+ffZKKUABxJ3oGpFoMoei+d727Nu4N92Onj+EAHu8 9GYUKiVv Kyh8Csd2kdp/LYOsXPwpJyI8sM+DtdQiLH0yoGRva5lVSfJYcuHWOji4iGNJoTUxeM+Hvaj8oPan4JySfngLTMBcS/Yjw0XOFYso9vOfmK9ZRuH8lJFhUNL21zNiNfKoFivXVQhYT74OX3RZsSgObhm4Z1x0t82KBdf2/JLCJgoeeeCCFxunnIvKP088oIfBhkSPXIsAmS9pppbqKUSwxjw/EAkO6r8dH3Li6bGMeIXQVt4BfiF8t1gHLkvNox21gX5TqPR5S55GX7dvk2CNol/Bqwd1lbZ3mom1j96zfXmdtNXKnCNT9Zpn1CXNj7CK3BWwtGGWMxLohcDaBrX+VxJ5GP+YkNQc/iLU7XhqDSjN5FyxCb5ytOoBPH3jIxs0qmPv8FQmC9BlNryL8BSekk5czwbFozbeYX9Np478Py5fx+CkiCfCvwRVN2lbLJofzrQ75IIFtnKQVGCk/QczRK8V8Roeh4eyPMispXy1AmPuwanpzvlUfD3GL2Ub9HGsSBZnpKsmhGfdZlxxkA+6jHZfNe4M0mbzjSp9R+h1rcqvqlPb4/kWE1l/HTUcfu03zR8/j/0MM4JQ08Pa6/uVOyZ2IcoUhKYu57tZVkmmeUVnLQNSlM5Lf1v77Dpf2anE3+J0exI7FioQkHER/URDA+HeZsLAovZd3qXH5IhZj7awSYf1ljOoIYAfQDZ45kvuMc211pb4YRIMz2MDIuOuVIpwW6A== 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: List-Subscribe: List-Unsubscribe: From: Mark Brown Since multiple architectures have support for shadow stacks and we need to select support for this feature in several places in the generic code provide a generic config option that the architectures can select. Suggested-by: David Hildenbrand Acked-by: David Hildenbrand Signed-off-by: Mark Brown Reviewed-by: Rick Edgecombe Reviewed-by: Deepak Gupta Reviewed-by: Carlos Bilbao --- arch/x86/Kconfig | 1 + fs/proc/task_mmu.c | 2 +- include/linux/mm.h | 2 +- mm/Kconfig | 6 ++++++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 2852fcd82cbd..8ccae77d40f7 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1954,6 +1954,7 @@ config X86_USER_SHADOW_STACK depends on AS_WRUSS depends on X86_64 select ARCH_USES_HIGH_VMA_FLAGS + select ARCH_HAS_USER_SHADOW_STACK select X86_CET help Shadow stack protection is a hardware feature that detects function diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 72f14fd59c2d..23f875e78eae 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -971,7 +971,7 @@ static void show_smap_vma_flags(struct seq_file *m, struct vm_area_struct *vma) #ifdef CONFIG_HAVE_ARCH_USERFAULTFD_MINOR [ilog2(VM_UFFD_MINOR)] = "ui", #endif /* CONFIG_HAVE_ARCH_USERFAULTFD_MINOR */ -#ifdef CONFIG_X86_USER_SHADOW_STACK +#ifdef CONFIG_ARCH_HAS_USER_SHADOW_STACK [ilog2(VM_SHADOW_STACK)] = "ss", #endif #if defined(CONFIG_64BIT) || defined(CONFIG_PPC32) diff --git a/include/linux/mm.h b/include/linux/mm.h index ecf63d2b0582..57533b9cae95 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -354,7 +354,7 @@ extern unsigned int kobjsize(const void *objp); #endif #endif /* CONFIG_ARCH_HAS_PKEYS */ -#ifdef CONFIG_X86_USER_SHADOW_STACK +#ifdef CONFIG_ARCH_HAS_USER_SHADOW_STACK /* * VM_SHADOW_STACK should not be set with VM_SHARED because of lack of * support core mm. diff --git a/mm/Kconfig b/mm/Kconfig index 4c9f5ea13271..4b2a1ef9a161 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -1296,6 +1296,12 @@ config NUMA_EMU into virtual nodes when booted with "numa=fake=N", where N is the number of nodes. This is only useful for debugging. +config ARCH_HAS_USER_SHADOW_STACK + bool + help + The architecture has hardware support for userspace shadow call + stacks (eg, x86 CET, arm64 GCS or RISC-V Zicfiss). + source "mm/damon/Kconfig" endmenu -- 2.45.0