From patchwork Wed Apr 3 23:34:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13616773 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 9EACDCD1292 for ; Wed, 3 Apr 2024 23:41:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 711176B00A8; Wed, 3 Apr 2024 19:41:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6C0496B00A9; Wed, 3 Apr 2024 19:41:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 519376B00AA; Wed, 3 Apr 2024 19:41:57 -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 2C3946B00A8 for ; Wed, 3 Apr 2024 19:41:57 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id E125E407D6 for ; Wed, 3 Apr 2024 23:41:56 +0000 (UTC) X-FDA: 81969845832.05.360F337 Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by imf01.hostedemail.com (Postfix) with ESMTP id 157824001B for ; Wed, 3 Apr 2024 23:41:54 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=MG51YGxy; spf=pass (imf01.hostedemail.com: domain of debug@rivosinc.com designates 209.85.215.182 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=1712187715; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=54i5AOpZ8eaoGeKx2/tq2pnpvo0kkfTAlmLvvQQ7IdM=; b=6uD9aLiIVVilqD8yZ2IHdrKmSHD/flWz3VrXSDhQmJOMkPKDvtsdA/Z9G3IcU40YMZ/4PN aFknSnWDC+zsudWp2xwj2taVBmaK9OQYy/IoAXQQYoS+BZBg50HMIVNAm44PatyTG2kJVw ve+CdrK59bY2oU63POXSBtNszoDHbfk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1712187715; a=rsa-sha256; cv=none; b=BRLhGjXsjSchBaBZribpR98O5oNy0YrtNfs5+Ae01hD833c3Ez5zpnmD9iKgyRgvvY4xX1 eu2x6LrchGRNc3mYxt2K3YwrNcEiz5+kQZGPZSnx/VD8ttZaKYvoNTaQ1fZkmsInUPHpKC fNwp1DgsbwRt4iEU61jjaBbmcFGZFWA= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=MG51YGxy; spf=pass (imf01.hostedemail.com: domain of debug@rivosinc.com designates 209.85.215.182 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none Received: by mail-pg1-f182.google.com with SMTP id 41be03b00d2f7-5ca29c131ebso331159a12.0 for ; Wed, 03 Apr 2024 16:41:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1712187714; x=1712792514; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=54i5AOpZ8eaoGeKx2/tq2pnpvo0kkfTAlmLvvQQ7IdM=; b=MG51YGxyciMvtwyLXx3DCy6twja7YfXSUoun4FryhCxxookSrGWwukTotMPA59ISq+ /G6/E0tvJjcMbk1DKofiArzWrT2Yef2jpdJaZq7wgYEkLoqqc6AWnM1HD91T/NxeCKso H/UAsqyPib4K3OeDP2mZYKR2Vxund1fDLISUHngGu6ukem0pRq/3Nev+P7KxOAOCj8Da Kg4SPvc9cPxkkl/qgJcmwurGUqSIrmb0379wHiYOW4f0IfaFIjfl9gzUVORgke6RLa92 aB7hxFlsFS8Z+8veYy8EpYJ0/MiAqjrD8oyYiHMKNTpI3OmhBAMaDOAu+hKGmiAsfvLi rzrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712187714; x=1712792514; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=54i5AOpZ8eaoGeKx2/tq2pnpvo0kkfTAlmLvvQQ7IdM=; b=pLD2JpXtYOFfTiqn2B4wfuLKKzBAq281s2ENJwc6EP2vAiznGnZJgXplhvl/7yT6oh 1WgyUD9GN2+mvfuUrTjy8Y/Y0ow/YZZzaKhp2rFCrzy0ASyKEfv0P6xZX7pkC77pviXC bgUNNU3RjjirunGlDdfp7hU0Tb0J+jFKRzI8x7bw/RZ7UDKKqsvQFBiFTCdPGPlWzLNQ nkJVJsyLq/Zy8t3C6JcQsyZDDGWsaHHKCPRHO9CdiIOWR0AXk9w+zeo3AgxD58+KUzu3 ziP20WXGdEgJVJrowMpyFY5B/+vhISydkFlsGKujliOawzn/FFjC+lfqpVL7GF7N92ON 6rCQ== X-Forwarded-Encrypted: i=1; AJvYcCUY65NM5RLWB4mrmThG9gE898skxMCA8/6w3z0z5lFabcoVuudB36dwmYxgDpQakxU/ycfBXVmgdMWIsXSLWt1doTo= X-Gm-Message-State: AOJu0Yzrsjmj1dF116jtcbHnFryBckMHy4T+bP+pK8R2+9uEXhgFhD5R X+8WjrY7S86Q6ImO0xCDSzfC9DDW/o2Y12Ra1HUT/V/F/od1qo9KaLUsShss8qE= X-Google-Smtp-Source: AGHT+IG6GlC+ZgzT+vgM3OEvECwnyeJlz7W2zSZ3hW3riRhMkNJ5fFd9UMQXlTdOrd5KXzyMbVV4Yg== X-Received: by 2002:a17:902:f085:b0:1e2:a5b2:ee0f with SMTP id p5-20020a170902f08500b001e2a5b2ee0fmr628269pla.24.1712187714025; Wed, 03 Apr 2024 16:41:54 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id b18-20020a170902d51200b001deeac592absm13899117plg.180.2024.04.03.16.41.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Apr 2024 16:41:53 -0700 (PDT) From: Deepak Gupta To: paul.walmsley@sifive.com, rick.p.edgecombe@intel.com, broonie@kernel.org, Szabolcs.Nagy@arm.com, kito.cheng@sifive.com, keescook@chromium.org, ajones@ventanamicro.com, conor.dooley@microchip.com, cleger@rivosinc.com, atishp@atishpatra.org, alex@ghiti.fr, bjorn@rivosinc.com, alexghiti@rivosinc.com, samuel.holland@sifive.com, conor@kernel.org Cc: linux-doc@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kselftest@vger.kernel.org, corbet@lwn.net, palmer@dabbelt.com, aou@eecs.berkeley.edu, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, oleg@redhat.com, akpm@linux-foundation.org, arnd@arndb.de, ebiederm@xmission.com, Liam.Howlett@oracle.com, vbabka@suse.cz, lstoakes@gmail.com, shuah@kernel.org, brauner@kernel.org, debug@rivosinc.com, andy.chiu@sifive.com, jerry.shih@sifive.com, hankuan.chen@sifive.com, greentime.hu@sifive.com, evan@rivosinc.com, xiao.w.wang@intel.com, charlie@rivosinc.com, apatel@ventanamicro.com, mchitale@ventanamicro.com, dbarboza@ventanamicro.com, sameo@rivosinc.com, shikemeng@huaweicloud.com, willy@infradead.org, vincent.chen@sifive.com, guoren@kernel.org, samitolvanen@google.com, songshuaishuai@tinylab.org, gerg@kernel.org, heiko@sntech.de, bhe@redhat.com, jeeheng.sia@starfivetech.com, cyy@cyyself.name, maskray@google.com, ancientmodern4@gmail.com, mathis.salmen@matsal.de, cuiyunhui@bytedance.com, bgray@linux.ibm.com, mpe@ellerman.id.au, baruch@tkos.co.il, alx@kernel.org, david@redhat.com, catalin.marinas@arm.com, revest@chromium.org, josh@joshtriplett.org, shr@devkernel.io, deller@gmx.de, omosnace@redhat.com, ojeda@kernel.org, jhubbard@nvidia.com, Mike Rapoport Subject: [PATCH v3 09/29] mm: abstract shadow stack vma behind `vma_is_shadow_stack` Date: Wed, 3 Apr 2024 16:34:57 -0700 Message-ID: <20240403234054.2020347-10-debug@rivosinc.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240403234054.2020347-1-debug@rivosinc.com> References: <20240403234054.2020347-1-debug@rivosinc.com> MIME-Version: 1.0 X-Stat-Signature: og4bfxzzs4yaiiyy1camen8gf6qo1nr7 X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 157824001B X-Rspam-User: X-HE-Tag: 1712187714-317514 X-HE-Meta: U2FsdGVkX1/LfHlpW7kXhg5mM633zRaZFZB4qO8ilkW1wzy31+jZNZf0vlg6tEEIAlAzafhTNKSoMIojeiLZ6fjPCRJD/xyw2vrpJZGEUvDE3ixpKbpL04ozcq+TiPWHTOgWsU5uqJ8aTrhAuq29XQFKEpxhhobnmE5OenVFSgzrSqgbnifiueEMSBEgrm5zff4pzc67joom3LXlD846OW8nk6F7D9MnDr5KaPdL2uJAU12rcnRH+arG3D4IN9UeZN63Bs+V8B8c7S1L9hXNV/iI6B6dOWH59Y3mYuqhPtM9b2TLDue4xmDmoYvnslhoMNR2WVVs4vAYVRDKAV6X9ehR3ab6gLYSnNgIDHgHw1E+dpASkg5JRLUAERldujIjvwiD6YmhPGJ6Br44z28wqcM6+XFJ1gZYb4CfehxCBFKqF0FqBPbpUdo9u2qvS15RZCKBAkxGpisTNb7B9UvwKgiOANa3y6J1Hj4zwIe8zmmOjJGgxeJcmGoFtITRs364Ogz0SMWenok5c03S7Ze6T3tjwslbQ/Is/0Lad9movUkZP7FpkBcLAcpPgL9aE9FaGPxMXyYr1dgwOcjle3AqFyk7xEO0BFJ0iNegi5wXNGVmRZgYD8iFRPWL9AnQsNykZXEgbNOyl1RILkrnvRp5hQkXbg7bGF/+1N6q9kV4BD+hP9CshKuB98XbT7cLYLYByKQDmCWRTTCzuHFGSway60Sq30uDFWkZJoahwSvr0ZAP22qk52ml+rwCD1/rn/GHWTSPLLykg26h59gu2FO9wMkdSn8b2oCzZJyVhhw8S94QoMvtD0eKeiggGR11gXqalngUv80cAzA3Rlo5BsFqxBPd+pHc642g2WUY4fUr1T0KzI5QH+NxW3cHh7JwraX3k2C74dH1yFcBCwXhdcBaLV7pp3eCXa4XTwhPXe8fgKx5x4onJ0td7KK8R2Mdq3i/Fmxaky5kn2V4ri+odYK 9uTBl3x8 nIKHRJPPmGHFS9EpsjC3WpDLypFgJpsmRHg66m4OMsHhH7m6gJpPbxd4Vj9S17vc9ytu/0ItYWqTrXor7CELri6P77G4bL3X/igjnnOKwetCuzY2uoeSWQHpD0SwJbnH8oY+3+raI9AyAKHbL3tQgOKaTDrHCzl+RYLE6fPcTMFnYKK+ZbOgUUgOYB4FKBnScwpibSA/TfKpEsfFC/Fg4NVTUMSrWr39MUV/n4tpqmCl8MhfjNbJbv4hQcBdsFT/6gWBBF6f546BiLNGvbCgFPL/yh9H33zRHr0yMuMLvDqZiennElxF/yYK4mNWBSvWuQtveRm8ryEPCPWamWIeE6isK5K1IxTMyMG5I8WPnohfr/YX8oMJyLS9jSSJXT1u1ZG6eknWvZiSf/kzOOgxKUERBC1opZzdkoapF7g83tJQqPF6PI5AEf8djM51crRfGQU/sUxZ4xdeL2ZVIpQuffQM+llOCX9ypRqmWz/kXF8LEwiL4UmaIcp3K/8meB6plMNGCYcRTi9d2xH3+7l1W4FWWE+kNhtzLHu2Yk8XNMWcjer/GMersXrvPatkBlZkY35QvZ1TwXtYzOjEnuNgHQx51NEDyR6dwxxhJYyZdVmOe4rTDg7VtXtwvZA== 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) to encode shadow stack VMA. This patch changes checks of VM_SHADOW_STACK flag in generic code to call to a function `vma_is_shadow_stack` which will return true if its a shadow stack vma and default stub (when support doesnt exist) returns false. Signed-off-by: Deepak Gupta Suggested-by: Mike Rapoport --- include/linux/mm.h | 13 ++++++++++++- mm/gup.c | 5 +++-- mm/internal.h | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 64109f6c70f5..9952937be659 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -363,8 +363,19 @@ extern unsigned int kobjsize(const void *objp); #ifndef VM_SHADOW_STACK # define VM_SHADOW_STACK VM_NONE + +static inline bool vma_is_shadow_stack(vm_flags_t vm_flags) +{ + return false; +} +#else +static inline bool vma_is_shadow_stack(vm_flags_t vm_flags) +{ + return (vm_flags & VM_SHADOW_STACK); +} #endif + #if defined(CONFIG_X86) # define VM_PAT VM_ARCH_1 /* PAT reserves whole VMA at once (x86) */ #elif defined(CONFIG_PPC) @@ -3473,7 +3484,7 @@ static inline unsigned long stack_guard_start_gap(struct vm_area_struct *vma) return stack_guard_gap; /* See reasoning around the VM_SHADOW_STACK definition */ - if (vma->vm_flags & VM_SHADOW_STACK) + if (vma->vm_flags && vma_is_shadow_stack(vma->vm_flags)) return PAGE_SIZE; return 0; diff --git a/mm/gup.c b/mm/gup.c index df83182ec72d..a7a02eb0a6b3 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -1053,7 +1053,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) || vma_is_shadow_stack(vm_flags)) { if (!(gup_flags & FOLL_FORCE)) return -EFAULT; /* hugetlb does not support FOLL_FORCE|FOLL_WRITE. */ @@ -1071,7 +1071,8 @@ static int check_vma_flags(struct vm_area_struct *vma, unsigned long gup_flags) if (!is_cow_mapping(vm_flags)) return -EFAULT; } - } else if (!(vm_flags & VM_READ)) { + } else if (!(vm_flags & VM_READ) && !vma_is_shadow_stack(vm_flags)) { + /* reads allowed if its shadow stack vma */ if (!(gup_flags & FOLL_FORCE)) return -EFAULT; /* diff --git a/mm/internal.h b/mm/internal.h index f309a010d50f..5035b5a58df0 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -572,7 +572,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) || vma_is_shadow_stack(flags); } /*