From nobody Fri Oct 25 17:15:29 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1718187117; cv=none; d=zohomail.com; s=zohoarc; b=fCPg5ISM6p1uZndooKZjriEleDmT9kj4dkGsvHGGBmNaUOZ0lOHT5gpR+8ajrA14eWRoJ/PqyGtm9/q4/XAlJfh2pKcx/4Dc32QIzbKtYVMG4w75jztpz5ADmzzzTb9Bu7NlbSuc5hqd2IUaEywXJw6lFd3id9Zr4zak2wtf7Fc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1718187117; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:Sender:Subject:Subject:To:To:Message-Id; bh=1c8U4N99xdjNIRx8zEh8oD2mfgZftSdPjIm8i0TN1BM=; b=n7Iv571vUVtLq6A+bc3jnguX7jx7OpVqXM+Ng7dgUkL3Y/eAO0r/Om6bKkBJSBeAvsRxDLzRu4/AHyst23TQ9hFbpMtIzI2yl0BTxNzZ/9c2+38hf3l9GnI3lYOd+uHSz+ytyHfYUYnb1UQlj94ENuju2dYYar8JWLr/sGL8RHQ= ARC-Authentication-Results: i=1; mx.zohomail.com; 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1718187117390551.0904349806955; Wed, 12 Jun 2024 03:11:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sHKwo-0005Ow-Er; Wed, 12 Jun 2024 06:11:18 -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 1sHKwm-0005Ol-Qe for qemu-devel@nongnu.org; Wed, 12 Jun 2024 06:11:16 -0400 Received: from 59-120-53-16.hinet-ip.hinet.net ([59.120.53.16] helo=mail.andestech.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sHKwk-0001nJ-K0 for qemu-devel@nongnu.org; Wed, 12 Jun 2024 06:11:16 -0400 Received: from atcpcw16.andestech.com (10.0.1.106) by ATCPCS34.andestech.com (10.0.1.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.7; Wed, 12 Jun 2024 18:11:08 +0800 To: CC: , , , , , Ethan Chen Subject: [RFC PATCH] system/physmem: Support IOMMU granularity smaller than TARGET_PAGE size Date: Wed, 12 Jun 2024 18:10:59 +0800 Message-ID: <20240612101059.3647556-1-ethan84@andestech.com> X-Mailer: git-send-email 2.42.0.345.gaab89be2eb.dirty MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.0.1.106] X-ClientProxiedBy: ATCPCS33.andestech.com (10.0.1.100) To ATCPCS34.andestech.com (10.0.1.134) 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=59.120.53.16; envelope-from=ethan84@andestech.com; helo=mail.andestech.com X-Spam_score_int: -8 X-Spam_score: -0.9 X-Spam_bar: / X-Spam_report: (-0.9 / 5.0 requ) BAYES_00=-1.9, RDNS_DYNAMIC=0.982, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, TVD_RCVD_IP=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: , Reply-to: Ethan Chen From: Ethan Chen via Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1718187119171100003 Content-Type: text/plain; charset="utf-8" If the IOMMU granularity is smaller than TARGET_PAGE size, there may have multiple entries in the same page. Pass the origin address to IOMMU to get correct result Similar to the RISCV PMP solution, TLB_INVALID_MASK will be set when there = have multiple entries in the same page to check the IOMMU on every access. Signed-off-by: Ethan Chen --- accel/tcg/cputlb.c | 17 ++++++++++++++++- system/physmem.c | 4 ++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 117b516739..9c0db4d9e2 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -1062,8 +1062,23 @@ void tlb_set_page_full(CPUState *cpu, int mmu_idx, =20 prot =3D full->prot; asidx =3D cpu_asidx_from_attrs(cpu, full->attrs); - section =3D address_space_translate_for_iotlb(cpu, asidx, paddr_page, + section =3D address_space_translate_for_iotlb(cpu, asidx, full->phys_a= ddr, &xlat, &sz, full->attrs, &= prot); + /* Update page size */ + full->lg_page_size =3D ctz64(sz); + if (full->lg_page_size > TARGET_PAGE_BITS) { + full->lg_page_size =3D TARGET_PAGE_BITS; + } else { + sz =3D TARGET_PAGE_SIZE; + } + + is_ram =3D memory_region_is_ram(section->mr); + is_romd =3D memory_region_is_romd(section->mr); + /* If the translated mr is ram/rom, make xlat align the TARGET_PAGE */ + if (is_ram || is_romd) { + xlat &=3D TARGET_PAGE_MASK; + } + assert(sz >=3D TARGET_PAGE_SIZE); =20 tlb_debug("vaddr=3D%016" VADDR_PRIx " paddr=3D0x" HWADDR_FMT_plx diff --git a/system/physmem.c b/system/physmem.c index b7847db1a2..0fd0326714 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -702,6 +702,10 @@ address_space_translate_for_iotlb(CPUState *cpu, int a= sidx, hwaddr orig_addr, iotlb =3D imrc->translate(iommu_mr, addr, IOMMU_NONE, iommu_idx); addr =3D ((iotlb.translated_addr & ~iotlb.addr_mask) | (addr & iotlb.addr_mask)); + /* Update size */ + if (iotlb.addr_mask !=3D -1 && *plen > iotlb.addr_mask + 1) { + *plen =3D iotlb.addr_mask + 1; + } /* Update the caller's prot bits to remove permissions the IOMMU * is giving us a failure response for. If we get down to no * permissions left at all we can give up now. --=20 2.34.1