From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760902AbbEEQ7K (ORCPT ); Tue, 5 May 2015 12:59:10 -0400 Received: from mail-wi0-f176.google.com ([209.85.212.176]:35645 "EHLO mail-wi0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760834AbbEEQ2f (ORCPT ); Tue, 5 May 2015 12:28:35 -0400 From: Ingo Molnar To: linux-kernel@vger.kernel.org Cc: Andy Lutomirski , Borislav Petkov , Dave Hansen , Fenghua Yu , "H. Peter Anvin" , Linus Torvalds , Oleg Nesterov , Thomas Gleixner Subject: [PATCH 032/208] x86/fpu: Simplify the xsave_state*() methods Date: Tue, 5 May 2015 18:24:12 +0200 Message-Id: <1430843228-13749-33-git-send-email-mingo@kernel.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1430843228-13749-1-git-send-email-mingo@kernel.org> References: <1430843228-13749-1-git-send-email-mingo@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org These functions (xsave_state() and xsave_state_booting()) have a 'mask' argument that is always -1. Propagate this into the functions instead and eliminate the extra argument. Does not change the generated code, because these were inlined functions. Reviewed-by: Borislav Petkov Cc: Andy Lutomirski Cc: Dave Hansen Cc: Fenghua Yu Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Oleg Nesterov Cc: Thomas Gleixner Signed-off-by: Ingo Molnar --- arch/x86/include/asm/fpu-internal.h | 4 ++-- arch/x86/include/asm/xsave.h | 8 +++++--- arch/x86/kernel/fpu/xsave.c | 3 ++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h index c3b7bd12f18f..b1f5dd63cfeb 100644 --- a/arch/x86/include/asm/fpu-internal.h +++ b/arch/x86/include/asm/fpu-internal.h @@ -527,9 +527,9 @@ static inline void __save_fpu(struct task_struct *tsk) { if (use_xsave()) { if (unlikely(system_state == SYSTEM_BOOTING)) - xsave_state_booting(&tsk->thread.fpu.state->xsave, -1); + xsave_state_booting(&tsk->thread.fpu.state->xsave); else - xsave_state(&tsk->thread.fpu.state->xsave, -1); + xsave_state(&tsk->thread.fpu.state->xsave); } else fpu_fxsave(&tsk->thread.fpu); } diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h index 58ed0ca5a11e..61c951ce77fe 100644 --- a/arch/x86/include/asm/xsave.h +++ b/arch/x86/include/asm/xsave.h @@ -70,8 +70,9 @@ extern void update_regset_xstate_info(unsigned int size, u64 xstate_mask); * This function is called only during boot time when x86 caps are not set * up and alternative can not be used yet. */ -static inline int xsave_state_booting(struct xsave_struct *fx, u64 mask) +static inline int xsave_state_booting(struct xsave_struct *fx) { + u64 mask = -1; u32 lmask = mask; u32 hmask = mask >> 32; int err = 0; @@ -123,8 +124,9 @@ static inline int xrstor_state_booting(struct xsave_struct *fx, u64 mask) /* * Save processor xstate to xsave area. */ -static inline int xsave_state(struct xsave_struct *fx, u64 mask) +static inline int xsave_state(struct xsave_struct *fx) { + u64 mask = -1; u32 lmask = mask; u32 hmask = mask >> 32; int err = 0; @@ -189,7 +191,7 @@ static inline int xrstor_state(struct xsave_struct *fx, u64 mask) */ static inline void fpu_xsave(struct fpu *fpu) { - xsave_state(&fpu->state->xsave, -1); + xsave_state(&fpu->state->xsave); } /* diff --git a/arch/x86/kernel/fpu/xsave.c b/arch/x86/kernel/fpu/xsave.c index d913d5024901..a52205b87acb 100644 --- a/arch/x86/kernel/fpu/xsave.c +++ b/arch/x86/kernel/fpu/xsave.c @@ -558,11 +558,12 @@ static void __init setup_init_fpu_buf(void) * Init all the features state with header_bv being 0x0 */ xrstor_state_booting(init_xstate_buf, -1); + /* * Dump the init state again. This is to identify the init state * of any feature which is not represented by all zero's. */ - xsave_state_booting(init_xstate_buf, -1); + xsave_state_booting(init_xstate_buf); } static enum { AUTO, ENABLE, DISABLE } eagerfpu = AUTO; -- 2.1.0