From patchwork Wed Feb 5 01:21:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13960388 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 06235C02194 for ; Wed, 5 Feb 2025 01:22:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Wq/KiKfHzL50StKgUXypTPj74N+O02KfsXDeQcwmBZ4=; b=q+PHEaXQ6sKNIS p4XpBu3yrN+Z6xZMDT3a+TyKc6t5eZohEuY+ZCh+YQsEUwdivYCCGZaQEsnWRXBx6NL9GXR1ejAHA 0D5d+qIl3GBPTIGuixt1Ch5nmWXNfkmE0K6iBJtueL65RCDeaU5mtDLTL8VFpt3KaqyJxTFwb5sOf cdvP5dy/+yTotd6s7iw2TfjDfmpjwz7IxlhUQ4Yatkf8Kmsp5A5rIgBAnWkz05pHxn6dXLfLc44pm 9uSccuw7MfU7JWPcr+eCWo+3cuNYvZH8KC9lKrsywPaOVxVADpGOhS3Y0pzkrWSIeXkW73MG0iDAO wUKa6yL5MyuhK/oo6wIA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tfU75-0000000218f-1wXo; Wed, 05 Feb 2025 01:21:59 +0000 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tfU73-0000000216s-07sQ for linux-riscv@lists.infradead.org; Wed, 05 Feb 2025 01:21:58 +0000 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-2165448243fso27687805ad.1 for ; Tue, 04 Feb 2025 17:21:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1738718516; x=1739323316; darn=lists.infradead.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=PZsmyzkl0ZY8OELLzFzrWZpLBbmgmsnkcCCgL90vWsc=; b=2U0tG23TGfiryisVRDVjQpCN5rLxy9zNTozswdzTcvHEkXoabUcAMovmRWW9bm1P9O 28/c5gg9HUe1XUo1w6PLknOJNWd8VKJMS5AEbK0rDPDjDpdE0YeIKXQ32NU8uVwYG76R Wo9/DTuPEz4T+HAD1Vjt7tWpmVbyBjoQ7KaK4mLYqdBdIp+llal4tMgRyJaXMZ42Jbqa vMpLDGAotgodhSrnY5PJ1D9kh7LXeIArp8cnmN8PZPK7HPXwgrJf2rm8zRWXhVd5Kuts 7rGh9O9PMy4D06rHpB/hl9jF0CC2RCRtTra2xeimPGvhhQ5/hpFU8lP6nCeyW+tab8H/ cP9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738718516; x=1739323316; 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=PZsmyzkl0ZY8OELLzFzrWZpLBbmgmsnkcCCgL90vWsc=; b=Pa7FEE2g8pufkhr69f6yD7jCndFR9YzfVlTrPhFzQHYzvmBe1ZZ6RF9U0Mv3crD/if 2RUEwRFkRmnifdm9L805ODPxZhQwrYFrmxstpLLXe7sq1wuvfJI+Mt21vdaDXzs44TwC om8W/MVH7uHUcNyP6wLm/HJ4CyhVF/pxwoVH7fDUxx16LalR9s9oVepa861C0YcDMfZW aM1TJ1Z+2F5XHv0H1bsU9D8KOsobeDf5kM07Y0TaKkazgA1vY7grGSOzMTH8mDR6Zj2y k4t+lyk3DrbZXRGk2me+4A5jODWEZ1olaUFxPaOLnScHQRq/eMVk5ImZYlYlxF+IxobM r91Q== X-Forwarded-Encrypted: i=1; AJvYcCVy16DeKTnp6YwghDsdlz4mBnMvvHvopA1nW+P0qm1Oe291jSBLlXfhLqwpGhDaivLE0ltw0prfNCSTtg==@lists.infradead.org X-Gm-Message-State: AOJu0YynOawTn9mqCtiuvYhiCWshydgsWivhuKmll8Hd5Npl7z2JFyz4 dEwsDvLeRx+QgbKD8+QFTWg2vUZ03na4AkYb34NYitm3h35RKPk5qWqCndG0dFujzZbqroPVe8A i X-Gm-Gg: ASbGnctScy/h3FHEqxYHehH6M6dOFbrioZBxSqQGJAM4oghiMnVm+GQhZqvvxoqHRti gmwH+Nf5ZPuTHK3ovZbyAZw0HxUdYiRcDDigJy6+zZW8oT882aaZUnIyojMkkcb0L5RvZDMWYme vClqk7a5Puz+Phv1N4942NiGLgClPubWfwTB3WxQl0sq45G5EKUE0Xo/UIYnt4wbhHUwDw42pH8 qLXr9j0aGjj4LnlAY7AXqxP9sa8ABWQfDlbwTxBG2/ldO2GNnuaN0qgn9t7viI+oNfDiULWc0lS RsRr5USGLT/Svudc1Cthn7ZWbg== X-Google-Smtp-Source: AGHT+IEGfToRmeKwtJLwJvQfR9G8FomtSd4VlGvn3V3djANNYRSyP8PCgL91KTN4ECR+cbbbSTicog== X-Received: by 2002:a05:6a21:9007:b0:1ed:9e58:5195 with SMTP id adf61e73a8af0-1ede8834f7cmr1948485637.13.1738718515327; Tue, 04 Feb 2025 17:21:55 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72fe69cec0fsm11457202b3a.137.2025.02.04.17.21.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 17:21:55 -0800 (PST) From: Deepak Gupta Date: Tue, 04 Feb 2025 17:21:48 -0800 Subject: [PATCH v9 01/26] mm: helper `is_shadow_stack_vma` to check shadow stack vma MIME-Version: 1.0 Message-Id: <20250204-v5_user_cfi_series-v9-1-b37a49c5205c@rivosinc.com> References: <20250204-v5_user_cfi_series-v9-0-b37a49c5205c@rivosinc.com> In-Reply-To: <20250204-v5_user_cfi_series-v9-0-b37a49c5205c@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 , Jann Horn , Conor Dooley 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 X-Mailer: b4 0.14.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250204_172157_072771_472A6C0F X-CRM114-Status: GOOD ( 13.99 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org VM_SHADOW_STACK (alias to VM_HIGH_ARCH_5) is used to encode shadow stack VMA on three architectures (x86 shadow stack, arm GCS and RISC-V shadow stack). In case architecture doesn't implement shadow stack, it's VM_NONE Introducing a helper `is_shadow_stack_vma` to determine shadow stack vma or not. Signed-off-by: Deepak Gupta Reviewed-by: Mark Brown --- mm/gup.c | 2 +- mm/mmap.c | 2 +- mm/vma.h | 10 +++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/mm/gup.c b/mm/gup.c index 3883b307780e..8c64f3ff34ab 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -1291,7 +1291,7 @@ static int check_vma_flags(struct vm_area_struct *vma, unsigned long gup_flags) !writable_file_mapping_allowed(vma, gup_flags)) return -EFAULT; - if (!(vm_flags & VM_WRITE) || (vm_flags & VM_SHADOW_STACK)) { + if (!(vm_flags & VM_WRITE) || is_shadow_stack_vma(vm_flags)) { if (!(gup_flags & FOLL_FORCE)) return -EFAULT; /* diff --git a/mm/mmap.c b/mm/mmap.c index cda01071c7b1..7b6be4eec35d 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -648,7 +648,7 @@ SYSCALL_DEFINE1(old_mmap, struct mmap_arg_struct __user *, arg) */ static inline unsigned long stack_guard_placement(vm_flags_t vm_flags) { - if (vm_flags & VM_SHADOW_STACK) + if (is_shadow_stack_vma(vm_flags)) return PAGE_SIZE; return 0; diff --git a/mm/vma.h b/mm/vma.h index a2e8710b8c47..47482a25f5c3 100644 --- a/mm/vma.h +++ b/mm/vma.h @@ -278,7 +278,7 @@ static inline struct vm_area_struct *vma_prev_limit(struct vma_iterator *vmi, } /* - * These three helpers classifies VMAs for virtual memory accounting. + * These four helpers classifies VMAs for virtual memory accounting. */ /* @@ -289,6 +289,11 @@ static inline bool is_exec_mapping(vm_flags_t flags) return (flags & (VM_EXEC | VM_WRITE | VM_STACK)) == VM_EXEC; } +static inline bool is_shadow_stack_vma(vm_flags_t vm_flags) +{ + return !!(vm_flags & VM_SHADOW_STACK); +} + /* * Stack area (including shadow stacks) * @@ -297,7 +302,7 @@ static inline bool is_exec_mapping(vm_flags_t flags) */ static inline bool is_stack_mapping(vm_flags_t flags) { - return ((flags & VM_STACK) == VM_STACK) || (flags & VM_SHADOW_STACK); + return ((flags & VM_STACK) == VM_STACK) || is_shadow_stack_vma(flags); } /* @@ -308,7 +313,6 @@ static inline bool is_data_mapping(vm_flags_t flags) return (flags & (VM_WRITE | VM_SHARED | VM_STACK)) == VM_WRITE; } - static inline void vma_iter_config(struct vma_iterator *vmi, unsigned long index, unsigned long last) {