From patchwork Wed Nov 20 17:39:20 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: 11254561 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 A6A8514ED for ; Wed, 20 Nov 2019 17:41:11 +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 819B520715 for ; Wed, 20 Nov 2019 17:41:11 +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="Cs87x09F" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 819B520715 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 1iXTxK-000859-S9; Wed, 20 Nov 2019 17:39:54 +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 1iXTxJ-000853-GM for xen-devel@lists.xenproject.org; Wed, 20 Nov 2019 17:39:53 +0000 X-Inumbo-ID: be635f5c-0bbc-11ea-a31b-12813bfff9fa Received: from esa6.hc3370-68.iphmx.com (unknown [216.71.155.175]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id be635f5c-0bbc-11ea-a31b-12813bfff9fa; Wed, 20 Nov 2019 17:39:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1574271586; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=EZicUdc1riiwjFfJjA0c61FqFWHPYbqQso68mUQeak8=; b=Cs87x09FGJ1Ll/DJvl/10TCe879V+MCL0iyxKnPlb1caW7llki+5U8Mf EW0a6gab5poMsQF8txfAgbpFkWnQK5H1a+9lOz2PUU1b5eXfwKJFy8sE0 SSpn+urDnG39j4s0o3P038+Lqb7MD3A4uDRCqF84P3aTL8XylM7zfGdzh A=; Authentication-Results: esa6.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 (esa6.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=esa6.hc3370-68.iphmx.com; envelope-from="roger.pau@citrix.com"; x-sender="roger.pau@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa6.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=esa6.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 (esa6.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=esa6.hc3370-68.iphmx.com; envelope-from="roger.pau@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: lW7yr/9SzEmoWtwj5atuK2cuTzZ17Idmh/MjzYbuvSppSvpgN6K3dxCnbysrEbNEwTQMmLoQjQ 8DdcGB7LB0HdUkOxW/ELRfTfcgSrl5yCosWK2g8qgsIi693yzNr0DCODouZ1RXsZtHRvG7YNQp eijopjEA41iWYskWyc5QkEDyrqVHB04IJPeANyyOI6wr4Ft9ACItCTYTGsAcJv8v5nqURWOEqa 3w3gxUdi0HR4fFeZxLoxMw2r83hPFJWQ1KDMWxomsYXzyWPbpsy8kN+Jc+qIugGc2wv+HJ9tRR LC8= X-SBRS: 2.7 X-MesageID: 9024069 X-Ironport-Server: esa6.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.69,222,1571716800"; d="scan'208";a="9024069" From: Roger Pau Monne To: Date: Wed, 20 Nov 2019 18:39:20 +0100 Message-ID: <20191120173920.8705-1-roger.pau@citrix.com> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 Subject: [Xen-devel] [PATCH for-4.13] x86/vlapic: allow setting APIC_SPIV_FOCUS_DISABLED in x2APIC mode 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: Juergen Gross , Andrew Cooper , Wei Liu , Jan Beulich , Roger Pau Monne Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Current code unconditionally prevents setting APIC_SPIV_FOCUS_DISABLED regardless of the processor model, which is not correct according to the specification. Fix it by allowing setting APIC_SPIV_FOCUS_DISABLED based on the domain cpuid policy. Signed-off-by: Roger Pau Monné --- Cc: Juergen Gross --- xen/arch/x86/hvm/vlapic.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index 9466258d6f..b318b4ed5c 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -977,6 +977,7 @@ int guest_wrmsr_x2apic(struct vcpu *v, uint32_t msr, uint64_t msr_content) { struct vlapic *vlapic = vcpu_vlapic(v); uint32_t offset = (msr - MSR_X2APIC_FIRST) << 4; + const struct cpuid_policy *cpuid = v->domain->arch.cpuid; /* The timer handling at least is unsafe outside of current context. */ ASSERT(v == current); @@ -993,6 +994,14 @@ int guest_wrmsr_x2apic(struct vcpu *v, uint32_t msr, uint64_t msr_content) case APIC_SPIV: if ( msr_content & ~(APIC_VECTOR_MASK | APIC_SPIV_APIC_ENABLED | + /* + * APIC_SPIV_FOCUS_DISABLED is not supported on + * Intel Pentium 4 and Xeon processors. + */ + ((cpuid->x86_vendor != X86_VENDOR_INTEL || + get_cpu_family(cpuid->basic.raw_fms, NULL, + NULL) != 15) ? + APIC_SPIV_FOCUS_DISABLED : 0) | (VLAPIC_VERSION & APIC_LVR_DIRECTED_EOI ? APIC_SPIV_DIRECTED_EOI : 0)) ) return X86EMUL_EXCEPTION;