From nobody Sat Nov 15 08:35:16 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1754059200; cv=none; d=zohomail.com; s=zohoarc; b=ZMxPKllDfEwo6k8NezOTjJFhXHCFBOqPxlw4UNDuGtY35WsmoXLDfSAcPpnYKxtQVIYwYhs6Ajf/6JvDlZGEkhv4eklRlY4HNqe6hUfnjtlSk1XA5hT9WHW081S2Lg6rhXm4qvMKBBxnGxNzeVOd349NO5kdR2UfHAsqmq2oFPE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754059200; h=Content-Type: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=vgmFtDgTAmGls1KrsF1UJKp0mhRKj20ErXb4GvRJyH4=; b=Ca8qlvLQ6uUgCSj8WksS+wh3YLuKntcTP/6JVl3WcnVvXD7nOyQmidI0U5pK2nfDoznZQ0mttKPR3xRJQBvIz0Yrldf+3gGbKuloLpybS9hfD5nLQfiJ0vHMxq0kse2UV2d2zuUqNp+wWkJInboXHm5vxg+3CBhk+W2eH9fYBrk= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1754059200210676.4822471751132; Fri, 1 Aug 2025 07:40:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uhqng-0007hX-0e; Fri, 01 Aug 2025 10:32:00 -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 1uhqhf-0005lv-2b for qemu-devel@nongnu.org; Fri, 01 Aug 2025 10:25:49 -0400 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 1uhqhZ-0002rj-Ne for qemu-devel@nongnu.org; Fri, 01 Aug 2025 10:25:43 -0400 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-502-l1aZ-_vcM1mlv7HeJcMdhg-1; Fri, 01 Aug 2025 10:25:39 -0400 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4588fb6854cso9271815e9.0 for ; Fri, 01 Aug 2025 07:25:39 -0700 (PDT) Received: from redhat.com ([2a0d:6fc0:1515:7300:62e6:253a:2a96:5e3]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-458af77e7d5sm12689775e9.0.2025.08.01.07.25.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Aug 2025 07:25:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1754058340; 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: in-reply-to:in-reply-to:references:references; bh=vgmFtDgTAmGls1KrsF1UJKp0mhRKj20ErXb4GvRJyH4=; b=NXIY2Bt8cPCMwie1SBAaV+W342vam5lek6DyDLhfJqYeujcqQraEqRjja/v1ZP5QIDn8+m sno5LNWC4i/0chwecAoWSUAXb3aK5xzaUIgjfeGmx0a7t1pHiBJ5kdq+GvDDb2GxzOlBtq 7GgIA+5BAdQ5dCDXoAKGn4T8aNkI/CA= X-MC-Unique: l1aZ-_vcM1mlv7HeJcMdhg-1 X-Mimecast-MFC-AGG-ID: l1aZ-_vcM1mlv7HeJcMdhg_1754058338 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754058338; x=1754663138; h=in-reply-to: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=vgmFtDgTAmGls1KrsF1UJKp0mhRKj20ErXb4GvRJyH4=; b=HsfJiLZpEuNuPf5FW4CaXAx4cnodMzFoPT6KbKLIxq9vgl879GCVUG3me6/BXy1V1g 5wM3D2q/kql4mPyfLrckYLBmI77zRgPWpF6HxAWZ5e20r4qRyKByv/CCycRD1VnBNr0X decEQFh/7qXFanTB9/QFLBd2K4Jl5unXbaLP7+orZnbYuKMEpAo4HpanpYFCHtqOquaR IHcvsF7aay93SYcmAHG2q6QUKXlbFsqVRlF3aViCDhPi4TLdrqCdvoujSfNMRHApTQt2 visG3ebUtbRSAmTdMecC47XjiGFGt1YZWLM3BWC8AOz/7RoI28kcHP28zDNslwJf+4ZC 8g8A== X-Gm-Message-State: AOJu0YxEHUrndJNAewkPtEEyJ+5yPmleodORVh+2vGptLy38IOwcMZxW JP3pwsSiBXxBHJZPKr+MlPngbmicI3YQmFfdZJMLyR4u8WZJXcgtVcOLeyBx9S5pAD290zmoFP6 lP3TIA1mDl0mKJH4+/kQCbh9iqDn+PTp/3glYTdWWHzR81IHTnPkIR/qIlbsN+Mel9LgUh7Id1V 56r6FarhdcTTtCc61qNvHEgirLGBFfDE1c9w== X-Gm-Gg: ASbGncs0qVh7ZOTwQbr+LtwsnKyBxo63gt7prh8NXg2vt7GH9oPuq/8WiAluE0OOQl+ 4+xP/LSDLbB8VYlhV12iwqMNo14MUO3Vet2NTA4x5uuNnNfEk2C0S3coINT4jnLhwm10YvMTJLJ etDtY711WQ9/kEsmSuaLasVJYNVieFLTQRRKrHCITuVvARcL6t4romGXXO6/XJSwjbY7EoDCujm AsBo6q+pSlImyW+dGkMtkMWy89+YOb/nVnIoxz1yQEK6YTKXgp7XuqlI497oRdWWXB+xO1nXuIQ Ekh7HbPFwSYuwjdeUnL4JHMEujzcZysn X-Received: by 2002:a05:600c:1da8:b0:456:1006:5415 with SMTP id 5b1f17b1804b1-45892b92eb2mr101941035e9.6.1754058337608; Fri, 01 Aug 2025 07:25:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEl0NeQa4oobAXZ1gqHmJj27ixyO2S+aobjlaO9fdfdKRxhWHZg95Kc9OXyJpN1+EvwMq47qQ== X-Received: by 2002:a05:600c:1da8:b0:456:1006:5415 with SMTP id 5b1f17b1804b1-45892b92eb2mr101940645e9.6.1754058337116; Fri, 01 Aug 2025 07:25:37 -0700 (PDT) Date: Fri, 1 Aug 2025 10:25:34 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , David Woodhouse , Jason Wang , Yi Liu , =?utf-8?Q?Cl=C3=A9ment?= Mathieu--Drif , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson , Eduardo Habkost Subject: [PULL 15/17] intel_iommu: Allow both Status Write and Interrupt Flag in QI wait Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline 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: -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, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-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: 1754059201797124100 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: David Woodhouse FreeBSD does both, and this appears to be perfectly valid. The VT-d spec even talks about the ordering (the status write should be done first, unsurprisingly). We certainly shouldn't assert() and abort QEMU if the guest asks for both. Fixes: ed7b8fbcfb88 ("intel-iommu: add supports for queued invalidation int= erface") Closes: https://gitlab.com/qemu-project/qemu/-/issues/3028 Signed-off-by: David Woodhouse Message-Id: <0122cbabc0adcc3cf878f5fd7834d8f258c7a2f2.camel@infradead.org> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/i386/intel_iommu.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index fe9a5f2872..83c5e44413 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -2828,6 +2828,7 @@ static bool vtd_process_wait_desc(IntelIOMMUState *s,= VTDInvDesc *inv_desc) { uint64_t mask[4] =3D {VTD_INV_DESC_WAIT_RSVD_LO, VTD_INV_DESC_WAIT_RSV= D_HI, VTD_INV_DESC_ALL_ONE, VTD_INV_DESC_ALL_ONE}; + bool ret =3D true; =20 if (!vtd_inv_desc_reserved_check(s, inv_desc, mask, false, __func__, "wait")) { @@ -2839,8 +2840,6 @@ static bool vtd_process_wait_desc(IntelIOMMUState *s,= VTDInvDesc *inv_desc) uint32_t status_data =3D (uint32_t)(inv_desc->lo >> VTD_INV_DESC_WAIT_DATA_SHIFT); =20 - assert(!(inv_desc->lo & VTD_INV_DESC_WAIT_IF)); - /* FIXME: need to be masked with HAW? */ dma_addr_t status_addr =3D inv_desc->hi; trace_vtd_inv_desc_wait_sw(status_addr, status_data); @@ -2849,18 +2848,22 @@ static bool vtd_process_wait_desc(IntelIOMMUState *= s, VTDInvDesc *inv_desc) &status_data, sizeof(status_data), MEMTXATTRS_UNSPECIFIED)) { trace_vtd_inv_desc_wait_write_fail(inv_desc->hi, inv_desc->lo); - return false; + ret =3D false; } - } else if (inv_desc->lo & VTD_INV_DESC_WAIT_IF) { + } + + if (inv_desc->lo & VTD_INV_DESC_WAIT_IF) { /* Interrupt flag */ vtd_generate_completion_event(s); - } else { + } + + if (!(inv_desc->lo & (VTD_INV_DESC_WAIT_IF | VTD_INV_DESC_WAIT_SW))) { error_report_once("%s: invalid wait desc: hi=3D%"PRIx64", lo=3D%"P= RIx64 " (unknown type)", __func__, inv_desc->hi, inv_desc->lo); return false; } - return true; + return ret; } =20 static bool vtd_process_context_cache_desc(IntelIOMMUState *s, --=20 MST