From patchwork Fri Jan 22 21:35:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Ostrovsky X-Patchwork-Id: 8093521 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 59834BEEE5 for ; Fri, 22 Jan 2016 21:39:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 76EFA20595 for ; Fri, 22 Jan 2016 21:39:14 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 915BF205B7 for ; Fri, 22 Jan 2016 21:39:13 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aMjNk-0004Nk-Mw; Fri, 22 Jan 2016 21:36:36 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aMjNh-0004JE-G5 for xen-devel@lists.xenproject.org; Fri, 22 Jan 2016 21:36:33 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id D6/FD-31122-0E0A2A65; Fri, 22 Jan 2016 21:36:32 +0000 X-Env-Sender: boris.ostrovsky@oracle.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1453498590!11673944!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiAyODgzMzk=\n X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21291 invoked from network); 22 Jan 2016 21:36:32 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-5.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 22 Jan 2016 21:36:32 -0000 Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u0MLaRsx013138 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Fri, 22 Jan 2016 21:36:28 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserv0021.oracle.com (8.13.8/8.13.8) with ESMTP id u0MLaRvl017007 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Fri, 22 Jan 2016 21:36:27 GMT Received: from abhmp0002.oracle.com (abhmp0002.oracle.com [141.146.116.8]) by userv0122.oracle.com (8.14.4/8.13.8) with ESMTP id u0MLaQQ1007231; Fri, 22 Jan 2016 21:36:26 GMT Received: from ovs104.us.oracle.com (/10.149.76.204) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 22 Jan 2016 13:36:26 -0800 From: Boris Ostrovsky To: david.vrabel@citrix.com, konrad.wilk@oracle.com Date: Fri, 22 Jan 2016 16:35:55 -0500 Message-Id: <1453498558-6028-10-git-send-email-boris.ostrovsky@oracle.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1453498558-6028-1-git-send-email-boris.ostrovsky@oracle.com> References: <1453498558-6028-1-git-send-email-boris.ostrovsky@oracle.com> X-Source-IP: aserv0021.oracle.com [141.146.126.233] Cc: Boris Ostrovsky , xen-devel@lists.xenproject.org, mcgrof@suse.com, linux-kernel@vger.kernel.org, roger.pau@citrix.com Subject: [Xen-devel] [PATCH v1 09/12] xen/hvmlite: Extend APIC operations for HVMlite guests X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP HVMlite guests need to be viewed as having APIC, otherwise smpboot code, for example, will complain. Signed-off-by: Boris Ostrovsky --- Not sure about xen_cpu_present_to_apicid() being an identity function, given xen_x86_32_early_logical_apicid(). arch/x86/xen/apic.c | 39 +++++++++++++++++++++++++++++++++++++-- arch/x86/xen/smp.c | 2 +- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/arch/x86/xen/apic.c b/arch/x86/xen/apic.c index abf4901..2a59c39 100644 --- a/arch/x86/xen/apic.c +++ b/arch/x86/xen/apic.c @@ -6,6 +6,7 @@ #include #include +#include #include "xen-ops.h" #include "pmu.h" #include "smp.h" @@ -78,6 +79,21 @@ static void xen_apic_write(u32 reg, u32 val) return; } + if (xen_hvmlite) { + switch (reg) { + case APIC_TASKPRI: + case APIC_SPIV: + case APIC_ESR: + case APIC_LVTT: + case APIC_LVT0: + case APIC_LVT1: + case APIC_LVTERR: + pr_debug("Unimplemented APIC register %x," + " value: %x\n", reg, val); + return; + } + } + /* Warn to see if there's any stray references */ WARN(1,"register: %x, value: %x\n", reg, val); } @@ -100,7 +116,7 @@ static u32 xen_safe_apic_wait_icr_idle(void) static int xen_apic_probe_pv(void) { - if (xen_pv_domain()) + if (xen_pv_domain() || xen_hvmlite) return 1; return 0; @@ -142,6 +158,19 @@ static void xen_silent_inquire(int apicid) { } +static int xen_cpu_present_to_apicid(int cpu) +{ + return cpu; +} + +static int xen_wakeup_secondary_cpu(int cpu, unsigned long start_eip) +{ + if (!xen_hvmlite) + return -EINVAL; + + return HYPERVISOR_vcpu_op(VCPUOP_up, cpu, NULL); +} + static struct apic xen_pv_apic = { .name = "Xen PV", .probe = xen_apic_probe_pv, @@ -162,7 +191,7 @@ static struct apic xen_pv_apic = { .ioapic_phys_id_map = default_ioapic_phys_id_map, /* Used on 32-bit */ .setup_apic_routing = NULL, - .cpu_present_to_apicid = default_cpu_present_to_apicid, + .cpu_present_to_apicid = xen_cpu_present_to_apicid, .apicid_to_cpu_present = physid_set_mask_of_physid, /* Used on 32-bit */ .check_phys_apicid_present = default_check_phys_apicid_present, /* smp_sanity_check needs it */ .phys_pkg_id = xen_phys_pkg_id, /* detect_ht */ @@ -180,6 +209,9 @@ static struct apic xen_pv_apic = { .send_IPI_all = xen_send_IPI_all, .send_IPI_self = xen_send_IPI_self, #endif + + .wakeup_secondary_cpu = xen_wakeup_secondary_cpu, + /* .wait_for_init_deassert- used by AP bootup - smp_callin which we don't use */ .inquire_remote_apic = xen_silent_inquire, @@ -216,5 +248,8 @@ void __init xen_init_apic(void) apic = &xen_pv_apic; x86_platform.apic_post_init = xen_apic_check; + + if (xen_hvmlite) + setup_force_cpu_cap(X86_FEATURE_APIC); } apic_driver(xen_pv_apic); diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c index b265c4f..fb085ef 100644 --- a/arch/x86/xen/smp.c +++ b/arch/x86/xen/smp.c @@ -214,7 +214,7 @@ static int xen_smp_intr_init(unsigned int cpu) * The IRQ worker on PVHVM goes through the native path and uses the * IPI mechanism. */ - if (xen_hvm_domain()) + if (xen_hvm_domain() && !xen_hvmlite) return 0; callfunc_name = kasprintf(GFP_KERNEL, "irqwork%d", cpu);