From nobody Sun Apr 6 20:49:06 2025 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=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1736965113; cv=none; d=zohomail.com; s=zohoarc; b=j9WdO5pvsZymZ8F8MooKoJmnBqSNrVezEoXJ9RJUIFP7k5EY9+PnF3n7d7WXpJdY2c251OyHHRHQeclfCy3SHtaaSPjkxd3yl1+CvtFjH2v85HPqeaRqRMhh0UGfFCEXWwm0OETt2tDgNrjWOg4vQI1hT1ySXNBMxpD0lwcK2TI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1736965113; h=Content-Type: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=yUuOMI9pfBriuw1YERiIKw5x8dB/u/FGXCgcdZJucXc=; b=VM2E0WFTFtwhbhkLG8elnrAqi8sEsGDiU6LjgQxgLzCna+tMssEYuTGwuY0QYfgusShoxWpaPvrOGG+a2PqAehyAU3Ryl7VgvSrwKTigXe+HAnXpXZx98Ar8hb76uhceUgIo1683JQQTU5IK+bmGQ8LcwGGMJebOC46Pm41R7W0= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1736965113015434.93018594354646; Wed, 15 Jan 2025 10:18:33 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tY7s3-0005kb-4s; Wed, 15 Jan 2025 13:12:03 -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 1tY7pV-0006cx-75 for qemu-devel@nongnu.org; Wed, 15 Jan 2025 13:09:27 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tY7pT-0006cO-IH for qemu-devel@nongnu.org; Wed, 15 Jan 2025 13:09:24 -0500 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-594-gfFyaFlKPgCbUcoPmMp7Kw-1; Wed, 15 Jan 2025 13:09:15 -0500 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-436289a570eso32469415e9.0 for ; Wed, 15 Jan 2025 10:09:15 -0800 (PST) Received: from redhat.com ([2a0d:6fc7:342:db8c:4ec4:322b:a6a8:f411]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-437c74c57ebsm30955795e9.20.2025.01.15.10.09.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jan 2025 10:09:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1736964563; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yUuOMI9pfBriuw1YERiIKw5x8dB/u/FGXCgcdZJucXc=; b=JnSLgxo9FOoDVnMXeD+jlOrQGUDjlg7P4ZMChVFo1N+UX6I3zvltKrIqfJcvzl0MmNMz6s enXjAyymgVum2MwbwPyvRR8ke4PKOoKHBA41xN0Sw19mbIY7zJpLaqLpitzl0U/pMXGHng H8W9rYrEGL9cLKAjcnTzWeGh1jmNyv8= X-MC-Unique: gfFyaFlKPgCbUcoPmMp7Kw-1 X-Mimecast-MFC-AGG-ID: gfFyaFlKPgCbUcoPmMp7Kw X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736964554; x=1737569354; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=yUuOMI9pfBriuw1YERiIKw5x8dB/u/FGXCgcdZJucXc=; b=kevC4j0yh3e2zp1O+bo0X2oeQqvcchy9cVpt3XdBNIyzSIn8xqN7pkdin2IO1jOcxb KyfowI9PeWVFaaIWTddk1rxB7uqsLnxBpFcpigIk4ttUTU9bg3ZvEafPYix/i9NSmfB9 fQ4aDNI06p9Ai4uWb9rAYiUojZQL5tGBx9VMs0O1AUDf8vuIp+c/4ciSPGYa5FgoKg0t wvTsgwo5CC4TtncAC8f4cS9u1nju7ZL4k4fbq1KCVEKa5RqA32wiWhHsxbHgBtZe9mE4 m+ys2GtvSloX0JF7IPBteEjMF6KGWg96SpKqCU3FWQscoFjZ6+2P2kP8gsLE8SUnSDKD MfSQ== X-Gm-Message-State: AOJu0Yw51C6jODsv10IxFM5Z51zIQKjt7tZsQTEi+OCkG3AOmTZKlPsH DgdE39qWuG67TfP3imrTx/kB/USP7l501fyW/vYbkkTiw6d8IuEV3fUyG1JDrko51K2XadmwOu1 uzFp17fZp12uLGze1bvcFsvEv68XJdcusyfXTlIOsTLFyet3mVcv8CthmEoBMuCqaM0/2HZwgA2 aUoNuXXKDS5gSuSPhddWrhmrvKgruXKg== X-Gm-Gg: ASbGncux5kqQO9bJuIkN2TpqIgKtu176AaCyTuyNtlZgh1iCYNXv4MldQXNBDPD2TPT SwhYae923iXpZbwShZc8Ae0FTBqhT3TFx5QlreSfVcR+Wbt2qsHeZJCgKIdKpwhMS5Z1menqHTg +dOfaAT3aBHcsN1Zxdr1Wm4N+QpWjbVnAAD/nMlmRdhkkZae2+41/5IjpRyfRn1VU4Fbivkoj06 hf7omVzsyCRZu7vF7WizgwYeSiEUYC0VRW3pLLVqWUlthr01C1V X-Received: by 2002:a05:600c:1d03:b0:434:a781:f5d9 with SMTP id 5b1f17b1804b1-436e2697b32mr267376865e9.11.1736964554100; Wed, 15 Jan 2025 10:09:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IHIneviXe17E+o3PnIig6VgM4OSau0R4EuAn4Q68ISo5oYe0VQd0Zlj4WjPCyDIeDVJQrnMZQ== X-Received: by 2002:a05:600c:1d03:b0:434:a781:f5d9 with SMTP id 5b1f17b1804b1-436e2697b32mr267376405e9.11.1736964553624; Wed, 15 Jan 2025 10:09:13 -0800 (PST) Date: Wed, 15 Jan 2025 13:09:10 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , =?utf-8?Q?Cl=C3=A9ment?= Mathieu--Drif , Zhenzhong Duan , Yi Liu , Jason Wang , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson , Eduardo Habkost Subject: [PULL 14/48] intel_iommu: Set accessed and dirty bits during stage-1 translation Message-ID: <65c4f0999991f6321d6a369fa56c81c57c5b87ad.1736964488.git.mst@redhat.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent 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=170.10.133.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -39 X-Spam_score: -4.0 X-Spam_bar: ---- X-Spam_report: (-4.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.141, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1.793, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, 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 @redhat.com) X-ZM-MESSAGEID: 1736965115242019000 From: Cl=C3=A9ment Mathieu--Drif Signed-off-by: Cl=C3=A9ment Mathieu--Drif Signed-off-by: Zhenzhong Duan Reviewed-by: Yi Liu Acked-by: Jason Wang Message-Id: <20241212083757.605022-10-zhenzhong.duan@intel.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/i386/intel_iommu_internal.h | 3 +++ hw/i386/intel_iommu.c | 25 ++++++++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/hw/i386/intel_iommu_internal.h b/hw/i386/intel_iommu_internal.h index 3e7365dfff..22dd3faf0c 100644 --- a/hw/i386/intel_iommu_internal.h +++ b/hw/i386/intel_iommu_internal.h @@ -332,6 +332,7 @@ typedef enum VTDFaultReason { =20 /* Output address in the interrupt address range for scalable mode */ VTD_FR_SM_INTERRUPT_ADDR =3D 0x87, + VTD_FR_FS_BIT_UPDATE_FAILED =3D 0x91, /* SFS.10 */ VTD_FR_MAX, /* Guard */ } VTDFaultReason; =20 @@ -564,6 +565,8 @@ typedef struct VTDRootEntry VTDRootEntry; #define VTD_FL_P 1ULL #define VTD_FL_RW (1ULL << 1) #define VTD_FL_US (1ULL << 2) +#define VTD_FL_A (1ULL << 5) +#define VTD_FL_D (1ULL << 6) =20 /* Second Level Page Translation Pointer*/ #define VTD_SM_PASID_ENTRY_SLPTPTR (~0xfffULL) diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index d53ce01e82..0aeb0dbde9 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -1806,6 +1806,7 @@ static const bool vtd_qualified_faults[] =3D { [VTD_FR_FS_PAGING_ENTRY_US] =3D true, [VTD_FR_SM_WRITE] =3D true, [VTD_FR_SM_INTERRUPT_ADDR] =3D true, + [VTD_FR_FS_BIT_UPDATE_FAILED] =3D true, [VTD_FR_MAX] =3D false, }; =20 @@ -1925,6 +1926,20 @@ static bool vtd_iova_fl_check_canonical(IntelIOMMUSt= ate *s, uint64_t iova, } } =20 +static MemTxResult vtd_set_flag_in_pte(dma_addr_t base_addr, uint32_t inde= x, + uint64_t pte, uint64_t flag) +{ + if (pte & flag) { + return MEMTX_OK; + } + pte |=3D flag; + pte =3D cpu_to_le64(pte); + return dma_memory_write(&address_space_memory, + base_addr + index * sizeof(pte), + &pte, sizeof(pte), + MEMTXATTRS_UNSPECIFIED); +} + /* * Given the @iova, get relevant @flptep. @flpte_level will be the last le= vel * of the translation, can be used for deciding the size of large page. @@ -1938,7 +1953,7 @@ static int vtd_iova_to_flpte(IntelIOMMUState *s, VTDC= ontextEntry *ce, dma_addr_t addr =3D vtd_get_iova_pgtbl_base(s, ce, pasid); uint32_t level =3D vtd_get_iova_level(s, ce, pasid); uint32_t offset; - uint64_t flpte; + uint64_t flpte, flag_ad =3D VTD_FL_A; =20 if (!vtd_iova_fl_check_canonical(s, iova, ce, pasid)) { error_report_once("%s: detected non canonical IOVA (iova=3D0x%" PR= Ix64 "," @@ -1985,6 +2000,14 @@ static int vtd_iova_to_flpte(IntelIOMMUState *s, VTD= ContextEntry *ce, return -VTD_FR_FS_PAGING_ENTRY_RSVD; } =20 + if (vtd_is_last_pte(flpte, level) && is_write) { + flag_ad |=3D VTD_FL_D; + } + + if (vtd_set_flag_in_pte(addr, offset, flpte, flag_ad) !=3D MEMTX_O= K) { + return -VTD_FR_FS_BIT_UPDATE_FAILED; + } + if (vtd_is_last_pte(flpte, level)) { *flptep =3D flpte; *flpte_level =3D level; --=20 MST