From patchwork Wed Dec 4 16:20:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 11273275 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3032B930 for ; Wed, 4 Dec 2019 16:21:43 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0D19E206DB for ; Wed, 4 Dec 2019 16:21:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="BGaY7g5Q" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0D19E206DB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1icXOW-0006sK-7K; Wed, 04 Dec 2019 16:20:52 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1icXOU-0006rs-Qj for xen-devel@lists.xenproject.org; Wed, 04 Dec 2019 16:20:50 +0000 X-Inumbo-ID: 080175d6-16b2-11ea-99dd-bc764e2007e4 Received: from esa1.hc3370-68.iphmx.com (unknown [216.71.145.142]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 080175d6-16b2-11ea-99dd-bc764e2007e4; Wed, 04 Dec 2019 16:20:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1575476449; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=8K929pLKGjsKHWuZReFQyGG9sX73qV7AkheF8i5ZCQo=; b=BGaY7g5QnRSOjNcMnFz0tAKXKt6nQMhfH1W1W2h6Eiaa9mm46dgLtZ86 InFFUB1TKs0ycnxHr4GoWXubGiQDbhyQfbSqVCvUoowLwSh3ATCwTXjKC WR6vlJk+DFRF+7l5BhsCIwLMFAAlKnnxV0BFuJvs/0pTVG7TX7yo4tzJR 8=; 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 (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: 7UcfKnWASAzwB9/pYSSpoZO1tznWUGYz+WeZuoViguPoOqnSbC36nZzsOLtI7TOS21vC70lc4A dG8Enu4LGmkVUF/qMl/EPA44fYz6lkbHG8yIlXpN87E2IsYnjbBswjaUlrEe/j/FO74YbOsXkY FNBZluS0O8QvVgKTBbFqnBrzXnQZ/6/DHudja3KAFTh4BABpUVDBXgmSgxyutxEayWqJBLnQgu sSzVJO40m9Esi0aQWiAZVQDCULB8BDmWIX+Ih0JYpx/WXfwOo8HJzWhzYMwJ5vwnfVgHpqsn48 UJI= X-SBRS: 2.7 X-MesageID: 9323386 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,277,1571716800"; d="scan'208";a="9323386" From: Roger Pau Monne To: Date: Wed, 4 Dec 2019 17:20:23 +0100 Message-ID: <20191204162025.37510-3-roger.pau@citrix.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191204162025.37510-1-roger.pau@citrix.com> References: <20191204162025.37510-1-roger.pau@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH v3 2/4] x86/apic: force phys mode if interrupt remapping is disabled 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: Stefano Stabellini , Julien Grall , Wei Liu , Konrad Rzeszutek Wilk , George Dunlap , Andrew Cooper , Ian Jackson , Jan Beulich , Roger Pau Monne Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Cluster mode can only be used with interrupt remapping support, since the top 16bits of the APIC ID are filled with the cluster ID, and hence on systems where the physical ID is still smaller than 255 the cluster ID is not. Force x2APIC to use physical mode if there's no interrupt remapping support. Note that this requires a further patch in order to enable x2APIC without interrupt remapping support. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- Changes since v2: - Update command line doc. - Fix logic to set x2apic_phys if user has specified a value. - Force phys mode if no interrupt remapping support. Changes since v1: - New in this version. --- docs/misc/xen-command-line.pandoc | 3 ++- xen/arch/x86/genapic/x2apic.c | 18 +++++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index 891d2d439f..d9495ef6b9 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -2303,7 +2303,8 @@ Permit use of x2apic setup for SMP environments. ### x2apic_phys (x86) > `= ` -> Default: `true` if **FADT** mandates physical mode, `false` otherwise. +> Default: `true` if **FADT** mandates physical mode or if interrupt remapping +> is not available, `false` otherwise. In the case that x2apic is in use, this option switches between physical and clustered mode. The default, given no hint from the **FADT**, is cluster diff --git a/xen/arch/x86/genapic/x2apic.c b/xen/arch/x86/genapic/x2apic.c index d5a17f10d5..79b6c07329 100644 --- a/xen/arch/x86/genapic/x2apic.c +++ b/xen/arch/x86/genapic/x2apic.c @@ -226,7 +226,23 @@ boolean_param("x2apic_phys", x2apic_phys); const struct genapic *__init apic_x2apic_probe(void) { if ( x2apic_phys < 0 ) - x2apic_phys = !!(acpi_gbl_FADT.flags & ACPI_FADT_APIC_PHYSICAL); + { + if ( !iommu_intremap ) + /* + * Force physical mode if there's no interrupt remapping support: + * the ID in clustered mode requires a 32 bit destination field due + * to the usage of the high 16 bits to store the cluster ID. + */ + x2apic_phys = true; + else + x2apic_phys = !!(acpi_gbl_FADT.flags & ACPI_FADT_APIC_PHYSICAL); + } + else if ( !x2apic_phys && !iommu_intremap ) + { + printk("WARNING: x2APIC cluster mode is not supported without interrupt remapping\n" + "x2APIC: forcing phys mode\n"); + x2apic_phys = true; + } if ( x2apic_phys ) return &apic_x2apic_phys;