From nobody Thu Apr 25 10:13:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=wdc.com ARC-Seal: i=1; a=rsa-sha256; t=1570568241; cv=none; d=zoho.com; s=zohoarc; b=Tn9WnjOmIaRHMMAj825DhWA5/zE4szOb41zduSKDuU0wjPhM8J5e6UbGcp4l+Gzdr0oP4HUawRfS6htLqMQKLiS4qzlOaxxSTm8mrkGBG3Vt0CT19Ro/z1fe2tdt8GO/edy0jigou1aaIVhHHoZNn5QbPBvxMUWd0ObeFjxsuE0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570568241; h=Content-Type: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=tS8ubdrGYA5t2RyyHx7Xn8YyRzD3brZWg17OPnUU4s0=; b=b5Nj03zzb0A+NN61MWbGTuIb7u12yhv2TZbqtDfv8XmEX2c2X33shrAWCV6TY8pYLK9vRQyOBV47Mp7Bxo1JuXttcwyyqrkVj6VG7vaXMyTRxCxAO0BnsLtB0CgeEFWqr8wJjeqI0/dNPCVogMqz+cbhXXkhN522WLjurY5+hWE= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1570568241848318.0393443498598; Tue, 8 Oct 2019 13:57:21 -0700 (PDT) Received: from localhost ([::1]:37212 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iHwXj-0000Ea-B2 for importer@patchew.org; Tue, 08 Oct 2019 16:57:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44184) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iHwWu-0008AC-DH for qemu-devel@nongnu.org; Tue, 08 Oct 2019 16:56:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iHwWt-0002Gz-3n for qemu-devel@nongnu.org; Tue, 08 Oct 2019 16:56:24 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:46687) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iHwWs-0002GZ-Ek; Tue, 08 Oct 2019 16:56:23 -0400 Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 09 Oct 2019 04:56:20 +0800 Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Oct 2019 13:52:21 -0700 Received: from risc6-mainframe.sdcorp.global.sandisk.com (HELO risc6-mainframe.int.fusionio.com) ([10.196.157.58]) by uls-op-cesaip01.wdc.com with ESMTP; 08 Oct 2019 13:56:21 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1570568182; x=1602104182; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=wesWJj6QvwS88ThbHC6ZBLzVjCXfFibXEQU4dzUr07U=; b=h2S8VnqV1KNmLdOfU+6uPmaJm6sQdOPWBcmnxzREvIwP0NGYYFbwTJM6 seBnS1r0+c+dFKOjHmxM/1nspn4RIM8CwtOwRVCteqvjDJE5UUziubl8a Lyg/lw9h5Ua3cPesvmCQ5CJl7W6Ch1CnaOV1zmuHixDkgDxN0v83D9N/e LYZynEZz44fWKhhhPF85LmJO+p63E4d+dH5eBm159aUX9ti3lIqoUFRoQ jp1APTTYI3f5M1O0mImEnUIdbp+Bl9pN8HjaBbZNUWhaTuL77/pneptGC doKexTolKWOnPs806gRvF6RTjF8rPc7Ivty7593Qn36jfoVW/LpXhyHOn w==; IronPort-SDR: a4v8IRJJplQwntak5Vjh+a0VRQZqzIYXzRR9Dp0soiSoWW1GHzPXGNbZANsp0byudK1S5SLcXl jx1WycwTIPQvacJYWQFChGWwhx9RouZQ5wHEA7AYE6qSTCZ0do1BGWPNC/Hn2FVbJ0DJUy1Vcz o8azeVCEEtA93ltF8/4UozHfmaq4hY5Rnpl7AKwSH6jXZsDQRtEBWtZA3PrVnQGOkwNpVKiAgP yPUGRceZ+5DYAlNTTrNEjrj71P26pwj7CN86XyHv8xhVxgsOneSCVy29wwAnKAy4JMRdU5s1kO RLU= X-IronPort-AV: E=Sophos;i="5.67,272,1566835200"; d="scan'208";a="227047824" IronPort-SDR: O8tQ+pIRFywICgypgKdKIGPPzVbtbeZEDCfZMZuqJtKtiPZj4DoyrDjTUgK4balxYFZeX7JzCb Bw9rTzXoTZGh8SehuXYF6AAHMPPI2xAW2ZJmJ3iy2YNMP5A0Uzx9rgWdjax0bmOEWyxlu14Y/X gdTp9y1NJYtH+MyzKDd0l7DXdQDYZlWEGYrRbalAA54tcHXrmeOLhcJcznGtB6Sf54+NK+opEJ PnebNz/6K508eaCbgTpAK7VwqawCCTW/Yy/7Q0mGMvs1s71sk0PGeWbSBknX2JZNCOYgOvkSQG GgJTP0ZI189rrc19v+euW/zS IronPort-SDR: hZpQ/tawF4T7Y0qzha7L8YGo917+rHaRgn2wf/Bq04egX+E/FQXkdhNqvHDyXndZfguqXUyUnT gF30emQyCm3qmjEr0orrvIP9VMP+5OcW93L1Vtdm2rZIr2mHwK8hD7azEYMZAfE9pBa4yPab62 exoy3kAVze6mjjC8Nt7yNq4Zr42Wk970QRuxDIzbtYWvahBNj76heJoL0dHwvEzyip25DWP6j6 XJWdm6+lBcltZ2bWPtO5p6smtGG8dRGMm2bL9J7kANjbMphcS01pZG6UXc/lQ119at7qIe3LgQ O+Q= WDCIronportException: Internal From: Alistair Francis To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v2 1/2] RISC-V: Handle bus errors in the page table walker Date: Tue, 8 Oct 2019 13:51:50 -0700 Message-Id: <944c4c9c5ef8c134cff2a7bef6e5994685e065ee.1570567870.git.alistair.francis@wdc.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x [fuzzy] X-Received-From: 68.232.141.245 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alistair23@gmail.com, palmer@sifive.com, alistair.francis@wdc.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Palmer Dabbelt We directly access physical memory while walking the page tables on RISC-V, but while doing so we were using cpu_ld*() which does not report bus errors. This patch converts the page table walker over to use address_space_ld*(), which allows bus errors to be detected. Signed-off-by: Palmer Dabbelt Signed-off-by: Alistair Francis Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- target/riscv/cpu_helper.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index 87dd6a6ece..c82e7ed52b 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -169,7 +169,8 @@ static int get_physical_address(CPURISCVState *env, hwa= ddr *physical, /* NOTE: the env->pc value visible here will not be * correct, but the value visible to the exception handler * (riscv_cpu_do_interrupt) is correct */ - + MemTxResult res; + MemTxAttrs attrs =3D MEMTXATTRS_UNSPECIFIED; int mode =3D mmu_idx; =20 if (mode =3D=3D PRV_M && access_type !=3D MMU_INST_FETCH) { @@ -256,11 +257,16 @@ restart: 1 << MMU_DATA_LOAD, PRV_S)) { return TRANSLATE_PMP_FAIL; } + #if defined(TARGET_RISCV32) - target_ulong pte =3D ldl_phys(cs->as, pte_addr); + target_ulong pte =3D address_space_ldl(cs->as, pte_addr, attrs, &r= es); #elif defined(TARGET_RISCV64) - target_ulong pte =3D ldq_phys(cs->as, pte_addr); + target_ulong pte =3D address_space_ldq(cs->as, pte_addr, attrs, &r= es); #endif + if (res !=3D MEMTX_OK) { + return TRANSLATE_FAIL; + } + hwaddr ppn =3D pte >> PTE_PPN_SHIFT; =20 if (!(pte & PTE_V)) { --=20 2.23.0 From nobody Thu Apr 25 10:13:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=wdc.com ARC-Seal: i=1; a=rsa-sha256; t=1570568594; cv=none; d=zoho.com; s=zohoarc; b=FBqb42sma2VIKFIWPQKGw+aXkgUvFHWOJcjc6X1AsMxKhP+KpkmnZlCUnd3vdUcReDAVPuxfxdW3tjcTiJpuc7hSvcioqqYOVzaaFZaaWUfeNleLdcUQTvg903wEMvXcdfX1/FDym+e+JcxnbNEWqyzGG5kEJgjTeKhnZ0qDtc8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570568594; h=Content-Type: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=n+an1VJDrMPOwJtsvStqLnthrv/H64t7+gar9o82e5Y=; b=XyPz0S0/OKIidKuFr3oW2igb1RVh1pFjBaW4TJ83WxMR/jH7XZRTN2O/rD/nVMydehY+a86RT90kvwIle/WrFF6lELE9xcTpUHFBXxUbSuLv81z11ewGhpLhEeYvBkl1yNLwWJen0fIXiTC7pzUGLTG7mAJ7HPc8rdjMjeuDg1o= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1570568594695971.6475649992375; Tue, 8 Oct 2019 14:03:14 -0700 (PDT) Received: from localhost ([::1]:37272 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iHwdU-0004Xz-UZ for importer@patchew.org; Tue, 08 Oct 2019 17:03:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44205) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iHwWw-0008AQ-6o for qemu-devel@nongnu.org; Tue, 08 Oct 2019 16:56:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iHwWu-0002HS-V3 for qemu-devel@nongnu.org; Tue, 08 Oct 2019 16:56:26 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:46689) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iHwWu-0002HA-NF; Tue, 08 Oct 2019 16:56:24 -0400 Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 09 Oct 2019 04:56:23 +0800 Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Oct 2019 13:52:24 -0700 Received: from risc6-mainframe.sdcorp.global.sandisk.com (HELO risc6-mainframe.int.fusionio.com) ([10.196.157.58]) by uls-op-cesaip01.wdc.com with ESMTP; 08 Oct 2019 13:56:24 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1570568184; x=1602104184; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=pvc66Uik+KxP3YvrM1LSPSwpT4x8ShXKtIkGQgR5Bdg=; b=lyLarlJodQVCcdcwIOFziiYPR3sxunTutcqv4vENjtTwslzQJcM69u/W HTdHud/evVCu7/UnSv7lI8ITjbahm7N5KVJMsNUNKPgDcD3Zgef843c/4 7TjPhONpsqJLMMVM08HOGd8ITVAnG2jKMaK53R/U5uFqy0XW+74WwOPY3 wkwe5xyC5gkhfQKP03U06F1vI6mven26OkvF83u36ch+5s5y0OuyDckhi p3U/tt2vo5uBAzYXRuNBcL+pmJlbvJCS77ah34qaj+ElGpYJlNePYPDLG OtwidFAGzc3dcJsRCnBlUd1Gp9nsLW5DtLiYqFFQFXkVCwha65woR39Y6 A==; IronPort-SDR: n5mw6F6QXI42U8TYKGtizQPxntQAuBOoaNkdLt8v97wqJqMkZnm9tR22w3eLn91LpkSYbJYwle I+fYbL06fIIGHtyP+Gcfa57CCxzpG3L9Sl6K/EmE6XaPq/bClyIoolGml1/YhdxHBAEScAOhpf lhiBi6U6UyoYK/n4iOO7vP5/37U/sSXThF3G+A/xFKMD/OSNLCijoXpXTyx9jp2m5ThrcipELM yaTZOQXklhAlWxXVSQaTmJD4+j0WYy+Ffj/b6ZPP7Nm30nXooPOXOQqdxgD72PEWGnthsbh6pK EJY= X-IronPort-AV: E=Sophos;i="5.67,272,1566835200"; d="scan'208";a="227047829" IronPort-SDR: uyCXAFmjkgdzdBfQRCC6Px/mloPNR9nIGxANa35k3FkTr5cRm2LLU7ow1ze6LNYC4kXEJghO7G cB4LPoZDr0h+CbpKeKPd2b1F8flvO/i9Rd8DxishehX6L+u/fM7n6Y5q7OXbFkwghYKegToyV3 XYdCPOvuz3w4OZUWr7d5QMMpJb+M82A5auekFwroaATVTPreJu7iUIo4eZ1/tvn4lCgR+aerXR 9vVfxOKfuuWF/07zJCAkg3XY41u8EcOsoapPZB0srMmpqbU7qM4qWI2TBKi20O6KbXjpc7kXsH bJq2M0Ec0B2shWgm6s+JS2aG IronPort-SDR: Y367CMfUEkQnQgvot/seoHQB7LaLgcGmDEsHLMq6ISm8QO/h2J8mbECjbGDnpxB5hJ9AZMQNGl z67BxHVYN0ibz//R3z1//CrSQ+SL7LQa6oVPU/G66IPj7fmaQI166Y27udSNJ0SKGZPfejmlLU 3k8nbjzmFpeB25xCkXDpzD0TI9uwi5KHA4gdElBh4dXpbRxypAVy1RjoF3/OPLBjEOIcEre28+ N5A9fjTcsAReRxAZhhagjWd4tcOOv1oQkEUZqJeMX6N0DUybT1k/DvHGOACHuPvHAu9K1bVRBU Qo8= WDCIronportException: Internal From: Alistair Francis To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v2 2/2] RISC-V: Implement cpu_do_transaction_failed Date: Tue, 8 Oct 2019 13:51:52 -0700 Message-Id: X-Mailer: git-send-email 2.23.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x [fuzzy] X-Received-From: 68.232.141.245 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alistair23@gmail.com, palmer@sifive.com, alistair.francis@wdc.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Palmer Dabbelt This converts our port over from cpu_do_unassigned_access to cpu_do_transaction_failed, as cpu_do_unassigned_access has been deprecated. Signed-off-by: Palmer Dabbelt Signed-off-by: Alistair Francis Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- target/riscv/cpu.c | 2 +- target/riscv/cpu.h | 7 +++++-- target/riscv/cpu_helper.c | 11 +++++++---- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index f13e298a36..3939963b71 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -484,7 +484,7 @@ static void riscv_cpu_class_init(ObjectClass *c, void *= data) cc->gdb_stop_before_watchpoint =3D true; cc->disas_set_info =3D riscv_cpu_disas_set_info; #ifndef CONFIG_USER_ONLY - cc->do_unassigned_access =3D riscv_cpu_unassigned_access; + cc->do_transaction_failed =3D riscv_cpu_do_transaction_failed; cc->do_unaligned_access =3D riscv_cpu_do_unaligned_access; cc->get_phys_page_debug =3D riscv_cpu_get_phys_page_debug; #endif diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 124ed33ee4..8c64c68538 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -264,8 +264,11 @@ void riscv_cpu_do_unaligned_access(CPUState *cs, vadd= r addr, bool riscv_cpu_tlb_fill(CPUState *cs, vaddr address, int size, MMUAccessType access_type, int mmu_idx, bool probe, uintptr_t retaddr); -void riscv_cpu_unassigned_access(CPUState *cpu, hwaddr addr, bool is_write, - bool is_exec, int unused, unsigned size); +void riscv_cpu_do_transaction_failed(CPUState *cs, hwaddr physaddr, + vaddr addr, unsigned size, + MMUAccessType access_type, + int mmu_idx, MemTxAttrs attrs, + MemTxResult response, uintptr_t retad= dr); char *riscv_isa_string(RISCVCPU *cpu); void riscv_cpu_list(void); =20 diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index c82e7ed52b..917252f71b 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -408,20 +408,23 @@ hwaddr riscv_cpu_get_phys_page_debug(CPUState *cs, va= ddr addr) return phys_addr; } =20 -void riscv_cpu_unassigned_access(CPUState *cs, hwaddr addr, bool is_write, - bool is_exec, int unused, unsigned size) +void riscv_cpu_do_transaction_failed(CPUState *cs, hwaddr physaddr, + vaddr addr, unsigned size, + MMUAccessType access_type, + int mmu_idx, MemTxAttrs attrs, + MemTxResult response, uintptr_t retad= dr) { RISCVCPU *cpu =3D RISCV_CPU(cs); CPURISCVState *env =3D &cpu->env; =20 - if (is_write) { + if (access_type =3D=3D MMU_DATA_STORE) { cs->exception_index =3D RISCV_EXCP_STORE_AMO_ACCESS_FAULT; } else { cs->exception_index =3D RISCV_EXCP_LOAD_ACCESS_FAULT; } =20 env->badaddr =3D addr; - riscv_raise_exception(&cpu->env, cs->exception_index, GETPC()); + riscv_raise_exception(&cpu->env, cs->exception_index, retaddr); } =20 void riscv_cpu_do_unaligned_access(CPUState *cs, vaddr addr, --=20 2.23.0