From nobody Thu May 2 21:11:28 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1680026015; cv=none; d=zohomail.com; s=zohoarc; b=AadHiO+CGrtmeT5FfsozBwI5THM2Ydpv4rCcJjmULgtDfno6K3og8p0WBeOFzoVKsCJHzbGUzwoM+Xo9D4yiUWQqCe24X5a8QED0mjdg0/n9nM6+jAQJGdcXPPG8bOO7FpLbnPtQq7ns1ggznboJ97qEjwxPtFPeg3wTQaO+Yxc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680026015; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=B5mh8eRonp6eLYRY8fNk1uwsaaBLHXRgLnj7sCGlLAY=; b=b15ZYdMsAVXSa7awHzWHQr6kPX31aiSfoJjmh6HIqu7zKu3EvKtxv4oPW2so7TZPM8+UCQD6KuRT1nWsp5TIXxakQpYOqm+I6Rr1nK5gnYXsGn6KNroe+VE4ErHtdXwvyIvqn5lQegyscTnqCiycHoAacCrmGD3FPiTQgDppjNw= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 168002601555710.030382121008529; Tue, 28 Mar 2023 10:53:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1phDV5-0001Dc-Hd; Tue, 28 Mar 2023 13:52:51 -0400 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 1phCgN-0008I0-U1; Tue, 28 Mar 2023 13:00:38 -0400 Received: from forward101a.mail.yandex.net ([178.154.239.84]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1phCgL-0005ai-Be; Tue, 28 Mar 2023 13:00:27 -0400 Received: from mail-nwsmtp-smtp-production-main-81.vla.yp-c.yandex.net (mail-nwsmtp-smtp-production-main-81.vla.yp-c.yandex.net [IPv6:2a02:6b8:c1d:63cd:0:640:4ab5:0]) by forward101a.mail.yandex.net (Yandex) with ESMTP id 50FA346CF5; Tue, 28 Mar 2023 20:00:18 +0300 (MSK) Received: by mail-nwsmtp-smtp-production-main-81.vla.yp-c.yandex.net (smtp/Yandex) with ESMTPSA id E0LU4L3PduQ0-8v8Zid0l; Tue, 28 Mar 2023 20:00:17 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=syntacore.com; s=mail; t=1680022817; bh=B5mh8eRonp6eLYRY8fNk1uwsaaBLHXRgLnj7sCGlLAY=; h=Message-Id:Date:In-Reply-To:Cc:Subject:References:To:From; b=n/V6VS/xBzE2ALwGzWVNVGX5uIVrziOctLSwfqv0QejEBKoa6Ndx9W2jiX48NJ/nh RHE5zcYOhM+21/XC6ehS5bFPLVMudApbE9l5hEeCkGpZqAii03YfiT11QhVMBjNWnE 7/7TRBRsJulP0qXsdBss8MAjTWagUEc9H8RZFFpc= Authentication-Results: mail-nwsmtp-smtp-production-main-81.vla.yp-c.yandex.net; dkim=pass header.i=@syntacore.com From: Irina Ryapolova To: qemu-devel@nongnu.org Cc: palmer@dabbelt.com, alistair.francis@wdc.com, bin.meng@windriver.com, liweiwei@iscas.ac.cn, dbarboza@ventanamicro.com, zhiwei_liu@linux.alibaba.com, qemu-riscv@nongnu.org, Irina Ryapolova Subject: [PATCH] target/riscv: Fix Guest Physical Address Translation Date: Tue, 28 Mar 2023 19:54:06 +0300 Message-Id: <20230328165406.271528-1-irina.ryapolova@syntacore.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <0> References: <0> 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=178.154.239.84; envelope-from=irina.ryapolova@syntacore.com; helo=forward101a.mail.yandex.net 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Tue, 28 Mar 2023 13:52:48 -0400 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 @syntacore.com) X-ZM-MESSAGEID: 1680026016578100001 Content-Type: text/plain; charset="utf-8" According to specification: For Sv39x4, address bits of the guest physical address 63:41 must all be ze= ros, or else a guest-page-fault exception occurs. Likewise for Sv48x4 and Sv57x4. For Sv48x4 address bits 63:50 must all be zeros, or else a guest-page-fault= exception occurs. For Sv57x4 address bits 63:59 must all be zeros, or else a guest-page-fault= exception occurs. Signed-off-by: Irina Ryapolova Reviewed-by: Weiwei Li --- target/riscv/cpu_helper.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index f88c503cf4..27289f2305 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -863,17 +863,24 @@ static int get_physical_address(CPURISCVState *env, h= waddr *physical, =20 CPUState *cs =3D env_cpu(env); int va_bits =3D PGSHIFT + levels * ptidxbits + widened; - target_ulong mask, masked_msbs; =20 - if (TARGET_LONG_BITS > (va_bits - 1)) { - mask =3D (1L << (TARGET_LONG_BITS - (va_bits - 1))) - 1; - } else { - mask =3D 0; - } - masked_msbs =3D (addr >> (va_bits - 1)) & mask; + if (first_stage =3D=3D true) { + target_ulong mask, masked_msbs; + + if (TARGET_LONG_BITS > (va_bits - 1)) { + mask =3D (1L << (TARGET_LONG_BITS - (va_bits - 1))) - 1; + } else { + mask =3D 0; + } + masked_msbs =3D (addr >> (va_bits - 1)) & mask; =20 - if (masked_msbs !=3D 0 && masked_msbs !=3D mask) { - return TRANSLATE_FAIL; + if (masked_msbs !=3D 0 && masked_msbs !=3D mask) { + return TRANSLATE_FAIL; + } + } else { + if (vm !=3D VM_1_10_SV32 && addr >> va_bits !=3D 0) { + return TRANSLATE_FAIL; + } } =20 int ptshift =3D (levels - 1) * ptidxbits; --=20 2.25.1