{"id":2225609,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2225609/?format=json","web_url":"http://patchwork.ozlabs.org/project/kvm-riscv/patch/20260421092457.37649-3-cuiyunhui@bytedance.com/","project":{"id":70,"url":"http://patchwork.ozlabs.org/api/1.1/projects/70/?format=json","name":"Linux KVM RISC-V","link_name":"kvm-riscv","list_id":"kvm-riscv.lists.infradead.org","list_email":"kvm-riscv@lists.infradead.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20260421092457.37649-3-cuiyunhui@bytedance.com>","date":"2026-04-21T09:24:52","name":"[2/7] riscv/kvm: use raw PTE helpers for G-stage leaf PTEs","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"19db3d0b19d3e8e5854aa287aaf5e0a1b75d855f","submitter":{"id":88211,"url":"http://patchwork.ozlabs.org/api/1.1/people/88211/?format=json","name":"Yunhui Cui","email":"cuiyunhui@bytedance.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/kvm-riscv/patch/20260421092457.37649-3-cuiyunhui@bytedance.com/mbox/","series":[{"id":500766,"url":"http://patchwork.ozlabs.org/api/1.1/series/500766/?format=json","web_url":"http://patchwork.ozlabs.org/project/kvm-riscv/list/?series=500766","date":"2026-04-21T09:24:50","name":"riscv: add Svnapot-based contiguous PTE support","version":1,"mbox":"http://patchwork.ozlabs.org/series/500766/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2225609/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2225609/checks/","tags":{},"headers":{"Return-Path":"\n ","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n secure) header.d=lists.infradead.org header.i=@lists.infradead.org\n header.a=rsa-sha256 header.s=bombadil.20210309 header.b=RFi6DW33;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n unprotected) header.d=bytedance.com header.i=@bytedance.com\n header.a=rsa-sha256 header.s=google header.b=GGWs3aih;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=none (no SPF record) smtp.mailfrom=lists.infradead.org\n (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org;\n envelope-from=kvm-riscv-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from bombadil.infradead.org (bombadil.infradead.org\n [IPv6:2607:7c80:54:3::133])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g0H5W4tF9z1yGs\n\tfor ; Tue, 21 Apr 2026 19:25:35 +1000 (AEST)","from localhost ([::1] helo=bombadil.infradead.org)\n\tby bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1wF7MM-00000008KMd-0IdP;\n\tTue, 21 Apr 2026 09:25:34 +0000","from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e])\n\tby bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1wF7MI-00000008KLD-0JnK\n\tfor kvm-riscv@lists.infradead.org;\n\tTue, 21 Apr 2026 09:25:31 +0000","by mail-pl1-x62e.google.com with SMTP id\n d9443c01a7336-2a9296b3926so23162955ad.1\n for ;\n Tue, 21 Apr 2026 02:25:29 -0700 (PDT)","from L6YN4KR4K9.bytedance.net ([61.213.176.6])\n by smtp.gmail.com with ESMTPSA id\n d9443c01a7336-2b5fa9ff39csm131965105ad.4.2026.04.21.02.25.19\n (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);\n Tue, 21 Apr 2026 02:25:28 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=lists.infradead.org; s=bombadil.20210309; h=Sender:\n\tContent-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post:\n\tList-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:\n\tMessage-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID:Content-Description:\n\tResent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:\n\tList-Owner; bh=uzJIbnT8aDB+NFUPksGx3WrnhDEZU/jEu4f/+2Wx82A=; b=RFi6DW33utavrS\n\trUI+wT2JGEMwt9N8XhS5l1DoVO8K55MYEY7XAPU8sZ078dMmfqfIHEXcEq4HR3MoxhaJnWehnsUSy\n\tbsQ5TjDolbtghUerM966m2jf1v4rN0BOlepDOuoV1gVp5ck7hd6xcO9mD3h18ni8Kt8SPUG1E+cg6\n\t4y4vRiDlQCWOt8ieW2oVZZ/IFBPs5xH/u63dyTrsk4DJhzzAuMvzZYQnfjYDEcdOR0hBj3jQf6H+Y\n\t15TJYu3ZpxU0qkl1yWLuu6za7P7KUy3cdTq27eYpo8Jn1WilEHvFTYollduCSDyNwm1OJoP5sPyok\n\t9YqJxza5qGG4QUU9DKvA==;","v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=bytedance.com; s=google; t=1776763529; x=1777368329;\n darn=lists.infradead.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:to:from:from:to:cc:subject:date:message-id\n :reply-to;\n bh=hAU2czezOYKOKIblUParrQgVvl9OeyW0IiuDcmMed3s=;\n b=GGWs3aih1jkFwYrx/jJ9sFnS90sYBDWM+1+XMe76Deb5rkxLmKQLwFNC8kw3dF5J41\n kBsJEwAttw52i4ERfaWe4Cvhhsct1T8WHk2gTw1vnVZR0l6TZHX54qb3cvSkqC1ToF2x\n LAe2AKPHQvYpIS0XfiIZ/QJJkeCtLivNyWpkLpFe5hnBzcLvskIU5PAZxCaTC3RiMspf\n N/iaEGkwXVO3GuL9VP94pHkwSD6eUWdf3uIcpRJKCDE13fqTpyPoIj/pV3ZwRZ3B1vWM\n PjYqBnN/4FkmwFeeh8JiCtNPZ1p/bIYKq/HvwIA3cveHEchqgy70yiNUImQOJ0h/tmx1\n Xm6g=="],"X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1776763529; x=1777368329;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to\n :cc:subject:date:message-id:reply-to;\n bh=hAU2czezOYKOKIblUParrQgVvl9OeyW0IiuDcmMed3s=;\n b=mhcAAUDYp/MxKzJwp4FT8NBjhsGJRjNR03DiQlecG2QGqv+orz3LL2fXceXNYJkbIE\n qfFU47OBBEJq2y4uzlYQe96yBe3A4Z9d/oo589d61v7gtntP+YVbhBMie847TCvPLIQk\n 09fMMfyfYqqSs8nHSjArQcILpZdtSLQh1By/9mG2vubuyVf8l7xdGOQKkUosOfcU+RZe\n Akg70mPMj8f8yR28OeiJIfpEU06ldVHv90DKkEwBJ1MFrF4ocHFfjAsIAIuui4DaiDXJ\n L4XJm7WbBomjMXoUCFsDpuOZdSF3uGjzn1ctkc3MNM2fNYxFrGrpoxEDQqTyDaNejwIY\n Naug==","X-Forwarded-Encrypted":"i=1;\n AFNElJ8w+DNziJQl2+HX40FmsKHZf8TYFvAgqrFIDmVaRuy4Znf1UL+Ew3Bn8wecXLkWjEvy3JUVXjBb3jg=@lists.infradead.org","X-Gm-Message-State":"AOJu0YyvsUbN3UEj2mmaOawrleGBCwt7uVtVvA+mL8xISQJKEKX9kPR1\n\tKsJ4Yl32RyV9xE0NUdYlrHJf8iHpIQ9m5z2uOBmNhnflcauQMCEm2+7/Z1YOMXb4CdE=","X-Gm-Gg":"AeBDies2NsAfL82EP1o6E/+wUybT2nsSsbDlIcgeSc8cYRzS9VAgmUJqYDHNzc3Pelv\n\tsb659BPIl1mwYosWz9kxzCmY55vt5KhO+qOfAjLGIOKgjtG3tAI/XbkSf5fVajW2hExUpMyDiYZ\n\tHjn9fWuACvj7ej/MsJc5XidVOoVY6JO5AiGbBjZEf0Boameu0bcMDeyevHfny7Im3SjkpGq4c1P\n\tkVHtGZu98myF7xOE8ROpamQK25AslkysHHHzgYjSDXG+rlartFvgUTZ7oYyJG6ba/KKmrSBKGm5\n\tLzHe4FaWNV/byUVtoFTyADsfrtcaB3AMkwMb4ZHvmpiogQVnRLrK/+9NN8KZ4WoQjA/9oTjpTJ2\n\tPrAkxGuR/2K96WNnCgdyDaYmDixWCP2BT3R5jhPs37KM8ba0ojeVs6LqE0dl90WS+oLMrR1qGc3\n\th8tCPZxIrP8ANtlmIXcnrKw2gd7+lMbYaVzHwprkDqBD11t/TwsGjZuVdeh+5uSoptX34P","X-Received":"by 2002:a17:902:bd44:b0:2b2:5da8:14be with SMTP id\n d9443c01a7336-2b5f9fcd9eemr128057035ad.41.1776763529026;\n Tue, 21 Apr 2026 02:25:29 -0700 (PDT)","From":"Yunhui Cui ","To":"akpm@linux-foundation.org,\n\talex@ghiti.fr,\n\tandrew+kernel@donnellan.id.au,\n\tandreyknvl@gmail.com,\n\tanup@brainfault.org,\n\taou@eecs.berkeley.edu,\n\tapopple@nvidia.com,\n\tardb@kernel.org,\n\tatish.patra@linux.dev,\n\tbaolin.wang@linux.alibaba.com,\n\tcuiyunhui@bytedance.com,\n\tdavid@kernel.org,\n\tdebug@rivosinc.com,\n\tdjordje.todorovic@htecgroup.com,\n\tdvyukov@google.com,\n\telver@google.com,\n\tglider@google.com,\n\tilias.apalodimas@linaro.org,\n\tjunhui.liu@pigmoral.tech,\n\tkasan-dev@googlegroups.com,\n\tkees@kernel.org,\n\tkevin.brodsky@arm.com,\n\tkvm-riscv@lists.infradead.org,\n\tkvm@vger.kernel.org,\n\tlinux-efi@vger.kernel.org,\n\tlinux-kernel@vger.kernel.org,\n\tlinux-riscv@lists.infradead.org,\n\tliu.xuemei1@zte.com.cn,\n\tljs@kernel.org,\n\tnamcao@linutronix.de,\n\tosalvador@suse.de,\n\tpalmer@dabbelt.com,\n\tpjw@kernel.org,\n\trmclure@linux.ibm.com,\n\trostedt@goodmis.org,\n\trppt@kernel.org,\n\tryabinin.a.a@gmail.com,\n\tsurenb@google.com,\n\tvincenzo.frascino@arm.com,\n\tvishal.moola@gmail.com,\n\twangruikang@iscas.ac.cn,\n\tzhangchunyan@iscas.ac.cn","Subject":"[PATCH 2/7] riscv/kvm: use raw PTE helpers for G-stage leaf PTEs","Date":"Tue, 21 Apr 2026 17:24:52 +0800","Message-Id":"<20260421092457.37649-3-cuiyunhui@bytedance.com>","X-Mailer":"git-send-email 2.39.2 (Apple Git-143)","In-Reply-To":"<20260421092457.37649-1-cuiyunhui@bytedance.com>","References":"<20260421092457.37649-1-cuiyunhui@bytedance.com>","MIME-Version":"1.0","X-CRM114-Version":"20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 ","X-CRM114-CacheID":"sfid-20260421_022530_187709_D05B440C ","X-CRM114-Status":"GOOD ( 13.35 )","X-Spam-Score":"0.4 (/)","X-Spam-Report":"Spam detection software,\n running on the system \"bombadil.infradead.org\",\n has NOT identified this incoming email as spam. The original\n message has been attached to this so you can view it or label\n similar future email. If you have any questions, see\n the administrator of that system for details.\n Content preview: Use the raw RISC-V PTE helpers when KVM G-stage code needs\n to inspect or update the exact leaf entry encoding. This keeps G-stage\n page\n tables independent from the public PTE wrappers that will gain Sv [...]\n Content analysis details: (0.4 points, 5.0 required)\n pts rule name description\n ---- ----------------------\n --------------------------------------------------\n -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no\n trust\n [2607:f8b0:4864:20:0:0:0:62e listed in]\n [list.dnswl.org]\n -0.0 SPF_PASS SPF: sender matches SPF record\n 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record\n -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from\n envelope-from domain\n -0.1 DKIM_VALID Message has at least one valid DKIM or DK\n signature\n -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from\n author's\n domain\n 0.1 DKIM_SIGNED Message has a DKIM or DK signature,\n not necessarily valid\n -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1%\n [score: 0.0000]\n 2.5 SORTED_RECIPS Recipient list is sorted by address","X-BeenThere":"kvm-riscv@lists.infradead.org","X-Mailman-Version":"2.1.34","Precedence":"list","List-Id":"","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Sender":"\"kvm-riscv\" ","Errors-To":"kvm-riscv-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org"},"content":"Use the raw RISC-V PTE helpers when KVM G-stage code needs to inspect\nor update the exact leaf entry encoding. This keeps G-stage page tables\nindependent from the public PTE wrappers that will gain Svnapot-aware\nbehavior.\n\nNo functional change intended.\n\nSigned-off-by: Yunhui Cui \n---\n arch/riscv/kvm/gstage.c | 48 ++++++++++++++++++++++-------------------\n arch/riscv/kvm/mmu.c | 4 ++--\n 2 files changed, 28 insertions(+), 24 deletions(-)","diff":"diff --git a/arch/riscv/kvm/gstage.c b/arch/riscv/kvm/gstage.c\nindex d9fe8be2a1516..fda235092533a 100644\n--- a/arch/riscv/kvm/gstage.c\n+++ b/arch/riscv/kvm/gstage.c\n@@ -88,7 +88,7 @@ bool kvm_riscv_gstage_get_leaf(struct kvm_gstage *gstage, gpa_t addr,\n \t*ptep_level = current_level;\n \tptep = (pte_t *)gstage->pgd;\n \tptep = &ptep[gstage_pte_index(gstage, addr, current_level)];\n-\twhile (ptep && pte_val(ptep_get(ptep))) {\n+\twhile (ptep && pte_val(__ptep_get(ptep))) {\n \t\tif (gstage_pte_leaf(ptep)) {\n \t\t\t*ptep_level = current_level;\n \t\t\t*ptepp = ptep;\n@@ -98,7 +98,7 @@ bool kvm_riscv_gstage_get_leaf(struct kvm_gstage *gstage, gpa_t addr,\n \t\tif (current_level) {\n \t\t\tcurrent_level--;\n \t\t\t*ptep_level = current_level;\n-\t\t\tptep = (pte_t *)gstage_pte_page_vaddr(ptep_get(ptep));\n+\t\t\tptep = (pte_t *)gstage_pte_page_vaddr(__ptep_get(ptep));\n \t\t\tptep = &ptep[gstage_pte_index(gstage, addr, current_level)];\n \t\t} else {\n \t\t\tptep = NULL;\n@@ -138,18 +138,19 @@ int kvm_riscv_gstage_set_pte(struct kvm_gstage *gstage,\n \t\tif (gstage_pte_leaf(ptep))\n \t\t\treturn -EEXIST;\n \n-\t\tif (!pte_val(ptep_get(ptep))) {\n+\t\tif (!pte_val(__ptep_get(ptep))) {\n \t\t\tif (!pcache)\n \t\t\t\treturn -ENOMEM;\n \t\t\tnext_ptep = kvm_mmu_memory_cache_alloc(pcache);\n \t\t\tif (!next_ptep)\n \t\t\t\treturn -ENOMEM;\n-\t\t\tset_pte(ptep, pfn_pte(PFN_DOWN(__pa(next_ptep)),\n-\t\t\t\t\t __pgprot(_PAGE_TABLE)));\n+\t\t\t__set_pte(ptep,\n+\t\t\t\t pfn_pte(PFN_DOWN(__pa(next_ptep)),\n+\t\t\t\t\t __pgprot(_PAGE_TABLE)));\n \t\t} else {\n \t\t\tif (gstage_pte_leaf(ptep))\n \t\t\t\treturn -EEXIST;\n-\t\t\tnext_ptep = (pte_t *)gstage_pte_page_vaddr(ptep_get(ptep));\n+\t\t\tnext_ptep = (pte_t *)gstage_pte_page_vaddr(__ptep_get(ptep));\n \t\t}\n \n \t\tcurrent_level--;\n@@ -157,7 +158,7 @@ int kvm_riscv_gstage_set_pte(struct kvm_gstage *gstage,\n \t}\n \n \tif (pte_val(*ptep) != pte_val(map->pte)) {\n-\t\tset_pte(ptep, map->pte);\n+\t\t__set_pte(ptep, map->pte);\n \t\tif (gstage_pte_leaf(ptep))\n \t\t\tgstage_tlb_flush(gstage, current_level, map->addr);\n \t}\n@@ -170,13 +171,13 @@ static void kvm_riscv_gstage_update_pte_prot(struct kvm_gstage *gstage, u32 leve\n {\n \tpte_t new_pte;\n \n-\tif (pgprot_val(pte_pgprot(ptep_get(ptep))) == pgprot_val(prot))\n+\tif (pgprot_val(pte_pgprot(__ptep_get(ptep))) == pgprot_val(prot))\n \t\treturn;\n \n-\tnew_pte = pfn_pte(pte_pfn(ptep_get(ptep)), prot);\n+\tnew_pte = pfn_pte(pte_pfn(__ptep_get(ptep)), prot);\n \tnew_pte = pte_mkdirty(new_pte);\n \n-\tset_pte(ptep, new_pte);\n+\t__set_pte(ptep, new_pte);\n \n \tgstage_tlb_flush(gstage, level, addr);\n }\n@@ -255,7 +256,8 @@ int kvm_riscv_gstage_map_page(struct kvm_gstage *gstage,\n \t\tif (ptep_level > out_map->level) {\n \t\t\tkvm_riscv_gstage_split_huge(gstage, pcache, gpa,\n \t\t\t\t\t\t out_map->level, true);\n-\t\t} else if (ALIGN_DOWN(PFN_PHYS(pte_pfn(ptep_get(ptep))), page_size) == hpa) {\n+\t\t} else if (ALIGN_DOWN(PFN_PHYS(pte_pfn(__ptep_get(ptep))),\n+\t\t\t\t\t page_size) == hpa) {\n \t\t\tkvm_riscv_gstage_update_pte_prot(gstage, ptep_level, gpa, ptep, prot);\n \t\t\treturn 0;\n \t\t}\n@@ -301,16 +303,16 @@ int kvm_riscv_gstage_split_huge(struct kvm_gstage *gstage,\n \twhile(current_level > target_level) {\n \t\tptep = (pte_t *)&next_ptep[gstage_pte_index(gstage, addr, current_level)];\n \n-\t\tif (!pte_val(ptep_get(ptep)))\n+\t\tif (!pte_val(__ptep_get(ptep)))\n \t\t\tbreak;\n \n \t\tif (!gstage_pte_leaf(ptep)) {\n-\t\t\tnext_ptep = (pte_t *)gstage_pte_page_vaddr(ptep_get(ptep));\n+\t\t\tnext_ptep = (pte_t *)gstage_pte_page_vaddr(__ptep_get(ptep));\n \t\t\tcurrent_level--;\n \t\t\tcontinue;\n \t\t}\n \n-\t\thuge_pte = pte_val(ptep_get(ptep));\n+\t\thuge_pte = pte_val(__ptep_get(ptep));\n \n \t\tret = gstage_level_to_page_size(gstage, current_level - 1, &child_page_size);\n \t\tif (ret)\n@@ -322,11 +324,12 @@ int kvm_riscv_gstage_split_huge(struct kvm_gstage *gstage,\n \n \t\tfor (i = 0; i < PTRS_PER_PTE; i++) {\n \t\t\tchild_pte = make_child_pte(huge_pte, i, child_page_size);\n-\t\t\tset_pte((pte_t *)&next_ptep[i], __pte(child_pte));\n+\t\t\t__set_pte((pte_t *)&next_ptep[i], __pte(child_pte));\n \t\t}\n \n-\t\tset_pte(ptep, pfn_pte(PFN_DOWN(__pa(next_ptep)),\n-\t\t\t\t__pgprot(_PAGE_TABLE)));\n+\t\t__set_pte(ptep,\n+\t\t\t pfn_pte(PFN_DOWN(__pa(next_ptep)),\n+\t\t\t\t __pgprot(_PAGE_TABLE)));\n \n \t\tif (flush)\n \t\t\tgstage_tlb_flush(gstage, current_level, addr);\n@@ -351,18 +354,18 @@ void kvm_riscv_gstage_op_pte(struct kvm_gstage *gstage, gpa_t addr,\n \n \tWARN_ON(addr & (page_size - 1));\n \n-\tif (!pte_val(ptep_get(ptep)))\n+\tif (!pte_val(__ptep_get(ptep)))\n \t\treturn;\n \n \tif (ptep_level && !gstage_pte_leaf(ptep)) {\n-\t\tnext_ptep = (pte_t *)gstage_pte_page_vaddr(ptep_get(ptep));\n+\t\tnext_ptep = (pte_t *)gstage_pte_page_vaddr(__ptep_get(ptep));\n \t\tnext_ptep_level = ptep_level - 1;\n \t\tret = gstage_level_to_page_size(gstage, next_ptep_level, &next_page_size);\n \t\tif (ret)\n \t\t\treturn;\n \n \t\tif (op == GSTAGE_OP_CLEAR)\n-\t\t\tset_pte(ptep, __pte(0));\n+\t\t\t__set_pte(ptep, __pte(0));\n \t\tfor (i = 0; i < PTRS_PER_PTE; i++)\n \t\t\tkvm_riscv_gstage_op_pte(gstage, addr + i * next_page_size,\n \t\t\t\t\t\t&next_ptep[i], next_ptep_level, op);\n@@ -371,9 +374,10 @@ void kvm_riscv_gstage_op_pte(struct kvm_gstage *gstage, gpa_t addr,\n \t} else {\n \t\told_pte = *ptep;\n \t\tif (op == GSTAGE_OP_CLEAR)\n-\t\t\tset_pte(ptep, __pte(0));\n+\t\t\t__set_pte(ptep, __pte(0));\n \t\telse if (op == GSTAGE_OP_WP)\n-\t\t\tset_pte(ptep, __pte(pte_val(ptep_get(ptep)) & ~_PAGE_WRITE));\n+\t\t\t__set_pte(ptep,\n+\t\t\t\t __pte(pte_val(__ptep_get(ptep)) & ~_PAGE_WRITE));\n \t\tif (pte_val(*ptep) != pte_val(old_pte))\n \t\t\tgstage_tlb_flush(gstage, ptep_level, addr);\n \t}\ndiff --git a/arch/riscv/kvm/mmu.c b/arch/riscv/kvm/mmu.c\nindex 2d3def024270c..f338ef08a6d13 100644\n--- a/arch/riscv/kvm/mmu.c\n+++ b/arch/riscv/kvm/mmu.c\n@@ -262,7 +262,7 @@ bool kvm_age_gfn(struct kvm *kvm, struct kvm_gfn_range *range)\n \t\t\t\t &ptep, &ptep_level))\n \t\treturn false;\n \n-\treturn ptep_test_and_clear_young(NULL, 0, ptep);\n+\treturn __ptep_test_and_clear_young(NULL, 0, ptep);\n }\n \n bool kvm_test_age_gfn(struct kvm *kvm, struct kvm_gfn_range *range)\n@@ -282,7 +282,7 @@ bool kvm_test_age_gfn(struct kvm *kvm, struct kvm_gfn_range *range)\n \t\t\t\t &ptep, &ptep_level))\n \t\treturn false;\n \n-\treturn pte_young(ptep_get(ptep));\n+\treturn pte_young(__ptep_get(ptep));\n }\n \n static bool fault_supports_gstage_huge_mapping(struct kvm_memory_slot *memslot,\n","prefixes":["2/7"]}