From mboxrd@z Thu Jan 1 00:00:00 1970 From: Juergen Gross Subject: [PATCH v3 09/15] x86/paravirt: remove unused paravirt bits Date: Tue, 28 Aug 2018 09:40:20 +0200 Message-ID: <20180828074026.820-10-jgross@suse.com> References: <20180828074026.820-1-jgross@suse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1fuYcE-0000GD-82 for xen-devel@lists.xenproject.org; Tue, 28 Aug 2018 07:40:42 +0000 In-Reply-To: <20180828074026.820-1-jgross@suse.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: linux-kernel@vger.kernel.org, xen-devel@lists.xenproject.org, x86@kernel.org, virtualization@lists.linux-foundation.org Cc: Juergen Gross , boris.ostrovsky@oracle.com, rusty@rustcorp.com.au, mingo@redhat.com, hpa@zytor.com, akataria@vmware.com, tglx@linutronix.de List-Id: xen-devel@lists.xenproject.org VGhlIG1hY3JvcyBFTkFCTEVfSU5URVJSVVBUU19TWVNFWElULCBHRVRfQ1IwX0lOVE9fRUFYIGFu ZApQQVJBVklSVF9BREpVU1RfRVhDRVBUSU9OX0ZSQU1FIGFyZSB1c2VkIG5vd2hlcmUuIFJlbW92 ZSB0aGVpcgpkZWZpbml0aW9ucy4KClNpZ25lZC1vZmYtYnk6IEp1ZXJnZW4gR3Jvc3MgPGpncm9z c0BzdXNlLmNvbT4KLS0tCiBhcmNoL3g4Ni9pbmNsdWRlL2FzbS9pcnFmbGFncy5oIHwgNCAtLS0t CiBhcmNoL3g4Ni9pbmNsdWRlL2FzbS9wYXJhdmlydC5oIHwgOSArLS0tLS0tLS0KIGFyY2gveDg2 L2tlcm5lbC9hc20tb2Zmc2V0cy5jICAgfCAxIC0KIDMgZmlsZXMgY2hhbmdlZCwgMSBpbnNlcnRp b24oKyksIDEzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2FyY2gveDg2L2luY2x1ZGUvYXNt L2lycWZsYWdzLmggYi9hcmNoL3g4Ni9pbmNsdWRlL2FzbS9pcnFmbGFncy5oCmluZGV4IGMxNGYy YTc0YjJiZS4uMjUwYmNkNDBkNzY5IDEwMDY0NAotLS0gYS9hcmNoL3g4Ni9pbmNsdWRlL2FzbS9p cnFmbGFncy5oCisrKyBiL2FyY2gveDg2L2luY2x1ZGUvYXNtL2lycWZsYWdzLmgKQEAgLTEzNCw4 ICsxMzQsNiBAQCBzdGF0aWMgaW5saW5lIG5vdHJhY2UgdW5zaWduZWQgbG9uZyBhcmNoX2xvY2Fs X2lycV9zYXZlKHZvaWQpCiAgKi8KICNkZWZpbmUgU1dBUEdTX1VOU0FGRV9TVEFDSwlzd2FwZ3MK IAotI2RlZmluZSBQQVJBVklSVF9BREpVU1RfRVhDRVBUSU9OX0ZSQU1FCS8qICAqLwotCiAjZGVm aW5lIElOVEVSUlVQVF9SRVRVUk4Jam1wIG5hdGl2ZV9pcmV0CiAjZGVmaW5lIFVTRVJHU19TWVNS RVQ2NAkJCQlcCiAJc3dhcGdzOwkJCQkJXApAQCAtMTQ5LDggKzE0Nyw2IEBAIHN0YXRpYyBpbmxp bmUgbm90cmFjZSB1bnNpZ25lZCBsb25nIGFyY2hfbG9jYWxfaXJxX3NhdmUodm9pZCkKICNlbmRp ZgogI2Vsc2UKICNkZWZpbmUgSU5URVJSVVBUX1JFVFVSTgkJaXJldAotI2RlZmluZSBFTkFCTEVf SU5URVJSVVBUU19TWVNFWElUCXN0aTsgc3lzZXhpdAotI2RlZmluZSBHRVRfQ1IwX0lOVE9fRUFY CQltb3ZsICVjcjAsICVlYXgKICNlbmRpZgogCiAKZGlmZiAtLWdpdCBhL2FyY2gveDg2L2luY2x1 ZGUvYXNtL3BhcmF2aXJ0LmggYi9hcmNoL3g4Ni9pbmNsdWRlL2FzbS9wYXJhdmlydC5oCmluZGV4 IGE5MTg5YjgxYzdkZC4uMmJhMjNlOThjNWNkIDEwMDY0NAotLS0gYS9hcmNoL3g4Ni9pbmNsdWRl L2FzbS9wYXJhdmlydC5oCisrKyBiL2FyY2gveDg2L2luY2x1ZGUvYXNtL3BhcmF2aXJ0LmgKQEAg LTg4NywxNCArODg3LDcgQEAgZXh0ZXJuIHZvaWQgZGVmYXVsdF9iYW5uZXIodm9pZCk7CiAJCSAg Y2FsbCBQQVJBX0lORElSRUNUKHB2X29wcytQVl9JUlFfaXJxX2VuYWJsZSk7CQlcCiAJCSAgUFZf UkVTVE9SRV9SRUdTKGNsb2JiZXJzIHwgQ0xCUl9DQUxMRUVfU0FWRSk7KQogCi0jaWZkZWYgQ09O RklHX1g4Nl8zMgotI2RlZmluZSBHRVRfQ1IwX0lOVE9fRUFYCQkJCVwKLQlwdXNoICVlY3g7IHB1 c2ggJWVkeDsJCQkJXAotCUFOTk9UQVRFX1JFVFBPTElORV9TQUZFOwkJCQlcCi0JY2FsbCBQQVJB X0lORElSRUNUKHB2X29wcytQVl9DUFVfcmVhZF9jcjApOwlcCi0JcG9wICVlZHg7IHBvcCAlZWN4 Ci0jZWxzZQkvKiAhQ09ORklHX1g4Nl8zMiAqLwotCisjaWZkZWYgQ09ORklHX1g4Nl82NAogLyoK ICAqIElmIHN3YXBncyBpcyB1c2VkIHdoaWxlIHRoZSB1c2Vyc3BhY2Ugc3RhY2sgaXMgc3RpbGwg Y3VycmVudCwKICAqIHRoZXJlJ3Mgbm8gd2F5IHRvIGNhbGwgYSBwdm9wLiAgVGhlIFBWIHJlcGxh Y2VtZW50ICptdXN0KiBiZQpkaWZmIC0tZ2l0IGEvYXJjaC94ODYva2VybmVsL2FzbS1vZmZzZXRz LmMgYi9hcmNoL3g4Ni9rZXJuZWwvYXNtLW9mZnNldHMuYwppbmRleCA0NmQxNDQ5OGUyMTQuLjM3 ZTMyM2YzZDhjOSAxMDA2NDQKLS0tIGEvYXJjaC94ODYva2VybmVsL2FzbS1vZmZzZXRzLmMKKysr IGIvYXJjaC94ODYva2VybmVsL2FzbS1vZmZzZXRzLmMKQEAgLTY5LDcgKzY5LDYgQEAgdm9pZCBj b21tb24odm9pZCkgewogCU9GRlNFVChQVl9JUlFfaXJxX2Rpc2FibGUsIHBhcmF2aXJ0X3BhdGNo X3RlbXBsYXRlLCBpcnEuaXJxX2Rpc2FibGUpOwogCU9GRlNFVChQVl9JUlFfaXJxX2VuYWJsZSwg cGFyYXZpcnRfcGF0Y2hfdGVtcGxhdGUsIGlycS5pcnFfZW5hYmxlKTsKIAlPRkZTRVQoUFZfQ1BV X2lyZXQsIHBhcmF2aXJ0X3BhdGNoX3RlbXBsYXRlLCBjcHUuaXJldCk7Ci0JT0ZGU0VUKFBWX0NQ VV9yZWFkX2NyMCwgcGFyYXZpcnRfcGF0Y2hfdGVtcGxhdGUsIGNwdS5yZWFkX2NyMCk7CiAJT0ZG U0VUKFBWX01NVV9yZWFkX2NyMiwgcGFyYXZpcnRfcGF0Y2hfdGVtcGxhdGUsIG1tdS5yZWFkX2Ny Mik7CiAjZW5kaWYKIAotLSAKMi4xNi40CgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMu eGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3Rp bmZvL3hlbi1kZXZlbA== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 23938C433F4 for ; Tue, 28 Aug 2018 07:41:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D4776208E1 for ; Tue, 28 Aug 2018 07:41:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D4776208E1 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727626AbeH1LcA (ORCPT ); Tue, 28 Aug 2018 07:32:00 -0400 Received: from mx2.suse.de ([195.135.220.15]:45416 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727356AbeH1LbC (ORCPT ); Tue, 28 Aug 2018 07:31:02 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 503BFB047; Tue, 28 Aug 2018 07:40:39 +0000 (UTC) From: Juergen Gross To: linux-kernel@vger.kernel.org, xen-devel@lists.xenproject.org, x86@kernel.org, virtualization@lists.linux-foundation.org Cc: akataria@vmware.com, rusty@rustcorp.com.au, boris.ostrovsky@oracle.com, hpa@zytor.com, tglx@linutronix.de, mingo@redhat.com, Juergen Gross Subject: [PATCH v3 09/15] x86/paravirt: remove unused paravirt bits Date: Tue, 28 Aug 2018 09:40:20 +0200 Message-Id: <20180828074026.820-10-jgross@suse.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180828074026.820-1-jgross@suse.com> References: <20180828074026.820-1-jgross@suse.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The macros ENABLE_INTERRUPTS_SYSEXIT, GET_CR0_INTO_EAX and PARAVIRT_ADJUST_EXCEPTION_FRAME are used nowhere. Remove their definitions. Signed-off-by: Juergen Gross --- arch/x86/include/asm/irqflags.h | 4 ---- arch/x86/include/asm/paravirt.h | 9 +-------- arch/x86/kernel/asm-offsets.c | 1 - 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h index c14f2a74b2be..250bcd40d769 100644 --- a/arch/x86/include/asm/irqflags.h +++ b/arch/x86/include/asm/irqflags.h @@ -134,8 +134,6 @@ static inline notrace unsigned long arch_local_irq_save(void) */ #define SWAPGS_UNSAFE_STACK swapgs -#define PARAVIRT_ADJUST_EXCEPTION_FRAME /* */ - #define INTERRUPT_RETURN jmp native_iret #define USERGS_SYSRET64 \ swapgs; \ @@ -149,8 +147,6 @@ static inline notrace unsigned long arch_local_irq_save(void) #endif #else #define INTERRUPT_RETURN iret -#define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit -#define GET_CR0_INTO_EAX movl %cr0, %eax #endif diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h index a9189b81c7dd..2ba23e98c5cd 100644 --- a/arch/x86/include/asm/paravirt.h +++ b/arch/x86/include/asm/paravirt.h @@ -887,14 +887,7 @@ extern void default_banner(void); call PARA_INDIRECT(pv_ops+PV_IRQ_irq_enable); \ PV_RESTORE_REGS(clobbers | CLBR_CALLEE_SAVE);) -#ifdef CONFIG_X86_32 -#define GET_CR0_INTO_EAX \ - push %ecx; push %edx; \ - ANNOTATE_RETPOLINE_SAFE; \ - call PARA_INDIRECT(pv_ops+PV_CPU_read_cr0); \ - pop %edx; pop %ecx -#else /* !CONFIG_X86_32 */ - +#ifdef CONFIG_X86_64 /* * If swapgs is used while the userspace stack is still current, * there's no way to call a pvop. The PV replacement *must* be diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c index 46d14498e214..37e323f3d8c9 100644 --- a/arch/x86/kernel/asm-offsets.c +++ b/arch/x86/kernel/asm-offsets.c @@ -69,7 +69,6 @@ void common(void) { OFFSET(PV_IRQ_irq_disable, paravirt_patch_template, irq.irq_disable); OFFSET(PV_IRQ_irq_enable, paravirt_patch_template, irq.irq_enable); OFFSET(PV_CPU_iret, paravirt_patch_template, cpu.iret); - OFFSET(PV_CPU_read_cr0, paravirt_patch_template, cpu.read_cr0); OFFSET(PV_MMU_read_cr2, paravirt_patch_template, mmu.read_cr2); #endif -- 2.16.4