From patchwork Tue Jan 14 17:51:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valentin Schneider X-Patchwork-Id: 13939220 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 52D00E77188 for ; Tue, 14 Jan 2025 18:04:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E0B0C280019; Tue, 14 Jan 2025 13:04:13 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DBA1928000C; Tue, 14 Jan 2025 13:04:13 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BE814280019; Tue, 14 Jan 2025 13:04:13 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 9E7D328000C for ; Tue, 14 Jan 2025 13:04:13 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 4D8251A0A02 for ; Tue, 14 Jan 2025 18:04:13 +0000 (UTC) X-FDA: 83006831586.17.DE80228 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf30.hostedemail.com (Postfix) with ESMTP id 67F3E8000A for ; Tue, 14 Jan 2025 18:04:11 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=LTwCaDm0; spf=pass (imf30.hostedemail.com: domain of vschneid@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=vschneid@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1736877851; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=qfGcbREmcisg82Rx6e546I8mjQ8z9ythW/HTCaSXKy0=; b=4O7uv8yRxlcaqT8+R8juM6t/N45l5i1/uHz99/SRK7KJbShcxMSCSdMGcnJ9hL8Rrr1Asf J/yQoa0tugJehnGMmB687/icJqDX1kX73GVyfUIMLtcq8CnnUKI0TOlQzHfeQ2rVgDSBYZ BGjIgIxqYC9MrGCYyDJxiU6queY1/Rk= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=LTwCaDm0; spf=pass (imf30.hostedemail.com: domain of vschneid@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=vschneid@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1736877851; a=rsa-sha256; cv=none; b=Y06zuhKXOFgRlaoOHtK1SNFPmAQ4/CC1r1QYCDrljksDbfzZCMGJMDD/JKK3vLN7yyhSwq DpLmP/b7fMWfMz+06SUWv+uQJ4yVCDLQJQKZW02U2aMkXKzWJPD/29LjE8G8U9US8AHFjO XGet8QRmelWtnXpyG3jTn8o6918oeSY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1736877850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qfGcbREmcisg82Rx6e546I8mjQ8z9ythW/HTCaSXKy0=; b=LTwCaDm030pG9AOhBs6eYL8FVYf41aic18w4nWdPtuJyXsj0F+g2wRKOBptvmqUT9KwHse E1ebR9dyzX62LSQh03PMnfQle0oNgEUhCKpCmB4HLRiz5/qJdKcbJ+Bihyrlx+K6PtYAWe 0741DzGA8VzB661JDz+biSa82BUPVPg= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-686-2bGxv9G8MbqEpONYIM0Pig-1; Tue, 14 Jan 2025 13:04:06 -0500 X-MC-Unique: 2bGxv9G8MbqEpONYIM0Pig-1 X-Mimecast-MFC-AGG-ID: 2bGxv9G8MbqEpONYIM0Pig Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id EBCE81955D4F; Tue, 14 Jan 2025 18:04:02 +0000 (UTC) Received: from vschneid-thinkpadt14sgen2i.remote.csb (unknown [10.39.192.55]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B2065195608A; Tue, 14 Jan 2025 18:03:39 +0000 (UTC) From: Valentin Schneider To: linux-kernel@vger.kernel.org, x86@kernel.org, virtualization@lists.linux.dev, linux-arm-kernel@lists.infradead.org, loongarch@lists.linux.dev, linux-riscv@lists.infradead.org, linux-perf-users@vger.kernel.org, xen-devel@lists.xenproject.org, kvm@vger.kernel.org, linux-arch@vger.kernel.org, rcu@vger.kernel.org, linux-hardening@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org, bpf@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com Cc: Juergen Gross , Ajay Kaher , Alexey Makhalov , Russell King , Catalin Marinas , Will Deacon , Huacai Chen , WANG Xuerui , Paul Walmsley , Palmer Dabbelt , Albert Ou , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , Peter Zijlstra , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , "Liang, Kan" , Boris Ostrovsky , Josh Poimboeuf , Pawan Gupta , Sean Christopherson , Paolo Bonzini , Andy Lutomirski , Arnd Bergmann , Frederic Weisbecker , "Paul E. McKenney" , Jason Baron , Steven Rostedt , Ard Biesheuvel , Neeraj Upadhyay , Joel Fernandes , Josh Triplett , Boqun Feng , Uladzislau Rezki , Mathieu Desnoyers , Lai Jiangshan , Zqiang , Juri Lelli , Clark Williams , Yair Podemsky , Tomas Glozar , Vincent Guittot , Dietmar Eggemann , Ben Segall , Mel Gorman , Kees Cook , Andrew Morton , Christoph Hellwig , Shuah Khan , Sami Tolvanen , Miguel Ojeda , Alice Ryhl , "Mike Rapoport (Microsoft)" , Samuel Holland , Rong Xu , Nicolas Saenz Julienne , Geert Uytterhoeven , Yosry Ahmed , "Kirill A. Shutemov" , "Masami Hiramatsu (Google)" , Jinghao Jia , Luis Chamberlain , Randy Dunlap , Tiezhu Yang Subject: [PATCH v4 27/30] x86/tlb: Make __flush_tlb_local() noinstr-compliant Date: Tue, 14 Jan 2025 18:51:40 +0100 Message-ID: <20250114175143.81438-28-vschneid@redhat.com> In-Reply-To: <20250114175143.81438-1-vschneid@redhat.com> References: <20250114175143.81438-1-vschneid@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 67F3E8000A X-Rspam-User: X-Stat-Signature: 8dhtwc7cxaa3z9so7ocaagsnjnc44qw9 X-HE-Tag: 1736877851-768702 X-HE-Meta: U2FsdGVkX18Q4x/1QIxaDcih18e+9EK9dFUeGHE9RYQ+OBThV7olVZNJ7FlFXZvZjTefd2HO58iRWY8i+6rPRjR71HyHJB5mnyegjri9DSRkTgy5rIkLMogjT/Yz4D4kai0Wef9cVGTR3Q/X+ODiOR6m4Qqu+wxy8ovrQ68a4U9Axip6tvIWHGdL+/HYpeMFwkvcpSmCmY/tKBTxQSkzFjOiCs8g31xIH0M/kVKVPdpdPRM/724w+xNL8uQJmoPESX7KXxYA6FN5VrxkS2DNUiwmeSLRnyJqIUPnbzwlYa6R/0DDBdGFS5RpMlsjgDvoIX3+JKDWfZqa9/lL0yKY3gWTo3U+szEFqScDx8oNAGrPbhCfoXVNlnSVEnTQXRm0TkkKpLGn+KwM9VZ3pUIMiuLwnIGvGQTZn+Ro/m2RpyGwjcaVqdxTV28gmMAf3rq3vgEbHImzY2A6iHe6Tx4megGUbp0NPzPJ4BuaygbZ5puVNP9WMw1L27mklTOy5FpuB3160CSkC1JKX6uCW3eB6RAbp5fXDCss2zEi29ySrZwIvR0EEm8TPFtx1Py3pn9oJQ2DBomTkj27RJWJZkVYoMoE4w/MxFScmnfo1mQ5Ff/4y/A2wles3Je5bnk8dfq4juWDHPsFJMdKLUs6PzqRnFPIXsAimr52ocVnSWpEhUgUyinR28ZbUj58E2jWUZpGhFHjrcwICcP61GEYxXuCVvTwImjoxWJ/D/wEmyqUPhN7feP7tD7gJiyFJivNJgL5Xa3Y39sRSD0QPjZDCjeiTc8M3LS3RTZJkl1USLxBvcpEV48JHZKKxFC5t0CIg9pcxRaJbuCtOe8x1/6GV7UNkyzRaa3eypyTuDQ5DNqYORnuwhSOfD1nmsrin9neHONolbSPxc43sZGutazVsJoCJ7op5DZ+OOPMv2Sv6qhwWWP522wr+B8BUXwcSJXfFZX0g3FOT4XyPvCpy9RHzvZ fsNOo82F UKyX+DyghpBOH2Q9T3scbv8FoSoRwPkkie10zxOHvyIzSKCJu6Q4w19LE/wMt0fMJW2+zSBFH2RLfrdTFH0O86oXF8skCVQwTgJmk3qAgExttJaGi8/79oTuNyffbt9IPKF7xpKhvlhwzVsvpJy7W7PpEOEqsq6HU2Z6YeHZ+R3gLwZUhoVJWeITEEmBhosmaXoE15CtNcP+cody1EcyH9hpDC35f5QMNbdRuEA1tC3xgNOdnGYO5ohzDIM/Fhye1kZrRiLfETujQKFZB0VRtY63slKqXKRdGwPLLBjemvPJgl1glvC9mPTq/t2E/fkdDVl8mJ5y/dRGryPns7lYYACWQExDapEedXXs7Pznrh3GX6uMLckjDm39dCc1g/bEtHTDS+D4H0VQw802OEgAGmvyI9VWv2ZOP9mw0vL9TTUarjzBAm9NBYV2yunHlcfBVc7sw/KEiFMxBIhJth0rfHK8XYg== 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: List-Subscribe: List-Unsubscribe: Later patches will require issuing a __flush_tlb_all() from noinstr code. This requires making both __flush_tlb_local() and __flush_tlb_global() noinstr-compliant. For __flush_tlb_local(), xen_flush_tlb() has already been made noinstr, so it's just native_flush_tlb_global(), and simply __always_inline'ing invalidate_user_asid() gets us there Signed-off-by: Valentin Schneider --- arch/x86/include/asm/paravirt.h | 2 +- arch/x86/mm/tlb.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h index b3daee3d46677..0c0dd186c03e6 100644 --- a/arch/x86/include/asm/paravirt.h +++ b/arch/x86/include/asm/paravirt.h @@ -70,7 +70,7 @@ void native_flush_tlb_one_user(unsigned long addr); void native_flush_tlb_multi(const struct cpumask *cpumask, const struct flush_tlb_info *info); -static inline void __flush_tlb_local(void) +static __always_inline void __flush_tlb_local(void) { PVOP_VCALL0(mmu.flush_tlb_user); } diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c index 2d2ab3e221f0c..18b40bbc2fa15 100644 --- a/arch/x86/mm/tlb.c +++ b/arch/x86/mm/tlb.c @@ -257,7 +257,7 @@ static void choose_new_asid(struct mm_struct *next, u64 next_tlb_gen, * * See SWITCH_TO_USER_CR3. */ -static inline void invalidate_user_asid(u16 asid) +static __always_inline void invalidate_user_asid(u16 asid) { /* There is no user ASID if address space separation is off */ if (!IS_ENABLED(CONFIG_MITIGATION_PAGE_TABLE_ISOLATION)) @@ -1206,7 +1206,7 @@ STATIC_NOPV noinstr void native_flush_tlb_global(void) /* * Flush the entire current user mapping */ -STATIC_NOPV void native_flush_tlb_local(void) +STATIC_NOPV noinstr void native_flush_tlb_local(void) { /* * Preemption or interrupts must be disabled to protect the access