From patchwork Tue Dec 27 03:08:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A. Shutemov" X-Patchwork-Id: 13082043 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 ED3AAC46467 for ; Tue, 27 Dec 2022 03:08:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BE2D88E0001; Mon, 26 Dec 2022 22:08:53 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id AF7FB8E0007; Mon, 26 Dec 2022 22:08:53 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7E6928E0005; Mon, 26 Dec 2022 22:08:53 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 5119C8E0001 for ; Mon, 26 Dec 2022 22:08:53 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 10671160587 for ; Tue, 27 Dec 2022 03:08:53 +0000 (UTC) X-FDA: 80286604146.16.7EDFEC1 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by imf17.hostedemail.com (Postfix) with ESMTP id CCE1E4000E for ; Tue, 27 Dec 2022 03:08:50 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=XbK9Gv5Z; dmarc=pass (policy=none) header.from=intel.com; spf=none (imf17.hostedemail.com: domain of kirill.shutemov@linux.intel.com has no SPF policy when checking 134.134.136.24) smtp.mailfrom=kirill.shutemov@linux.intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1672110531; 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=3oEAak2Bk2D6xV/o1T1HeLHo/xDtSBqAhlKUcWH+Zxo=; b=SKQ0g7/rSJ9zPgTOJ0Lm5mMVRhkXNpqaRkFi0WLDmidG/DCpjoZcO7BBDAy2ciU7LmSq2I qVlMpJKtwx7dZ8xwOU7T3RgAY3gk5i67mQDvTm8jiXVH8fz4e1JH+3l70k11tEjqAZfQOG GVHB95sveHOpLQcQTjBN4yIvcgmg89s= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=XbK9Gv5Z; dmarc=pass (policy=none) header.from=intel.com; spf=none (imf17.hostedemail.com: domain of kirill.shutemov@linux.intel.com has no SPF policy when checking 134.134.136.24) smtp.mailfrom=kirill.shutemov@linux.intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1672110531; a=rsa-sha256; cv=none; b=3m4nfCjvkVAkw766b1l95FEkYzp39AJK1JB9Tor9eyyAJfZAlzXGSUOwCQgBd5z9w3vYXK Tg8KzSvHy6ekJkcp2U1+Gp4ayMXKRuXV4+4IipIK3neMC0H9RPSnyQtlDHV0B2H8WhI884 DJsMY+p+OVXLb0fxL6vtctdQea8l7hA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1672110531; x=1703646531; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=RtCIdg8lGqV2ZfTQEm450k++h2Jppj7vK0WjZsYLBB4=; b=XbK9Gv5ZEQbxkya/gVPOE9SGQvFynLAr2qzqZGnpKtccZgQqm8bG6Uzl va1uYhYZr4BweQESAu0lRhPHzlDTSTnOu22lr2mbQ84Z5PN4bhWP+Kbhn pWhyCLuLmR7WpsJiRtDc6qtMMSXQZWmNgc60qmpB+hSlUiTRGsisczvSn p7/Zw4aRZmCR9xPBr1xdSGL5f0XD7FP0bkS0T73/9Hdyd62Srg/UYYUZl 9aE5gr0HONk4JukQi1GrkuMdSom4gNq5t/dlHgOPcAVkYxFkN/O3jMp9U AbHK8GDRtKSLs/Var9G8Jjek7lynz+U+t0L1ObUYK+xetGpZWUOMU8J3I w==; X-IronPort-AV: E=McAfee;i="6500,9779,10572"; a="321869748" X-IronPort-AV: E=Sophos;i="5.96,277,1665471600"; d="scan'208";a="321869748" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Dec 2022 19:08:47 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10572"; a="652917515" X-IronPort-AV: E=Sophos;i="5.96,277,1665471600"; d="scan'208";a="652917515" Received: from ppogotov-mobl.ger.corp.intel.com (HELO box.shutemov.name) ([10.252.62.152]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Dec 2022 19:08:39 -0800 Received: by box.shutemov.name (Postfix, from userid 1000) id 84BC110BBAD; Tue, 27 Dec 2022 06:08:36 +0300 (+03) From: "Kirill A. Shutemov" To: Dave Hansen , Andy Lutomirski , Peter Zijlstra Cc: x86@kernel.org, Kostya Serebryany , Andrey Ryabinin , Andrey Konovalov , Alexander Potapenko , Taras Madan , Dmitry Vyukov , "H . J . Lu" , Andi Kleen , Rick Edgecombe , Bharata B Rao , Jacob Pan , Ashok Raj , Linus Torvalds , linux-mm@kvack.org, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCHv13 01/16] x86: Allow atomic MM_CONTEXT flags setting Date: Tue, 27 Dec 2022 06:08:14 +0300 Message-Id: <20221227030829.12508-2-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.38.2 In-Reply-To: <20221227030829.12508-1-kirill.shutemov@linux.intel.com> References: <20221227030829.12508-1-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: CCE1E4000E X-Stat-Signature: zazhjx4ecio3ohbc15m88bs9xrij49th X-HE-Tag: 1672110530-625381 X-HE-Meta: U2FsdGVkX19oJCWHhgTVOCgUhUlkAqIxQsQNc64H06jB+BsqYQZUwCl66q0gEsECYWimTjVPsk1Q5MNogyKXdWMqJ+I2lBFSROj0mtYfxEVP4HI+S4LzBmbL2KkUYwlFZdacKwtWXF8fZPYJAHapnnID285kx97fLfxP2ldrwHi1B+X0qxNAHZlWO8H/fZqL9IQE3e/r4vyca6X1SrZsdGgnWw7IcPnkiG8R2s2i2H88PmLJjI1B20PF3wXFGt8QBnXTWKJ0qmbeBeqH5id52IN3oJ1niYWwDn1+ZYjiEFjWUCVT1/FCPmjW1zCAvx5idjFo/NDX9gVEBNmoDwMTXJoxn0efRF1C24DXbVkw9VLIQ0o7dEqWIvoR2503Y067/6YN0eG1K3cE+aiGbp7b4fAqtCdNOxOMy2d6jRbrJysVrh7WfIURpdqIVIKAi7FtbSW01R655ukJVPorizQf04D6wSWhx1ET81f8qieiTUY0+jJPYMqiBTimd66EzYUijqsIwkk3Qn1AlBFHkgy+fgJEjZ/uzf363+mY0ejolgxQKGQpWEYwF8XC/C2RnU+OipdVBDL3KStKZGr/N3sL9/Z7sz3I+d3sBaQqQ5RBrMw9He9F0+9D7AMgzdpLvvXBqVaihiLAn4FmM2ht4/ptfJGKdpLsHWaVlCG0zqihLKSRiXqLy+ggHArOZqegjlC7AfYSQ6XY/lYkKapLyWfVq6cNZgbo+XoJXA+90os3Eom++8tJZp8PdV4uk0Bjskg3zqzSoAuWAhpK3qRyOoRPC34tWxWwPdT78iNOQwbVOD6rnDx9NCN7eAyAW0NSXUDWJNpFEhC7XFL/1GW1QTU8Jasowhgc7seDLGg+R33AzUP5ejSsWl8eThI1OKGOAl8j2j1TNF45UIDQ0uYIOKkTzJ2aaElw3xXJ2dTzH5tUf29FYpVfHhNhcwNVVk7Mue0JNhOnPkpXJA/Z/wXIrLr z8I8skQw qXMil7KvpyVSCQ+lGbuy47w6qzDrItyjuHHZq 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: So far there's no need in atomic setting of MM context flags in mm_context_t::flags. The flags set early in exec and never change after that. LAM enabling requires atomic flag setting. Convert the field to unsigned long and MM_CONTEXT_* accesses with __set_bit() and test_bit(). No functional changes. Signed-off-by: Kirill A. Shutemov --- arch/x86/entry/vsyscall/vsyscall_64.c | 2 +- arch/x86/include/asm/mmu.h | 6 +++--- arch/x86/include/asm/mmu_context.h | 2 +- arch/x86/kernel/process_64.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/x86/entry/vsyscall/vsyscall_64.c b/arch/x86/entry/vsyscall/vsyscall_64.c index 4af81df133ee..ed320e145cf9 100644 --- a/arch/x86/entry/vsyscall/vsyscall_64.c +++ b/arch/x86/entry/vsyscall/vsyscall_64.c @@ -317,7 +317,7 @@ static struct vm_area_struct gate_vma __ro_after_init = { struct vm_area_struct *get_gate_vma(struct mm_struct *mm) { #ifdef CONFIG_COMPAT - if (!mm || !(mm->context.flags & MM_CONTEXT_HAS_VSYSCALL)) + if (!mm || test_bit(MM_CONTEXT_HAS_VSYSCALL, &mm->context.flags)) return NULL; #endif if (vsyscall_mode == NONE) diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h index 5d7494631ea9..efa3eaee522c 100644 --- a/arch/x86/include/asm/mmu.h +++ b/arch/x86/include/asm/mmu.h @@ -9,9 +9,9 @@ #include /* Uprobes on this MM assume 32-bit code */ -#define MM_CONTEXT_UPROBE_IA32 BIT(0) +#define MM_CONTEXT_UPROBE_IA32 0 /* vsyscall page is accessible on this MM */ -#define MM_CONTEXT_HAS_VSYSCALL BIT(1) +#define MM_CONTEXT_HAS_VSYSCALL 1 /* * x86 has arch-specific MMU state beyond what lives in mm_struct. @@ -39,7 +39,7 @@ typedef struct { #endif #ifdef CONFIG_X86_64 - unsigned short flags; + unsigned long flags; #endif struct mutex lock; diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h index b8d40ddeab00..53ef591a6166 100644 --- a/arch/x86/include/asm/mmu_context.h +++ b/arch/x86/include/asm/mmu_context.h @@ -181,7 +181,7 @@ static inline void arch_exit_mmap(struct mm_struct *mm) static inline bool is_64bit_mm(struct mm_struct *mm) { return !IS_ENABLED(CONFIG_IA32_EMULATION) || - !(mm->context.flags & MM_CONTEXT_UPROBE_IA32); + !test_bit(MM_CONTEXT_UPROBE_IA32, &mm->context.flags); } #else static inline bool is_64bit_mm(struct mm_struct *mm) diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index 4e34b3b68ebd..8b06034e8c70 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c @@ -671,7 +671,7 @@ void set_personality_64bit(void) task_pt_regs(current)->orig_ax = __NR_execve; current_thread_info()->status &= ~TS_COMPAT; if (current->mm) - current->mm->context.flags = MM_CONTEXT_HAS_VSYSCALL; + __set_bit(MM_CONTEXT_HAS_VSYSCALL, ¤t->mm->context.flags); /* TBD: overwrites user setup. Should have two bits. But 64bit processes have always behaved this way, @@ -708,7 +708,7 @@ static void __set_personality_ia32(void) * uprobes applied to this MM need to know this and * cannot use user_64bit_mode() at that time. */ - current->mm->context.flags = MM_CONTEXT_UPROBE_IA32; + __set_bit(MM_CONTEXT_UPROBE_IA32, ¤t->mm->context.flags); } current->personality |= force_personality32;