aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBoris Ostrovsky <boris.ostrovsky@oracle.com>2014-12-02 15:19:13 -0500
committerDavid Vrabel <david.vrabel@citrix.com>2014-12-04 08:02:43 -0500
commit14520c92cbd7619ae097a3087b140c992b5c270b (patch)
tree61a2753722c43559087af44abcce2de742bd8790
parent066d79e4e2a41fbd0da62bd994f9b77ef8fa040a (diff)
xen/pci: Use APIC directly when APIC virtualization hardware is available
When hardware supports APIC/x2APIC virtualization we don't need to use pirqs for MSI handling and instead use APIC since most APIC accesses (MMIO or MSR) will now be processed without VMEXITs. As an example, netperf on the original code produces this profile (collected wih 'xentrace -e 0x0008ffff -T 5'): 342 cpu_change 260 CPUID 34638 HLT 64067 INJ_VIRQ 28374 INTR 82733 INTR_WINDOW 10 NPF 24337 TRAP 370610 vlapic_accept_pic_intr 307528 VMENTRY 307527 VMEXIT 140998 VMMCALL 127 wrap_buffer After applying this patch the same test shows 230 cpu_change 260 CPUID 36542 HLT 174 INJ_VIRQ 27250 INTR 222 INTR_WINDOW 20 NPF 24999 TRAP 381812 vlapic_accept_pic_intr 166480 VMENTRY 166479 VMEXIT 77208 VMMCALL 81 wrap_buffer ApacheBench results (ab -n 10000 -c 200) improve by about 10% Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com> Signed-off-by: David Vrabel <david.vrabel@citrix.com>
-rw-r--r--arch/x86/include/asm/xen/cpuid.h91
-rw-r--r--arch/x86/pci/xen.c16
2 files changed, 107 insertions, 0 deletions
diff --git a/arch/x86/include/asm/xen/cpuid.h b/arch/x86/include/asm/xen/cpuid.h
new file mode 100644
index 000000000000..0d809e9fc975
--- /dev/null
+++ b/arch/x86/include/asm/xen/cpuid.h
@@ -0,0 +1,91 @@
1/******************************************************************************
2 * arch-x86/cpuid.h
3 *
4 * CPUID interface to Xen.
5 *
6 * Permission is hereby granted, free of charge, to any person obtaining a copy
7 * of this software and associated documentation files (the "Software"), to
8 * deal in the Software without restriction, including without limitation the
9 * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
10 * sell copies of the Software, and to permit persons to whom the Software is
11 * furnished to do so, subject to the following conditions:
12 *
13 * The above copyright notice and this permission notice shall be included in
14 * all copies or substantial portions of the Software.
15 *
16 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
21 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
22 * DEALINGS IN THE SOFTWARE.
23 *
24 * Copyright (c) 2007 Citrix Systems, Inc.
25 *
26 * Authors:
27 * Keir Fraser <keir@xen.org>
28 */
29
30#ifndef __XEN_PUBLIC_ARCH_X86_CPUID_H__
31#define __XEN_PUBLIC_ARCH_X86_CPUID_H__
32
33/*
34 * For compatibility with other hypervisor interfaces, the Xen cpuid leaves
35 * can be found at the first otherwise unused 0x100 aligned boundary starting
36 * from 0x40000000.
37 *
38 * e.g If viridian extensions are enabled for an HVM domain, the Xen cpuid
39 * leaves will start at 0x40000100
40 */
41
42#define XEN_CPUID_FIRST_LEAF 0x40000000
43#define XEN_CPUID_LEAF(i) (XEN_CPUID_FIRST_LEAF + (i))
44
45/*
46 * Leaf 1 (0x40000x00)
47 * EAX: Largest Xen-information leaf. All leaves up to an including @EAX
48 * are supported by the Xen host.
49 * EBX-EDX: "XenVMMXenVMM" signature, allowing positive identification
50 * of a Xen host.
51 */
52#define XEN_CPUID_SIGNATURE_EBX 0x566e6558 /* "XenV" */
53#define XEN_CPUID_SIGNATURE_ECX 0x65584d4d /* "MMXe" */
54#define XEN_CPUID_SIGNATURE_EDX 0x4d4d566e /* "nVMM" */
55
56/*
57 * Leaf 2 (0x40000x01)
58 * EAX[31:16]: Xen major version.
59 * EAX[15: 0]: Xen minor version.
60 * EBX-EDX: Reserved (currently all zeroes).
61 */
62
63/*
64 * Leaf 3 (0x40000x02)
65 * EAX: Number of hypercall transfer pages. This register is always guaranteed
66 * to specify one hypercall page.
67 * EBX: Base address of Xen-specific MSRs.
68 * ECX: Features 1. Unused bits are set to zero.
69 * EDX: Features 2. Unused bits are set to zero.
70 */
71
72/* Does the host support MMU_PT_UPDATE_PRESERVE_AD for this guest? */
73#define _XEN_CPUID_FEAT1_MMU_PT_UPDATE_PRESERVE_AD 0
74#define XEN_CPUID_FEAT1_MMU_PT_UPDATE_PRESERVE_AD (1u<<0)
75
76/*
77 * Leaf 5 (0x40000x04)
78 * HVM-specific features
79 */
80
81/* EAX Features */
82/* Virtualized APIC registers */
83#define XEN_HVM_CPUID_APIC_ACCESS_VIRT (1u << 0)
84/* Virtualized x2APIC accesses */
85#define XEN_HVM_CPUID_X2APIC_VIRT (1u << 1)
86/* Memory mapped from other domains has valid IOMMU entries */
87#define XEN_HVM_CPUID_IOMMU_MAPPINGS (1u << 2)
88
89#define XEN_CPUID_MAX_NUM_LEAVES 4
90
91#endif /* __XEN_PUBLIC_ARCH_X86_CPUID_H__ */
diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c
index 1370716907e1..37914ef19c0a 100644
--- a/arch/x86/pci/xen.c
+++ b/arch/x86/pci/xen.c
@@ -23,6 +23,8 @@
23#include <xen/features.h> 23#include <xen/features.h>
24#include <xen/events.h> 24#include <xen/events.h>
25#include <asm/xen/pci.h> 25#include <asm/xen/pci.h>
26#include <asm/xen/cpuid.h>
27#include <asm/apic.h>
26#include <asm/i8259.h> 28#include <asm/i8259.h>
27 29
28static int xen_pcifront_enable_irq(struct pci_dev *dev) 30static int xen_pcifront_enable_irq(struct pci_dev *dev)
@@ -434,6 +436,20 @@ int __init pci_xen_init(void)
434#ifdef CONFIG_PCI_MSI 436#ifdef CONFIG_PCI_MSI
435void __init xen_msi_init(void) 437void __init xen_msi_init(void)
436{ 438{
439 if (!disable_apic) {
440 /*
441 * If hardware supports (x2)APIC virtualization (as indicated
442 * by hypervisor's leaf 4) then we don't need to use pirqs/
443 * event channels for MSI handling and instead use regular
444 * APIC processing
445 */
446 uint32_t eax = cpuid_eax(xen_cpuid_base() + 4);
447
448 if (((eax & XEN_HVM_CPUID_X2APIC_VIRT) && x2apic_mode) ||
449 ((eax & XEN_HVM_CPUID_APIC_ACCESS_VIRT) && cpu_has_apic))
450 return;
451 }
452
437 x86_msi.setup_msi_irqs = xen_hvm_setup_msi_irqs; 453 x86_msi.setup_msi_irqs = xen_hvm_setup_msi_irqs;
438 x86_msi.teardown_msi_irq = xen_teardown_msi_irq; 454 x86_msi.teardown_msi_irq = xen_teardown_msi_irq;
439} 455}