From patchwork Mon Jan 23 22:04:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A. Shutemov" X-Patchwork-Id: 13113075 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 658ABC54EAA for ; Mon, 23 Jan 2023 22:05:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E92386B007B; Mon, 23 Jan 2023 17:05:28 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DF46D6B007D; Mon, 23 Jan 2023 17:05:28 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CBC086B007E; Mon, 23 Jan 2023 17:05:28 -0500 (EST) 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 BD64F6B007B for ; Mon, 23 Jan 2023 17:05:28 -0500 (EST) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 807DC80720 for ; Mon, 23 Jan 2023 22:05:28 +0000 (UTC) X-FDA: 80387445936.24.DEBA681 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by imf05.hostedemail.com (Postfix) with ESMTP id 676D7100019 for ; Mon, 23 Jan 2023 22:05:26 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=WElsee3N; spf=none (imf05.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; 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=1674511526; 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=TQF1tdq01mdscIRxQekmBHdkXQlI68Nw30IEMqdgrEQ=; b=32XjKEI6Yx3d51dKaqzxLMF0t2RmvVU2XV/qKukfWWfu8rAUZP+eaALtCWQm2ASFRtpGKK 8vFt2kHRjrFtc4uYyEPo4t6S49umcRWbhTsqXIID4KW2jf3MdCEJXFfJDVlfVjRsHnQ3P9 ViQt2hCUk1k6Ac5XjR042kPOKaosmac= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=WElsee3N; spf=none (imf05.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; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1674511526; a=rsa-sha256; cv=none; b=WUre0KXHdslpL63wajJNuwIYxem5rLKJrnbXAfKCHO1mK4EXXc5fMouhi2614Y0Xlt/Fux O/nYCU1srcIoAwG1N2qDEkulzkyp5fEANVVY/pd3mb2BkFUERJLKKPeANFtatJihj+SPG4 Dp0h0F0q3Ny9qYO99pGlseT4onPoBeg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674511526; x=1706047526; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=goQpwLMTaN14VQUbpuKQyEVCPJNPBRQVQcckNmVxg+o=; b=WElsee3N3tV95vH9BRSeeh25ZRhd7QQ57nopgsWrKPEKQ2MM9M86aEai jgqb28a/Itjp4OT7okfdRn6pQgUwxz49zz+ypdkfqhcRnBps9GJg13jS2 20OL7WA0I4NWn+dY57zUv0VJBEIm3FZ53FQHUsvF34lNHChyrM9S0BvW2 rrf37SG5UL6olCp5kklBSDrhmJdJiQvX/Y5w1HStNu8BqKjCPeMIATB0M 5pTduc0mg+HbDA77nbltb2wuPAhoJuZ2Zw8AUh2wNbJcm1AXD5gHVYDU9 VUT/YQ133w/BsxYR6um2GYLKmfuj/gJl10EqDahd6hYj3EihjmFPMCo7z A==; X-IronPort-AV: E=McAfee;i="6500,9779,10599"; a="327421948" X-IronPort-AV: E=Sophos;i="5.97,240,1669104000"; d="scan'208";a="327421948" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jan 2023 14:05:23 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10599"; a="661878110" X-IronPort-AV: E=Sophos;i="5.97,240,1669104000"; d="scan'208";a="661878110" Received: from ssauty-mobl1.ger.corp.intel.com (HELO box.shutemov.name) ([10.249.46.171]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jan 2023 14:05:17 -0800 Received: by box.shutemov.name (Postfix, from userid 1000) id 6EBC3109479; Tue, 24 Jan 2023 01:05:03 +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: [PATCHv15 08/17] x86/mm: Provide arch_prctl() interface for LAM Date: Tue, 24 Jan 2023 01:04:51 +0300 Message-Id: <20230123220500.21077-9-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230123220500.21077-1-kirill.shutemov@linux.intel.com> References: <20230123220500.21077-1-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 676D7100019 X-Stat-Signature: 9m6bcr74q1fi18w8g697infdhna7cdud X-Rspam-User: X-HE-Tag: 1674511526-417860 X-HE-Meta: U2FsdGVkX1/hK9iYmK2Uy/ttoaVmrYZzuoYo07wjL3tJY0qCZ9ECGYHme71duMkjMqyzg8zGcbgtur7fe53Me15GoSXXoD4trXcGYGP0C4tJxKlkkYltJE12fRBF6YQApxWntV07eIIGBVXXmG0SagnnX45UYMzctMwwM3UTSzksjjJtPkVUsFdITNZv34x3SkN2ssNa9Zck/rdSlfbvVCPi3RUTUiIY6FanMUFn+nFG2SisAnlyHf9v5MU46JLuhSXxfjNYpkqGWhzryN1e2RQJR4mYh1RWHkN3APMuYpq8OYP2Yp1Fp/BrJaj1iTnbxBT+FvSUKPSZZ/BrNMNG5Te4ct+F7/XXVXwmw2QbsI3sWDfTc38+qV9lx72ucLRItf3DVx2+jQ6GhzGQ/CihgP5n9ct91sR5whn6zgTBSdJzQHsL2SbtrEEkz3lmZknmn5Q9+ZYGqN1jWYSAWPaYJ9by/uaZdQ7grx2m+YfEbi/NeFevrdxIMnuw48Qi9SZx5WGP1kT/Odt4LuvmHU9FwadpqyUzkynSnaiRv4+c9XxB5nS7jJ59fHNCBY0Ld8G23Sb2v79LzTydoQnUKnQ4wDBzYvkTOKNMH2ZgJ1NafESYWcJKZ7nE1RN158FZgjoeKN6u2htVNb1r2rRO8a0KlXaoPH+GTwOMbp53OnIuuXHt9pBB1KmPZk+i3l1BVJX9iuUhErsLP2wHjtuBou4ETsASNM4RNjSD/PGOi9vX5XWOqrwgMpsj9xawRjB/BlHD9uMZr+V4imHwuQVnoVd6pwH0IyuCBZHESVZLm5WLGW4575jHRr56OY6sZeFYgL7wxWMVwKMuFmkh9Og3u5MdfgXZVyK239YqpxL0acPRnEJNJoMTXzjatneyhhe6ORP7wUSF8MQODtx/yldgfqIEz+nPYppVe4fgcqq/mXGOGXtA3owsEqYk9SZEl1I3CquQPVQiDwynV4GnX3DkS1v yTKAyXT/ QDDVZassS11KTK1xPRjz0KlVtORkDXI4d8+DYZ1QexxV31sIfmQQjs6aM4SAVHnnFieM9mkCMKjoNkjkLxzN1Os9VvzzgFL0BzgWDGICQ68IBxrZbJG2p9s2Ryv67VDAbnA/3G4LD7WBUTSMVJc8LESA10ConDXBRj0ogCyofUjFprAJZpBECefveK5jRW/6HJ2WCVmRjMciYlkzGxrQOw+QT8uzkSSKC1yWXh3COyhjYuKbw1KFWeiFx2JhafQ7/2jZiaRAHyQaH19O8t3hGTiLm93KmgCliQafjcVa6waI26t695p9BkcmJ7CjrdG/AJEuEQhT64bVf//Q6cLPRP8PDMQ== 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: Add a few of arch_prctl() handles: - ARCH_ENABLE_TAGGED_ADDR enabled LAM. The argument is required number of tag bits. It is rounded up to the nearest LAM mode that can provide it. For now only LAM_U57 is supported, with 6 tag bits. - ARCH_GET_UNTAG_MASK returns untag mask. It can indicates where tag bits located in the address. - ARCH_GET_MAX_TAG_BITS returns the maximum tag bits user can request. Zero if LAM is not supported. Signed-off-by: Kirill A. Shutemov Acked-by: Peter Zijlstra (Intel) Tested-by: Alexander Potapenko --- arch/x86/include/asm/mmu.h | 2 ++ arch/x86/include/uapi/asm/prctl.h | 4 +++ arch/x86/kernel/process.c | 3 ++ arch/x86/kernel/process_64.c | 55 ++++++++++++++++++++++++++++++- 4 files changed, 63 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h index 9cac8c45a647..e80762e998ce 100644 --- a/arch/x86/include/asm/mmu.h +++ b/arch/x86/include/asm/mmu.h @@ -12,6 +12,8 @@ #define MM_CONTEXT_UPROBE_IA32 0 /* vsyscall page is accessible on this MM */ #define MM_CONTEXT_HAS_VSYSCALL 1 +/* Do not allow changing LAM mode */ +#define MM_CONTEXT_LOCK_LAM 2 /* * x86 has arch-specific MMU state beyond what lives in mm_struct. diff --git a/arch/x86/include/uapi/asm/prctl.h b/arch/x86/include/uapi/asm/prctl.h index 500b96e71f18..a31e27b95b19 100644 --- a/arch/x86/include/uapi/asm/prctl.h +++ b/arch/x86/include/uapi/asm/prctl.h @@ -20,4 +20,8 @@ #define ARCH_MAP_VDSO_32 0x2002 #define ARCH_MAP_VDSO_64 0x2003 +#define ARCH_GET_UNTAG_MASK 0x4001 +#define ARCH_ENABLE_TAGGED_ADDR 0x4002 +#define ARCH_GET_MAX_TAG_BITS 0x4003 + #endif /* _ASM_X86_PRCTL_H */ diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index ef6bde1d40d8..cc0677f58f42 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c @@ -162,6 +162,9 @@ int copy_thread(struct task_struct *p, const struct kernel_clone_args *args) savesegment(es, p->thread.es); savesegment(ds, p->thread.ds); + + if (p->mm && (clone_flags & (CLONE_VM | CLONE_VFORK)) == CLONE_VM) + set_bit(MM_CONTEXT_LOCK_LAM, &p->mm->context.flags); #else p->thread.sp0 = (unsigned long) (childregs + 1); savesegment(gs, p->thread.gs); diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index 8b06034e8c70..88aae519c8f8 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c @@ -743,6 +743,48 @@ static long prctl_map_vdso(const struct vdso_image *image, unsigned long addr) } #endif +#ifdef CONFIG_ADDRESS_MASKING + +#define LAM_U57_BITS 6 + +static int prctl_enable_tagged_addr(struct mm_struct *mm, unsigned long nr_bits) +{ + if (!cpu_feature_enabled(X86_FEATURE_LAM)) + return -ENODEV; + + /* PTRACE_ARCH_PRCTL */ + if (current->mm != mm) + return -EINVAL; + + if (mmap_write_lock_killable(mm)) + return -EINTR; + + if (test_bit(MM_CONTEXT_LOCK_LAM, &mm->context.flags)) { + mmap_write_unlock(mm); + return -EBUSY; + } + + if (!nr_bits) { + mmap_write_unlock(mm); + return -EINVAL; + } else if (nr_bits <= LAM_U57_BITS) { + mm->context.lam_cr3_mask = X86_CR3_LAM_U57; + mm->context.untag_mask = ~GENMASK(62, 57); + } else { + mmap_write_unlock(mm); + return -EINVAL; + } + + write_cr3(__read_cr3() | mm->context.lam_cr3_mask); + set_tlbstate_lam_mode(mm); + set_bit(MM_CONTEXT_LOCK_LAM, &mm->context.flags); + + mmap_write_unlock(mm); + + return 0; +} +#endif + long do_arch_prctl_64(struct task_struct *task, int option, unsigned long arg2) { int ret = 0; @@ -830,7 +872,18 @@ long do_arch_prctl_64(struct task_struct *task, int option, unsigned long arg2) case ARCH_MAP_VDSO_64: return prctl_map_vdso(&vdso_image_64, arg2); #endif - +#ifdef CONFIG_ADDRESS_MASKING + case ARCH_GET_UNTAG_MASK: + return put_user(task->mm->context.untag_mask, + (unsigned long __user *)arg2); + case ARCH_ENABLE_TAGGED_ADDR: + return prctl_enable_tagged_addr(task->mm, arg2); + case ARCH_GET_MAX_TAG_BITS: + if (!cpu_feature_enabled(X86_FEATURE_LAM)) + return put_user(0, (unsigned long __user *)arg2); + else + return put_user(LAM_U57_BITS, (unsigned long __user *)arg2); +#endif default: ret = -EINVAL; break;