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 05CB8CF042C for ; Tue, 8 Oct 2024 22:37:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6A5346B0089; Tue, 8 Oct 2024 18:37:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 62C7A6B008C; Tue, 8 Oct 2024 18:37:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 431696B0092; Tue, 8 Oct 2024 18:37:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 23BAF6B0089 for ; Tue, 8 Oct 2024 18:37:56 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 0E8CA1C68FB for ; Tue, 8 Oct 2024 22:37:54 +0000 (UTC) X-FDA: 82651898910.26.CFA50E0 Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by imf27.hostedemail.com (Postfix) with ESMTP id CDED340010 for ; Tue, 8 Oct 2024 22:37:53 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=MUzvxPKd; spf=pass (imf27.hostedemail.com: domain of debug@rivosinc.com designates 209.85.210.169 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=1728426938; 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=OwXMBbOWCv06xRC7kuAtikxfL3CuNBKfrSTtPkKqEqk=; b=qLqUwxc9ZhEzXgnS1oOPMC20jQhxVI0cFXEzAWw0Jnfta4NSPMQyZdnTUoYQKKqwzW+nmv lnL+ybl1DyC5NlCfijpLZfA/tHVxxrA1ay0rg0lgcOuTVgUHreDeiNETWX+/qRpOoP3R4n aAX8aQ5rn/sruXBqoV38iMroE/E2zlU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1728426938; a=rsa-sha256; cv=none; b=APxcCGDXwoTNJyApSx/wIfNPyNYv5ZLbZJX+DjD1GwdAAvsWWv1rpIEQkzkKeHSY89eg7o h4/+r8gSt67nxqPgTtHlg44K/+2AFt2Sm6AJ4kGnz6N+d6GL/49pOnbZK40/zbzgyqCYBv LLdjfQUYtB4XBT29E1k3bNRhrsmaCqw= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=MUzvxPKd; spf=pass (imf27.hostedemail.com: domain of debug@rivosinc.com designates 209.85.210.169 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-71dfc1124cdso223276b3a.1 for ; Tue, 08 Oct 2024 15:37:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1728427072; x=1729031872; 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=OwXMBbOWCv06xRC7kuAtikxfL3CuNBKfrSTtPkKqEqk=; b=MUzvxPKdho4wFyAGQdGAO+EdByHvQSWjFxnPDr373jw7oHcukG6KBmMoIK35qSvpB1 6bHXq7jp3i7ku2hg4M99D2RFIbjvvbym2EuKZaRNf/D2A1XmpRPTf3e/w7PobI+96kbc 8p5l0OJIpCTVpl3JDMK5Vmon0ySMd6K8jC684bbEeOfD1hHIBNwwuKi6fmPxdhuPsqvh lrrOrB/5jgZjDTWV+pqqN/F+Ej8kykZwYd8yt3ra71LZEyd1SDUMtS6fZw6KVEO7SbNY 6TOI2pwk3P8yYXbOmKG3gdBmfcZrISYQBBNLl+AnLm3s4lHv6wak7lPM9xzq3r/fRDKX 1P7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728427072; x=1729031872; 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=OwXMBbOWCv06xRC7kuAtikxfL3CuNBKfrSTtPkKqEqk=; b=WxSA4ssOByP5sn6mQ1kHaS6lKB7mVAW+Pl1RNBu3SD+CMIYQW0+LCXC31AgItTpbe6 wYttZGN1jAlceD8VSr76cJjaLMNDFVea+AB9JtyMtlfmRF682mKmTVhr+npfFwG/Fium cggoQh3gYoYWE0XUeoCPcdRNNd1gdOVdK6WGzmAAJlEHID8gPBOyHbv0rpxbpze/dYCo +19Hb9yeHujoR9qr8V7cxE7atsxAxpGaI2wV2gqvenOIrVheM3xjRAjqXqiwKyz9Pl0o 8G0+6bJIjheMmT8ndF50HXk6fuQvUiRmNLNWmcw72BGlPWRRZmSc2Hq+VzvSJ0lP1H3e K5Jw== X-Forwarded-Encrypted: i=1; AJvYcCVuH+FxvfrvF3Tv1bQpmQ0DrRH2M03VQ6Kjg/b1AxUbfslsUzpDE77XhrH12wkDfXumA19iBFPxBg==@kvack.org X-Gm-Message-State: AOJu0YxdvJSxmlVotzsMz1bddzuRWROPI98ZW1z297nKxqDRfzSMQtpc 4SKD8Ya/GkKacauELPd/yxHmGA1Z1V+JtPxJY3NNRdrvCdzFZqDShAtONDUOFyE= X-Google-Smtp-Source: AGHT+IE674Tlfxux7he+iKObmN4Z/Vy2GyXvFfvVMkaZszYDuFORWLn02mu8lREUGmUPEtmKzi9hiA== X-Received: by 2002:a05:6a00:c94:b0:71d:f2e1:f02b with SMTP id d2e1a72fcca58-71e1048dfadmr8990425b3a.2.1728427072537; Tue, 08 Oct 2024 15:37:52 -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.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Oct 2024 15:37:52 -0700 (PDT) From: Deepak Gupta Date: Tue, 08 Oct 2024 15:36:44 -0700 Subject: [PATCH v6 02/33] mm: helper `is_shadow_stack_vma` to check shadow stack vma MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20241008-v5_user_cfi_series-v6-2-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 X-Mailer: b4 0.14.0 X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: CDED340010 X-Stat-Signature: o1ywr1rot65emg4araddnd1jtjdmiq8a X-HE-Tag: 1728427073-20067 X-HE-Meta: U2FsdGVkX18QWO4gknj4iM06ysW6ptx4dV0thn3WG47sWsXRQlkBBgOzGlglMka4Pr27pB9VwIsP/0NC+8IgYrr4hZsqv/VAQ4GFQPQ9E0GaslU5Ff0Jv/6uzSUtORDtk03aPpX42lGUL+sf/4YZxSk8UtWJ4WAvNAHx73xpBpt71r1qlMvxJVjE31oHD3f88zRmdgrKcrsiFp+op2lAkkEkgUuLDl/P0bao5R6ogrpIK3qXF2EoGM3h30HUBEW2yDQL0br3s4SYKmMDN7F0Yhx0WUnq5FLEodLeS9tQ78F6+mYBgfLBW8VOwB3l8bhNMIM6JVvGMwLlONyub9UqhjubVBx72wZOFcK8OGxnq5YnBzHm9fEhzlEEXb+IFAp3iCN8RNym1/wpIXpkfLNil7krQ+6O4jUuhgJy+Srj0EK0HDjdRdI57+PNF9iRXWSbGl+jRL1HSwDjxtBrF5bx5vXWgGNRNrSvQ0HCQWVlQYVyR+w8FPmgFb4KAWkSw0eSmlKSwkrvApk8s0CkKP+hEi5xTNuTu+gQQpcKHKBYI6KhCDnNmZaGCJxQexf3g5WLqjCBlY93sTe0Ycpwr7+7TO/zeM3t8VUbV5ca8v6rW4jhwq5PMDDJ++X5DuHfrcTOoCHC9LUvi+44tSbWIbT7m+UKM36+J4e1xc52sx6jPYjqiWP3bqEm1mdUeIGRgE6Bqm3r6ZHGwLzOq8ANtm2+D64F/N39/EdthV1VltssXX6+FPO303qrX08B5Nt4/mLeY9SAASHumEOn1VBGe1MK37Wp93a0lOkMnggGzSCSfIUy4QOjDn3XNgMkThYX5V2EyXdz22gKt+8KrTRB13bLEHlbUp5qJqveYNfr1CoO7t81999XOWskUkQNF35HNISQu9dOfrgKDq76ElNco083KZBJKG6YJ/0x+mQMBvZOLfOrpBrJNnEJZ817/7rF/efiSy3j42yroWSBleTSSI6 E/6/Ypva xQ48tf9bXiAfDYG5/7yHpRG6hRuU4dhuU+BeLkzgcnfB8wVAdQAqwVCNoKG3F9RYVphGXTVDtxyGLfr41Cn5Ox//I8Oj1v6tLqXHb49xyzAUB8MLTw7B0IHBx32qkLczokjLqtob9n6voJ2z+38dfgzW+WVUYgy6HkEd4oyNVzE725NYBBMl+pM3JF4lWBbqXxtKyPPJVqrMBDed3POYwCaqsBQl1UUb/vP46J/MXlAnjWY66SjVtTI1HBI1/W4P4znz9rQkmORVzFKWpdKDEQfHRSmwmpHLthpnW6t5S5ZNaf6mhokHJjZ+86ABYBzHCNTHVqgeanx2BuWoT7O9cMeEZ/TisDzF5CZAgnrJp9ntVxNetbkJdJfqZTkGJbZnrXz9nUSqVtSZlJuUEfEKEevPzNwv53N3OZL5jugdLiyoFQKMZWVUs3js5WVJZbdAp2MyK5sHR9NzKQO4nHNoJITyVLPTl3j90cO+RjRkJSPjaEa5C5YZWmGFYqt0fjrnHYCNrVWSBwmZSnaEtTDNUJy+VW8TVveAmajygmwv7VfenIaUZMmPG0MhnTs5gOJMoidCOJ3R4rT/yoSGRZ95fgsXhG/Ysi2zHye6/gWjzP9Z3Evg0lsB3Dl+7AQ== 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 --- mm/gup.c | 2 +- mm/vma.h | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/mm/gup.c b/mm/gup.c index a82890b46a36..8e6e14179f6c 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -1282,7 +1282,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; /* hugetlb does not support FOLL_FORCE|FOLL_WRITE. */ diff --git a/mm/vma.h b/mm/vma.h index 819f994cf727..0f238dc37231 100644 --- a/mm/vma.h +++ b/mm/vma.h @@ -357,7 +357,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. */ /* @@ -368,6 +368,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) * @@ -376,7 +381,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); } /* @@ -387,7 +392,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) { -- 2.45.0