From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1752486AbdK2UCU (ORCPT <rfc822;w@1wt.eu>);
        Wed, 29 Nov 2017 15:02:20 -0500
Received: from mail.skyhub.de ([5.9.137.197]:45538 "EHLO mail.skyhub.de"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1752014AbdK2UCS (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Wed, 29 Nov 2017 15:02:18 -0500
Date: Wed, 29 Nov 2017 21:02:12 +0100
From: Borislav Petkov <bp@alien8.de>
To: Peter Zijlstra <peterz@infradead.org>
Cc: linux-kernel@vger.kernel.org, Thomas Gleixner <tglx@linutronix.de>,
        Dave Hansen <dave.hansen@linux.intel.com>,
        Andy Lutomirski <luto@kernel.org>, Ingo Molnar <mingo@kernel.org>,
        Brian Gerst <brgerst@gmail.com>, Denys Vlasenko <dvlasenk@redhat.com>,
        "H. Peter Anvin" <hpa@zytor.com>, Josh Poimboeuf <jpoimboe@redhat.com>,
        Linus Torvalds <torvalds@linux-foundation.org>,
        Rik van Riel <riel@redhat.com>, daniel.gruss@iaik.tugraz.at,
        hughd@google.com, keescook@google.com, linux-mm@kvack.org,
        michael.schwarz@iaik.tugraz.at, moritz.lipp@iaik.tugraz.at,
        richard.fellner@student.tugraz.at
Subject: Re: [PATCH 5/6] x86/mm/kaiser: Optimize RESTORE_CR3
Message-ID: <20171129200212.gze3avcjofxrpy4t@pd.tnic>
References: <20171129103301.131535445@infradead.org>
 <20171129103512.869504878@infradead.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <20171129103512.869504878@infradead.org>
User-Agent: NeoMutt/20170609 (1.8.3)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Wed, Nov 29, 2017 at 11:33:06AM +0100, Peter Zijlstra wrote:
> Currently RESTORE_CR3 does an unconditional flush
> (SAVE_AND_SWITCH_TO_KERNEL_CR3 does not set bit 63 on \save_reg).
> 
> When restoring to a user ASID, check the user_asid_flush_mask to see
> if we can avoid the flush.
> 
> For kernel ASIDs we can unconditionaly avoid the flush, since we do
> explicit flushes for them.
> 
> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
> ---
>  arch/x86/entry/calling.h  |   29 +++++++++++++++++++++++++++--
>  arch/x86/entry/entry_64.S |    4 ++--
>  2 files changed, 29 insertions(+), 4 deletions(-)
> 
> --- a/arch/x86/entry/calling.h
> +++ b/arch/x86/entry/calling.h
> @@ -263,8 +263,33 @@ For 32-bit we have the following convent
>  .Ldone_\@:
>  .endm
>  
> -.macro RESTORE_CR3 save_reg:req
> +.macro RESTORE_CR3 scratch_reg:req save_reg:req
>  	STATIC_JUMP_IF_FALSE .Lend_\@, kaiser_enabled_key, def=1
> +
> +	/* ASID bit 11 is for user */
> +	bt	$11, \save_reg

<---- newline here.

> +	/*
> +	 * KERNEL pages can always resume with NOFLUSH as we do
> +	 * explicit flushes.
> +	 */
> +	jnc	.Lnoflush_\@
> +
> +	/*
> +	 * Check if there's a pending flush for the user ASID we're
> +	 * about to set.
> +	 */
> +	movq	\save_reg, \scratch_reg
> +	andq	$(0x7FF), \scratch_reg
> +	bt	\scratch_reg, PER_CPU_VAR(user_asid_flush_mask)
> +	jnc	.Lnoflush_\@
> +
> +	btr	\scratch_reg, PER_CPU_VAR(user_asid_flush_mask)
> +	jmp	.Ldo_\@

Can you save yourself one of the BT-insns?

	...
	andq	$(0x7FF), \scratch_reg
	btr     \scratch_reg, PER_CPU_VAR(user_asid_flush_mask)
	jnc	.Lnoflush_\@
	jmp     .Ldo_\@
	...

or am I missing a case?

-- 
Regards/Gruss,
    Boris.

Good mailing practices for 400: avoid top-posting and trim the reply.