Received-SPF: pass (google.com: domain of linux-kernel+bounces-100446-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Date: Tue, 12 Mar 2024 15:34:55 +0000
In-Reply-To: <3a56vovcqy7ju5og76nqlekfruq42i56wmp4oek3jgkffvzjby@q5guufebkpzr>
Precedence: bulk
Mime-Version: 1.0
References: <20240312035951.3535980-1-yosryahmed@google.com>
 <20240312035951.3535980-2-yosryahmed@google.com> <3a56vovcqy7ju5og76nqlekfruq42i56wmp4oek3jgkffvzjby@q5guufebkpzr>
Message-ID: <ZfB2HyzkWzaAQHYo@google.com>
Subject: Re: [PATCH 2/3] x86/mm: Fix LAM inconsistency during context switch
From: Yosry Ahmed <yosryahmed@google.com>
To: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Cc: x86@kernel.org, Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>, 
	Borislav Petkov <bp@alien8.de>, Dave Hansen <dave.hansen@linux.intel.com>, 
	"H. Peter Anvin" <hpa@zytor.com>, Andy Lutomirski <luto@kernel.org>, Peter Zijlstra <peterz@infradead.org>, 
	Rick Edgecombe <rick.p.edgecombe@intel.com>, Andrew Morton <akpm@linux-foundation.org>, 
	linux-mm@kvack.org, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="us-ascii"

On Tue, Mar 12, 2024 at 02:35:46PM +0200, Kirill A. Shutemov wrote:
> On Tue, Mar 12, 2024 at 03:59:50AM +0000, Yosry Ahmed wrote:
> > diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
> > index 76e91fc68c5f3..748d2b3bdb985 100644
> > --- a/arch/x86/kernel/process_64.c
> > +++ b/arch/x86/kernel/process_64.c
> > @@ -753,10 +753,12 @@ static long prctl_map_vdso(const struct vdso_image *image, unsigned long addr)
> >  static void enable_lam_func(void *__mm)
> >  {
> >  	struct mm_struct *mm = __mm;
> > +	unsigned long lam = mm_lam_cr3_mask(mm);
> > +	u64 untag_mask = mm_untag_mask(mm);
> >  
> 
> Maybe push these mm dereferences inside the if block below?
> I am not sure if compiler can re-order operations past this_cpu_read().

I am not sure either, so I will push them inside. Better safe than
sorry. Will send a v2 shortly, thanks for the reviews!

> 
> >  	if (this_cpu_read(cpu_tlbstate.loaded_mm) == mm) {
> > -		write_cr3(__read_cr3() | mm->context.lam_cr3_mask);
> > -		set_tlbstate_lam_mode(mm);
> > +		write_cr3(__read_cr3() | lam);
> > +		cpu_tlbstate_update_lam(lam, untag_mask);
> >  	}
> >  }
> >  
> 
> -- 
>   Kiryl Shutsemau / Kirill A. Shutemov