From nobody Sat Apr 20 11:42:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1575027040; cv=none; d=zohomail.com; s=zohoarc; b=b0dDIXvkwH6DsS/0qNTK3OCIZTuepdGmHjBiExhZ5nnh4xdXlxEshEUDYaWmcgV/zrW4BBXBxHLaM5Jo5b6EOGXea4y7pwKe97yXYzFvLeoL1UdULmN+85sKrzCmlM1kg0c+EwWgQAPNy1EvNFcGARPkIk9WNi4H2mpSoPEPnMs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575027040; 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=IgqNiITSBZeviBlKqvtpCJnCCugAN6vRPbwayI9hgoM=; b=IDDxXqkP3W64PsMmRFpt4OdMNxOXbH5ZZqBybysoqs1Qq/uv3tGS1NHPpIgMmwRkVeKVEloAHmBCBHoKTGaMv1lGZArAT9qsG5QSGsdMju130SY/MrtSDcXocQkOdio1jVUVbdXk3bp48OFqFW4terDBdelcaTVcexVtlFQrMBw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none 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 1575027040715832.4397572719652; Fri, 29 Nov 2019 03:30:40 -0800 (PST) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iaeSx-0006qN-Uf; Fri, 29 Nov 2019 11:29:39 +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.89) (envelope-from ) id 1iaeSw-0006qG-Rk for xen-devel@lists.xenproject.org; Fri, 29 Nov 2019 11:29:38 +0000 Received: from esa1.hc3370-68.iphmx.com (unknown [216.71.145.142]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 8615b07e-129b-11ea-a3e3-12813bfff9fa; Fri, 29 Nov 2019 11:29:37 +0000 (UTC) X-Inumbo-ID: 8615b07e-129b-11ea-a3e3-12813bfff9fa DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1575026978; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=XUYFi2R2qXQsUBynqEbA0UN2CXp44zL7+ww6QKkSEyY=; b=FXKvS/emJXthtKGMyAGAndxvP7PM6zmozaq0d75gt6yeFPMlFcc0mj9q vipUCW4SaRAMLM3CdTQkah5reDXm1dQmMd9dod0btmExiUkoUuB32nRh1 bqFnZ2D6yZ/Y1XkHFh1qvvU8R6zMwFLIjVBOhe9l1WjmbopU1PWw9ETtb 4=; Authentication-Results: esa1.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=roger.pau@citrix.com; spf=Pass smtp.mailfrom=roger.pau@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: None (esa1.hc3370-68.iphmx.com: no sender authenticity information available from domain of roger.pau@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa1.hc3370-68.iphmx.com; envelope-from="roger.pau@citrix.com"; x-sender="roger.pau@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa1.hc3370-68.iphmx.com: domain of roger.pau@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa1.hc3370-68.iphmx.com; envelope-from="roger.pau@citrix.com"; x-sender="roger.pau@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ip4:168.245.78.127 ~all" Received-SPF: None (esa1.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa1.hc3370-68.iphmx.com; envelope-from="roger.pau@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: zrdiOabcACzS85etsYCph7G63eKZAhY37Mh05bDtkSNhvDVpfeODCdiL5PFQMGln5/Dj/2toBU RmKlGtY56Ax9TN6+oLIm6JPTq5ou1WekGWi8/TnB7lB5xl2fxfndSjsnvzvMlog+Yh4fJavzI9 Zaya4HabWD39jAJGoAT+oOunvHFygja3y8DVHI7G1eZe/JIvKlPmOmrzA/8/MXEaUPxNHt5lrK DR76uzA4jYEFlHI23QAG10Ux1oIKFWcHqhI83Ubhrf32M6H/pB7+rw125RECrmgRLfQQVZqN7H XEM= X-SBRS: 2.7 X-MesageID: 9108564 X-Ironport-Server: esa1.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.69,257,1571716800"; d="scan'208";a="9108564" From: Roger Pau Monne To: Date: Fri, 29 Nov 2019 12:28:48 +0100 Message-ID: <20191129112851.19273-2-roger.pau@citrix.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191129112851.19273-1-roger.pau@citrix.com> References: <20191129112851.19273-1-roger.pau@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH v2 1/4] x86/ioapic: only use dest32 with x2apic and interrupt remapping enabled X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Andrew Cooper , Wei Liu , Jan Beulich , Roger Pau Monne Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The IO-APIC code assumes that x2apic being enabled also implies interrupt remapping being enabled, and hence will use the 32bit destination field in the IO-APIC entry. This is safe now, but there's no reason to not enable x2APIC even without interrupt remapping, and hence the IO-APIC code needs to use the 32 bit destination field only when both interrupt remapping and x2APIC are enabled. Signed-off-by: Roger Pau Monn=C3=A9 --- Changes since v1: - Fix set_ioapic_affinity_irq. --- xen/arch/x86/io_apic.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index 97cb2d154a..be0b085513 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -562,7 +562,7 @@ set_ioapic_affinity_irq(struct irq_desc *desc, const cp= umask_t *mask) =20 dest =3D set_desc_affinity(desc, mask); if (dest !=3D BAD_APICID) { - if ( !x2apic_enabled ) + if ( !iommu_intremap ) dest =3D SET_APIC_LOGICAL_ID(dest); entry =3D irq_2_pin + irq; for (;;) { @@ -964,7 +964,7 @@ static hw_irq_controller ioapic_edge_type; #define IOAPIC_LEVEL 1 =20 #define SET_DEST(ent, mode, val) do { \ - if (x2apic_enabled) \ + if (x2apic_enabled && iommu_intremap) \ (ent).dest.dest32 =3D (val); \ else \ (ent).dest.mode.mode##_dest =3D (val); \ @@ -1194,14 +1194,14 @@ static void /*__init*/ __print_IO_APIC(bool boot) printk(KERN_DEBUG ".... IRQ redirection table:\n"); =20 printk(KERN_DEBUG " NR %s Msk Trg IRR Pol Stat DstM DelM Vec\n", - x2apic_enabled ? " DestID" : "Dst"); + (x2apic_enabled && iommu_intremap) ? " DestID" : "Dst"); =20 for (i =3D 0; i <=3D reg_01.bits.entries; i++) { struct IO_APIC_route_entry entry; =20 entry =3D ioapic_read_entry(apic, i, 0); =20 - if ( x2apic_enabled ) + if ( x2apic_enabled && iommu_intremap ) printk(KERN_DEBUG " %02x %08x", i, entry.dest.dest32); else printk(KERN_DEBUG " %02x %02x ", i, @@ -2504,9 +2504,9 @@ void dump_ioapic_irq_info(void) rte.dest_mode ? 'L' : 'P', rte.delivery_status, rte.polarity, rte.irr, rte.trigger ? 'L' : 'E', rte.mask, - x2apic_enabled ? 8 : 2, - x2apic_enabled ? rte.dest.dest32 - : rte.dest.logical.logical_dest); + (x2apic_enabled && iommu_intremap) ? 8 : 2, + (x2apic_enabled && iommu_intremap) ? + rte.dest.dest32 : rte.dest.logical.logical_dest); =20 if ( entry->next =3D=3D 0 ) break; --=20 2.24.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel