From nobody Mon Feb 9 05:01:20 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1616062501; cv=none; d=zohomail.com; s=zohoarc; b=SIsRXFuxNvUGFdRZV1c4gOHD2Ozplgy1x6ysOjn6N1AMvDBCBAzWRmF6/STr9E/HiLSirJq7LdU6gxhL718ufWGlba3x/0ahu+WiItW/ZWq24g+wGJQ0A11TcvQ6TyaqAS3qjIXSS3nFlcKDNI8QTSVkOAADEaFzNAh+ZSUhSgc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616062501; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=GPmVawULsDWDzc2AL6YzBoU9qI4rbrFjxnykvjGJcYI=; b=gTY9D4FNkTngR5aPJL0ubuFIL52QK3AY6xs2tNNN90wKMIkNrRm4fuaazaSbu/Eo2sZD6nI5Kq2Mu37FGF2Fwym6wmFnoG7mvoajqd8sqK9+aOBvuPaYyPh4QNC17CPeZXcjsmEsqpNPY64oWhNrI7Njf7x21tTyIy3CjOKSWaY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1616062501358122.76241714469256; Thu, 18 Mar 2021 03:15:01 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.98877.187843 (Exim 4.92) (envelope-from ) id 1lMpfn-0007Zm-UB; Thu, 18 Mar 2021 10:14:35 +0000 Received: by outflank-mailman (output) from mailman id 98877.187843; Thu, 18 Mar 2021 10:14:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lMpfn-0007Zf-Qw; Thu, 18 Mar 2021 10:14:35 +0000 Received: by outflank-mailman (input) for mailman id 98877; Thu, 18 Mar 2021 10:14:34 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lMpfm-0007ZU-DJ for xen-devel@lists.xenproject.org; Thu, 18 Mar 2021 10:14:34 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id f42204a6-c052-46cf-8a96-b10a1d5f3c30; Thu, 18 Mar 2021 10:14:33 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id DF035AD20; Thu, 18 Mar 2021 10:14:32 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: f42204a6-c052-46cf-8a96-b10a1d5f3c30 X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1616062473; h=from:from:reply-to: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=GPmVawULsDWDzc2AL6YzBoU9qI4rbrFjxnykvjGJcYI=; b=NEmSx4pvrG7l2F8X//6YOPn/o3iD96gvZjEg5yY6K9Fd+Tn+SZVl5rM3AqYLayF2+8nED1 ceIr53Mww7wBfDWSkuGjG5YlEGbjrEnHd+2zeIGp93U23cLvK31APitU3tVxDqsugiJvg2 hg/+EqIJGRdaiJ5/qYjVgvyQR5u5SSI= Subject: [PATCH 3/4][4.15?] VT-d: re-order register restoring in vtd_resume() From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Kevin Tian , Ian Jackson References: Message-ID: <04332d46-a595-3f42-71f8-a933048982ab@suse.com> Date: Thu, 18 Mar 2021 11:14:32 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) Content-Type: text/plain; charset="utf-8" For one FECTL must be written last - the interrupt shouldn't be unmasked without first having written the data and address needed to actually deliver it. In the common case (when dma_msi_set_affinity() doesn't end up bailing early) this happens from init_vtd_hw(), but for this to actually have the intended effect we shouldn't subsequently overwrite what was written there - this is only benign when old and new settings match. Instead we should restore the registers ahead of calling init_vtd_hw(), just for the unlikely case of dma_msi_set_affinity() bailing early. In the moved code drop some stray casts as well. Signed-off-by: Jan Beulich --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -2594,6 +2594,21 @@ static void vtd_resume(void) if ( !iommu_enabled ) return; =20 + for_each_drhd_unit ( drhd ) + { + iommu =3D drhd->iommu; + i =3D iommu->index; + + spin_lock_irqsave(&iommu->register_lock, flags); + dmar_writel(iommu->reg, DMAR_FEDATA_REG, + iommu_state[i][DMAR_FEDATA_REG]); + dmar_writel(iommu->reg, DMAR_FEADDR_REG, + iommu_state[i][DMAR_FEADDR_REG]); + dmar_writel(iommu->reg, DMAR_FEUADDR_REG, + iommu_state[i][DMAR_FEUADDR_REG]); + spin_unlock_irqrestore(&iommu->register_lock, flags); + } + if ( init_vtd_hw(true) !=3D 0 && force_iommu ) panic("IOMMU setup failed, crash Xen for security purpose\n"); =20 @@ -2605,12 +2620,6 @@ static void vtd_resume(void) spin_lock_irqsave(&iommu->register_lock, flags); dmar_writel(iommu->reg, DMAR_FECTL_REG, (u32) iommu_state[i][DMAR_FECTL_REG]); - dmar_writel(iommu->reg, DMAR_FEDATA_REG, - (u32) iommu_state[i][DMAR_FEDATA_REG]); - dmar_writel(iommu->reg, DMAR_FEADDR_REG, - (u32) iommu_state[i][DMAR_FEADDR_REG]); - dmar_writel(iommu->reg, DMAR_FEUADDR_REG, - (u32) iommu_state[i][DMAR_FEUADDR_REG]); spin_unlock_irqrestore(&iommu->register_lock, flags); =20 iommu_enable_translation(drhd);