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: 13960362 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 CCDA2C02196 for ; Wed, 5 Feb 2025 01:21:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 24B3728000C; Tue, 4 Feb 2025 20:21:59 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1FC6F280001; Tue, 4 Feb 2025 20:21:59 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F40D228000C; Tue, 4 Feb 2025 20:21:58 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id CCF10280001 for ; Tue, 4 Feb 2025 20:21:58 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 5D40C47A3F for ; Wed, 5 Feb 2025 01:21:58 +0000 (UTC) X-FDA: 83084139516.19.2E560A8 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by imf19.hostedemail.com (Postfix) with ESMTP id 785641A0006 for ; Wed, 5 Feb 2025 01:21:56 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=lJq0NJEy; spf=pass (imf19.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.177 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=1738718516; 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=PZsmyzkl0ZY8OELLzFzrWZpLBbmgmsnkcCCgL90vWsc=; b=12bH12u/eQpQWqf33oAKDLKR+82HVj8rhToYjWi40m7BOyb7DD1xXB0w6JEAifTiNdF9Im D1PtriitL0VwlAl3+XWDYXJYFCUOd0W/U2aR+EUqCB9QhWIjVj8ys0Vlz5ylpy1aqzK4JN x+5uYGpxs2ra/OsC8XdubWcHWGt25iU= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=lJq0NJEy; spf=pass (imf19.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.177 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738718516; a=rsa-sha256; cv=none; b=EYadE0Dug/8PhSRKId9af8Ntw9G+RvuyllYMLeJDslKsMx4bm1jnx0Vpe4ufeX6gO6y4g/ xKiKbPToGlZga0YWSuLJqCyfZRlvm7Z1aGOmkhejnyqneMdyhAn4qk3vXGGIPVbqnpCinA Sbc1+Hd29HdFlJYusO7uaaIKk0o5bTQ= Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-2166651f752so26834005ad.3 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=1738718515; x=1739323315; 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=PZsmyzkl0ZY8OELLzFzrWZpLBbmgmsnkcCCgL90vWsc=; b=lJq0NJEyU595DM7p8AF1MvbU6kNEUVxtxORs9nlEAy9izyYfdaqfql8UDkURtlX6Kb bI1xa8oM+janyDgc76V3ab7I6MBwtXxRzIUeki3Jk++DvyHsUWkNGVk2Fd7AYnWCcblc CRpioU4kLrR+Dzn0nyoxLvjvUA7zgWCpXHPFQx8cWYZ5PMQnkg4Dj9dbKNAxnVuLOmXR PdZf4MwdcHAT+4BRCvM/eR5O+arYowPBPVouxGQdXJ2YmpVIFkLaTuW5AuilhlZ/hPKf BvxTYdSgMW83I8+525zGVWtROHTzwzzapxkM9Zbbe3l30MoUJ3OH2OBr4KfE3PcJZmgL CAlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738718515; x=1739323315; 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=jB66FV0D+CEKRI4HvWGqhAu5GBvQWcnoQxeYPacDnxv82gbzORaCtOl/7UPCE7mxji NjPvZDhSUCBGnbhdeUJByLRVSVkU5OeyMigz1WXPaalVa/jp1tt1BRCP7mdVKfjIYIHA at2UsKyI2F4+kEn73MNzIsJBo/EVQocFYG6N192zzpjG0gpZj5VdVeJEXoffaTm1Tt35 65Qia3QLLJL53wTWlDiCzl1k9dSx//NmWIrKqhTQd8ombiMJ30sKuphWRiduETfbXeBA Sg8H8PgVh5SSyLXnTEB7BoIHGNT9joy+fYQlxtthN0MYSlahXyawbxrleW42Vq/MAOD3 8zQw== X-Forwarded-Encrypted: i=1; AJvYcCW/VU3SNq3Buz//xC6lV3w0lMLnmIKtSMFrwoS3PMRmqG7txN3wjNNLvlQOf7POI1Pq+wR3FOahpQ==@kvack.org X-Gm-Message-State: AOJu0Yy/htX+nCVNDDXpck2/VqA0NG+z8FYo+rOlrjuzCyLR1L2zCHwG a7rxcxaS1IiYh71mVWfr9yafEo2OcFr1CvR3BbPGp15EjVsf0azxS3l9sYaA4zg= X-Gm-Gg: ASbGncunBwdmYJARmeQBiowQtMtO+6cM9l/RUs8bUAVOfkmCH6VypJwsXzT6TAlsfGz 9Rh7MQmyU/KKKPUUswd8ck/GHpaOw1DQJ2GpfeM05coMsqNrxvswkpZjy0lphHIaCZy2wNa3DDT CHHTdHHEB6ri399OTrrj01/pyLAvFxxCTqblc7lGwJUN0J5sAR++NUXABMzj0ipkDbVZiZmd+SX 1RFQzdWipKiKUV1AT5B3NwLv4aI6/x9uLdtLLbZ6Im7Qbe3JfGtEWP5lrNKpH2acdgHbQI1aSGB xEynhoUA4Yql4E6l1u4WP+FxHg== 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-Rspamd-Queue-Id: 785641A0006 X-Stat-Signature: noqd8wbpmq7nbd6yponyrspiwe3dpejk X-Rspamd-Server: rspam08 X-Rspam-User: X-HE-Tag: 1738718516-672323 X-HE-Meta: U2FsdGVkX1+amhMSnJP4QBl0idUT2LadkLIQa1+UHLpPMH7Z1WMGAzCMr+BeNd3IC6t8YopxwsPNsyvcJNt6+aRtxopjToEIBRSRKMVKGDXVyx8UKGr+KZMJE7FTFLXGKsQHM97v4iPfooAc84SN3qv/19yPVD3xTQD0P0VwFLPnEguxfUWDaLSad1zqG4Izqxzx8HyqnqSVHkKZEEdtAa/cCjVx3IDcnjh4VfUFUxgagwbarWRGuuwKoaT/6d0OO50st0yrCwNH/o9G4Gy7HDOxyBJ/rmYfSFogfC8jYKkpK3idskhnHB6N4NqVlLTq9hx/JnWvUFIhsL2U8OGKTkbCxhIvHZXYSDnRVTeMHBHCCoUuYmlPKxCrApMtjwqEvT6zdGZx+unMDAZPolu6+Wm+credssqafkGNaHIjr/u8j84UBUHyocKM7RmHU6mIh/hoWd+LFnmXkbmEzJW34x5EZEMwgpKao2wBLSq1FbRsbJjF3g6uWvwQoWkognuKav81Biun0RWf6JAYI2jeMmNoEEoU1PPm8NlSMtqAtzwaW4M3PNOB83PcDxggOFR7p+oi5kPhB3U+IDcLYV+mY0anLVOHqJaFchTp3D+mG8Hqf90a5KinBROtxLWnmPkcIRPtqVNu8iQXIn2TsR+ZcbPe95HpgMk0VufZ7UpVTmXr0+9qIaMMhM0kFAAJosP4v7Fu39hFWUNgQoCqeJOzNGbNWAjgi8qTEsoOnZLxVIB45QHGhPRSLy0QGuhCr4kf2YKSUdYn/JuSOU/EXezHiStzi0RvvXdZvwMcJRcDmpTHBO7lBES6DlDH+Q3b9UoqAHAtkytPHKEtz82rbdcBgh+GySsdUcDQ12FeKn4t4hxrWxkOjgJ5mvpml2i2rZWhHB9O3vtyQPnfrrIHVN17jJj/CQ3PexabcUOr2fnRnpcsqCaitlc/jSv/cxTOjJHSYxMOi2NpYJzbLpw+MAT fWG5Zorc NRKfGtBAHvTnAGm96aM5CfDJ+0YH3xzTs2Gw07bd3YGPjBSGtF2UWhqVKrnn2LcXEiWyHHWqcJB6GtKSnUXt4vJdayf+OW9ai3MnYh3gQHZhsTIwW4btiL8r5ns5b6ZXwV8eA88qDT4z65VA8OHFIxk5bd47OTh15L5GjKUztkFKHkqsVDdVZD2+VGCmrWEXLcusuArThygOotcJCrQu0bWmQjGg7ZeLNs9lMg2X3hfUC56eT/AXPNiwn/AlVF4bWD2jytjuuan2hSUxwzuTgFBTlw4BUIZmw2vRduD7cx71uHECyK6h7PGbo0J9+6zWmbQw7G6qNLVxMVcSV1WYpQxoA52Gt9iqvHU6RnFogFaznvc/ejCiMBBHmgumIrQX8GGBKbYfUEqDa5uA3DCwDb15xpPbEtyXDHU1c25GWlUqOZkMFWjX0Dky6P4atIkOSChDsBzYxccXRxHdujWlpxRDHEMb7eS3kD6KnDMJVR0YEdWI6nvBB00EAfjlLL2japAuJ0xmVhe9aZedf+z2VXAdf8g== 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: 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) {