From patchwork Wed Oct 16 21:57:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13839019 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 3F894D2F7D0 for ; Wed, 16 Oct 2024 21:57:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A62256B0082; Wed, 16 Oct 2024 17:57:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9C1B36B0083; Wed, 16 Oct 2024 17:57:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 862A46B0088; Wed, 16 Oct 2024 17:57:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 69C736B0082 for ; Wed, 16 Oct 2024 17:57:42 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 304BEA0C42 for ; Wed, 16 Oct 2024 21:57:23 +0000 (UTC) X-FDA: 82680827628.25.5220F30 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by imf10.hostedemail.com (Postfix) with ESMTP id 26A8FC0003 for ; Wed, 16 Oct 2024 21:57:35 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=oQO0Go52; dmarc=none; spf=pass (imf10.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.171 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1729115827; a=rsa-sha256; cv=none; b=ZTIMHPW2lNHH5p9fpslTiFguk7al1JWIZFIN0BvpJhR2AvzNEmgOgDd77uj1kzLumvU8dL uNt0i60SZ6UBhhVGs0hOE9Pzu+KP+uSUJJ9ztbldq6Jp9bkhULdfpXFvxq8Ijka+UMzj79 hEEqstywn++ASY6di3sPRuzS+8QPvQs= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=oQO0Go52; dmarc=none; spf=pass (imf10.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.171 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1729115827; 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=XdsLfzbeIJUmffXDRsTtiOytmZQkMd2fCbnSq93GpGM=; b=SyAhXgQoc3wra4ClCJ2t2VtgighBKtBwa4r85HyUibmkkkvfLSrWgHMsvdEmhBTy4mlSFp Tg7Qj2lfYYcSO1sPv40Th0ggj9lVmKU9/JNubTcEtyuB3XX/jUjWqLvXxa2zekueNjXrq9 l/cspKKj85wlJKXsZdSm6HWZcK/yHpg= Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-207115e3056so2270985ad.2 for ; Wed, 16 Oct 2024 14:57:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1729115859; x=1729720659; 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=XdsLfzbeIJUmffXDRsTtiOytmZQkMd2fCbnSq93GpGM=; b=oQO0Go52PSq8E52IDi+jsUQCngUMwePvOkg0fyf4sQJhMv7pV3TQHsKRFqQsaPhLDe eYwToagkVpc+8CMrZeELjj2ZeE6GCVFBfrxapwTIqLQxUsMVz/UWI9bnwFMWGUhWsPVr qsupKuRT+qkg0AwgYPsklHeeYNWgUhhr2CPdzx8hev83Sm8KOyV2JKr1q/OhNO9JGsbo MntpFxqRaP6lfDYWX1uYMP4AXrx0zZQ3AVp2AZNkHIXsTG4fY85qBSq/RIYlvoALtxUk i3pFbSZR+e+lA5I3IGp28GHrm/yRYES9MdyFJuAdIOB9+T97izYaG9MA7TXG6kbCFnrh ANDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729115859; x=1729720659; 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=XdsLfzbeIJUmffXDRsTtiOytmZQkMd2fCbnSq93GpGM=; b=cdAekWKs3dMYX65DE21vCEDCDrWOX8+8az6+LqWxTVlti5jUAc3738QMXniu0vtySX nsR7mQdq7PEkO2A7lvkNqX+dbefVH2IE6SFy1jNOIsvwCg11ZnKftR6JXBYHwS+agQ1P 0SZSyAMobTUx5y7azbZLjpIrZWS+O0HIwVHs1GKuOSO827z6HmOZbi2s43BJhUwYm9zy qsZB/SkXZiyf4slLUiCUgSRCEw0M8HYpe01kA5I/54e3hTxDtTY+2m86nApYB7b/NMwQ 1yTy4aE0rRjWV0FbxLRV1L4sC+HJ94ZLDmhBceBIGxCFe5PbYoT0cZWPGiqRpZk/AuCI 5VYQ== X-Forwarded-Encrypted: i=1; AJvYcCUS0yf7Uv7M9sFkxjf0qRJzNrPXQ+6ri6lgGs8S7vQaNd4Vsq2D59M75Vys2NNjB4qMW7S/PnoHyQ==@kvack.org X-Gm-Message-State: AOJu0YznuODX2FlkagSmbuvlP9BM0K8/FP7rT2m5RufYtiBLrfY8K2t5 rQAClaEFoRSpTi6E8cWTtS2gXdDXRO5G8AggTR61OBcMVCqFsPuUB+q8jqSpKCw= X-Google-Smtp-Source: AGHT+IFluSxzlxpD9Tp1FCJcZbgYHrumOfhgLbhKxxdpf7sn2E/e71vVpkROxUYqoklPv+KqnK6MeQ== X-Received: by 2002:a17:902:ea10:b0:20c:c704:629e with SMTP id d9443c01a7336-20d27f2f5eemr63371415ad.56.1729115858946; Wed, 16 Oct 2024 14:57:38 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20d17f87ccasm32973295ad.62.2024.10.16.14.57.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Oct 2024 14:57:38 -0700 (PDT) From: Deepak Gupta Date: Wed, 16 Oct 2024 14:57:33 -0700 Subject: [PATCH RFC/RFT v2 1/2] mm: helper `is_shadow_stack_vma` to check shadow stack vma MIME-Version: 1.0 Message-Id: <20241016-shstk_converge-v2-1-c41536eb5c3b@rivosinc.com> References: <20241016-shstk_converge-v2-0-c41536eb5c3b@rivosinc.com> In-Reply-To: <20241016-shstk_converge-v2-0-c41536eb5c3b@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 , Arnd Bergmann Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, Rick Edgecombe , Mark Brown , Deepak Gupta X-Mailer: b4 0.14.0 X-Rspam-User: X-Stat-Signature: a3cj8asehdupnn73goafbguqk9qq6oqn X-Rspamd-Queue-Id: 26A8FC0003 X-Rspamd-Server: rspam02 X-HE-Tag: 1729115855-872817 X-HE-Meta: U2FsdGVkX1+WyEeAL1BOIqjQr+mPB/kHh0ms+9r0vifZBdj5nqW/evARu99x9X2XlnWrrqxl7CpwPtraOnyS3YOpscPq1SEIJMXmfAsQTPxnBlDvSjkPPjvMiPcDa7O2rp9w/QgZJMewhohzo0hI66t5zdYqo1VF8OkF37bSJHZL4iqwOrKwtrsjcgJsKQv6OoUhJ50C6dUVhijhooxONK8sdW23MkU9oR0oFAlh/5rdlOVA8S+6izB3/Sg4vTrVqbwha4dU74yZBZX0i8Hq1wNX5EgYR7hfSOkgDvu9BzRA1b/WD2tjYO++hqXrXt27kzVKoxlbbwY8vTtEHokPHwPghqBtDQeQflyKlN8qKSV+gepnvG5QVhEQZqdpRMvZzBQrctIC5PRnykapLCqux+r+ezFw+yP8Qu+Rbp/9kcTGSb7zwuuyeEYtiGyy4Vk4Awgren0M/kKLxioiz2+nY2b0XOKAC0LrjiBC4YxQDYFkfd1oUwySlkA8vektR9g3b9rmHc2iUa35i1ZNPM5XEHlIDYubxi8xPPFXMSlwediAxp6VWKzat0j9idlB+v82arIqLctUTtcY7Tsa049NLdkxI0aII8D932uKaXrQIWIUHWTplp9zsKc8G6UF8ycPQd0j631JHFn0P+PAh0K2tWmevDboKzsY+062w3a9N8qdkdRMFIaPiydb+aLiFSIW1boSXsVt6uZIbyb+6ckAowfXNrrvRPsMr3igrdsWPghO/QFOqoggvEe5n2MhQZgC0OPZ8NgfIqTVDu1Oj5FNzFqqBy++hUobKMcIyt+AQ3GFbU5eWR0gTXtfLeT/WZXPpnsGljQ1c2l1yuG7ylbOiZNJ+O7BuQBsHQX4z3dGMe2ZgOiQg7mVGuxPQRF13zZBcybEaZrfUJj7YfO3ssIFtMTeXRdUUdyJX9+Qqu0GqX/hi87eRT/m9NXjNgsA43njOUyI7gqAe8ZUt5ALzwU 4j4+reMI P2Y41MAzmrsaGaeiRj8WXelKYyxf/E8zLVNY0adu8jVDgyva+8ERPrd65Vy1aSvMLfBhqNrst2G+TfNVSJok0MfWG1wHZwRSP53vAsj00LKyjegJsOZF7S1wJZQKXcAzkTH9sR08PCI/DMg1Vznt89QmYN0o47GkYSHJVPNsuew2ouBDwB4nlCctC0vfrKtf9cFw/1HKRz/B8Im0981T6Zkj/JBXba99mRdhtqAG2AGGd3SS9gTW0CKs2u/Y4qAAoTiL3tksM49Ap/4BJnBRl2N8FiTa+GOoLwA40dwRRvEaJQi75RwTqxYyyRS1Qoc3SccVknKBu8gtC6+Vk924iT3tmGLjUJZZ75lFQV7Eim+0YraRZRugy0655RePFKRIGl2MdXV3huPq6QvLpGkbffwAxxR7/ppUDy7k2g3HouTiHLl4wNu2IAH0o/Q== 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 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/mmap.c b/mm/mmap.c index dd4b35a25aeb..0853e6784069 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -708,7 +708,7 @@ static unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info) */ 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 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) {