{"id":2230034,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2230034/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260429044752.4176397-49-alistair.francis@wdc.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.1/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20260429044752.4176397-49-alistair.francis@wdc.com>","date":"2026-04-29T04:47:49","name":"[PULL,48/51] target/riscv: Fix pointer masking for virtual-machine load/store insns","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"b69144afd3f718b3a671ce670578e45e2b19bb47","submitter":{"id":64571,"url":"http://patchwork.ozlabs.org/api/1.1/people/64571/?format=json","name":"Alistair Francis","email":"alistair23@gmail.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260429044752.4176397-49-alistair.francis@wdc.com/mbox/","series":[{"id":501983,"url":"http://patchwork.ozlabs.org/api/1.1/series/501983/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=501983","date":"2026-04-29T04:47:05","name":"[PULL,01/51] hw/riscv/riscv-iommu: Use standard EN_PRI bit for PRI","version":1,"mbox":"http://patchwork.ozlabs.org/series/501983/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2230034/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2230034/checks/","tags":{},"headers":{"Return-Path":"","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 unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256\n header.s=20251104 header.b=oitsMGP5;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g54pp3r80z1yK5\n\tfor ; Wed, 29 Apr 2026 14:59:29 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1wHwuH-0001iE-Nv; Wed, 29 Apr 2026 00:52:17 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1wHwuF-0001Uv-0T\n for qemu-devel@nongnu.org; Wed, 29 Apr 2026 00:52:15 -0400","from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from )\n id 1wHwuD-0001JD-8q\n for qemu-devel@nongnu.org; Wed, 29 Apr 2026 00:52:14 -0400","by mail-pl1-x633.google.com with SMTP id\n d9443c01a7336-2aaed195901so52981455ad.0\n for ; Tue, 28 Apr 2026 21:52:12 -0700 (PDT)","from toolbx.alistair23.me ([2403:581e:fdf9:0:6209:4521:6813:45b7])\n by smtp.gmail.com with ESMTPSA id\n d9443c01a7336-2b988772ae8sm7756145ad.7.2026.04.28.21.52.07\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Tue, 28 Apr 2026 21:52:11 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=gmail.com; s=20251104; t=1777438331; x=1778043131; darn=nongnu.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=CFjIveUuOnrhIzHJ+Ozf2SIcBbSrIZOaJvuBTb2IHEQ=;\n b=oitsMGP5GZF2/C6WEcpnBGGXLsmoTC3fz79eXCrj5HdnkxEseO+g+ZFqRDOkc3xrRP\n CRCSVdjTJtquESFmGiFU35clg34mB8bdc/YbitGVOPPSKWRoBTvSgqcOCPzN4IBck0px\n vLgxDGltsrVwhMXQTdexAXPuqXTll/ZWOZWYa+JI2JD69RqLmPPysaAhbSVW5+bZxDwa\n Xmyw6kukSQ3syZtdrtXUclqy0oL7/MhR/gRDb95G10zpAkzdJfMRvK5QZIbt5ei+XoXC\n coPCxvQ2AP8lN4SE63cCvdPfR14EsJvmR8JuBTZZj/eQmofmiinWDOP9Qlt4wxrnFuiD\n pzQQ==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1777438331; x=1778043131;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=CFjIveUuOnrhIzHJ+Ozf2SIcBbSrIZOaJvuBTb2IHEQ=;\n b=tJmxtwEHlLep9SNOSgYo32SIIbV27bN/dcFbKLeypkDGr29Vrx3hDZYLe2v8bAC/su\n 3LRiVmU5FJXZAGFDizHcqFZ1GvmwEJV9XCoHWLXXNVauOY4PMKPAV7Xhl95yv8bseK26\n Wvl3i+bU0zo7X6y2tNM3WQNWt+22WbI6c1IrMQRam2h+KbyRjfghUKSRsgexDFbD+aj7\n ghIUF6MYUlXvSzhfuqjYXnhaSwPK6fK6lrFHFPj3JwhOgX0tp42H2REH5P1xZYAnNlz4\n We8VLyXrUF/cCiRl9Ab9z/Ueed7KNoleJ64cC3tb7UcROuVrPllsK9GKviPuwe8Z1I2g\n J7Nw==","X-Forwarded-Encrypted":"i=1;\n AFNElJ+0Nn0eEWPTSKOnrHoOKZL566fcDKRezmIarG6JniDDVP01Y3LvSRH8GuB7LMfNWKqnfppoVT/pKWxI@nongnu.org","X-Gm-Message-State":"AOJu0YxZMsTYlqfezswSj5lohYUnnEr9ZL007Cm7EGGwwFdow8R0ltZe\n 6d/anRgZzeDuB00FjwlguMijRv3QN89EWKgaLk3M6RkgV3zJQc5I0QAW2pebiw==","X-Gm-Gg":"AeBDievnXZw+cKv9GxaBbUI/BTSIOecOP9kerHswSxQtm0klNhL00tuq0QzTaQrazSS\n rS8fnU6dPEK4O6tPXdeJnUWifmw3AwRAs5O2p9Ixlxs55sM7aNfex5pr4uuMGD868wM/2qJC5Df\n 6LM5lHIfYk4vdhsDkfpwIgrTtEMuNnHukeERrx3itR89rC1vrAYcIb/I4MM70vqSTIr2l6YO2ZE\n qgPn3XnLBcVGJ+10wM3lllN2Jmxj75tJAvGTuBntH6+GcO0xpz8EbZmEsfEfd72gfNRiHFPn6cC\n T5W7ANh26Xn1dR0/pl/7io5gEjeFw67LBQxj8hVGxifEVYzwpMoOuQYFo6xY8fu3OSzPKz2iX/H\n Z/zarSznR+PVZ/zDkPIPUHUGYQvIQXFC4RTh2Un/OwhSz3XSQXLVxaEHlEOVCt4ZPbQ4Ma7Xa81\n vyu+joBzlS8guWTmpg152gsqB6IWF7FqbHnqdv0F0nAjc1Ehi40xeg","X-Received":"by 2002:a17:903:1a8d:b0:2b4:689a:e420 with SMTP id\n d9443c01a7336-2b97c3e3166mr60768775ad.8.1777438331591;\n Tue, 28 Apr 2026 21:52:11 -0700 (PDT)","From":"alistair23@gmail.com","X-Google-Original-From":"alistair.francis@wdc.com","To":"palmer@dabbelt.com, liwei1518@gmail.com, daniel.barboza@oss.qualcomm.com,\n zhiwei_liu@linux.alibaba.com, chao.liu.zevorn@gmail.com,\n qemu-riscv@nongnu.org, qemu-devel@nongnu.org","Cc":"alistair23@gmail.com, Frank Chang ,\n Alistair Francis ","Subject":"[PULL 48/51] target/riscv: Fix pointer masking for virtual-machine\n load/store insns","Date":"Wed, 29 Apr 2026 14:47:49 +1000","Message-ID":"<20260429044752.4176397-49-alistair.francis@wdc.com>","X-Mailer":"git-send-email 2.53.0","In-Reply-To":"<20260429044752.4176397-1-alistair.francis@wdc.com>","References":"<20260429044752.4176397-1-alistair.francis@wdc.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Received-SPF":"pass client-ip=2607:f8b0:4864:20::633;\n envelope-from=alistair23@gmail.com; helo=mail-pl1-x633.google.com","X-Spam_score_int":"-17","X-Spam_score":"-1.8","X-Spam_bar":"-","X-Spam_report":"(-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001,\n RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,\n SPF_PASS=-0.001 autolearn=ham autolearn_force=no","X-Spam_action":"no action","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"qemu development ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"From: Frank Chang \n\nThe effective privilege of explicit memory accesses made by\nvirtual-machine load/store instructions (HLV.* and HSV.*) is controlled\nby hstatus.SPVP. mstatus.MPRV does not affect these virtual-machine\nload/store instructions.\n\nSigned-off-by: Frank Chang \nReviewed-by: Alistair Francis \nMessage-ID: <20260421093715.2995067-5-frank.chang@sifive.com>\nSigned-off-by: Alistair Francis \n---\n target/riscv/cpu_helper.c | 23 +++++++++++++++--------\n 1 file changed, 15 insertions(+), 8 deletions(-)","diff":"diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c\nindex bab4153e53..2b3fea81d5 100644\n--- a/target/riscv/cpu_helper.c\n+++ b/target/riscv/cpu_helper.c\n@@ -217,16 +217,23 @@ RISCVPmPmm riscv_pm_get_pmm(CPURISCVState *env)\n RISCVPmPmm riscv_pm_get_virt_pmm(CPURISCVState *env)\n {\n #ifndef CONFIG_USER_ONLY\n- int priv_mode = cpu_address_mode(env);\n+ int priv_mode;\n+\n+ if (!riscv_cpu_cfg(env)->ext_ssnpm ||\n+ get_field(env->mstatus, MSTATUS_MXR) ||\n+ get_field(env->vsstatus, MSTATUS_MXR)) {\n+ return PMM_FIELD_DISABLED;\n+ }\n+\n+ priv_mode = get_field(env->hstatus, HSTATUS_SPVP);\n \n- if (priv_mode == PRV_U) {\n- return get_field(env->hstatus, HSTATUS_HUPMM);\n+ if (priv_mode == PRV_S) {\n+ /* Effective privilege mode: VS */\n+ return get_field(env->henvcfg, HENVCFG_PMM);\n } else {\n- if (get_field(env->hstatus, HSTATUS_SPVP)) {\n- return get_field(env->henvcfg, HENVCFG_PMM);\n- } else {\n- return get_field(env->senvcfg, SENVCFG_PMM);\n- }\n+ /* Effective privilege mode: VU */\n+ return (env->priv == PRV_U) ? get_field(env->hstatus, HSTATUS_HUPMM) :\n+ get_field(env->senvcfg, SENVCFG_PMM);\n }\n #else\n return PMM_FIELD_DISABLED;\n","prefixes":["PULL","48/51"]}