From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756546AbbEESTQ (ORCPT ); Tue, 5 May 2015 14:19:16 -0400 Received: from mail-wi0-f171.google.com ([209.85.212.171]:37314 "EHLO mail-wi0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762079AbbEERxq (ORCPT ); Tue, 5 May 2015 13:53:46 -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 138/208] x86/fpu: Simplify fpu__unlazy_stopped() error handling Date: Tue, 5 May 2015 19:50:30 +0200 Message-Id: <1430848300-27877-60-git-send-email-mingo@kernel.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1430848300-27877-1-git-send-email-mingo@kernel.org> References: <1430848300-27877-1-git-send-email-mingo@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that FPU contexts are always allocated, fpu__unlazy_stopped() cannot fail. Remove its error return and propagate the changes to the callers. 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/kernel/fpu/core.c | 48 +++++++++++++----------------------------------- 1 file changed, 13 insertions(+), 35 deletions(-) diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c index ca1b74831887..b8b03547072d 100644 --- a/arch/x86/kernel/fpu/core.c +++ b/arch/x86/kernel/fpu/core.c @@ -296,24 +296,18 @@ EXPORT_SYMBOL_GPL(fpstate_init_curr); * the read-only case, it's not strictly necessary for * read-only access to the context. */ -static int fpu__unlazy_stopped(struct fpu *child_fpu) +static void fpu__unlazy_stopped(struct fpu *child_fpu) { - int ret; - - if (WARN_ON_ONCE(child_fpu == ¤t->thread.fpu)) - return -EINVAL; + WARN_ON_ONCE(child_fpu == ¤t->thread.fpu); if (child_fpu->fpstate_active) { child_fpu->last_cpu = -1; - return 0; - } - - fpstate_init(child_fpu); - - /* Safe to do for stopped child tasks: */ - child_fpu->fpstate_active = 1; + } else { + fpstate_init(child_fpu); - return 0; + /* Safe to do for stopped child tasks: */ + child_fpu->fpstate_active = 1; + } } /* @@ -389,15 +383,11 @@ int xfpregs_get(struct task_struct *target, const struct user_regset *regset, void *kbuf, void __user *ubuf) { struct fpu *fpu = &target->thread.fpu; - int ret; if (!cpu_has_fxsr) return -ENODEV; - ret = fpu__unlazy_stopped(fpu); - if (ret) - return ret; - + fpu__unlazy_stopped(fpu); sanitize_i387_state(target); return user_regset_copyout(&pos, &count, &kbuf, &ubuf, @@ -414,10 +404,7 @@ int xfpregs_set(struct task_struct *target, const struct user_regset *regset, if (!cpu_has_fxsr) return -ENODEV; - ret = fpu__unlazy_stopped(fpu); - if (ret) - return ret; - + fpu__unlazy_stopped(fpu); sanitize_i387_state(target); ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, @@ -449,9 +436,7 @@ int xstateregs_get(struct task_struct *target, const struct user_regset *regset, if (!cpu_has_xsave) return -ENODEV; - ret = fpu__unlazy_stopped(fpu); - if (ret) - return ret; + fpu__unlazy_stopped(fpu); xsave = &fpu->state.xsave; @@ -480,9 +465,7 @@ int xstateregs_set(struct task_struct *target, const struct user_regset *regset, if (!cpu_has_xsave) return -ENODEV; - ret = fpu__unlazy_stopped(fpu); - if (ret) - return ret; + fpu__unlazy_stopped(fpu); xsave = &fpu->state.xsave; @@ -643,11 +626,8 @@ int fpregs_get(struct task_struct *target, const struct user_regset *regset, { struct fpu *fpu = &target->thread.fpu; struct user_i387_ia32_struct env; - int ret; - ret = fpu__unlazy_stopped(fpu); - if (ret) - return ret; + fpu__unlazy_stopped(fpu); if (!static_cpu_has(X86_FEATURE_FPU)) return fpregs_soft_get(target, regset, pos, count, kbuf, ubuf); @@ -677,9 +657,7 @@ int fpregs_set(struct task_struct *target, const struct user_regset *regset, struct user_i387_ia32_struct env; int ret; - ret = fpu__unlazy_stopped(fpu); - if (ret) - return ret; + fpu__unlazy_stopped(fpu); sanitize_i387_state(target); -- 2.1.0