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=-7.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_PASS,USER_AGENT_MUTT 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 C5CA2C04EB8 for ; Tue, 4 Dec 2018 13:39:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8A606206B7 for ; Tue, 4 Dec 2018 13:39:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="tseYKfu7" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8A606206B7 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org 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 S1726407AbeLDNjl (ORCPT ); Tue, 4 Dec 2018 08:39:41 -0500 Received: from mail.kernel.org ([198.145.29.99]:44192 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725770AbeLDNjl (ORCPT ); Tue, 4 Dec 2018 08:39:41 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0C525206B6; Tue, 4 Dec 2018 13:39:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1543930780; bh=AUOps6vsAp5H0ofVvGFUrs0Z8qFuqwt5MJBumjVMxeI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=tseYKfu7/ndCoXZzIcgEeXSgIOV6HepMyUwv6D6fuIS3luU9f1EmZUAOFqHcBy+UR bOULq9G+2WNnESpg97DsT5OCQu+a8iX+WhO4R31eVQeyVg0HPcRCu/U8HHrlmPEDeT 0RzAHAx0Q+ojkIRGGKjfKTJDoy/eZmihKVu81bPw= Date: Tue, 4 Dec 2018 14:39:38 +0100 From: Greg Kroah-Hartman To: Thomas Gleixner Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, Ingo Molnar , Peter Zijlstra , Andy Lutomirski , Linus Torvalds , Jiri Kosina , Tom Lendacky , Josh Poimboeuf , Andrea Arcangeli , David Woodhouse , Tim Chen , Andi Kleen , Dave Hansen , Casey Schaufler , Asit Mallick , Arjan van de Ven , Jon Masters , Waiman Long , Dave Stewart , Kees Cook Subject: Re: [PATCH 4.14 098/146] x86/process: Consolidate and simplify switch_to_xtra() code Message-ID: <20181204133938.GA4749@kroah.com> References: <20181204103726.750894136@linuxfoundation.org> <20181204103730.767674414@linuxfoundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.11.0 (2018-11-25) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Dec 04, 2018 at 12:14:13PM +0100, Thomas Gleixner wrote: > On Tue, 4 Dec 2018, Greg Kroah-Hartman wrote: > > --- a/arch/x86/kernel/process_32.c > > +++ b/arch/x86/kernel/process_32.c > > @@ -234,7 +234,6 @@ __switch_to(struct task_struct *prev_p, > > struct fpu *prev_fpu = &prev->fpu; > > struct fpu *next_fpu = &next->fpu; > > int cpu = smp_processor_id(); > > - struct tss_struct *tss = &per_cpu(cpu_tss_rw, cpu); > > > > /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */ > > > > @@ -266,12 +265,7 @@ __switch_to(struct task_struct *prev_p, > > if (get_kernel_rpl() && unlikely(prev->iopl != next->iopl)) > > set_iopl_mask(next->iopl); > > > > - /* > > - * Now maybe handle debug registers and/or IO bitmaps > > - */ > > - if (unlikely(task_thread_info(prev_p)->flags & _TIF_WORK_CTXSW_PREV || > > - task_thread_info(next_p)->flags & _TIF_WORK_CTXSW_NEXT)) > > - __switch_to_xtra(prev_p, next_p, tss); > > + switch_to_extra(prev_p, next_p); > > This is missing the hunk below. > > Thanks, > > tglx > > 8<------------------ > > diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c > index 67cecc9a2b6f..c2df91eab573 100644 > --- a/arch/x86/kernel/process_32.c > +++ b/arch/x86/kernel/process_32.c > @@ -59,6 +59,8 @@ > #include > #include > > +#include "process.h" > + > void __show_regs(struct pt_regs *regs, int all) > { > unsigned long cr0 = 0L, cr2 = 0L, cr3 = 0L, cr4 = 0L; Thanks, now updated. greg k-h