From nobody Mon Feb 9 05:13:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=sifive.com ARC-Seal: i=1; a=rsa-sha256; t=1763701515; cv=none; d=zohomail.com; s=zohoarc; b=Y1RY4t841PsJ+1YuT1ufPEj+WENDHxPMxY5HrCqMXWYpUJDYdxICsRJtJpWbEGxIoE+73tcb5Jbd0OYP4OO15npx0rhFtcsvL/bz7JsbBOHMzpTxtLJAqfFn9MRe/l/nZyutQFf5cDSDZNw8NE3drdosVWdiwhgui3TMq7050Mw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763701515; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=pFjzAt3V16vj8pMOvPT4tfpSGw4vX8nwSrhUGNpwdlI=; b=NtDgCD992A17cdksnCJBAk+u/PVRtT1THQa148Hv+LyJuxQvJA/QO+o6WEgF+TVOofw2NvRhwMVuG6dLoXSEw9heoSGnnOEYsaeL6Cpxgy15DFUcYS0sPS6Qdo5+tDyaoFyuiNSuqc9AOEhGImV5Wyy43zFn7DeQSDOKFBlwHhw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 176370151516236.081481463578484; Thu, 20 Nov 2025 21:05:15 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vMJK8-0006FJ-3G; Fri, 21 Nov 2025 00:04:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vMJJq-000664-07 for qemu-devel@nongnu.org; Fri, 21 Nov 2025 00:04:30 -0500 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vMJJn-0006mN-N4 for qemu-devel@nongnu.org; Fri, 21 Nov 2025 00:04:25 -0500 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-29845b06dd2so20354595ad.2 for ; Thu, 20 Nov 2025 21:04:23 -0800 (PST) Received: from hsinchu16.internal.sifive.com ([210.176.154.34]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29b5b26fed2sm43384525ad.69.2025.11.20.21.04.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Nov 2025 21:04:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1763701461; x=1764306261; darn=nongnu.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=pFjzAt3V16vj8pMOvPT4tfpSGw4vX8nwSrhUGNpwdlI=; b=Jfx78jdIoulaAcEqM76EmAp5xQLiGbyGQ8CXqBr1HYBjfdo0uw72uUyV8lgA68c6nS XdkDDiXSrgJD1skOBgsA7NE4WAnai5T8KsBhbBEf2Fd8qFTVPfZdxLEXwlLtWaGERi98 6LuC9qVCum36x5qMXNvNqSMUzrD685f6PJGuCtfjkXjIaBHZAnKkAa0c3XACtxFdeVHs 87tHB+kZn3MyfzsUnCq8MCWbf/N37eDrWwjrJ3yNX2NYFqaE/efFqDIxO5BgJgj4izSW 9Yi1xvBDVS4NtpZ2LjvEfC1o1CT1bK3zlkWhi4knEdWiN36CzCdsCRhHF2l6cXbdnkqK dWlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763701461; x=1764306261; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=pFjzAt3V16vj8pMOvPT4tfpSGw4vX8nwSrhUGNpwdlI=; b=N4GxG40rzKG55XLSV20ov0XeWjLoRe2YLsYPF4QR/ES0rsdgWdTaqwYBvt4CPUg0MY AO4IXcgUKnsqPdwTQbeDnAErdZI2G+JrIr6zQiek9R9rS9DU7gRGiBHD6kSF4Oido+zx CmmQWhLYZPwkKjMJOMQ4hECevrONcpqLmfQd6Z9O0+JXhZRS+7ea76LTvXfK0nOuXRPg Mk3KvrbCYhwEMEiuoOcdgNcyFS4qPa7S0le8S6ERbZlHUOKZGD+MO3ErjAadd5IAI5rQ CA5jM/gSNmZd8lCc2YcQ5Y21eelrXXjVAEx6YzZWfDyqNyz6eXJNyhez4i+tKoojjKAm T/yA== X-Gm-Message-State: AOJu0YxWs0x6yhjaQoN/EAuLEiALfN3iiNk7Nz5+GQJ8kt8fGx2FYivm h1oSiscxI347IVKKMLJFO1UuzBYQt1tgnjVXuQV++aAwHDpzosGJgyzfQrofInkmXx5UMug0Eq4 kOQ7lrAbShvITI2NniFLBsp6AhjRvo3e8l19f6oGohfA8SQA3U7kcSiY4cxSJUvTzdUOmd5Hhb/ liO7hSyc5npGeWQ0We5tTUZ7dWe3hTBIGefib7blXHrFw= X-Gm-Gg: ASbGncuW13am/ii+E3jk10fZ7Pn7H9bYbGdgCGvyYoKuZuElapan0xrCKesFyElMAdf 34mxLWsGzvz0W8YLYaNPRD1ofhxJyxLxl96z6QM078sgCWmljQy37GfFfbGAnvOJMegvX3Q0qBs qD9LR9Cle/9kz3k0L69x6eX/2RQChOHMYLlw2aVVMhLxsoQ2ZnPFz1Fodg7qefr8H9p7Mp7Orj4 ZLjVblHeVuZwTZeSv3cHioA0MqlYLCEYZ3CCuV8Rs1i/8gynDeKba+SSnHPcBkCe6rIX6UBFgyj Gd7Q/NZ3AqCVQ63XTB4t+bTM2FCnKE0VpLzN1dL7I0RNPHUHRoPfVf6RnY1flnMX2QjxKYG9XWg p8NpVZ1Jd555FvpKACekGK+KG3XyatgTLbOhXeZAfAisXYDGNkkIYiBMTjqp22JiZyZyoLWkjQN WekNRTp3ho4rhX6k8WGiSV9YRBFd1XYwkyClBRgg== X-Google-Smtp-Source: AGHT+IEU64lQHCK3R/6lKyXLvSyJmQakO6mbjALNH6iha0QBrJ8WxMbexpFdzDDpEMo5EmXhKDO3BA== X-Received: by 2002:a17:903:2ec4:b0:27e:f018:d2fb with SMTP id d9443c01a7336-29b6c3c766emr14437205ad.6.1763701460825; Thu, 20 Nov 2025 21:04:20 -0800 (PST) From: frank.chang@sifive.com To: qemu-devel@nongnu.org Cc: Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , qemu-riscv@nongnu.org (open list:RISC-V TCG CPUs), Yong-Xuan Wang Subject: [PATCH v2 1/6] target/riscv: fix address masking Date: Fri, 21 Nov 2025 13:04:08 +0800 Message-ID: <20251121050413.3718427-2-frank.chang@sifive.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251121050413.3718427-1-frank.chang@sifive.com> References: <20251121050413.3718427-1-frank.chang@sifive.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::634; envelope-from=frank.chang@sifive.com; helo=mail-pl1-x634.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, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @sifive.com) X-ZM-MESSAGEID: 1763701517149018900 Content-Type: text/plain; charset="utf-8" From: Yong-Xuan Wang The pmlen should get the corresponding value before shifting address. Signed-off-by: Yong-Xuan Wang Reviewed-by: Daniel Henrique Barboza --- target/riscv/internals.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/riscv/internals.h b/target/riscv/internals.h index 172296f12e2..9b3f01144d2 100644 --- a/target/riscv/internals.h +++ b/target/riscv/internals.h @@ -203,8 +203,8 @@ static inline target_ulong adjust_addr_body(CPURISCVSta= te *env, if (!is_virt_addr) { signext =3D riscv_cpu_virt_mem_enabled(env); } - addr =3D addr << pmlen; pmlen =3D riscv_pm_get_pmlen(pmm); + addr =3D addr << pmlen; =20 /* sign/zero extend masked address by N-1 bit */ if (signext) { --=20 2.43.0 From nobody Mon Feb 9 05:13:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=sifive.com ARC-Seal: i=1; a=rsa-sha256; t=1763701516; cv=none; d=zohomail.com; s=zohoarc; b=FDl2l0OJVt1NAQeVN0t/24og5lAybSl6P64FUdf+I/x6smlJBMHY3kthQ357fDtSgQVCeUnNOJjV9AcyzdNnCs5Mw28oWP+Kh7fOlguklPbq81WZuEVl1b++1uO4T3T855R+xip37cF3ysr8+prQAMww/6CwBp3+bqInGSaK5co= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763701516; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=v+Vo75nBxgljZp+vA5zxFb2iMeyrZvaQZGA+2VSeTK0=; b=VYPc6BfChlosybrmXcPJgr/oUjaFJ/34iLbaAvOMSAjqZbsXsauzAV9YYu2qE5fWiI9469srQbmyDQDKag8t9JYLt/AusTH0HEgDT/6+4OyYlh6vJZmAJhTsYow8L5Rv3a36KDUrZKvQzLpVP1jJyX0myXiIP4kAgvGFk9ZRgwk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1763701516537230.8540139918681; Thu, 20 Nov 2025 21:05:16 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vMJK5-0006D7-Gi; Fri, 21 Nov 2025 00:04:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vMJJs-00066R-1M for qemu-devel@nongnu.org; Fri, 21 Nov 2025 00:04:32 -0500 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vMJJp-0006n3-PH for qemu-devel@nongnu.org; Fri, 21 Nov 2025 00:04:27 -0500 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-298456bb53aso20527955ad.0 for ; Thu, 20 Nov 2025 21:04:24 -0800 (PST) Received: from hsinchu16.internal.sifive.com ([210.176.154.34]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29b5b26fed2sm43384525ad.69.2025.11.20.21.04.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Nov 2025 21:04:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1763701463; x=1764306263; darn=nongnu.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=v+Vo75nBxgljZp+vA5zxFb2iMeyrZvaQZGA+2VSeTK0=; b=MFqnH57Mmsje0oBqHEye0RmigGjl5x48E6Ns4oBEq2PRo3mnshWG0aI7B2gDFgiKuL IvkBsl8uWZmpNYY+rqg+XWEyk/LDkAFwEPdbnIeU6AzqfwVvwK9jzvQpnMB4p0ZRGiZK rn07D4Al/ondgDKAW9hXGuQhm5BMcRJXbC5/CZJYFnqmIeDKup3IXaD2XqSsG3OY+V3S c1ZdQAgnRZR5XQfc0AZSyahG4pM0SJ1FJb0WRzJUV3+8S3mbMhCbUOTi/49cfKjqSXHl wcsadgUCzuf+/1ues94T6+S6qaDgyl/FUcuNZH4f7n7npt/xxYq2sXWeVZg5kE7byyKx iCmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763701463; x=1764306263; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=v+Vo75nBxgljZp+vA5zxFb2iMeyrZvaQZGA+2VSeTK0=; b=BnRm+TTBR/Gap3xXpnHyrwK0qZBj53amVG8YaMOfSTYWC03rLNWFlAFcaxZ1tEgw4M HWp5faXEBOC8i98WSmsVD08N+Odf2GH8ffNsN5rlJG8rK9s5dxmZcmdUaSHqjTnS9yVS /sl4TC1xNERhakvmOv4TCeLuHp1dsmFq8eYlF8lAtNiURAdOsqVUTBgkdEOEhf1HsSHj Hvx9DGFpVobq/OIpf1INVCWNjrJ75J+62GZiqBDdoVBSqyOncraiIYmTr9vS7iNiG5JA ZOya7xVUtpWdNxnLIyg5wvq1Ldc2X10rjroOLSMSShgIcXiGVRS6bSeT5/m6Piu547Rv aHmQ== X-Gm-Message-State: AOJu0Yy0Pvm9oQf5XgRJaIN6Nyvjc6gf1oVr5CelHmYv56Xy8e2RD7gp yQ1EIISA1sEZ9k5SyeTeb5bdqd/fcbWCndxN2+NS3scqsvQh37xr9vsLgRGmOp+jK/Di5UeQTM3 T+Ps0e0x3L2AFuSZ/zxIXvFNGvUv4Ldx60FRJqdRTHjlN/8MADvlgejSxCsPlEzgaKmYV+ycatc BXQQp4G8BWD8+khacqpZ8SmLSz5DdVZ8IHTwudl6SfTls= X-Gm-Gg: ASbGncv3UfX9p4ZSfW89v9ZnPzQG92YTrwYmtpZhV1kbHbQDvf81aGj3rYC79BimnVv 3LVld9s+GsY5+9Yt1NNZkb5yHDYN/kldAht3gzy9NmGErHak0TAwHKj9aJhLFVR79+2KZlog77t OUvvzhjKV5vjUnVKKmwayy5ftmTJi078n0dyLG53YjnvG9elWV0qRsc/HQJAQle/KdOgIzmWw+t kSkCvzMndGscJtW4bbiOv32Bwyugg2fAMsu8ERx5Vv/InxI1RGaaBqo8+ZAk781kKzrKeT78Hvy JPhSRar9JJFQTDTrWSrZvnkypspFK88F8m6WSneDGuRwtCRUpZHlcwdhDgkcDqiXp9uyzNPR+Bd AHJv9B1qqW97MoRbuitXKmMTsrjSgrM+2UmyCYPbbtnP1KCBjVeHN334b60MgwQub3IDL148SMT 8HG6RdQr1l5iQRvZEJl8EniXX0RboXDouOp7bzQQ== X-Google-Smtp-Source: AGHT+IEdJxDMYO7PFeUCPlBgGplsfGU2U+FTDkztOeCj0cJmnNQKN0Dl66lZiB6s0XGYDUgQbvF5lg== X-Received: by 2002:a17:903:234e:b0:295:9db1:ff3b with SMTP id d9443c01a7336-29b6c3db5fbmr14313405ad.6.1763701462929; Thu, 20 Nov 2025 21:04:22 -0800 (PST) From: frank.chang@sifive.com To: qemu-devel@nongnu.org Cc: Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , qemu-riscv@nongnu.org (open list:RISC-V TCG CPUs), Frank Chang Subject: [PATCH v2 2/6] target/riscv: Add a helper to return the current effective priv mode Date: Fri, 21 Nov 2025 13:04:09 +0800 Message-ID: <20251121050413.3718427-3-frank.chang@sifive.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251121050413.3718427-1-frank.chang@sifive.com> References: <20251121050413.3718427-1-frank.chang@sifive.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::636; envelope-from=frank.chang@sifive.com; helo=mail-pl1-x636.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, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @sifive.com) X-ZM-MESSAGEID: 1763701517136018900 Content-Type: text/plain; charset="utf-8" From: Frank Chang This helper returns the current effective privilege mode. Signed-off-by: Frank Chang Reviewed-by: Radim Kr=C4=8Dm=C3=A1=C5=99 --- target/riscv/cpu.h | 1 + target/riscv/cpu_helper.c | 55 ++++++++++++++++++++++++++++++++------- 2 files changed, 46 insertions(+), 10 deletions(-) diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 8899bf7667a..ab285d7a6d1 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -607,6 +607,7 @@ target_ulong riscv_cpu_get_geilen(CPURISCVState *env); void riscv_cpu_set_geilen(CPURISCVState *env, target_ulong geilen); bool riscv_cpu_vector_enabled(CPURISCVState *env); void riscv_cpu_set_virt_enabled(CPURISCVState *env, bool enable); +bool riscv_cpu_eff_priv(CPURISCVState *env, int *priv, bool *virt); int riscv_env_mmu_index(CPURISCVState *env, bool ifetch); bool cpu_get_fcfien(CPURISCVState *env); bool cpu_get_bcfien(CPURISCVState *env); diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index dd6c861a90e..fbab8177092 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -38,6 +38,46 @@ #include "pmp.h" #include "qemu/plugin.h" =20 +/* + * Returns the current effective privilege mode. + * + * @env: CPURISCVState + * @priv: The returned effective privilege mode. + * @virt: The returned effective virtualization mode. + * + * Returns true if the effective privilege mode is modified. + */ +bool riscv_cpu_eff_priv(CPURISCVState *env, int *priv, bool *virt) +{ +#ifndef CONFIG_USER_ONLY + int mode =3D env->priv; + bool virt_enabled =3D env->virt_enabled; + bool mode_modified =3D false; + +#ifndef CONFIG_USER_ONLY + if (mode =3D=3D PRV_M && get_field(env->mstatus, MSTATUS_MPRV)) { + mode =3D get_field(env->mstatus, MSTATUS_MPP); + virt_enabled =3D get_field(env->mstatus, MSTATUS_MPV) && (mode != =3D PRV_M); + mode_modified =3D true; + } +#endif + + if (priv) { + *priv =3D mode; + } + + if (virt) { + *virt =3D virt_enabled; + } + + return mode_modified; +#else + *priv =3D env->priv; + *virt =3D false; + return false; +#endif +} + int riscv_env_mmu_index(CPURISCVState *env, bool ifetch) { #ifdef CONFIG_USER_ONLY @@ -45,19 +85,14 @@ int riscv_env_mmu_index(CPURISCVState *env, bool ifetch) #else bool virt =3D env->virt_enabled; int mode =3D env->priv; + bool mode_modified =3D false; =20 /* All priv -> mmu_idx mapping are here */ if (!ifetch) { - uint64_t status =3D env->mstatus; - - if (mode =3D=3D PRV_M && get_field(status, MSTATUS_MPRV)) { - mode =3D get_field(env->mstatus, MSTATUS_MPP); - virt =3D get_field(env->mstatus, MSTATUS_MPV) && - (mode !=3D PRV_M); - if (virt) { - status =3D env->vsstatus; - } - } + mode_modified =3D riscv_cpu_eff_priv(env, &mode, &virt); + uint64_t status =3D (mode_modified && virt) ? env->vsstatus : + env->mstatus; + if (mode =3D=3D PRV_S && get_field(status, MSTATUS_SUM)) { mode =3D MMUIdx_S_SUM; } --=20 2.43.0 From nobody Mon Feb 9 05:13:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=sifive.com ARC-Seal: i=1; a=rsa-sha256; t=1763701517; cv=none; d=zohomail.com; s=zohoarc; b=NF0uO8QTRrAmsJbha2OGMHKAYpken3gmtrPI6L6t/Z/Um+fZJA51r6kTI8i0E+G3x25hniieT1HCf6pPNbD5Oftvds4ZSjhiVYSZpiYojEko2ZAs8/TBrnETLh/Rkcb8ggKPFixAGdJOceAFxStcweUaABO9G+BHYP8ulZgEVZk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763701517; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=DdrR0qRhyHxnG+TvMN35yCUkjNJYPzQ6aw7tzmaZAHw=; b=I0rQLL16RIcox41Hx6b5qNDVxH8ZYcW4lQ+QKVXF92iE0F4yu7UFykI6uPt+E2QS/7C4DpmvEbInV9jKy2X3vAp6OeYlxivoFCqZ1RKrDwF4Tr5jssKh8VeHYiFwhw3wEv8bOlgmwX19Ybxaj+/TN56toEKEd/Ef1fb4UM8yqSs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1763701517082352.4445151222752; Thu, 20 Nov 2025 21:05:17 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vMJK5-0006D6-FP; Fri, 21 Nov 2025 00:04:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vMJJu-000679-Mk for qemu-devel@nongnu.org; Fri, 21 Nov 2025 00:04:32 -0500 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vMJJr-0006nf-Ql for qemu-devel@nongnu.org; Fri, 21 Nov 2025 00:04:29 -0500 Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-29555415c5fso17811375ad.1 for ; Thu, 20 Nov 2025 21:04:26 -0800 (PST) Received: from hsinchu16.internal.sifive.com ([210.176.154.34]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29b5b26fed2sm43384525ad.69.2025.11.20.21.04.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Nov 2025 21:04:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1763701465; x=1764306265; darn=nongnu.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=DdrR0qRhyHxnG+TvMN35yCUkjNJYPzQ6aw7tzmaZAHw=; b=iK6k743lj6XsQChhKWyIhV0iNdhyQaCyisrmaFOMvq6yX9fCptk2lxDhTz5UpBakMs yg5uxB+mLBOoPALNCM0GSK1PF1utcZA6BVxqqvVeTc1UN4VBTc3lbDTMftV7Mt1khLGd 0sOf7ejdhPAL5XG1ujQSv/M/GFOc9wlfBrn866D+22JZdeCH83D+TBSZMLBYbnjbZIVs igd5GELvYwww6OQ94N5kvzQ74uzoVB87zbxhk2USxGt0u0dqguw8kwuUAkR3aOWG+crW uTFNBAt/0MRrPyDObmxrqATTVw1gLXcr8z1HdtIAqHkeEdihbz+IKaw7o1VhC3vWkeoJ T4kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763701465; x=1764306265; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=DdrR0qRhyHxnG+TvMN35yCUkjNJYPzQ6aw7tzmaZAHw=; b=s5519Li01rtAF9McFF6AjU1CjE9D3bYPA/3MWojHIMu3ME1kEV1Q4QqxnYEjzfIkK2 b0VonIZQP3+rrDqg7NkEAOVr8U4UdIEGdha3uICjPvieBkPEP4Vj8L1GgKLzdJRuZQze +rPN/bcu25WaaSuH+dcjazMgYMT4xQLjA/8oN1/KgLbOletxiyzIhGA9AZCvad+GfmYM PoC0J0wwXMPSrnjXJugQgWepHG+N/ENTdQ8R1RFTaBl6Z16lroiUMA8hfMk5FzAYRGc6 0R+ePfxae+IZAx5TKSn8qsizg+MzsFxNGyf4QqUeNCvw+XPSxG7aalJdKoq9VhDxy0mX IGcg== X-Gm-Message-State: AOJu0Yzd/KmrHB3Y+Aje7Mzg1m/U97wum9YeNldASqBlCudMec75qfJX cp+VbOB5hoEAdyDs0MEk4HLpKSc4mtJCSsY5ZkFD7SlDh852XrtPOuK4KOJtl7lQAUB2P94paRW PSIcb9FoJPLcwbik6f0+7QA+4ZCSmzDmjCJbr4FbpJ7Q98PYc7+bquw6E7NJlmZUmP8tWZR7ERc XBQyr243E4LUMmW3OsBgygxSU9D8C+FcViQ7ehlyc7+Ug= X-Gm-Gg: ASbGncu/H0m7B+ZTpv9Pni6cF+Vgomna3rGA/GvZB7uhgqTmxX9DIcw48uXRGNBKfNw gfapOnRoL01UsRToTGHOhlxpEGcrQJ65SnnFbJYbPLxnYbIbNbOyMCeLgewHGP1I8hFpGX56u6D lhlzE/tOaFzcw2pHlhZAsK8rwaRanhRPtKtfLb+PD8Lg5BEnHQ4+hZbKAhiugZnXq/Wo02rxjhW tTSrAaSMeZ1f4031VvQts3RypVy+tiGfUpAUJAEgkaIV9f5jQBxM3Fu+RkmikNoC/7yu30LbPj2 kR+ExA/2vHTLrDrmRqaeu2TyJm6RRPUz/3ChCJvIG1rYADWgSFHlZW87B9gkizT48cqGTyyi+L7 +/pAJhVdylVqYwk1XWTx+Ds19CJGJPI5GuVil593IGBAE2uYG5x+0WZe4PUCQXlVA4kg8xSwZHT fZ5b9uT4T9Q0VCRZvlCpYSl/kEqsd6yWvGnmf0vA== X-Google-Smtp-Source: AGHT+IF3eV/1EaFWrDprz8c/ZKZCFeRacK8vQDjPT4tZAhRHzDBbLKEmKnBh5kBvtfZ2mmNrnLjrJA== X-Received: by 2002:a17:902:eb8b:b0:26b:da03:60db with SMTP id d9443c01a7336-29b6c40263cmr14875085ad.13.1763701465027; Thu, 20 Nov 2025 21:04:25 -0800 (PST) From: frank.chang@sifive.com To: qemu-devel@nongnu.org Cc: Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , qemu-riscv@nongnu.org (open list:RISC-V TCG CPUs), Frank Chang Subject: [PATCH v2 3/6] target/riscv: Fix pointer masking PMM field selection logic Date: Fri, 21 Nov 2025 13:04:10 +0800 Message-ID: <20251121050413.3718427-4-frank.chang@sifive.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251121050413.3718427-1-frank.chang@sifive.com> References: <20251121050413.3718427-1-frank.chang@sifive.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::630; envelope-from=frank.chang@sifive.com; helo=mail-pl1-x630.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, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @sifive.com) X-ZM-MESSAGEID: 1763701518853018900 Content-Type: text/plain; charset="utf-8" From: Frank Chang mstatus.MPV only records the previous virtualization state, and does not affect pointer masking according to the Zjpm specification. This patch rewrites riscv_pm_get_pmm() to follow the architectural definition of Smmpm, Smnpm, and Ssnpm. The resulting PMM selection logic for each mode is summarized below: * mstatus.MXR =3D 1: pointer masking disabled * Smmpm + Smnpm + Ssnpm: M-mode: mseccfg.PMM S-mode: menvcfg.PMM U-mode: senvcfg.PMM VS-mode: henvcfg.PMM VU-mode: senvcfg.PMM * Smmpm + Smnpm (RVS implemented): M-mode: mseccfg.PMM S-mode: menvcfg.PMM U/VS/VU: disabled (Ssnpm not present) * Smmpm + Smnpm (RVS not implemented): M-mode: mseccfg.PMM U-mode: menvcfg.PMM S/VS/VU: disabled (no S-mode) * Smmpm only: M-mode: mseccfg.PMM Other existing modes: pointer masking disabled Signed-off-by: Frank Chang Reviewed-by: Daniel Henrique Barboza --- target/riscv/cpu_helper.c | 61 ++++++++++++++++++++++++++++++++------- 1 file changed, 51 insertions(+), 10 deletions(-) diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index fbab8177092..acfc6c10607 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -171,16 +171,49 @@ bool riscv_env_smode_dbltrp_enabled(CPURISCVState *en= v, bool virt) #endif } =20 +/* + * Returns the effective PMM field. + * + * @env: CPURISCVState + * + * The PMM field selection logic for each effective privilege mode + * is as follows: + * + * - mstatus.MXR =3D 1: disabled + * + * - Smmpm + Smnpm + Ssnpm: + * M-mode: mseccfg.PMM + * S-mode: menvcfg.PMM + * U-mode: senvcfg.PMM + * VS-mode: henvcfg.PMM + * VU-mode: senvcfg.PMM + * + * - Smmpm + Smnpm (RVS implemented): + * M-mode: mseccfg.PMM + * S-mode: menvcfg.PMM + * U/VS/VU: disabled (Ssnpm not present) + * + * - Smmpm + Smnpm (RVS not implemented): + * M-mode: mseccfg.PMM + * U-mode: menvcfg.PMM + * S/VS/VU: disabled (no S-mode) + * + * - Smmpm only: + * M-mode: mseccfg.PMM + * Other existing modes: disabled + */ RISCVPmPmm riscv_pm_get_pmm(CPURISCVState *env) { #ifndef CONFIG_USER_ONLY - int priv_mode =3D cpu_address_mode(env); + int priv_mode; + bool virt; =20 - if (get_field(env->mstatus, MSTATUS_MPRV) && - get_field(env->mstatus, MSTATUS_MXR)) { + if (get_field(env->mstatus, MSTATUS_MXR)) { return PMM_FIELD_DISABLED; } =20 + riscv_cpu_eff_priv(env, &priv_mode, &virt); + /* Get current PMM field */ switch (priv_mode) { case PRV_M: @@ -189,22 +222,30 @@ RISCVPmPmm riscv_pm_get_pmm(CPURISCVState *env) } break; case PRV_S: - if (riscv_cpu_cfg(env)->ext_smnpm) { - if (get_field(env->mstatus, MSTATUS_MPV)) { - return get_field(env->henvcfg, HENVCFG_PMM); - } else { + if (!virt) { + if (riscv_cpu_cfg(env)->ext_smnpm) { return get_field(env->menvcfg, MENVCFG_PMM); } + } else { + if (riscv_cpu_cfg(env)->ext_ssnpm) { + return get_field(env->henvcfg, HENVCFG_PMM); + } } break; case PRV_U: - if (riscv_has_ext(env, RVS)) { + if (!virt) { if (riscv_cpu_cfg(env)->ext_ssnpm) { return get_field(env->senvcfg, SENVCFG_PMM); } - } else { + if (riscv_cpu_cfg(env)->ext_smnpm) { - return get_field(env->menvcfg, MENVCFG_PMM); + if (!riscv_has_ext(env, RVS)) { + return get_field(env->menvcfg, MENVCFG_PMM); + } + } + } else { + if (riscv_cpu_cfg(env)->ext_ssnpm) { + return get_field(env->senvcfg, SENVCFG_PMM); } } break; --=20 2.43.0 From nobody Mon Feb 9 05:13:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=sifive.com ARC-Seal: i=1; a=rsa-sha256; t=1763701526; cv=none; d=zohomail.com; s=zohoarc; b=SIg8mIFI36VYhwFZxx0kxus1XURwnJaztWp9SvV4nxPiQW3MUJ2zad+RRAxMs4xiTlITG9ZwpTG9YqTYG3+9+WlZOnc/LKx4+6+Nf2Ou8gjjZTI9jkhGA3Ppggn0LNxPTq9Ah9DloKmPSkIO9pO/CT3EUGZy37Jhab0N9USBG3Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763701526; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=JY7v5PFUTvqG5xjU8tx4kJ2bLxHjuCr4rVrZ2t+pKeU=; b=eNB+6c1vBYkffLYCztDie1i8Os3dQ2eSYMzg1Kc6ZIMK/Kr3Y+4o+rkd/OJhDM/NjFNjGCZEVpY53sMuiu1neFON62vzCDZI19jQ3S86BlGMbbtkJ+xtI0GlXHkNySGbE/TzotZUNmeF0WvXmvvx8IZ29vzdeYTPYQVsjUaWHLM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 176370152648879.63347140018254; Thu, 20 Nov 2025 21:05:26 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vMJK7-0006EO-1k; Fri, 21 Nov 2025 00:04:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vMJJx-00068C-9v for qemu-devel@nongnu.org; Fri, 21 Nov 2025 00:04:33 -0500 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vMJJu-0006oM-EF for qemu-devel@nongnu.org; Fri, 21 Nov 2025 00:04:33 -0500 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-29555b384acso19792965ad.1 for ; Thu, 20 Nov 2025 21:04:28 -0800 (PST) Received: from hsinchu16.internal.sifive.com ([210.176.154.34]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29b5b26fed2sm43384525ad.69.2025.11.20.21.04.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Nov 2025 21:04:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1763701467; x=1764306267; darn=nongnu.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=JY7v5PFUTvqG5xjU8tx4kJ2bLxHjuCr4rVrZ2t+pKeU=; b=iQDVq+ils4rLp0h6PE8du57BQA9Z7NdW4bbQyBNpXaDDD5bdmSUmhw5YVp8bFLawJY ZXC7Vg6UZ9EsvNWAwPjsW+oB2wschCdFM36S0KfiBVd3K4L+Kc+Z40f1RuK8r1n5WsTf MVVUyiAPMzKLZ06r4vX2QLwxob6fV3KDScl7SrNTocHJ8oeDAikK2uCATHSyObkzFEk4 8NLDg7Xut+01X6lqxdjdfunvfV+K2Z9pnZkfjFoqT2OXeTRwZFTISEutqThQGxUxvRAr If82f1oSuF1YFUiIyF+PI/5kSmeFLLnrV2aNZMDjpNB15bFmKkVVnkXlkdVmr5CTQKD1 YlKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763701467; x=1764306267; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=JY7v5PFUTvqG5xjU8tx4kJ2bLxHjuCr4rVrZ2t+pKeU=; b=gDAgNg2QF/SD5thGxZeE5h8qtOgCkKT/iJPb/8W/y0AUUDqlm3FOl7vqMGT9felEaY Bm6nCAX95mT//MT0xjiUPm6GiUBVk798VTk462pLDTbD/wxuvYjBvhFDCyYDVQTvn3Vj JtWo3EybNrtWKOCH5PYsBRPP+AvYxDzBGDnIku5CMGBq+361cgc1Z1tHQIKxtK8XC0Np lnokaZt1XgEylufl63K/SzgK9gwXYQAy+bUDeIof47mdmSA+YhE5imaeFPPtI4oG7JYj l6JtSXunRPUjl49IqsvLqS4qwrUBFrlQ/nf64DIEC5c43yO6zj/q8o71/rxupq5cNbb+ PoSQ== X-Gm-Message-State: AOJu0YyU1z+/mI+NqLIWQye2KuDznDlAIsgXE6bxnFo1t9Yd8iUONF4W MMUmHiPrFm41DI3Md66FnYSGOiX5ZL8sK8VnT+Rb37gO93UhrEirR2lyfnr+TqvHwDb77tdRqFV vQN4ojivpWfsFa+ffAK/XuP0T05Wcy7XLp7td8VW6G2BilrtyK31Zq0TNJQWAqI1UuJW3HW6+EH tQEMjDXpY9Vtg5XqZatU/xJ0qPq/xt0lh8neY+xmItMAg= X-Gm-Gg: ASbGncsSVo67aJ9nKPAS+J4/TSzNu3SnQTNgXxRMvZ0l7NGFZKbsWR4ttLFu7qwUC7+ cuCmupq8+vpofrlqEpPXlmZuB0voHw/cuzWArD4KN0V4kz/nhhQ3YEaiUJZ2iOwXJDY4ewfg7HX JzJaFeZBOGnYHlYmsU0M8Be7GVCVVDonDVnvO5STNh6pgzpo+DFzOPK2ZR8m5NtQIAXwWAAefEb RdIRBDMjvt2bksSyUuoq6aSk1aWb8oPWsFvHl6IPe/9j8gIWlSSeMbRhxsriHboLf4/MlbRL0JR p84SKTSb3uQ21IjiJrAppGGxQ2EkDgA8EVDeiKUopQS/nqu+v1iXCzf1CusVCKmVsalJFhPAJ2L SxJtS7dE8m1wWa+dL8dC2lRKbxCvx4xiZQgKp9Kzq+P6lwHJy9rWNy9tQWzCir+NIhiejhGPjrU CkubqR4FS5+PWPMNIKDQ4kUR4LXWcnyNgKz4MUCg== X-Google-Smtp-Source: AGHT+IGDQsx3GUn9fEEQjlCOT+4TGxmxEVZX+br837s4osQ4OwsxBH3JauGV/XGQuAw43so8gGJwCQ== X-Received: by 2002:a17:902:ce88:b0:295:5132:1a99 with SMTP id d9443c01a7336-29b6c68be3emr15581185ad.44.1763701467333; Thu, 20 Nov 2025 21:04:27 -0800 (PST) From: frank.chang@sifive.com To: qemu-devel@nongnu.org Cc: Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , qemu-riscv@nongnu.org (open list:RISC-V TCG CPUs), Frank Chang Subject: [PATCH v2 4/6] target/riscv: Fix pointer masking for virtual-machine load/store insns Date: Fri, 21 Nov 2025 13:04:11 +0800 Message-ID: <20251121050413.3718427-5-frank.chang@sifive.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251121050413.3718427-1-frank.chang@sifive.com> References: <20251121050413.3718427-1-frank.chang@sifive.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62f; envelope-from=frank.chang@sifive.com; helo=mail-pl1-x62f.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, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @sifive.com) X-ZM-MESSAGEID: 1763701526916018900 Content-Type: text/plain; charset="utf-8" From: Frank Chang The effective privilege of explicit memory accesses made by virtual-machine load/store instructions (HLV.* and HSV.*) is controlled by hstatus.SPVP. mstatus.MPRV does not affect these virtual-machine load/store instructions. Signed-off-by: Frank Chang --- target/riscv/cpu_helper.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index acfc6c10607..bf747834dcc 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -261,16 +261,25 @@ RISCVPmPmm riscv_pm_get_pmm(CPURISCVState *env) RISCVPmPmm riscv_pm_get_virt_pmm(CPURISCVState *env) { #ifndef CONFIG_USER_ONLY - int priv_mode =3D cpu_address_mode(env); + int priv_mode; =20 - if (priv_mode =3D=3D PRV_U) { - return get_field(env->hstatus, HSTATUS_HUPMM); - } else { - if (get_field(env->hstatus, HSTATUS_SPVP)) { - return get_field(env->henvcfg, HENVCFG_PMM); - } else { - return get_field(env->senvcfg, SENVCFG_PMM); - } + if (get_field(env->mstatus, MSTATUS_MXR) || + !riscv_cpu_cfg(env)->ext_ssnpm) { + return PMM_FIELD_DISABLED; + } + + priv_mode =3D get_field(env->hstatus, HSTATUS_SPVP); + + switch (priv_mode) { + case PRV_S: + /* Effective privilege mode: VS */ + return get_field(env->henvcfg, HENVCFG_PMM); + case PRV_U: + /* Effective privilege mode: VU */ + return (env->priv =3D=3D PRV_U) ? get_field(env->hstatus, HSTATUS_= HUPMM) : + get_field(env->senvcfg, SENVCFG_PMM); + default: + return PMM_FIELD_DISABLED; } #else return PMM_FIELD_DISABLED; --=20 2.43.0 From nobody Mon Feb 9 05:13:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=sifive.com ARC-Seal: i=1; a=rsa-sha256; t=1763701531; cv=none; d=zohomail.com; s=zohoarc; b=IiNXn06gUSo3r0LVP2dIrKdSbeq+mCQ3aeh1K3EQXEH/bVDavSPtPFziHGPqplJLZVfexD88Q7FTVfc4WYDjBkng9BhlhgGHZyuyu9Zon/L4ungvtczWyMp8bMcvADxzRhZRFac+yydvyMIl8hKXpDK/MCEL0868E1qFZX43QB8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763701531; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=q+qfbZQ+LM2ZIXAyRAEmu54btDTIb/g6gYHrgwx2V5I=; b=FaG9nY3FpkGCe/cZ7l465jJz1InmmPHxw27/AVS2d+TYYsaurwLFBlomhVH688goJaE3nvyABuacfFDmAWMu64nRNEjzlPHxxcZbGNUnQOBn5nofDUO4omS0Butvhhv22sy8gDoibo1W91tuW85OTHwKgUP5EZhVQ8FCXgij53M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1763701531583611.8832795725376; Thu, 20 Nov 2025 21:05:31 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vMJKA-0006Hz-FN; Fri, 21 Nov 2025 00:04:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vMJJy-00069O-FW for qemu-devel@nongnu.org; Fri, 21 Nov 2025 00:04:34 -0500 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vMJJw-0006oy-5d for qemu-devel@nongnu.org; Fri, 21 Nov 2025 00:04:33 -0500 Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-297e982506fso22050555ad.2 for ; Thu, 20 Nov 2025 21:04:30 -0800 (PST) Received: from hsinchu16.internal.sifive.com ([210.176.154.34]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29b5b26fed2sm43384525ad.69.2025.11.20.21.04.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Nov 2025 21:04:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1763701469; x=1764306269; darn=nongnu.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=q+qfbZQ+LM2ZIXAyRAEmu54btDTIb/g6gYHrgwx2V5I=; b=gjHYoVgovhkLdU57gh7XNW1fCLV/U+PKcfsrO3H0HQ3auOP6zP7QR5g+/ty5Q9CfmR w5TnMof0n5+TC3SdMsvHxjAmufamc+BopNvF54vrYqYnm3jZP6BgxGN0Ao2ir38TAaIy Hy7by36L71XmCoLR7WZfnrT06GfF1XHP7/4Lx67WSMtXqpVu8ThY2x0UKiADm59y3O2f q9HiJhlZB52u5gGi2hy//menILbKp5hFZpWWSMSz+d0XPx61npcnAk2E/xvnpVlwFFuG KR91MPsj4873brrR7bD5gqCiO3wwERUXjeWBwGfkOreUcQPkX3j6rHWxz0xLd7jpdWxc V7JA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763701469; x=1764306269; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=q+qfbZQ+LM2ZIXAyRAEmu54btDTIb/g6gYHrgwx2V5I=; b=rYfIlb/WEip272h8SoO8BxGuVsAVEZ40ZEqANzjhzARvTLzwteJns+kjhK5YI8WX01 BldNWp8yGGwKG7G02f7AhL/+U52WBRP5IuUf/lsgPML0/a66cFmkTmTdrAMQAsnH5yYH XNg63OqDR9ywimBmfmGz/ta0905AkO7Tq1eHlcQvu59XVPUGI+9/ILLtiGqCdwI4Pjn1 5jZm7eB7X8FRv1vjWA4U4Hz0MyqH254IWJ8ltshuhOCO8WZYHUnZ57IoYovRPngseMXg aw9y9FeSqBxZQl1yHI7bfrZoLmCsblIbqj7uwcSmgbGRIefQ9onxKP7EKpgKSo4w4i5j kqmQ== X-Gm-Message-State: AOJu0Yzo1eZNtXK67NWxSxroFJFGcyr9GRxUNax55/iW3RXbNe9kVhXR 4QsagTdzB4A7NWz0wqsJuU45XXpH4h8qd2GJEpouq8HM+84w/lQm5+qJE+qPVQN8RDNd1jhjeW7 3bUqSvWQ7Rh4StMUgO0QgzRfy181TWC/DuqM0q2+o7Ccdq+ihbCNx42P3zX0HZLsqz7TlV7xyJO 3ZhPGQjO73r5il0yjsTWP62UicSPDhjKsKUr0Q22Nhmys= X-Gm-Gg: ASbGncuD69sk2aOLkoUIbZptlZTk9omCgihqBfhZQRtcNY3Qnh34xr/n1S5ckfCj63h 3jJfL+BOYu1ybCpqsiyr3If/DrHU5fooMnJH7SVk/pP5CgMcm/SGP4KewlQwuESk2b5znzPqMJc q2NT+tu7VQ2wAWcl8ZnJ46VItAo0hkBHu4BDmWQgwpeDI33hgQlToCI5xVrkvwgFTp+ICBmkJbK tycyyJBfbtttfAmzbVK6Nit71ZKrSFljKLQ62ApKH/6eOTgUEVG0ARGyMAj0puQ+Gs8c+DluzHJ XibdT2CVwP0aqF9DXtanPtWLg42z1vWMc3PMuJB3ZVgWkl+uMzVKzrYZY+XYbrcycpiUQaAoodL GZzltnD1aIw/2XZ1evHdO4SB8ABW0xKVMtbcEDCPG3voHCX2ssUPe1YSS2XGW3dekLuw6iO2GCb DN6hndpiRBx7nd0jLcKxxMw8fxFC6amK2Tamb6xw== X-Google-Smtp-Source: AGHT+IHlx6ub8IXShKcw3APValCsZ0rsVa0izJWSlRPVW/qwPRZusH9uMQwni9Gi5kfPtpQktRqQHg== X-Received: by 2002:a17:903:b84:b0:290:cd9c:1229 with SMTP id d9443c01a7336-29b6bec4961mr14163685ad.19.1763701469381; Thu, 20 Nov 2025 21:04:29 -0800 (PST) From: frank.chang@sifive.com To: qemu-devel@nongnu.org Cc: Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , qemu-riscv@nongnu.org (open list:RISC-V TCG CPUs), Frank Chang Subject: [PATCH v2 5/6] target/riscv: Rename riscv_pm_get_virt_pmm() to riscv_pm_get_vm_ldst_pmm() Date: Fri, 21 Nov 2025 13:04:12 +0800 Message-ID: <20251121050413.3718427-6-frank.chang@sifive.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251121050413.3718427-1-frank.chang@sifive.com> References: <20251121050413.3718427-1-frank.chang@sifive.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::635; envelope-from=frank.chang@sifive.com; helo=mail-pl1-x635.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, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @sifive.com) X-ZM-MESSAGEID: 1763701532975018900 Content-Type: text/plain; charset="utf-8" From: Frank Chang Rename riscv_pm_get_virt_pmm() to riscv_pm_get_vm_ldst_pmm() to better reflect its actual usage. This function is used when checking the PMM field for virtual-machine load/store instructions (HLV.* and HSV.*), rather than for VS/VU modes. Signed-off-by: Frank Chang Reviewed-by: Daniel Henrique Barboza --- target/riscv/cpu.h | 2 +- target/riscv/cpu_helper.c | 2 +- target/riscv/internals.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index ab285d7a6d1..9ba01b9f90a 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -847,7 +847,7 @@ bool riscv_cpu_is_32bit(RISCVCPU *cpu); =20 bool riscv_cpu_virt_mem_enabled(CPURISCVState *env); RISCVPmPmm riscv_pm_get_pmm(CPURISCVState *env); -RISCVPmPmm riscv_pm_get_virt_pmm(CPURISCVState *env); +RISCVPmPmm riscv_pm_get_vm_ldst_pmm(CPURISCVState *env); uint32_t riscv_pm_get_pmlen(RISCVPmPmm pmm); =20 RISCVException riscv_csrr(CPURISCVState *env, int csrno, diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index bf747834dcc..958b05aaa32 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -258,7 +258,7 @@ RISCVPmPmm riscv_pm_get_pmm(CPURISCVState *env) #endif } =20 -RISCVPmPmm riscv_pm_get_virt_pmm(CPURISCVState *env) +RISCVPmPmm riscv_pm_get_vm_ldst_pmm(CPURISCVState *env) { #ifndef CONFIG_USER_ONLY int priv_mode; diff --git a/target/riscv/internals.h b/target/riscv/internals.h index 9b3f01144d2..b17b661e2a8 100644 --- a/target/riscv/internals.h +++ b/target/riscv/internals.h @@ -190,7 +190,7 @@ static inline target_ulong adjust_addr_body(CPURISCVSta= te *env, =20 /* get pmm field depending on whether addr is */ if (is_virt_addr) { - pmm =3D riscv_pm_get_virt_pmm(env); + pmm =3D riscv_pm_get_vm_ldst_pmm(env); } else { pmm =3D riscv_pm_get_pmm(env); } --=20 2.43.0 From nobody Mon Feb 9 05:13:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=sifive.com ARC-Seal: i=1; a=rsa-sha256; t=1763701521; cv=none; d=zohomail.com; s=zohoarc; b=kBEUdDTBlfO08qBvR+UfoWFSr/RAvf4DCeL+KJmu4OZg69secqdWZu60GV63lDqhzOVPumUFAuRKLJZzDuL1l/hojKf3oZKDF4pNcQXuj5RUcGQtZhBwkk8lHbHm4TablrGHhJNulQRkWNvVqUyeAaXsNsBHELmretNW6ZoV4f4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763701521; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=wuxsSWXc0dTR/oYhQOqPPr2cG5wBOrul760l+HkCixA=; b=RHDhGwD2eorpmQvzdaDiM82/ihv5h3a9WCiw8m+Jg8n4KN4WaL+BJPm/r/GdEsYJqWeJKv7pe9GcCz2Xk7OQdb4HnR/3GvFpbVgd9sKVUZr6VTyjoqxp+XZq6MGhEHPCNl420nrvDq5qiiCwIx9Nhx9HpyHArwDWrz/VQTt2rYk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1763701521726663.8101131599674; Thu, 20 Nov 2025 21:05:21 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vMJK8-0006GT-Vy; Fri, 21 Nov 2025 00:04:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vMJJz-00069x-Tl for qemu-devel@nongnu.org; Fri, 21 Nov 2025 00:04:36 -0500 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vMJJy-0006pg-6H for qemu-devel@nongnu.org; Fri, 21 Nov 2025 00:04:35 -0500 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-295548467c7so18938075ad.2 for ; Thu, 20 Nov 2025 21:04:33 -0800 (PST) Received: from hsinchu16.internal.sifive.com ([210.176.154.34]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29b5b26fed2sm43384525ad.69.2025.11.20.21.04.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Nov 2025 21:04:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1763701472; x=1764306272; darn=nongnu.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=wuxsSWXc0dTR/oYhQOqPPr2cG5wBOrul760l+HkCixA=; b=ZFXbg6MBIiRohprZwVqGYgDnjb2loY7rKrB3hxbn9I+5+cTOa+gCGy0KFPtPqPOya6 8Y1cBZmW1JyqrLHAxSj01vKbHols70ysX+8YIWvO7ermzrctLSjWWaAGcwZvwM+Co8sV yr3X1bt1PLn/AqeNHhUzHf/R6csmxhN1qp53xysZzu96+scnwWJkWgdHnWreX6QTcK+A HHcvA34I9zAVovDt6QYF7+KJYihAdd4j2M61AwRA1DEP6yI4GtUVVXQ4plAtv11N7YQU 8r5HlXWwXKCRC7AUgBgpeGoqJEwWl1ipzr02GDfrj5g/8U70gOYEYH0pgedKy+KxoSYV YSBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763701472; x=1764306272; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=wuxsSWXc0dTR/oYhQOqPPr2cG5wBOrul760l+HkCixA=; b=A+VttsNYec3Ta92qfQxIBjb6Co+9ASsFkoAu6IJyV3NzA65M5qKMoLhK0bEDdxwQK8 onc61MlZwkoYn+erlqb5STIQ/3lgCjsQsFSOFGCKg7qmpoXHzvgDkVoErnL1JC4bioRj oSEzkItGSu5hW8KKP2zPYGrDapvemWLBDFyFQwPTuKddTF8a/MY9ZhHq42WHOVCsav3d n3iCoCRpoPkqFRqjR2OLQDOzyZvHLQ6K8NVd88KcaWbwpwlkNryyYXHDSn7TebiZqFE+ 8qO33+2tSpCaCUNUpEIfSoE0xoBktOnTLXKCm0ZXucSb3f+HapUMx168E/AUOvfpSNXP TCHw== X-Gm-Message-State: AOJu0Ywcy72GbWjAgmK4oGlwf1KbwQu6vjpnQOLLgA9lQoUIz74hOola p2BavlnOjYWTwv7/1GEBtCpxTXs9DO2thvKz4Nqlrq8FgPfFaw3d0DwBWQiVuovPrGEalRm14Cc Ogl3GHv4w3MKepgfdMO5zwFnQrQEqhzrT1vOWNaHvVdm2IJjWRFVQbLzXi4XyIEwq9M0/QIBrUA cAMbk5mHQC5rhAonExTJPY3C52gvBH6wV/erCOLDFp7Aw= X-Gm-Gg: ASbGncslvJhK9espLZHbfoLTNvhjJuIdnPOUvmWaENVbVyZ4DXlZwbsLl4gL9ZIrZxI wc9vbBtx0gnrVvJ0Xld/BgWR8ZCprTC0Lc/HUkLjKdo9DYpy9kjY7bfde2+uC429Qggzi/pR4tQ rI5XLPZU56JCjTQrPm/xANYqgJmgLndqHAlzaTlK1NZMf8QnVovH1fJt3UuOENJpAht+27LCjop DZ5s4qyGYr9HTn9dqZkCgLtq72lsjnGNUoXjoxqQJvNsDVhJjEKOgmBSaPzaAWAwGJ1sghhdPwq UZJi7qWId7XWBRFuoW8egpG5zrS5ggqDRjJGhVRSkkvysE3tllh77PGEfogtLYxAc/YS6V6V+zy Vr8Mg2FeHn0zcmN6GW9RDlLM5gtodzADNg9/Z+xu+OM51UZy5jV7JpwDa8+LGspQb9xENhwwnbp /4aHKJJsQMevxuvRgzMSU5iO/tqTeFnkLGYYblYw== X-Google-Smtp-Source: AGHT+IG7hA0Pl8XgYJs6k+FG46KS+uEPyomMUV8HOVZfuC4sVjqW7NHDT1pH1bYsXRz7kttzK4etvQ== X-Received: by 2002:a17:902:ebc8:b0:295:290d:4afa with SMTP id d9443c01a7336-29b6bec6564mr14878085ad.23.1763701471444; Thu, 20 Nov 2025 21:04:31 -0800 (PST) From: frank.chang@sifive.com To: qemu-devel@nongnu.org Cc: Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , qemu-riscv@nongnu.org (open list:RISC-V TCG CPUs), Frank Chang Subject: [PATCH v2 6/6] target/riscv: Fix pointer masking translation mode check bug Date: Fri, 21 Nov 2025 13:04:13 +0800 Message-ID: <20251121050413.3718427-7-frank.chang@sifive.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251121050413.3718427-1-frank.chang@sifive.com> References: <20251121050413.3718427-1-frank.chang@sifive.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::634; envelope-from=frank.chang@sifive.com; helo=mail-pl1-x634.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, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @sifive.com) X-ZM-MESSAGEID: 1763701523052018900 Content-Type: text/plain; charset="utf-8" From: Frank Chang When running with virtualization in VS/VU mode, or when executing the virtual-machine load/store instructions (HLV.* and HSV.*), the type of address that determines which pointer masking rules apply should be checked against vsatp rather than satp. As a result, sign extension also applies to the virtual-machine load/store instructions. Signed-off-by: Frank Chang Reviewed-by: Radim Kr=C4=8Dm=C3=A1=C5=99 --- target/riscv/cpu.h | 2 +- target/riscv/cpu_helper.c | 19 +++++++++++++++---- target/riscv/internals.h | 4 +--- target/riscv/tcg/tcg-cpu.c | 4 ++-- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 9ba01b9f90a..c98f95179cc 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -845,7 +845,7 @@ static inline uint32_t vext_get_vlmax(uint32_t vlenb, u= int32_t vsew, =20 bool riscv_cpu_is_32bit(RISCVCPU *cpu); =20 -bool riscv_cpu_virt_mem_enabled(CPURISCVState *env); +bool riscv_cpu_virt_mem_enabled(CPURISCVState *env, bool is_vm_ldst); RISCVPmPmm riscv_pm_get_pmm(CPURISCVState *env); RISCVPmPmm riscv_pm_get_vm_ldst_pmm(CPURISCVState *env); uint32_t riscv_pm_get_pmlen(RISCVPmPmm pmm); diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index 958b05aaa32..54ff2881831 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -286,16 +286,27 @@ RISCVPmPmm riscv_pm_get_vm_ldst_pmm(CPURISCVState *en= v) #endif } =20 -bool riscv_cpu_virt_mem_enabled(CPURISCVState *env) +bool riscv_cpu_virt_mem_enabled(CPURISCVState *env, bool is_vm_ldst) { #ifndef CONFIG_USER_ONLY int satp_mode =3D 0; - int priv_mode =3D cpu_address_mode(env); + uint64_t satp; + int priv_mode; + bool virt =3D false; + + if (!is_vm_ldst) { + riscv_cpu_eff_priv(env, &priv_mode, &virt); + } else { + priv_mode =3D get_field(env->hstatus, HSTATUS_SPVP); + virt =3D true; + } + + satp =3D virt ? env->vsatp : env->satp; =20 if (riscv_cpu_mxl(env) =3D=3D MXL_RV32) { - satp_mode =3D get_field(env->satp, SATP32_MODE); + satp_mode =3D get_field(satp, SATP32_MODE); } else { - satp_mode =3D get_field(env->satp, SATP64_MODE); + satp_mode =3D get_field(satp, SATP64_MODE); } =20 return ((satp_mode !=3D VM_1_10_MBARE) && (priv_mode !=3D PRV_M)); diff --git a/target/riscv/internals.h b/target/riscv/internals.h index b17b661e2a8..38d438fbf93 100644 --- a/target/riscv/internals.h +++ b/target/riscv/internals.h @@ -200,9 +200,7 @@ static inline target_ulong adjust_addr_body(CPURISCVSta= te *env, return addr; } =20 - if (!is_virt_addr) { - signext =3D riscv_cpu_virt_mem_enabled(env); - } + signext =3D riscv_cpu_virt_mem_enabled(env, is_virt_addr); pmlen =3D riscv_pm_get_pmlen(pmm); addr =3D addr << pmlen; =20 diff --git a/target/riscv/tcg/tcg-cpu.c b/target/riscv/tcg/tcg-cpu.c index 440626ddfad..2b4bcefa0c9 100644 --- a/target/riscv/tcg/tcg-cpu.c +++ b/target/riscv/tcg/tcg-cpu.c @@ -104,7 +104,7 @@ static TCGTBCPUState riscv_get_tb_cpu_state(CPUState *c= s) RISCVCPU *cpu =3D env_archcpu(env); RISCVExtStatus fs, vs; uint32_t flags =3D 0; - bool pm_signext =3D riscv_cpu_virt_mem_enabled(env); + bool pm_signext =3D riscv_cpu_virt_mem_enabled(env, false); =20 if (cpu->cfg.ext_zve32x) { /* @@ -255,7 +255,7 @@ static vaddr riscv_pointer_wrap(CPUState *cs, int mmu_i= dx, return result; } =20 - pm_signext =3D riscv_cpu_virt_mem_enabled(env); + pm_signext =3D riscv_cpu_virt_mem_enabled(env, false); if (pm_signext) { return sextract64(result, 0, 64 - pm_len); } --=20 2.43.0