From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A7F3C3AE6F0 for ; Tue, 24 Feb 2026 17:58:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771955897; cv=none; b=MU/4rOr5NTJG7QpX9K9sXJoD9/tvDK0duQS8gCEL0OIoNXsDq8QM2TCZREOQOu6CMF/BgR4zNaQiPtQ7x0qb20RvH7uDQbszHzNfRU1zCYc8oot9x+2ltNirY1Pd+wWFV3XitDYGlTZOM2TwML/+bLhhDdRgKIuHVRZOS75V82I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771955897; c=relaxed/simple; bh=mwUDeR1gppKAmBSz50GrSFFbVwP2z3ql7U6IusAaE4M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LCrTwmYOKd6U/k9xdv4/75DUN6naAZKPoziGsCE0FOgMFCYk93ECERtDx2Ts4BU+g3Qz2dQCVQQhghpIBXMX9JgmGPcsNxGnuXjD6DYnvdckYlrJo0IG+aMa4AEFu6YLv6AKzoWLrkmFxr2HkQSWcv7We/o+Vfo4i72zRI3SqNM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 04822C19422; Tue, 24 Feb 2026 17:58:13 +0000 (UTC) From: Catalin Marinas To: Andrew Morton , David Hildenbrand , Mark Brown , Deepak Gupta , Rick Edgecombe Cc: Will Deacon , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, linux-mm@kvack.org Subject: [PATCH 3/5] riscv: shstk: Use the new common vm_mmap_shadow_stack() helper Date: Tue, 24 Feb 2026 17:57:55 +0000 Message-ID: <20260224175800.2500729-4-catalin.marinas@arm.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260224175800.2500729-1-catalin.marinas@arm.com> References: <20260224175800.2500729-1-catalin.marinas@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Replace part of the allocate_shadow_stack() content with a call to vm_mmap_shadow_stack(). Signed-off-by: Catalin Marinas Cc: Paul Walmsley Cc: Palmer Dabbelt Cc: Albert Ou Cc: Alexandre Ghiti Cc: Deepak Gupta --- arch/riscv/kernel/usercfi.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/arch/riscv/kernel/usercfi.c b/arch/riscv/kernel/usercfi.c index 1adba746f164..7e57f54dc5b2 100644 --- a/arch/riscv/kernel/usercfi.c +++ b/arch/riscv/kernel/usercfi.c @@ -230,17 +230,7 @@ int restore_user_shstk(struct task_struct *tsk, unsigned long shstk_ptr) static unsigned long allocate_shadow_stack(unsigned long addr, unsigned long size, unsigned long token_offset, bool set_tok) { - int flags = MAP_ANONYMOUS | MAP_PRIVATE; - struct mm_struct *mm = current->mm; - unsigned long populate; - - if (addr) - flags |= MAP_FIXED_NOREPLACE; - - mmap_write_lock(mm); - addr = do_mmap(NULL, addr, size, PROT_READ, flags, - VM_SHADOW_STACK | VM_WRITE, 0, &populate, NULL); - mmap_write_unlock(mm); + addr = vm_mmap_shadow_stack(addr, size, 0); if (!set_tok || IS_ERR_VALUE(addr)) goto out;