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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id A3CD8C00140 for ; Mon, 15 Aug 2022 17:34:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C5FD78D0001; Mon, 15 Aug 2022 13:34:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C0EFE6B0075; Mon, 15 Aug 2022 13:34:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AB0B48D0001; Mon, 15 Aug 2022 13:34:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 9932F6B0073 for ; Mon, 15 Aug 2022 13:34:27 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 65F7E1C60C6 for ; Mon, 15 Aug 2022 17:34:27 +0000 (UTC) X-FDA: 79802526174.05.0BE21A3 Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) by imf16.hostedemail.com (Postfix) with ESMTP id DCE89180002 for ; Mon, 15 Aug 2022 17:34:26 +0000 (UTC) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id 355FB3200978; Mon, 15 Aug 2022 13:34:24 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Mon, 15 Aug 2022 13:34:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shutemov.name; h=cc:cc:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm2; t=1660584863; x=1660671263; bh=s8 F5Li3vLXtiHsgPNRcWkpFl7ut43BURsDBMgZOTsU8=; b=DHsHchmeMXQCRyU3aM jlgJK7s49Lft57hqXe0uWIZHN/kg1Ax2mynbSaBkHuCzuZ4xEYU0flcw3CpQblID 0jaqwrjiTD5mhBczkgm00mg9sLvqAkYalWHtYfOnU3JalKNldaYzMjiJ/JgH1jy1 npa9ANx3eL37kYoY/29vdqecJ1eUA4562ZNAGeLCkFjfe5wRJXW6++eG6Hz+Rooi J4zRs/tOOoFEcX1nZlyprspioJMVf5wSYnS/7ud56zYegS61KINMBoV239zGQxMu eHWvgU0pifa41kNe8XFnHKdswe9zLRqM80R+HRP4iKKiFhXtcvFF0hLVvgyytQRM P1GQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:date:date:feedback-id :feedback-id:from:from:in-reply-to:in-reply-to:message-id :mime-version:references:reply-to:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; t=1660584863; x=1660671263; bh=s8F5Li3vLXtiHsgPNRcWkpFl7ut4 3BURsDBMgZOTsU8=; b=bp4pJT2YbiY6d4r7eCyBP33QhuR3vchYjmgT1pFZI5/G t0PuyUkiSpSroZQNlN516Sh8RdI29lBLDAQ+Go4Yz5MI1YLoUK0xyvapX2aQofHJ RVAyPsWRq1z6E8O18hstgsV9k1mWwq1d4XjtzHZX9RTijjqGzpSHLfwoHkHqo6Sy wskaCoWTxDnO5iTunxMEKxCiem17W42rkPUfUox11vIdy7aiXfbjhdNQSH07tzZU +O0OOVnFXjuY6Cc9bL6H2DpC78vNSGRGX5h57oA9RkUdiYOn/3TsC7eQ7Fuc59zv uMBF0WPAreIXTqNBg4kEWx9mxhpcAgyGUSWHMowVBg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdehvddgudduhecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpeffhffvvefukfhfgggtuggjsehttddttddttddvnecuhfhrohhmpedfmfhi rhhilhhlucetrdcuufhhuhhtvghmohhvfdcuoehkihhrihhllhesshhhuhhtvghmohhvrd hnrghmvgeqnecuggftrfgrthhtvghrnhephfeigefhtdefhedtfedthefghedutddvueeh tedttdehjeeukeejgeeuiedvkedtnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrg hmpehmrghilhhfrhhomhepkhhirhhilhhlsehshhhuthgvmhhovhdrnhgrmhgv X-ME-Proxy: Feedback-ID: ie3994620:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 15 Aug 2022 13:34:22 -0400 (EDT) Received: by box.shutemov.name (Postfix, from userid 1000) id 0F94E104A4B; Mon, 15 Aug 2022 20:37:25 +0300 (+03) Date: Mon, 15 Aug 2022 20:37:25 +0300 From: "Kirill A. Shutemov" To: Peter Zijlstra Cc: "Kirill A. Shutemov" , Dave Hansen , Andy Lutomirski , x86@kernel.org, Kostya Serebryany , Andrey Ryabinin , Andrey Konovalov , Alexander Potapenko , Taras Madan , Dmitry Vyukov , "H . J . Lu" , Andi Kleen , Rick Edgecombe , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCHv6 04/11] x86/mm: Handle LAM on context switch Message-ID: <20220815173725.ph6ogtqneiqwqek7@box.shutemov.name> References: <20220815041803.17954-1-kirill.shutemov@linux.intel.com> <20220815041803.17954-5-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=shutemov.name header.s=fm2 header.b=DHsHchme; dkim=pass header.d=messagingengine.com header.s=fm1 header.b=bp4pJT2Y; spf=pass (imf16.hostedemail.com: domain of kirill@shutemov.name designates 64.147.123.19 as permitted sender) smtp.mailfrom=kirill@shutemov.name; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1660584867; a=rsa-sha256; cv=none; b=hgXml3iCNeousLHBjmTPRz9pCWF1RRQaYA21GwmVCetxacBQF4UvMgO9axcJPsRBeSooTf juGQndxcJJ0IBg3N0UKdt3jv1qjf27OLtFmOW+McS0azgJotnzMLTsLumN2bfHVnH8X2qx xBtQInD6R5uNvMY0SkIx2jJBRh83Q2s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1660584867; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=s8F5Li3vLXtiHsgPNRcWkpFl7ut43BURsDBMgZOTsU8=; b=ZW7pgiOtlcjtL89jyeNYL9MDWWaVX5coFLqnCMqkx+jU0Nse157xg9sgWX+HNb7WofNE+4 cymWKfU0yhWbVJUByd9/G30o6nPD+2+fAdfMb9lqKhl7pwgnkSl+ZqVujMKTsM89EhZ5uy 3aN2yXo9hZzfl2IYE3DCw1mBgBrRm0w= Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=shutemov.name header.s=fm2 header.b=DHsHchme; dkim=pass header.d=messagingengine.com header.s=fm1 header.b=bp4pJT2Y; spf=pass (imf16.hostedemail.com: domain of kirill@shutemov.name designates 64.147.123.19 as permitted sender) smtp.mailfrom=kirill@shutemov.name; dmarc=none X-Stat-Signature: qsqp4r87ffo3qzbepi44tmkz7mdjm6j1 X-Rspamd-Server: rspam09 X-Rspam-User: X-Rspamd-Queue-Id: DCE89180002 X-HE-Tag: 1660584866-455421 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Mon, Aug 15, 2022 at 03:42:25PM +0200, Peter Zijlstra wrote: > On Mon, Aug 15, 2022 at 07:17:56AM +0300, Kirill A. Shutemov wrote: > > diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c > > index c1e31e9a85d7..fdc0b69b5da7 100644 > > --- a/arch/x86/mm/tlb.c > > +++ b/arch/x86/mm/tlb.c > > @@ -154,17 +154,18 @@ static inline u16 user_pcid(u16 asid) > > return ret; > > } > > > > -static inline unsigned long build_cr3(pgd_t *pgd, u16 asid) > > +static inline unsigned long build_cr3(pgd_t *pgd, u16 asid, unsigned long lam) > > { > > if (static_cpu_has(X86_FEATURE_PCID)) { > > - return __sme_pa(pgd) | kern_pcid(asid); > > + return __sme_pa(pgd) | kern_pcid(asid) | lam; > > } else { > > VM_WARN_ON_ONCE(asid != 0); > > - return __sme_pa(pgd); > > + return __sme_pa(pgd) | lam; > > } > > } > > > > -static inline unsigned long build_cr3_noflush(pgd_t *pgd, u16 asid) > > +static inline unsigned long build_cr3_noflush(pgd_t *pgd, u16 asid, > > + unsigned long lam) > > { > > VM_WARN_ON_ONCE(asid > MAX_ASID_AVAILABLE); > > /* > > @@ -173,7 +174,7 @@ static inline unsigned long build_cr3_noflush(pgd_t *pgd, u16 asid) > > * boot because all CPU's the have same capabilities: > > */ > > VM_WARN_ON_ONCE(!boot_cpu_has(X86_FEATURE_PCID)); > > - return __sme_pa(pgd) | kern_pcid(asid) | CR3_NOFLUSH; > > + return __sme_pa(pgd) | kern_pcid(asid) | lam | CR3_NOFLUSH; > > } > > Looking at this; I wonder if we want something like this: > > --- a/arch/x86/mm/tlb.c > +++ b/arch/x86/mm/tlb.c > @@ -157,6 +157,7 @@ static inline u16 user_pcid(u16 asid) > static inline unsigned long build_cr3(pgd_t *pgd, u16 asid, unsigned long lam) > { > if (static_cpu_has(X86_FEATURE_PCID)) { > + VM_WARN_ON_ONCE(asid > MAX_ASID_AVAILABLE); > return __sme_pa(pgd) | kern_pcid(asid) | lam; > } else { > VM_WARN_ON_ONCE(asid != 0); > @@ -167,14 +168,13 @@ static inline unsigned long build_cr3(pg > static inline unsigned long build_cr3_noflush(pgd_t *pgd, u16 asid, > unsigned long lam) > { > - VM_WARN_ON_ONCE(asid > MAX_ASID_AVAILABLE); > /* > * Use boot_cpu_has() instead of this_cpu_has() as this function > * might be called during early boot. This should work even after > * boot because all CPU's the have same capabilities: > */ > VM_WARN_ON_ONCE(!boot_cpu_has(X86_FEATURE_PCID)); > - return __sme_pa(pgd) | kern_pcid(asid) | lam | CR3_NOFLUSH; > + return build_cr3(pgd, asid, lam) | CR3_NOFLUSH; > } Looks sane, but seems unrelated to the patch. Is it okay to fold it anyway? -- Kiryl Shutsemau / Kirill A. Shutemov