From patchwork Fri Apr 1 12:22:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ralf Ramsauer X-Patchwork-Id: 1612195 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=oth-regensburg.de header.i=@oth-regensburg.de header.a=rsa-sha256 header.s=mta01-20211122 header.b=Higyc0ci; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KVK8n0xRhz9sV6 for ; Fri, 1 Apr 2022 23:23:51 +1100 (AEDT) Received: from localhost ([::1]:33194 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1naGJg-00053J-4o for incoming@patchwork.ozlabs.org; Fri, 01 Apr 2022 08:23:48 -0400 Received: from eggs.gnu.org ([209.51.188.92]:38282) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naGIx-00052v-GE for qemu-devel@nongnu.org; Fri, 01 Apr 2022 08:23:05 -0400 Received: from [2001:638:a01:1096::11] (port=51454 helo=mta01.hs-regensburg.de) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1naGIv-0004ps-F9 for qemu-devel@nongnu.org; Fri, 01 Apr 2022 08:23:02 -0400 Received: from E16S03.hs-regensburg.de (e16s03.hs-regensburg.de [IPv6:2001:638:a01:8013::93]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "E16S03", Issuer "E16S03" (not verified)) by mta01.hs-regensburg.de (Postfix) with ESMTPS id 4KVK7l23sFzxvK; Fri, 1 Apr 2022 14:22:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oth-regensburg.de; s=mta01-20211122; t=1648815779; bh=L9OOR+LsgELV0+rnmajakzDm+GoENflL7WtxnPHV/Go=; h=From:To:CC:Subject:Date:From; b=Higyc0ci9bkG4QKlTGdNITlUbPoI8nYxYQGKRG0LphRcn6VVHOqIau6ABWUxmo/MD AySl0lw9e2ytNEUvUMBzgFgu5mygNrOuG1AUq7PEJsX/0m3BnvLNbHm4nw2dKzUc76 vFZg+Ant/Enj203IyVVfpWWiXdvsbGUczFO1ntVUKgjQh9Xw7H4SaDTh1fZ4g8tqnb 6YK6gXH4ZpZjn05F7e13a7NeAoe1l+UTQaeyTdPPgopl8J1cgXcWE2BZwxsl0AsX+7 rrgDx+2hunhqbxU76nuGoP1l8JluXrAkadaS4UwDm3Gvzxa+ODFWrYbKtmEVBiMwOh pkVFjelYPPY1g== Received: from localhost.localdomain (2001:638:a01:8013::138) by E16S03.hs-regensburg.de (2001:638:a01:8013::93) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Fri, 1 Apr 2022 14:22:58 +0200 From: Ralf Ramsauer To: Palmer Dabbelt , Alistair Francis , , , Stefan Huber Subject: [PATCH] target/riscv: Fix incorrect PTE merge in walk_pte Date: Fri, 1 Apr 2022 14:22:48 +0200 Message-ID: <20220401122248.2792180-1-ralf.ramsauer@oth-regensburg.de> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Originating-IP: [2001:638:a01:8013::138] X-ClientProxiedBy: E16S04.hs-regensburg.de (2001:638:a01:8013::94) To E16S03.hs-regensburg.de (2001:638:a01:8013::93) X-Host-Lookup-Failed: Reverse DNS lookup failed for 2001:638:a01:1096::11 (failed) Received-SPF: pass client-ip=2001:638:a01:1096::11; envelope-from=ralf.ramsauer@oth-regensburg.de; helo=mta01.hs-regensburg.de X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 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, RDNS_NONE=0.793, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: Bin Meng , Konrad Schwarz , Ralf Ramsauer Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Two non-subsequent PTEs can be mapped to subsequent paddrs. In this case, walk_pte will erroneously merge them. Enforce the split up, by tracking the virtual base address. Let's say we have the mapping: 0x81200000 -> 0x89623000 (4K) 0x8120f000 -> 0x89624000 (4K) Before, walk_pte would have shown: vaddr paddr size attr ---------------- ---------------- ---------------- ------- 0000000081200000 0000000089623000 0000000000002000 rwxu-ad as it only checks for subsequent paddrs. With this patch, it becomes: vaddr paddr size attr ---------------- ---------------- ---------------- ------- 0000000081200000 0000000089623000 0000000000001000 rwxu-ad 000000008120f000 0000000089624000 0000000000001000 rwxu-ad Signed-off-by: Ralf Ramsauer Reviewed-by: Richard Henderson --- target/riscv/monitor.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/target/riscv/monitor.c b/target/riscv/monitor.c index 7efb4b62c1..60e3edd0ad 100644 --- a/target/riscv/monitor.c +++ b/target/riscv/monitor.c @@ -84,6 +84,7 @@ static void walk_pte(Monitor *mon, hwaddr base, target_ulong start, { hwaddr pte_addr; hwaddr paddr; + target_ulong last_start = -1; target_ulong pgsize; target_ulong pte; int ptshift; @@ -116,13 +117,15 @@ static void walk_pte(Monitor *mon, hwaddr base, target_ulong start, * contiguous mapped block details. */ if ((*last_attr != attr) || - (*last_paddr + *last_size != paddr)) { + (*last_paddr + *last_size != paddr) || + (last_start + *last_size != start)) { print_pte(mon, va_bits, *vbase, *pbase, *last_paddr + *last_size - *pbase, *last_attr); *vbase = start; *pbase = paddr; *last_attr = attr; + last_start = start; } *last_paddr = paddr;