From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1032303AbbKELPR (ORCPT ); Thu, 5 Nov 2015 06:15:17 -0500 Received: from mx2.suse.de ([195.135.220.15]:48734 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031125AbbKELPO (ORCPT ); Thu, 5 Nov 2015 06:15:14 -0500 Subject: Re: [RFC PATCH] x86/paravirt: Kill some unused patching functions To: Borislav Petkov , LKML References: <1446542329-32037-1-git-send-email-bp@alien8.de> Cc: Andrew Morton , Andy Lutomirski , Chris Wright , "H. Peter Anvin" , Ingo Molnar , Jeremy Fitzhardinge , "Peter Zijlstra (Intel)" , Rusty Russell , Thomas Gleixner , virtualization@lists.linux-foundation.org, xen-devel@lists.xenproject.org From: Juergen Gross Message-ID: <563B3A3B.8020804@suse.com> Date: Thu, 5 Nov 2015 12:15:07 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <1446542329-32037-1-git-send-email-bp@alien8.de> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11/03/2015 10:18 AM, Borislav Petkov wrote: > From: Borislav Petkov > > paravirt_patch_ignore() is completely unused and paravirt_patch_nop() > doesn't do a whole lot. Remove them both. > > Signed-off-by: Borislav Petkov Reviewed-by: Juergen Gross > Cc: Andrew Morton > Cc: Andy Lutomirski > Cc: Chris Wright > Cc: "H. Peter Anvin" > Cc: Ingo Molnar > Cc: Jeremy Fitzhardinge > Cc: Juergen Gross > Cc: "Peter Zijlstra (Intel)" > Cc: Rusty Russell > Cc: Thomas Gleixner > Cc: virtualization@lists.linux-foundation.org > Cc: xen-devel@lists.xenproject.org > --- > arch/x86/include/asm/paravirt_types.h | 2 -- > arch/x86/kernel/paravirt.c | 13 +------------ > 2 files changed, 1 insertion(+), 14 deletions(-) > > diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h > index 31247b5bff7c..e1f31dfc3b31 100644 > --- a/arch/x86/include/asm/paravirt_types.h > +++ b/arch/x86/include/asm/paravirt_types.h > @@ -402,10 +402,8 @@ extern struct pv_lock_ops pv_lock_ops; > __visible extern const char start_##ops##_##name[], end_##ops##_##name[]; \ > asm(NATIVE_LABEL("start_", ops, name) code NATIVE_LABEL("end_", ops, name)) > > -unsigned paravirt_patch_nop(void); > unsigned paravirt_patch_ident_32(void *insnbuf, unsigned len); > unsigned paravirt_patch_ident_64(void *insnbuf, unsigned len); > -unsigned paravirt_patch_ignore(unsigned len); > unsigned paravirt_patch_call(void *insnbuf, > const void *target, u16 tgt_clobbers, > unsigned long addr, u16 site_clobbers, > diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c > index c2130aef3f9d..4f32a10979db 100644 > --- a/arch/x86/kernel/paravirt.c > +++ b/arch/x86/kernel/paravirt.c > @@ -74,16 +74,6 @@ void __init default_banner(void) > /* Undefined instruction for dealing with missing ops pointers. */ > static const unsigned char ud2a[] = { 0x0f, 0x0b }; > > -unsigned paravirt_patch_nop(void) > -{ > - return 0; > -} > - > -unsigned paravirt_patch_ignore(unsigned len) > -{ > - return len; > -} > - > struct branch { > unsigned char opcode; > u32 delta; > @@ -152,8 +142,7 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf, > /* If there's no function, patch it with a ud2a (BUG) */ > ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a)); > else if (opfunc == _paravirt_nop) > - /* If the operation is a nop, then nop the callsite */ > - ret = paravirt_patch_nop(); > + ret = 0; > > /* identity functions just return their single argument */ > else if (opfunc == _paravirt_ident_32) >