Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp8258789imu; Tue, 4 Dec 2018 05:41:41 -0800 (PST) X-Google-Smtp-Source: AFSGD/U6qNbEXdjr04tlSQU/zc+5aSnJwQZGeELVCgkiTTRZwE1Jvyi0oqELS64L9z9y4V3iU+t4 X-Received: by 2002:a17:902:5a0b:: with SMTP id q11mr20278975pli.186.1543930901730; Tue, 04 Dec 2018 05:41:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543930901; cv=none; d=google.com; s=arc-20160816; b=bEJUJ3X1VBncrje6T3taxmZUAi3qZCoiiM0/snA7G01rbczawlDXU2igvfjmvCzFno PIt7886At3+AuI7dGG0tQFnf6NhDphishdOGBBUg6U1VfpZ3XyfkId9QW0Twu3TqDOs8 h6dP3FuTDDXN2D4yAp8P2uqA/DsB+kLmNFwIILZViIZFFkaeb36ArSZM9CNM9BTBFPte 2CXLo+PG4A1btq/hyQv8h2ONGb90NfJtvYhbq8eC5EvecVkv5+n5IWCql6+KMade7k9K CyNUrp30bYyu+wyKQMugNOetAC7xPwyj1kPoe+0Udqt2I37CZnZ/WDA4Ah1+MQVQyB+u glcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:dkim-signature; bh=vxusfD7uFDSlfGfCPXtDy+YOfg11Qd/g5Y353M6Vg6Q=; b=0SPS96vA3AQQnf0NrJ9hAPzXKny/84r4n77Uu6BjsKtv/cHRNqrfoo9ao6RSVRyWQ/ pY00KV7+aB/KNw9s+/4WWtbGQy+tAX/QyL/kcktLjAQ1QrN5hChIh2Z0lznAsyfzifjR 0PHhOJpVdb0h2ZP2IRIPPbBZZNvJWi8wLDn6ez9j0tzSVkoCSZfzBKe7OoAxfa/xBNIA JCI6FZnVtX9lA7NLCq2DPitu10XLi8+y4ZC0ax5hUUr4adNAo5vyMdhr3fR3MyI++qAV khTcgd0UgAWEp/JWbS6yHfuy9hTCInszjSUTNwKOiXM+Ypkf6OTKn47peBm7yQfymZ2h liKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=tseYKfu7; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e12si16878148pls.71.2018.12.04.05.41.26; Tue, 04 Dec 2018 05:41:41 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=tseYKfu7; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726399AbeLDNjl (ORCPT + 99 others); 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