From patchwork Thu Aug 10 15:28:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Shai Fultheim (Shai@ScaleMP.com)" X-Patchwork-Id: 9893917 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 365A960384 for ; Thu, 10 Aug 2017 15:32:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2865D28AE5 for ; Thu, 10 Aug 2017 15:32:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1CE4228B1C; Thu, 10 Aug 2017 15:32:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6D4B828AE5 for ; Thu, 10 Aug 2017 15:32:46 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dfpPN-0004Xd-2G; Thu, 10 Aug 2017 15:30:01 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dfpO9-0004Vq-4P for xen-devel@lists.xenproject.org; Thu, 10 Aug 2017 15:28:45 +0000 Received: from [193.109.254.147] by server-3.bemta-6.messagelabs.com id 63/92-03044-CAB7C895; Thu, 10 Aug 2017 15:28:44 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA1WSbUhTURjHO/febVfxxmm+PS4NnETN2tLRiyR UUFRERolBZpF3eduWe5F7V0ztwzCKln2oqYSrYbWSaJFLCwqKICNKo9JMLLMyxffeLFgWVPd6 zep8+j/n/+M5/+fw0KTap9TQnNvF8Q7WplVGU5ZF6Rv0ofJj+Rmt/XOyIteqiFVoffOnDmoz2 q6wOkxOd6HCcvJHtaLkUarbX9us8qCKlKMoiqbwBwLOB3RHUTStxtUEVDScU8jFPQRXqhtVEq XE2RDoOUFKRhxuQXBq4pdSKkhcS8D3Ko9ComLxSugerJvUcXgVTNQFVLI2gq83SMrvzYXO12G RoWkG74AXt7dI12pRnrn4aBKPwouhPvh9sg3CCRBpuUxImsSJ8LK/blIDxnD+1hNS1vEw3Pdz is+FoO8xJd+nwhdPGMk6BdrrKpGUGfBhFYSf3FfJhgGun3g/BeXAg3eDhAy9JSBydVicUiUW6 dA2V0b2QuuzyFSGYpjwj1Ey3quA06FOpWwkQ9PHwJRxUgltkRZCnnI3fH4TouTP0kBPhxcdRz r/P8PJ2gBdNdVKWS+A+rOjpKQZPAse1vZTZxB1Cc0XOH4/x+szlxlMvNVscdlZq02fmbHUYOc EgTVzNtYkGHY77Y1I3I8Z4rmBuq9uvouSaEIbzwjjlfnqmSZnUamFFSy7+H02TriLkmlaC8zq smP56lk8Z+bce6w2ccn+2EDHaOOYm5LNCCWsXbCaZasF6elwqOEroaYcTgenSWSyJAhLkGWfY 7rFn1VtRymaWAaJodQxJRxvt7r+90dQIo20sYxP6hJjdbimXxoRQxBiiG05XimEi/1raTyosD gtu0ixcMXN5ZfYO69urfPVbzWO9iU3NZdEqoxdA215hUk/U5Wbgk8Hzd8CBdGVB3CBF+tajVl lj5OXfPXHFQhHNo6UXljaNDAcsedeGBo7aH6+JsfJ1iTN2znf/UkXo288NDa+tre03JSQa0iD 9f68Aa93dpkpA24cH7qzUEsJFjYzneQF9jderHmrpQMAAA== X-Env-Sender: Shai@ScaleMP.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1502378921!105765521!1 X-Originating-IP: [104.47.42.74] X-SpamReason: No, hits=0.3 required=7.0 tests=MAILTO_TO_SPAM_ADDR X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20397 invoked from network); 10 Aug 2017 15:28:43 -0000 Received: from mail-by2nam03on0074.outbound.protection.outlook.com (HELO NAM03-BY2-obe.outbound.protection.outlook.com) (104.47.42.74) by server-5.tower-27.messagelabs.com with AES256-SHA256 encrypted SMTP; 10 Aug 2017 15:28:43 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=scalemp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=gyQXcpLrcknioyjvJhMoY4LrzCB+FnTFnUX9zmuimd8=; b=IhDCjIjgOBW07nm5jz7N2bXlsHUj2wBY6tIxQkypFf3XrdCNwwROemCDBwSfnTU8kKmslOKm4sUraTu/4DsQZeQUTWXgz331WjFQeMLL19wnPq/K4jSusvp8NkPrURtb5sS8gM8XcgCowOvzC2gGHbo+XdMclpJ0gqXpxnFTuME= Received: from BN6PR15MB1859.namprd15.prod.outlook.com (10.174.239.20) by BN6PR15MB1857.namprd15.prod.outlook.com (10.174.239.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1320.16; Thu, 10 Aug 2017 15:28:39 +0000 Received: from BN6PR15MB1859.namprd15.prod.outlook.com ([10.174.239.20]) by BN6PR15MB1859.namprd15.prod.outlook.com ([10.174.239.20]) with mapi id 15.01.1320.019; Thu, 10 Aug 2017 15:28:39 +0000 From: "Shai Fultheim (Shai@ScaleMP.com)" To: Juergen Gross , "linux-kernel@vger.kernel.org" , "xen-devel@lists.xenproject.org" , "x86@kernel.org" Thread-Topic: [PATCH 3/3] x86/vsmp: remove vsmp paravirt support Thread-Index: AQHTEePPcPpZ+7/C90uJJ7ECAQ5MoaJ9tryw Date: Thu, 10 Aug 2017 15:28:39 +0000 Message-ID: References: <20170810125254.1347-1-jgross@suse.com> <20170810125254.1347-4-jgross@suse.com> In-Reply-To: <20170810125254.1347-4-jgross@suse.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [62.219.139.52] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; BN6PR15MB1857; 6:ct5zU9QfE6DVIcFHDeHiuX2ZQTOE3Sm494gXe+EqEzaSIdOZktUrKfYN32xXxI88wfmjrX4FFry0Rq9luDj3XDBJwm+LQV6cTPwTac5Fr++btYSp/6rmAFH+JWVImR9tv5mLrrx2d8yaq0/IqKRmaQMKvx1rjWDGh9rF6kFUOBwJsFN+0BjVxFtZuO7/xTo4654E9laOL6NyQrfGj6Jcv5VQ/RZCCYWi2H9Tb5dFcVQQtilbQ9PUUa7Cd7IaKs1KHlVlDR2RnDjcoLDWL8SWeM6U/U1UzgTqLHpoJao+/G8kP6EoWZqpH4WFrn5ROzKYCjMUXgvr5HYGKgOeGgPmpQ==; 5:MwLe1EmYlj+R8ufcAychcspQq+CeSXM7VM6FBpZfXQ7MK2Tp9q9m9yq2rsJfQkTWehnj7PTZ01XB4FW0Uo7OZZQWhgSv3zdhl7gofNVrj+LQgSBOq3PAPiUkTVe6Mx8ssA+fObh+Qpu6Vaovc5Mxcg==; 24:/PD7v/O5eqRuFFopKu/oSTVD9FgzguZ19Hh5kwYNX96rHGc4qTUx3tmdShdEP4yVHpZDkFMXd5gTfCweUIR+C3ZM3MxBJ2zwvlqkOT5oZLg=; 7:rEpKHdQgPUvVFnnUaYAVPawAz8dpSFVqSheuluVCpkPWHdOdNOUe51O7XIitGmNcorZieWHw/EHKvTCK8Q0GphfKJKgWSfrgpNPKF5oDUNev9P1dUBQVc6T7uWTFlGhyCdcIeKPLzcT4baV+7JNNtVx69FHLzQAlNjig1HPPHdIRmG7pXVKs5pmcYWnA74bTHL/mtoIqdgFdccBzRHj+7AstAvY81g96Sn+a4CHPuQ0= x-ms-exchange-antispam-srfa-diagnostics: SSOS; x-ms-office365-filtering-correlation-id: 513915a9-794c-493b-5791-08d4e00479d1 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(2017082002075)(300000503095)(300135400095)(2017052603031)(201703131423075)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:BN6PR15MB1857; x-ms-traffictypediagnostic: BN6PR15MB1857: x-exchange-antispam-report-test: UriScan:(9452136761055)(65623756079841)(46150409022019)(146099531331640); x-microsoft-antispam-prvs: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(93006095)(100000703101)(100105400095)(6041248)(2016111802025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(20161123560025)(20161123564025)(20161123562025)(6072148)(6043046)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BN6PR15MB1857; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN6PR15MB1857; x-forefront-prvs: 03950F25EC x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(6009001)(39410400002)(39400400002)(39830400002)(39450400003)(199003)(13464003)(189002)(97736004)(7416002)(9686003)(8676002)(189998001)(8936002)(81156014)(6506006)(74316002)(106356001)(66066001)(105586002)(55016002)(99286003)(54906002)(6246003)(14454004)(7736002)(478600001)(305945005)(229853002)(38730400002)(68736007)(4326008)(77096006)(5660300001)(81166006)(53546010)(53936002)(25786009)(6436002)(3846002)(7696004)(102836003)(6116002)(72206003)(2906002)(2950100002)(2900100001)(2201001)(3660700001)(3280700002)(2501003)(54356999)(76176999)(50986999)(101416001)(5890100001)(80792005)(33656002)(86362001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR15MB1857; H:BN6PR15MB1859.namprd15.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; received-spf: None (protection.outlook.com: ScaleMP.com does not designate permitted sender hosts) spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: scalemp.com X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Aug 2017 15:28:39.2617 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a60757ae-8e1a-437b-b61a-75f96e2fad93 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR15MB1857 X-Mailman-Approved-At: Thu, 10 Aug 2017 15:29:59 +0000 Cc: "lguest@lists.ozlabs.org" , "rusty@rustcorp.com.au" , "mingo@redhat.com" , "hpa@zytor.com" , "tglx@linutronix.de" , "boris.ostrovsky@oracle.com" Subject: Re: [Xen-devel] [PATCH 3/3] x86/vsmp: remove vsmp paravirt support X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP NACK. This is needed and used by thousands of installations. diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 3fac2570a2e1..13a3d8744ae4 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -495,7 +495,6 @@ config X86_NUMACHIP config X86_VSMP bool "ScaleMP vSMP" select HYPERVISOR_GUEST - select PARAVIRT depends on X86_64 && PCI depends on X86_EXTENDED_PLATFORM depends on SMP diff --git a/arch/x86/kernel/vsmp_64.c b/arch/x86/kernel/vsmp_64.c index b034b1b14b9c..5d392b809ee4 100644 --- a/arch/x86/kernel/vsmp_64.c +++ b/arch/x86/kernel/vsmp_64.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #define TOPOLOGY_REGISTER_OFFSET 0x10 @@ -29,64 +28,7 @@ /* Flag below is initialized once during vSMP PCI initialization. */ static int irq_routing_comply = 1; -#if defined CONFIG_PCI && defined CONFIG_PARAVIRT -/* - * Interrupt control on vSMPowered systems: - * ~AC is a shadow of IF. If IF is 'on' AC should be 'off' - * and vice versa. - */ - -asmlinkage __visible unsigned long vsmp_save_fl(void) -{ - unsigned long flags = native_save_fl(); - - if (!(flags & X86_EFLAGS_IF) || (flags & X86_EFLAGS_AC)) - flags &= ~X86_EFLAGS_IF; - return flags; -} -PV_CALLEE_SAVE_REGS_THUNK(vsmp_save_fl); - -__visible void vsmp_restore_fl(unsigned long flags) -{ - if (flags & X86_EFLAGS_IF) - flags &= ~X86_EFLAGS_AC; - else - flags |= X86_EFLAGS_AC; - native_restore_fl(flags); -} -PV_CALLEE_SAVE_REGS_THUNK(vsmp_restore_fl); - -asmlinkage __visible void vsmp_irq_disable(void) -{ - unsigned long flags = native_save_fl(); - - native_restore_fl((flags & ~X86_EFLAGS_IF) | X86_EFLAGS_AC); -} -PV_CALLEE_SAVE_REGS_THUNK(vsmp_irq_disable); - -asmlinkage __visible void vsmp_irq_enable(void) -{ - unsigned long flags = native_save_fl(); - - native_restore_fl((flags | X86_EFLAGS_IF) & (~X86_EFLAGS_AC)); -} -PV_CALLEE_SAVE_REGS_THUNK(vsmp_irq_enable); - -static unsigned __init vsmp_patch(u8 type, u16 clobbers, void *ibuf, - unsigned long addr, unsigned len) -{ - switch (type) { - case PARAVIRT_PATCH(pv_irq_ops.irq_enable): - case PARAVIRT_PATCH(pv_irq_ops.irq_disable): - case PARAVIRT_PATCH(pv_irq_ops.save_fl): - case PARAVIRT_PATCH(pv_irq_ops.restore_fl): - return paravirt_patch_default(type, clobbers, ibuf, addr, len); - default: - return native_patch(type, clobbers, ibuf, addr, len); - } - -} - +#if defined CONFIG_PCI static void __init set_vsmp_pv_ops(void) { void __iomem *address; @@ -115,15 +57,6 @@ static void __init set_vsmp_pv_ops(void) } #endif - if (cap & ctl & (1 << 4)) { - /* Setup irq ops and turn on vSMP IRQ fastpath handling */ - pv_irq_ops.irq_disable = PV_CALLEE_SAVE(vsmp_irq_disable); - pv_irq_ops.irq_enable = PV_CALLEE_SAVE(vsmp_irq_enable); - pv_irq_ops.save_fl = PV_CALLEE_SAVE(vsmp_save_fl); - pv_irq_ops.restore_fl = PV_CALLEE_SAVE(vsmp_restore_fl); - pv_init_ops.patch = vsmp_patch; - ctl &= ~(1 << 4); - } writel(ctl, address + 4); ctl = readl(address + 4); pr_info("vSMP CTL: control set to:0x%08x\n", ctl);