{"id":2225623,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2225623/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260421093715.2995067-7-frank.chang@sifive.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":"<20260421093715.2995067-7-frank.chang@sifive.com>","date":"2026-04-21T09:37:15","name":"[v4,6/6] target/riscv: Fix pointer masking translation mode check bug","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"dd1642c75fe41c65cf374ad454d0c45d2d0a6cd0","submitter":{"id":79604,"url":"http://patchwork.ozlabs.org/api/1.1/people/79604/?format=json","name":"Frank Chang","email":"frank.chang@sifive.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260421093715.2995067-7-frank.chang@sifive.com/mbox/","series":[{"id":500769,"url":"http://patchwork.ozlabs.org/api/1.1/series/500769/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=500769","date":"2026-04-21T09:37:09","name":"Fix Zjpm implementation","version":4,"mbox":"http://patchwork.ozlabs.org/series/500769/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2225623/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2225623/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=sifive.com header.i=@sifive.com header.a=rsa-sha256\n header.s=google header.b=lnhmGP9x;\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 4g0HP92LJMz1yCv\n\tfor ; Tue, 21 Apr 2026 19:39:09 +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 1wF7Y7-0000C9-C4; Tue, 21 Apr 2026 05:37:43 -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 1wF7Y5-00009i-MJ\n for qemu-devel@nongnu.org; Tue, 21 Apr 2026 05:37:41 -0400","from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e])\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 1wF7Y3-0007uY-PH\n for qemu-devel@nongnu.org; Tue, 21 Apr 2026 05:37:41 -0400","by mail-pf1-x42e.google.com with SMTP id\n d2e1a72fcca58-82fbdd60b64so1142228b3a.3\n for ; Tue, 21 Apr 2026 02:37:38 -0700 (PDT)","from hsinchu16.internal.sifive.com ([210.176.154.34])\n by smtp.gmail.com with ESMTPSA id\n d2e1a72fcca58-82f8e981be6sm15904589b3a.9.2026.04.21.02.37.34\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Tue, 21 Apr 2026 02:37:36 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=sifive.com; s=google; t=1776764257; x=1777369057; 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=mfwLARxELoq8ANLXoGfCo6a2UvGWGx8gKCesGr9dyns=;\n b=lnhmGP9xOU/KamEMMuk7D6oPtzjtJzX/xfZMKBINaPtmz1WHBmsv9b5fNUkVrOr5sZ\n dzOiOqW7e6w4Ja+Al7HP7Z22Aed0QfIS9AbLrTZvlv0pWgcQeMu6U/r/cA551YTCRcRB\n 6MipGkAFXKUUnxRzDb0lZOdz4t2wDcgtJqWKFf+DAjuR3wevUsqrCSUHoe0xTREfq+Gb\n dTOIf3v6s2iwuXpP0pNM5eZLcUv+RI/7enwa2GJB16zz/ez5AtsqECayHvoa9PlN2Dbt\n d0Q1iXAhUxh5IVUGrT5SGK80BdQAB0ERrbRAgbSvzd8VOhcJ2p1QJTMB+FlPbh2qkM26\n AP5Q==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1776764257; x=1777369057;\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=mfwLARxELoq8ANLXoGfCo6a2UvGWGx8gKCesGr9dyns=;\n b=EWfw/41nNkeWlxag++ObOpHtHYkZ9mFh7vc+A9ShvhjrIKoqRRNetmbU2NXmhjvvhK\n BJyF+PcWVwz74BBYhmfFADJAn/QqLa3wQ0gqd9z/ytUIB+5t5zZx3bywKba8S7q9BkVA\n 1HCQF3UfKCQgOCYBmkWjaEPCQ/qFhra/enY4Lk9vBVhEqtnR8o3YHtmQoRSKhBA/ezvG\n 8QNW2cgVf90c/YwF4jNkrTF3MDXctLUengmDgpRj1+1j/C1djrKfGAUJEoygkaQH/JA8\n nlFC/dR74wb/vEBWDZnGgoxFkNWYBNcBuomtKmgdUZ4FuEUuv9sXJzbqmCfhl4+oWIk3\n hXlw==","X-Gm-Message-State":"AOJu0YxzxfliqePrBcpP18dSrdqOwNZzimKWWOWHIabB1x6ubtl8Codd\n 4CvJDxlUCIBja6qtsUEE4IJLOx+dDOqZfWH/wIcDSze8zDNFp0N2weuDBa2uY4+BCTsrBqnbIb3\n qg4Ra0JrPkIMWHdVAwY/o5eXNhdbpeHo8gjyt389yWnmEK5rPQbQxylJ0N7EAi8MfTUPHcv+OaO\n FuJGXVPV2CbOPcqtqVG0Fr+Gk1Tdx3i6raWPlU186L4bACXVgE","X-Gm-Gg":"AeBDievZuxtdexhX2kvAUNcUqERuPevU2zci6+WkUokk26JFQNk0JLTxnZ6ddVkpiF7\n Q3egicbvdQ6M1KqtvA3YHw4czE2M/OFJREovwzFJ+Gij8EMyq7KfIi5w2G4PLhuTCThBUNAkB/p\n skX2Nt24Wd4RfBBhpeUhIowl0/uNSFkUAvQedH39Z+JyEEq7aVeQj7ZGC5kgu16C7BhYCFLqE6R\n HQJbHodyk1wRkiY7oaVxmvvHArx26ck9xudGqKHHcc32rFdFwgGvNEN7wJ59+rq5jNT3UrB5veJ\n 2KYERxDyQ4cVrVWlKNMbrLb+l4mv9AiDntC9AGufqqcIwYclbbZcMt9CMsEkdvtJW/Ez1NDUnpd\n krgmSCcVGlcuwfjymWfG5UyA0Z09wbZd7RpQA3dcz5l2t7wK2no2MP2md4HE+5ZY2QHn0C2eGfg\n w5mrZzWQ8H7pwD8VGlHQ4SckNi2ufuG90gi6gFL6KqeGihzd6W3p8htHW7VCf+","X-Received":"by 2002:a05:6a00:e1a:b0:82f:2a78:6302 with SMTP id\n d2e1a72fcca58-82f8c9027b0mr19297692b3a.26.1776764257214;\n Tue, 21 Apr 2026 02:37:37 -0700 (PDT)","From":"frank.chang@sifive.com","To":"qemu-devel@nongnu.org","Cc":"Palmer Dabbelt ,\n Alistair Francis , Weiwei Li ,\n Daniel Henrique Barboza ,\n Liu Zhiwei ,\n Chao Liu ,\n qemu-riscv@nongnu.org (open list:RISC-V TCG CPUs),\n Frank Chang ,\n =?utf-8?b?UmFkaW0gS3LEjW3DocWZ?= ","Subject":"[PATCH v4 6/6] target/riscv: Fix pointer masking translation mode\n check bug","Date":"Tue, 21 Apr 2026 17:37:15 +0800","Message-ID":"<20260421093715.2995067-7-frank.chang@sifive.com>","X-Mailer":"git-send-email 2.43.0","In-Reply-To":"<20260421093715.2995067-1-frank.chang@sifive.com>","References":"<20260421093715.2995067-1-frank.chang@sifive.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Received-SPF":"pass client-ip=2607:f8b0:4864:20::42e;\n envelope-from=frank.chang@sifive.com; helo=mail-pf1-x42e.google.com","X-Spam_score_int":"-20","X-Spam_score":"-2.1","X-Spam_bar":"--","X-Spam_report":"(-2.1 / 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 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\nWhen running with virtualization in VS/VU mode, or when executing the\nvirtual-machine load/store instructions (HLV.* and HSV.*), the type of\naddress that determines which pointer masking rules apply should be\nchecked against vsatp rather than satp.\n\nAs a result, sign extension also applies to the virtual-machine\nload/store instructions.\n\nSigned-off-by: Frank Chang \nReviewed-by: Radim Krčmář \n---\n target/riscv/cpu.h | 2 +-\n target/riscv/cpu_helper.c | 19 +++++++++++++++----\n target/riscv/internals.h | 4 +---\n target/riscv/tcg/tcg-cpu.c | 4 ++--\n 4 files changed, 19 insertions(+), 10 deletions(-)","diff":"diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h\nindex 138183e017c..81c41e34296 100644\n--- a/target/riscv/cpu.h\n+++ b/target/riscv/cpu.h\n@@ -888,7 +888,7 @@ static inline uint32_t vext_get_vlmax(uint32_t vlenb, uint32_t vsew,\n \n bool riscv_cpu_is_32bit(RISCVCPU *cpu);\n \n-bool riscv_cpu_virt_mem_enabled(CPURISCVState *env);\n+bool riscv_cpu_virt_mem_enabled(CPURISCVState *env, bool is_vm_ldst);\n RISCVPmPmm riscv_pm_get_pmm(CPURISCVState *env);\n RISCVPmPmm riscv_pm_get_vm_ldst_pmm(CPURISCVState *env);\n uint32_t riscv_pm_get_pmlen(RISCVPmPmm pmm);\ndiff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c\nindex ef1ff7cb0bd..39c3486ae0f 100644\n--- a/target/riscv/cpu_helper.c\n+++ b/target/riscv/cpu_helper.c\n@@ -240,16 +240,27 @@ RISCVPmPmm riscv_pm_get_vm_ldst_pmm(CPURISCVState *env)\n #endif\n }\n \n-bool riscv_cpu_virt_mem_enabled(CPURISCVState *env)\n+bool riscv_cpu_virt_mem_enabled(CPURISCVState *env, bool is_vm_ldst)\n {\n #ifndef CONFIG_USER_ONLY\n int satp_mode = 0;\n- int priv_mode = cpu_address_mode(env);\n+ uint64_t satp;\n+ int priv_mode;\n+ bool virt = false;\n+\n+ if (!is_vm_ldst) {\n+ riscv_cpu_eff_priv(env, &priv_mode, &virt);\n+ } else {\n+ priv_mode = get_field(env->hstatus, HSTATUS_SPVP);\n+ virt = true;\n+ }\n+\n+ satp = virt ? env->vsatp : env->satp;\n \n if (riscv_cpu_mxl(env) == MXL_RV32) {\n- satp_mode = get_field(env->satp, SATP32_MODE);\n+ satp_mode = get_field(satp, SATP32_MODE);\n } else {\n- satp_mode = get_field(env->satp, SATP64_MODE);\n+ satp_mode = get_field(satp, SATP64_MODE);\n }\n \n return ((satp_mode != VM_1_10_MBARE) && (priv_mode != PRV_M));\ndiff --git a/target/riscv/internals.h b/target/riscv/internals.h\nindex 82d24f433dc..683bb3bce3e 100644\n--- a/target/riscv/internals.h\n+++ b/target/riscv/internals.h\n@@ -213,9 +213,7 @@ static inline target_ulong adjust_addr_body(CPURISCVState *env,\n return addr;\n }\n \n- if (!is_virt_addr) {\n- signext = riscv_cpu_virt_mem_enabled(env);\n- }\n+ signext = riscv_cpu_virt_mem_enabled(env, is_virt_addr);\n pmlen = riscv_pm_get_pmlen(pmm);\n addr = addr << pmlen;\n \ndiff --git a/target/riscv/tcg/tcg-cpu.c b/target/riscv/tcg/tcg-cpu.c\nindex f3f78088956..02c98cc2dbb 100644\n--- a/target/riscv/tcg/tcg-cpu.c\n+++ b/target/riscv/tcg/tcg-cpu.c\n@@ -105,7 +105,7 @@ static TCGTBCPUState riscv_get_tb_cpu_state(CPUState *cs)\n RISCVExtStatus fs, vs;\n uint32_t flags = 0;\n uint64_t ext_flags = 0;\n- bool pm_signext = riscv_cpu_virt_mem_enabled(env);\n+ bool pm_signext = riscv_cpu_virt_mem_enabled(env, false);\n \n if (cpu->cfg.ext_zve32x) {\n /*\n@@ -260,7 +260,7 @@ static vaddr riscv_pointer_wrap(CPUState *cs, int mmu_idx,\n return result;\n }\n \n- pm_signext = riscv_cpu_virt_mem_enabled(env);\n+ pm_signext = riscv_cpu_virt_mem_enabled(env, false);\n if (pm_signext) {\n return sextract64(result, 0, 64 - pm_len);\n }\n","prefixes":["v4","6/6"]}