From patchwork Thu Sep 12 23:16: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: 13802837 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 3EEB2EEE271 for ; Thu, 12 Sep 2024 23:18:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C58A46B00AB; Thu, 12 Sep 2024 19:18:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C08216B00AC; Thu, 12 Sep 2024 19:18:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A33C16B00AD; Thu, 12 Sep 2024 19:18:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 825996B00AB for ; Thu, 12 Sep 2024 19:18:10 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 46FD7C0C2B for ; Thu, 12 Sep 2024 23:18:10 +0000 (UTC) X-FDA: 82557651540.17.F59F85F Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by imf28.hostedemail.com (Postfix) with ESMTP id 7027FC0007 for ; Thu, 12 Sep 2024 23:18:08 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=xa2q09UW; spf=pass (imf28.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=1726183059; 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=VBBK/J5ZkF8zw3prIEqqwLEmBIMH3Wf5Ldc6S2vu7i8=; b=A2jWrfxqGRNjy5kcFOg3HfU2sGDsMLM3KsVKgp+xdet7Jv+ENVb89v09vysfHTRmzI7wDG uxnDo+WumVEjAvlMpDqtYyLuIpe8rmMVH+R5OViOW71pZ34W4o1faNGzN2QFrl40xiZEez 6mfamD1325rtfvz8sk6qxqz4+2g3gTc= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=xa2q09UW; spf=pass (imf28.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=1726183059; a=rsa-sha256; cv=none; b=M/O1t60/ptiZkOn0Fa4CuTJyVQK2cjFyqCInHFk7gTTdsNHbh6/vudwWeEegoed6GwTmuw FL/9FK0CWLb7LntVY2NEvf0GDzbn1FFPdm/hBUgB3YqiEwWmioiYkykr6Oh037ffj0mpjM EgCEVhWzwGS1T9aFRRdnzlGi4A6lYLQ= Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-206aee40676so2678175ad.0 for ; Thu, 12 Sep 2024 16:18:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1726183087; x=1726787887; 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=VBBK/J5ZkF8zw3prIEqqwLEmBIMH3Wf5Ldc6S2vu7i8=; b=xa2q09UWh9n2xgCgVxpRxs4J9YhoFCuj/1rHVdr9Pp11G6MWzVUJdD+i6W1jLoHK5i NpEUQj3VPAmIcVxAaBb9b36jQ/bGv0yk8skKLN54Mf7huIKkmY/FiUlEPyj/HPMMENy1 nFKLuo1yMNKY1Se7AODbtP2Cmhwgu0Hd+POIPx3cfNz7hv0k3yp6fxPDzx09S5607dGC 4h2M8AY6rxWtESpbMh4yDAay9NpMJDgH7VsmJHPKqVFApk8aKLOAs7EvZIPrflJK/rZU kIsiKT6748zwc3lqw8DkJrlTViafzfg/2VNPigDrgkos3Is78uhCAa6nacFcB54lupMa mWCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726183087; x=1726787887; 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=VBBK/J5ZkF8zw3prIEqqwLEmBIMH3Wf5Ldc6S2vu7i8=; b=pR/1GttpW9hqdFVH8UVcYeDPfuWfrL1gIWa4hNyykYAmrxEeR/Hr+JKaJxmaW+3+pf cnsMpzT0de6Qzj/8yAyorr69Bt0GqirWIB+/OwGj+KQ9qOiR1vd6ly9O+0bdzODzKLMW 76wbeYU+dUa0Gq3QcB6tvcOpwsU8MCWhONeRS8lBNod+3pKYk3O0MqKuWOCf3SDr/oZv PB5rZmh2YuB1X8QOk3Ii9HmN21AHoFt0ya58h6Lsb8k35pHwP8XwowFkFx2ky2dhWKDi 6TORB9/b+4f+INZndSxe6W+jf4mjKN0mpMQ8M618wfQAYxwnFoPozKGVlZh7SkM9ru6n 4bWQ== X-Forwarded-Encrypted: i=1; AJvYcCWmBI3uyZlfu/YxXSApCvZoHFgTMPpok6/aH6JqgqqW6sZtj7tcezQ/dQghD1yDSZJN0rFL5oh3LA==@kvack.org X-Gm-Message-State: AOJu0Yxc7Y/1MjxVusxXXQWFYuHV7sT/EmnibNb73GgesPs4tLDFdx7i k7hp2eJrXk9Qs9DofjOufMJ/+yCGTmRfBwts/XgHgN3Su+kippnzjiuvLJzKgZ4= X-Google-Smtp-Source: AGHT+IE7QT3LPeXx/i7CBXip6JfNZehNxjoWUrudSu14L33B4uvstSRbHxig02g+rV2oP6p01q6aLg== X-Received: by 2002:a17:90b:1c88:b0:2d8:9a0c:36c0 with SMTP id 98e67ed59e1d1-2dbb9dc0f39mr1065039a91.8.1726183087183; Thu, 12 Sep 2024 16:18:07 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2db6c1ac69asm3157591a91.0.2024.09.12.16.18.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Sep 2024 16:18:06 -0700 (PDT) From: Deepak Gupta To: paul.walmsley@sifive.com, palmer@sifive.com, conor@kernel.org, linux-doc@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kselftest@vger.kernel.org Cc: corbet@lwn.net, palmer@dabbelt.com, aou@eecs.berkeley.edu, robh@kernel.org, krzk+dt@kernel.org, oleg@redhat.com, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, peterz@infradead.org, akpm@linux-foundation.org, arnd@arndb.de, ebiederm@xmission.com, kees@kernel.org, Liam.Howlett@oracle.com, vbabka@suse.cz, lorenzo.stoakes@oracle.com, shuah@kernel.org, brauner@kernel.org, samuel.holland@sifive.com, debug@rivosinc.com, andy.chiu@sifive.com, jerry.shih@sifive.com, greentime.hu@sifive.com, charlie@rivosinc.com, evan@rivosinc.com, cleger@rivosinc.com, xiao.w.wang@intel.com, ajones@ventanamicro.com, anup@brainfault.org, mchitale@ventanamicro.com, atishp@rivosinc.com, sameo@rivosinc.com, bjorn@rivosinc.com, alexghiti@rivosinc.com, david@redhat.com, libang.li@antgroup.com, jszhang@kernel.org, leobras@redhat.com, guoren@kernel.org, samitolvanen@google.com, songshuaishuai@tinylab.org, costa.shul@redhat.com, bhe@redhat.com, zong.li@sifive.com, puranjay@kernel.org, namcaov@gmail.com, antonb@tenstorrent.com, sorear@fastmail.com, quic_bjorande@quicinc.com, ancientmodern4@gmail.com, ben.dooks@codethink.co.uk, quic_zhonhan@quicinc.com, cuiyunhui@bytedance.com, yang.lee@linux.alibaba.com, ke.zhao@shingroup.cn, sunilvl@ventanamicro.com, tanzhasanwork@gmail.com, schwab@suse.de, dawei.li@shingroup.cn, rppt@kernel.org, willy@infradead.org, usama.anjum@collabora.com, osalvador@suse.de, ryan.roberts@arm.com, andrii@kernel.org, alx@kernel.org, catalin.marinas@arm.com, broonie@kernel.org, revest@chromium.org, bgray@linux.ibm.com, deller@gmx.de, zev@bewilderbeest.net Subject: [PATCH v4 14/30] riscv mmu: write protect and shadow stack Date: Thu, 12 Sep 2024 16:16:33 -0700 Message-ID: <20240912231650.3740732-15-debug@rivosinc.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240912231650.3740732-1-debug@rivosinc.com> References: <20240912231650.3740732-1-debug@rivosinc.com> MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: ijgzzfkfm4txr83rpbzqrsm75ninuac7 X-Rspamd-Queue-Id: 7027FC0007 X-Rspamd-Server: rspam11 X-HE-Tag: 1726183088-400108 X-HE-Meta: U2FsdGVkX1/Nz+1PcekeaiakFFGxv+b7mJ6RLWRer7SqHEUWWaspEYFA/KS/fojXo3Q5PJvBrgBCTXzeK2uKh/tPkT9jFDIyDPAOhgRqFNcj7FFQJGITrqb7HO2LSiBYUbP+nGcb8f2LHPzwT8SFYlwIg7lMlnCuD8r4EfvEb3rY5ugXeVOr+0CwazRFEEgFHOLgumzNy9XDS+YayZIKOYtfAv4stLHo4h33lF/KCu/IA/ZO641QuQ7Qabfp8q+gaANE1wUHKUkZ6Y1IHRiYMnV3rjpmD0xaePzJX/HLi2/ENOOcnpnhjRlADqxv9DZytDBVKpAnPBVYKw3wiDi/WPPXfTVFBsqctVnltrhD10oqwTkkEbwWYAI8dBMwI9vX5m/Cw9BQe8AK/Iz2odS9hJ7Qo10sH3fxB1sD6Tew4d+V9BjoQ3AcEvntc1KCHtjtsuz3paJRfMvznbSBPKIUdF0b4KO91q5qGj6JpkXimXZj7nK+ujE1OZoMdwEnYaG9trJ17eWRYIJLIqg0YxRnA8lfSH5X35xy+WhxYABFwidndeS+GUpt04ZsmvC+qIVzjUBGw8BIshe84J4q7h8TDC/PbmbJHcnizBFUyZg+MQ8jsZSiVnvOEIKAwub265RsX+tLiUsJWZfSLq0zjcuORR9M7S1Ghiifgmtoc61xHHCFOZcozI9ERMDPifUbSy/FEOcIdi8Ithkj1bwSJ+sd/coLOqW3dEaZVUsmcwvrmCWFMS693yc0hL/D/Q7ni8Ot+yj7khFm/4NiFZrHzJIlR4c8QNLkpa+Pup5y08it6PYN9zxQhmdiuSXBX+YUDLycTM4iedKuibztA5TOvvmFpW1W+u3EliEMZHTxB1Wm2Ysce48i0B4ImmdNYUjOjtVmRzyAntHCLqpKRsW6vxoXIKR8KhKJYABVL7i79vqpdvDixuuJVM3EVw5xrXaDyZ+aSGPl7lj8a2rfKIrsa1g a8RssUmu AVOJWcUcLFrZTH/0UEzBtwVbtmCQeTJZ6UBEskXypaCAHGLCBtZY/FmtpKSS1qM0XbfZ3jVCLEq75GU9OTJTA89qjV2uNipFSaSeoFh+6AT/qfNyO2sFVHma9lJY42Ay5KCx/0caJ5nHuhcnMjIgdu652e9obO9UeqgNpqjSdsxkq08JVq+7O89W80wK+5um4W2ze+tavuwZ6LM0dvFEFyb1icD64h4JcFbtjlWeImUh9SwsNQRg4f0xoa0I/xuuHI/8mwkSlD22rx8djJlWZZM1NskZRTLHBtMizKdCjnN6J9cGYVSOQZAi2sa8I76OOvwA8/ATfzs91WYntPmQHXbOWHGsZJQfcCBRAHX3VUSXoc1Zm/MHIAY62jdPrtxJYEq7YlN82f32A4QXYEd5Xs6xsG3/TXWgdLVwb8OY7Auxap1w2AwEjaHOXvI+hCI7r0N3G 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: `fork` implements copy on write (COW) by making pages readonly in child and parent both. ptep_set_wrprotect and pte_wrprotect clears _PAGE_WRITE in PTE. Assumption is that page is readable and on fault copy on write happens. To implement COW on shadow stack pages, clearing up W bit makes them XWR = 000. This will result in wrong PTE setting which says no perms but V=1 and PFN field pointing to final page. Instead desired behavior is to turn it into a readable page, take an access (load/store) fault on sspush/sspop (shadow stack) and then perform COW on such pages. This way regular reads would still be allowed and not lead to COW maintaining current behavior of COW on non-shadow stack but writeable memory. On the other hand it doesn't interfere with existing COW for read-write memory. Assumption is always that _PAGE_READ must have been set and thus setting _PAGE_READ is harmless. Signed-off-by: Deepak Gupta Alexandre Ghiti --- arch/riscv/include/asm/pgtable.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index 30fd4874e871..3e05fedb871c 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -415,7 +415,7 @@ static inline int pte_devmap(pte_t pte) static inline pte_t pte_wrprotect(pte_t pte) { - return __pte(pte_val(pte) & ~(_PAGE_WRITE)); + return __pte((pte_val(pte) & ~(_PAGE_WRITE)) | (_PAGE_READ)); } /* static inline pte_t pte_mkread(pte_t pte) */ @@ -606,7 +606,15 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm, static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long address, pte_t *ptep) { - atomic_long_and(~(unsigned long)_PAGE_WRITE, (atomic_long_t *)ptep); + pte_t read_pte = READ_ONCE(*ptep); + /* + * ptep_set_wrprotect can be called for shadow stack ranges too. + * shadow stack memory is XWR = 010 and thus clearing _PAGE_WRITE will lead to + * encoding 000b which is wrong encoding with V = 1. This should lead to page fault + * but we dont want this wrong configuration to be set in page tables. + */ + atomic_long_set((atomic_long_t *)ptep, + ((pte_val(read_pte) & ~(unsigned long)_PAGE_WRITE) | _PAGE_READ)); } #define __HAVE_ARCH_PTEP_CLEAR_YOUNG_FLUSH