Date: Fri, 1 Sep 2017 07:39:53 -0700
From: Andrei Vagin <avagin@virtuozzo.com>
To: Ingo Molnar <mingo@kernel.org>
Cc: tip-bot for Jacob Shin <tipbot@zytor.com>,
        Thomas Gleixner <tglx@linutronix.de>,
        Cyrill Gorcunov <gorcunov@openvz.org>,
        linux-tip-commits@vger.kernel.org, luto@kernel.org,
        peterz@infradead.org, rostedt@goodmis.org,
        linux-kernel@vger.kernel.org, hpa@zytor.com, brgerst@gmail.com,
        jpoimboe@redhat.com, bp@alien8.de, torvalds@linux-foundation.org,
        dvlasenk@redhat.com
Subject: Re: [PATCH] x86/idt: Fix the X86_TRAP_BP gate
Message-ID: <20170901143952.GA9394@outlook.office365.com>
References: <tip-90f6225fba0c732f3f5f9f5e265bdefa021ff12d@git.kernel.org>
 <20170901062815.GA349@outlook.office365.com>
 <20170901082630.xvyi5bwk6etmppqc@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=koi8-r
Content-Disposition: inline
In-Reply-To: <20170901082630.xvyi5bwk6etmppqc@gmail.com>
User-Agent: Mutt/1.8.3 (2017-05-23)
SpamDiagnosticOutput: 1:99
SpamDiagnosticMetadata: NSPM
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Sep 2017 14:40:06.0031 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5PR08MB0743
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 2262
Lines: 70

On Fri, Sep 01, 2017 at 10:26:30AM +0200, Ingo Molnar wrote:
> 
> Hi Andrei,
> 
> * Andrei Vagin <avagin@virtuozzo.com> wrote:
> 
> > Hi Thomas,
> > 
> > We run CRIU tests for linux-next and today they detected an issue. I've
> > bisected this problem and it looks like a problem is in this patch.
> 
> Ok, there appears to be a bug in that conversion - does the patch below fix the 
> regression for you?

Yes, it is.

Thank you!

> 
> Thanks,
> 
> 	Ingo
> 
> ================================>
> Subject: x86/idt: Fix the X86_TRAP_BP gate
> From: Ingo Molnar <mingo@kernel.org>
> 
> Andrei Vagin reported a CRIU regression and bisected it back to:
> 
>   90f6225fba0c ("x86/idt: Move IST stack based traps to table init")
> 
> This table init conversion loses the system-gate property of X86_TRAP_BP
> and erroneously moves it from DPL3 to DPL0.
> 
> Fix it.
> 
> Reported-by: Andrei Vagin <avagin@virtuozzo.com>
> Cc: Linus Torvalds <torvalds@linux-foundation.org>
> Cc: Peter Zijlstra <peterz@infradead.org>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Signed-off-by: Ingo Molnar <mingo@kernel.org>
> ---
> arch/x86/kernel/idt.c | 6 +++++-
>  arch/x86/kernel/idt.c |    6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> Index: tip/arch/x86/kernel/idt.c
> ===================================================================
> --- tip.orig/arch/x86/kernel/idt.c
> +++ tip/arch/x86/kernel/idt.c
> @@ -44,6 +44,10 @@ struct idt_data {
>  #define ISTG(_vector, _addr, _ist)			\
>  	G(_vector, _addr, _ist, GATE_INTERRUPT, DPL0, __KERNEL_CS)
>  
> +/* System interrupt gate with interrupt stack */
> +#define SISTG(_vector, _addr, _ist)			\
> +	G(_vector, _addr, _ist, GATE_INTERRUPT, DPL3, __KERNEL_CS)
> +
>  /* Task gate */
>  #define TSKG(_vector, _gdt)				\
>  	G(_vector, NULL, DEFAULT_STACK, GATE_TASK, DPL0, _gdt << 3)
> @@ -181,7 +185,7 @@ gate_desc debug_idt_table[IDT_ENTRIES] _
>  static const __initdata struct idt_data ist_idts[] = {
>  	ISTG(X86_TRAP_DB,	debug,		DEBUG_STACK),
>  	ISTG(X86_TRAP_NMI,	nmi,		NMI_STACK),
> -	ISTG(X86_TRAP_BP,	int3,		DEBUG_STACK),
> +	SISTG(X86_TRAP_BP,	int3,		DEBUG_STACK),
>  	ISTG(X86_TRAP_DF,	double_fault,	DOUBLEFAULT_STACK),
>  #ifdef CONFIG_X86_MCE
>  	ISTG(X86_TRAP_MC,	&machine_check,	MCE_STACK),