From nobody Mon Feb 9 10:58:25 2026 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=1665294803; cv=none; d=zohomail.com; s=zohoarc; b=BrYswzi0f/WF60MQPMrpddE8eGWXyAetP2xpXzzcYQ5a9zWWIs/WfdhnXHuW8bUIQELumXgX6VlE1vl0I00lXKYajjMV3r85Y0blDLKtvMu77jEli9k8ceVlCP2+j0epPfnPNq1i4oQ8ZKprnirJ7pMOqK/DZC+dVrrIXgUfc/M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1665294803; 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=pxj5eQC5tiU7j1h3XqBwm6nGmkkeJwGrj22dmyiBSBs=; b=MSL7jhrHrfIHYspvr4ZiWasttGeuvlesr80ElPyBW1pvddhMKl4gShR1wVQ0XatpOu8zOGSAM6UfdvGowgbVJIbE+w7VGOMqFlCMYBmx/boSvecgr8tv+tiN/H6ED3hExVRRCqQiNQXWQyRfNE1jaZjojb/hVkhKg57wcozho0s= 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 1665294803101387.40500630935117; Sat, 8 Oct 2022 22:53:23 -0700 (PDT) Received: from localhost ([::1]:41286 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ohPFZ-0006wA-VZ for importer@patchew.org; Sun, 09 Oct 2022 01:53:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45522) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ohPBL-0002et-PU for qemu-devel@nongnu.org; Sun, 09 Oct 2022 01:48:59 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:53468) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ohPBJ-0005PH-T9 for qemu-devel@nongnu.org; Sun, 09 Oct 2022 01:48:59 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-557-7zOECRjxOvqfIwJxW4VfiA-1; Sun, 09 Oct 2022 01:48:55 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6FFC129AB3F7; Sun, 9 Oct 2022 05:48:55 +0000 (UTC) Received: from localhost.localdomain (ovpn-12-61.pek2.redhat.com [10.72.12.61]) by smtp.corp.redhat.com (Postfix) with ESMTP id BF5522166B4D; Sun, 9 Oct 2022 05:48:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1665294537; 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=pxj5eQC5tiU7j1h3XqBwm6nGmkkeJwGrj22dmyiBSBs=; b=eACt45xZYspHq2WBhxKWkS9UfayIlZUW9GRI4NF15iC3oQC0CmUGGV9WzalhFpDlpcxiEV XCbqrGPJCmby2OIInua7pdxv7irZT5iIyW1oxd+3R3uUNp12Cpdph7SJ7naRLTId08XnG/ kvujKNVCtJKe0HjO41xgNhEXRzKqTUI= X-MC-Unique: 7zOECRjxOvqfIwJxW4VfiA-1 From: Jason Wang To: mst@redhat.com, peterx@redhat.com Cc: qemu-devel@nongnu.org, yi.l.liu@intel.com, yi.y.sun@linux.intel.com, Jason Wang Subject: [PATCH V3 3/4] intel-iommu: convert VTD_PE_GET_FPD_ERR() to be a function Date: Sun, 9 Oct 2022 13:48:34 +0800 Message-Id: <20221009054835.1540-4-jasowang@redhat.com> In-Reply-To: <20221009054835.1540-1-jasowang@redhat.com> References: <20221009054835.1540-1-jasowang@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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.129.124; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1665294803831100001 Content-Type: text/plain; charset="utf-8" We used to have a macro for VTD_PE_GET_FPD_ERR() but it has an internal goto which prevents it from being reused. This patch convert that macro to a dedicated function and let the caller to decide what to do (e.g using goto or not). This makes sure it can be re-used for other function that requires fault reporting. Signed-off-by: Jason Wang Reviewed-by: Peter Xu --- Changes since V2: - rename vtd_qualify_report_fault() to vtd_report_qualify_fault() --- hw/i386/intel_iommu.c | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index 3bf28e7f47..0d534c9e93 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -49,17 +49,6 @@ /* pe operations */ #define VTD_PE_GET_TYPE(pe) ((pe)->val[0] & VTD_SM_PASID_ENTRY_PGTT) #define VTD_PE_GET_LEVEL(pe) (2 + (((pe)->val[0] >> 2) & VTD_SM_PASID_ENTR= Y_AW)) -#define VTD_PE_GET_FPD_ERR(ret_fr, is_fpd_set, s, source_id, addr, is_writ= e) {\ - if (ret_fr) { = \ - ret_fr =3D -ret_fr; = \ - if (is_fpd_set && vtd_is_qualified_fault(ret_fr)) { = \ - trace_vtd_fault_disabled(); = \ - } else { = \ - vtd_report_dmar_fault(s, source_id, addr, ret_fr, is_write); = \ - } = \ - goto error; = \ - } = \ -} =20 /* * PCI bus number (or SID) is not reliable since the device is usaully @@ -1718,6 +1707,19 @@ out: trace_vtd_pt_enable_fast_path(source_id, success); } =20 +static void vtd_report_qualify_fault(IntelIOMMUState *s, + int err, bool is_fpd_set, + uint16_t source_id, + hwaddr addr, + bool is_write) +{ + if (is_fpd_set && vtd_is_qualified_fault(err)) { + trace_vtd_fault_disabled(); + } else { + vtd_report_dmar_fault(s, source_id, addr, err, is_write); + } +} + /* Map dev to context-entry then do a paging-structures walk to do a iommu * translation. * @@ -1778,7 +1780,11 @@ static bool vtd_do_iommu_translate(VTDAddressSpace *= vtd_as, PCIBus *bus, is_fpd_set =3D ce.lo & VTD_CONTEXT_ENTRY_FPD; if (!is_fpd_set && s->root_scalable) { ret_fr =3D vtd_ce_get_pasid_fpd(s, &ce, &is_fpd_set); - VTD_PE_GET_FPD_ERR(ret_fr, is_fpd_set, s, source_id, addr, is_= write); + if (ret_fr) { + vtd_report_qualify_fault(s, -ret_fr, is_fpd_set, + source_id, addr, is_write); + goto error; + } } } else { ret_fr =3D vtd_dev_to_context_entry(s, bus_num, devfn, &ce); @@ -1786,7 +1792,11 @@ static bool vtd_do_iommu_translate(VTDAddressSpace *= vtd_as, PCIBus *bus, if (!ret_fr && !is_fpd_set && s->root_scalable) { ret_fr =3D vtd_ce_get_pasid_fpd(s, &ce, &is_fpd_set); } - VTD_PE_GET_FPD_ERR(ret_fr, is_fpd_set, s, source_id, addr, is_writ= e); + if (ret_fr) { + vtd_report_qualify_fault(s, -ret_fr, is_fpd_set, + source_id, addr, is_write); + goto error; + } /* Update context-cache */ trace_vtd_iotlb_cc_update(bus_num, devfn, ce.hi, ce.lo, cc_entry->context_cache_gen, @@ -1822,7 +1832,11 @@ static bool vtd_do_iommu_translate(VTDAddressSpace *= vtd_as, PCIBus *bus, =20 ret_fr =3D vtd_iova_to_slpte(s, &ce, addr, is_write, &slpte, &level, &reads, &writes, s->aw_bits); - VTD_PE_GET_FPD_ERR(ret_fr, is_fpd_set, s, source_id, addr, is_write); + if (ret_fr) { + vtd_report_qualify_fault(s, -ret_fr, is_fpd_set, source_id, + addr, is_write); + goto error; + } =20 page_mask =3D vtd_slpt_level_page_mask(level); access_flags =3D IOMMU_ACCESS_FLAG(reads, writes); --=20 2.25.1