From patchwork Sun Mar 12 11:25:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "kirill.shutemov@linux.intel.com" X-Patchwork-Id: 13171296 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 98FA9C74A5B for ; Sun, 12 Mar 2023 11:26:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 71C0D8E0005; Sun, 12 Mar 2023 07:26:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6CE2E8E0001; Sun, 12 Mar 2023 07:26:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4D0A58E0005; Sun, 12 Mar 2023 07:26:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 406D38E0001 for ; Sun, 12 Mar 2023 07:26:36 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 022E140951 for ; Sun, 12 Mar 2023 11:26:35 +0000 (UTC) X-FDA: 80560018392.20.8CD16BA Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by imf14.hostedemail.com (Postfix) with ESMTP id EAF67100005 for ; Sun, 12 Mar 2023 11:26:33 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=aoYCQNet; spf=none (imf14.hostedemail.com: domain of kirill.shutemov@linux.intel.com has no SPF policy when checking 134.134.136.65) smtp.mailfrom=kirill.shutemov@linux.intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1678620394; 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=543GYs3qqt/4FEUXvHVYjsq+MgfRqUiu/iNq6oSVdnk=; b=TJekYhKEOU6qsKj8NrCnj3qf/BV4Sslwg3aX477R3lo8kOFPwx3bTSQXPc70PqbsMWmybX yMhpBoE53dV2etI7crKuHuEQvGtp+0x/Mm633CMYZsIDPBsGRa8+q9IStZGwMkGb+7r2WX wn3JgNGyqWKPOjhwd0aH9L/C8Hc+NxQ= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=aoYCQNet; spf=none (imf14.hostedemail.com: domain of kirill.shutemov@linux.intel.com has no SPF policy when checking 134.134.136.65) smtp.mailfrom=kirill.shutemov@linux.intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678620394; a=rsa-sha256; cv=none; b=28eNWjJzJ42dOva11Cn//IOTHrBAH2zSTNRh7QyjSEQB4TFSRmrUpCO5v/EEexSEYPWWge I4hCK8GHJ/PjzDksGtbWe2FSKvt8mTxirj60AkBtWNEZljRDdY77lKkAinyo5syp9hIlO/ c/7g+qvt7zOdaNeYxgFM9vhwSgcPDqU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678620394; x=1710156394; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tV3JtlGM60BECBxuCA+QuZaWNCs779YV6vXF0y1DbTc=; b=aoYCQNetVIfY3+/hrjklsCbH9o5Ze6VWkg8M5bXWJ1mTNAN7yRf/n6+L 4A5ZRvIJ4b8jKnAG7sKLTAZ7NM/6wIjwN7vIhVMBncFDsFSdDdk+4m8+3 hE+yUpCqVbYlvGkLNGBhd3uaONTiGeZ8zoKVUkS/S3GyKcJUO93ZWq3Zg HMu8Ta+8SbfZxqlHJZ7YtU9fOB31Rtwece+3aQioy1jj9DZnVYhCga+Ik Cw5mBJnmUON83UgTQclH/xW9aQ7IGDGjFSYPBxODWSNf7DK2FbKNoYAlA 4GN7vXU0duh3fJfMK1hBxYNQiVF2WQ6yrl06xH02IVkaNcOxA+CKTn710 w==; X-IronPort-AV: E=McAfee;i="6500,9779,10646"; a="339349935" X-IronPort-AV: E=Sophos;i="5.98,254,1673942400"; d="scan'208";a="339349935" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Mar 2023 04:26:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10646"; a="852438015" X-IronPort-AV: E=Sophos;i="5.98,254,1673942400"; d="scan'208";a="852438015" Received: from nmoazzen-mobl1.amr.corp.intel.com (HELO box.shutemov.name) ([10.251.219.215]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Mar 2023 04:26:22 -0700 Received: by box.shutemov.name (Postfix, from userid 1000) id 6695310D7B0; Sun, 12 Mar 2023 14:26:19 +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: [PATCHv16 02/17] x86: Allow atomic MM_CONTEXT flags setting Date: Sun, 12 Mar 2023 14:25:57 +0300 Message-Id: <20230312112612.31869-3-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230312112612.31869-1-kirill.shutemov@linux.intel.com> References: <20230312112612.31869-1-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: EAF67100005 X-Rspam-User: X-Stat-Signature: dwbu8umujmqs7zkxtjes7q8hjxux9zb5 X-HE-Tag: 1678620393-52919 X-HE-Meta: U2FsdGVkX1/h5EKAnNmr1Ol5QWB7xtCA6bQNx4d4MX2rPjA6oP4dGtKzmO7mgmeoaamJjCjZx+2R/altoDzI74JcdLzxmSJH7K/Clq0vQ7y01UIGnLU/Ucuf1NT5F7ICuAnPC/EdfAALmOmHml1QTYAvMsRhRkFF1I9UfngGJmLRzq8XMONU6j9YLe3/ZCyM0bmwZrwNLCCPDIfqvuDwRwDm3sRnNK8Bwb8qnlmLtWPKFeF/JAlppqf/qVmfEWi1ODBCAqfhzZdNx9DrUae4RxWP975JM4GCD5Cv6gZ6YGmqmLZFrXUmyxacrE+N+Yj8DxnkjlCLjk9ORjQ/+XoVAoWeOp79X5F6rFVAaI/hp9VxtT2kbeQGfGUubHjnjnwU0pS01+LI+3964+jaeWUGA82cchz3SHYSEsxXsY/xVmmAodE7dtPbaAEk+LY/o4qiY+TY9NRS3vGM9VyFKg/IEB6+PqkWLZsKdaDH/syZfkdD8yI66ffLM290qy0/Hn7l2y/0skMOm07ihZggm8tZe5hGk0BabEylP1ZrUelPXK9/Pb8GdzPmNwElpwdZsUEww3d8nWBIStN8b0pnY1GFFeDl0zCqIH0UkY3pPeeoaeEuOr/8WcFLduGU6/0LuN/WuVXQKXB49fk9ZC+7lCfg+K8TfQtUcymvpEjKPbQBVyo1Y7zh2SJ1iL4JSdXORN3zyW5GBeBYsZ3TKA36C1/OykthPHgTJui2T0M6+ILL7XJwXHgrIDATQEDQcxjJBeu9wbP5F0lST2lM0lvaQAcS+Rcetup0PmGit5GpNl6p0SkwFUcHseBGj1XvfbiaT9Lzp9kC8wB+a2l90d6MiysQwZ27nE0+AGznFsz9lzJtoln7C4ymrYMlx7VCRYmOhsOf8NiL6IEsS4eCJv0QVQ6x300rMILNBfCvsUurtcI8cMmZHNI8B964tl4uPV0dsvjpT9mZZ1jlMWyy8hgHk/N LlKcmXrp LkRm9EdoPTYHn6yrYPzAkWJyRGMZYSEMYwnB4IOFD3wjLfZwhp2Iw68LkhQJQFdsD2PFwGnaBhQU7vzKulcSyez3zaXBvv4wbJ7I2WzYUm/XTuCLz4NvLicDkJUJ51ZrFgjnZO69dAi4Sh4BmVwtDPsoetIGRmwp7wQxQc1P7LhEvrUgYi5cyzxbR94QxaK6jA6OsnfyXuuc4IeNMNj2BNqXNWxHt6513aZ/8ZiUbqB0+qr8goiDA0uKSzCDDtSPjQrs0jQN0AVqafH32JlozFQ7NDMleThucisBM7X5DdvnrkV1Ff/mskVEwmjVHGmHYjNLyZoQlZcvaA1jQfcm5tevHD9uxj/j/2QeUJ+jakdQRgiI= 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. The upcoming flag MM_CONTEXT_FORCE_TAGGED_SVA can be set much later in the process lifetime where multiple threads exist. Convert the field to unsigned long and do MM_CONTEXT_* accesses with __set_bit() and test_bit(). No functional changes. Signed-off-by: Kirill A. Shutemov Acked-by: Peter Zijlstra (Intel) Tested-by: Alexander Potapenko --- 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 d234ca797e4a..e0ca8120aea8 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 e01aa74a6de7..b4e4a0c04304 100644 --- a/arch/x86/include/asm/mmu_context.h +++ b/arch/x86/include/asm/mmu_context.h @@ -182,7 +182,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;