From patchwork Sat Feb 18 21:14:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgecombe, Rick P" X-Patchwork-Id: 13145662 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 5B77AC64EC4 for ; Sat, 18 Feb 2023 21:16:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2D5C2280012; Sat, 18 Feb 2023 16:16:22 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 23863280016; Sat, 18 Feb 2023 16:16:22 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E21C0280012; Sat, 18 Feb 2023 16:16:21 -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 BF15B280012 for ; Sat, 18 Feb 2023 16:16:21 -0500 (EST) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 9AAEDC0345 for ; Sat, 18 Feb 2023 21:16:21 +0000 (UTC) X-FDA: 80481670962.01.D7D5169 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by imf25.hostedemail.com (Postfix) with ESMTP id 97E61A0006 for ; Sat, 18 Feb 2023 21:16:19 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=kXXQF5hv; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf25.hostedemail.com: domain of rick.p.edgecombe@intel.com designates 192.55.52.43 as permitted sender) smtp.mailfrom=rick.p.edgecombe@intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1676754979; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:in-reply-to: references:references:dkim-signature; bh=usK09sGT9EyD0WZXI5DqW7zN0VjIXAZLAMOKcXZAWZ0=; b=SvDov6YyF/PQvgm1oBYTHfUdyMrI2GxmDKJkmhygrbb+Pn4A77bc6WZZrhP7rsDVLE/2lX qaajnb9W1NgQoGG9f15Tyih+M+QbbEKIZ4ycQzVPz1NgOkGXzUci0hM+qoL6Xjg2+bpXWr wbxscAPCalD4sKj8gKPYJ3QkGuCfgyk= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=kXXQF5hv; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf25.hostedemail.com: domain of rick.p.edgecombe@intel.com designates 192.55.52.43 as permitted sender) smtp.mailfrom=rick.p.edgecombe@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1676754979; a=rsa-sha256; cv=none; b=JSrnKmQ4ujEfTdiiyDGqUJrCSM7Qeajk6VHWriYPDR3G7Q/jeKOwVobWJJWWkB3rBuixF4 QmyFkItsSB+sObEzp0fJ3cSKQ2PH5tFkz/upFHp67SV45sbwq+RauC/Z0Bq1NTIwdv6p+Y JCgbQAR5XnTUnJOEBYtEkBGz9SKjd4U= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1676754979; x=1708290979; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=M6irf6FiLm+DEdVV2c/4paQ/4mYnKshDCbvMphRfAuU=; b=kXXQF5hvRUhziiSl85LE9MjBtfKE7cFp84bT8z+/FlZeZ1KEI4CDhQkQ 0QV+VuGVxI0t8DDKhcvsRvZm/D4nSsg49Ym5xGggOWGcIhyXjm4r/ogbI COWF9mOkjJ2WoK5chcmx3SH1uqHVAXNH1dk4g8jBCuBqSbbz775fMFT5i SqymoVsEPRyIryE2jjFj6Kxy8FnZXfD/nZlyObIoIezusjfKqvRg2APlI cit/3cRKkW7JdCHNMndTs0ebKl1XZdg4dyR1aTv+S+ui/1GGwsxpsr/85 jS1Lq8MAMlqUW58yDT0q9M8LxIzvHHDTPYAldGuH3X103y9B4ZFhgvSLm Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10625"; a="418427593" X-IronPort-AV: E=Sophos;i="5.97,309,1669104000"; d="scan'208";a="418427593" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Feb 2023 13:16:16 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10625"; a="664241680" X-IronPort-AV: E=Sophos;i="5.97,309,1669104000"; d="scan'208";a="664241680" Received: from adityava-mobl1.amr.corp.intel.com (HELO rpedgeco-desk.amr.corp.intel.com) ([10.209.80.223]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Feb 2023 13:16:14 -0800 From: Rick Edgecombe To: x86@kernel.org, "H . Peter Anvin" , Thomas Gleixner , Ingo Molnar , linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-api@vger.kernel.org, Arnd Bergmann , Andy Lutomirski , Balbir Singh , Borislav Petkov , Cyrill Gorcunov , Dave Hansen , Eugene Syromiatnikov , Florian Weimer , "H . J . Lu" , Jann Horn , Jonathan Corbet , Kees Cook , Mike Kravetz , Nadav Amit , Oleg Nesterov , Pavel Machek , Peter Zijlstra , Randy Dunlap , Weijiang Yang , "Kirill A . Shutemov" , John Allen , kcc@google.com, eranian@google.com, rppt@kernel.org, jamorris@linux.microsoft.com, dethoma@microsoft.com, akpm@linux-foundation.org, Andrew.Cooper3@citrix.com, christina.schimpe@intel.com, david@redhat.com, debug@rivosinc.com Cc: rick.p.edgecombe@intel.com, Yu-cheng Yu Subject: [PATCH v6 23/41] mm: Re-introduce vm_flags to do_mmap() Date: Sat, 18 Feb 2023 13:14:15 -0800 Message-Id: <20230218211433.26859-24-rick.p.edgecombe@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230218211433.26859-1-rick.p.edgecombe@intel.com> References: <20230218211433.26859-1-rick.p.edgecombe@intel.com> X-Rspamd-Queue-Id: 97E61A0006 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: oqa414j1x6dmupcdm1tu14jipmwfepe4 X-HE-Tag: 1676754979-798795 X-HE-Meta: U2FsdGVkX19vy35ETopkaIdk2a7WFPr/qRZyC/8CQiFW/sQYd/4RGc/HFH/hdCtsopyiDUzn0Zs62qQOLFtamVK996dQNU/kLOATSX5NZHam+FQ64MUzS766fAvBbUAkIPqP3DXSxQwbQOc3EZN/0kYi2paIRQFeX78J4tjfkgEV4bj2af7wj9hqdalqf25wku0qupdpw0MiEkiGrKq/KtNbMQk4u/jjNurFfNCGkszVaWxbM8g5EhXWaCuJ54WJnFHu6sjIPHqjdQMDmD+PdVgr67rKxLRFNM491FOUR0wmlaxaDIOIGXBUAtQf7F+jnGhdTzE3LJtwfrq5Itr1vUHBNg3PaC7UzaWBeeZhnvvQJYL4s3cqLtupikYCJUmWjKtwrbnWGJl32yueuCVi+PehONauSdivzP7E1RQERKV35FmXtV0v9hS/QH1QIntkSh61qKIrqdXJdwlQbwsYG22c7it6eNxlBg4a68xHI3hHdLgkAcMOT8a+XbgSXTWq3PMy0AkZ5HqyxMg7cePZ5oRXAixi7n8feuHAf+ozIsDrMD54FqyU3rYpLy36xFlMz5U6AvYcOZ93Id0RwMhwSSpKSOWWR1ASJ3PoPuAdTiip36le+DTfYgHMhYmra+O0aiUZMztGHK/pUsanVOOs1plqKd/raiVJ8OWemh0/DcF9Wr/yq63mnfxQCARpX4F3W307NDS6pg4Y/42s/8+jL+akY2C3OXG01z4kFBFwhUv84uroGHIJAYKJWYk5cuYBdcSh+h1G84JHB9Os4OWIAVeqgN0KRyqwHo4LLC6RiYDOmGMJFRAAQMxOrDM837v1JDieGdadgSwvJnJQudi53HZR3NIASwysEe6t3rnZaeVr+cl3LMsj5lZJ4rJ3MNskgUeVlh3SZB6DJZB9XHiqfeaFej6jJqFAJiCQLuTapKjDcoRwLi5W8pDUnOOX/GV8MywuKf6N7J8XZofZaiS Y8GRoeAf xfHqqucRXQHuN1IqB98W52O7FNubW0Xcj33+klNyWt/tgajFLBWn8BWYrFVAShgsDOf3uYAy6WAqbvy3lNdoz0tlkk4yqDiooMgLfayXde9CCtJKYm1lntrlX3ONcHsvvHucuqTId3PhDpFo5xdG/+lL7+5nDFaGq3yYcmL8kE4VMHVW6YlYK2NlOjzs7J4SkVsgi6U1HuO0bFuD877zSFubMiMT05bJPpbtLOdlzP/gaaKy2YbITg2SqjF674x0Cg7cYSyp7Pm1RV2r6kYIaKDMS2nW/R0M2mDy3sSGJctX8XeyvBE6CmPLYCZfq2xPggX5UJX/KLRlSzNAy2BUDh/kYS/alJEaXAB6uNWSa+jLqhid9bJkorYFdBdp3mAA30fGZH6BHH3ZZRfea7gn9+qQFGmBDBkWLJ8Tm+IcWqeGmfS+fPYweQFAT+zj4sxD6iNW8f8W2iDOpvszs5KHnvtu5KtBdMJrl9cD2CLxMjbFrVNVTsID6ekN2GA== 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: From: Yu-cheng Yu There was no more caller passing vm_flags to do_mmap(), and vm_flags was removed from the function's input by: commit 45e55300f114 ("mm: remove unnecessary wrapper function do_mmap_pgoff()"). There is a new user now. Shadow stack allocation passes VM_SHADOW_STACK to do_mmap(). Thus, re-introduce vm_flags to do_mmap(). Tested-by: Pengfei Xu Tested-by: John Allen Signed-off-by: Yu-cheng Yu Reviewed-by: Peter Collingbourne Reviewed-by: Kees Cook Reviewed-by: Kirill A. Shutemov Signed-off-by: Rick Edgecombe Cc: Andrew Morton Cc: Oleg Nesterov Cc: linux-mm@kvack.org --- fs/aio.c | 2 +- include/linux/mm.h | 3 ++- ipc/shm.c | 2 +- mm/mmap.c | 10 +++++----- mm/nommu.c | 4 ++-- mm/util.c | 2 +- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/fs/aio.c b/fs/aio.c index 562916d85cba..279c75ec6a05 100644 --- a/fs/aio.c +++ b/fs/aio.c @@ -554,7 +554,7 @@ static int aio_setup_ring(struct kioctx *ctx, unsigned int nr_events) ctx->mmap_base = do_mmap(ctx->aio_ring_file, 0, ctx->mmap_size, PROT_READ | PROT_WRITE, - MAP_SHARED, 0, &unused, NULL); + MAP_SHARED, 0, 0, &unused, NULL); mmap_write_unlock(mm); if (IS_ERR((void *)ctx->mmap_base)) { ctx->mmap_size = 0; diff --git a/include/linux/mm.h b/include/linux/mm.h index a41577c5bf3e..6d6ffd7563bf 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2890,7 +2890,8 @@ extern unsigned long mmap_region(struct file *file, unsigned long addr, struct list_head *uf); extern unsigned long do_mmap(struct file *file, unsigned long addr, unsigned long len, unsigned long prot, unsigned long flags, - unsigned long pgoff, unsigned long *populate, struct list_head *uf); + vm_flags_t vm_flags, unsigned long pgoff, unsigned long *populate, + struct list_head *uf); extern int do_mas_munmap(struct ma_state *mas, struct mm_struct *mm, unsigned long start, size_t len, struct list_head *uf, bool downgrade); diff --git a/ipc/shm.c b/ipc/shm.c index bd2fcc4d454e..1c5476bfec8b 100644 --- a/ipc/shm.c +++ b/ipc/shm.c @@ -1662,7 +1662,7 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, goto invalid; } - addr = do_mmap(file, addr, size, prot, flags, 0, &populate, NULL); + addr = do_mmap(file, addr, size, prot, flags, 0, 0, &populate, NULL); *raddr = addr; err = 0; if (IS_ERR_VALUE(addr)) diff --git a/mm/mmap.c b/mm/mmap.c index 9f85596cce31..350bf156fcae 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1238,11 +1238,11 @@ static inline bool file_mmap_ok(struct file *file, struct inode *inode, */ unsigned long do_mmap(struct file *file, unsigned long addr, unsigned long len, unsigned long prot, - unsigned long flags, unsigned long pgoff, - unsigned long *populate, struct list_head *uf) + unsigned long flags, vm_flags_t vm_flags, + unsigned long pgoff, unsigned long *populate, + struct list_head *uf) { struct mm_struct *mm = current->mm; - vm_flags_t vm_flags; int pkey = 0; validate_mm(mm); @@ -1303,7 +1303,7 @@ unsigned long do_mmap(struct file *file, unsigned long addr, * to. we assume access permissions have been handled by the open * of the memory object, so we don't do any here. */ - vm_flags = calc_vm_prot_bits(prot, pkey) | calc_vm_flag_bits(flags) | + vm_flags |= calc_vm_prot_bits(prot, pkey) | calc_vm_flag_bits(flags) | mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC; if (flags & MAP_LOCKED) @@ -2877,7 +2877,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, file = get_file(vma->vm_file); ret = do_mmap(vma->vm_file, start, size, - prot, flags, pgoff, &populate, NULL); + prot, flags, 0, pgoff, &populate, NULL); fput(file); out: mmap_write_unlock(mm); diff --git a/mm/nommu.c b/mm/nommu.c index 5b83938ecb67..3642a3e01265 100644 --- a/mm/nommu.c +++ b/mm/nommu.c @@ -1042,6 +1042,7 @@ unsigned long do_mmap(struct file *file, unsigned long len, unsigned long prot, unsigned long flags, + vm_flags_t vm_flags, unsigned long pgoff, unsigned long *populate, struct list_head *uf) @@ -1049,7 +1050,6 @@ unsigned long do_mmap(struct file *file, struct vm_area_struct *vma; struct vm_region *region; struct rb_node *rb; - vm_flags_t vm_flags; unsigned long capabilities, result; int ret; MA_STATE(mas, ¤t->mm->mm_mt, 0, 0); @@ -1069,7 +1069,7 @@ unsigned long do_mmap(struct file *file, /* we've determined that we can make the mapping, now translate what we * now know into VMA flags */ - vm_flags = determine_vm_flags(file, prot, flags, capabilities); + vm_flags |= determine_vm_flags(file, prot, flags, capabilities); /* we're going to need to record the mapping */ diff --git a/mm/util.c b/mm/util.c index b56c92fb910f..77867bf9959a 100644 --- a/mm/util.c +++ b/mm/util.c @@ -517,7 +517,7 @@ unsigned long vm_mmap_pgoff(struct file *file, unsigned long addr, if (!ret) { if (mmap_write_lock_killable(mm)) return -EINTR; - ret = do_mmap(file, addr, len, prot, flag, pgoff, &populate, + ret = do_mmap(file, addr, len, prot, flag, 0, pgoff, &populate, &uf); mmap_write_unlock(mm); userfaultfd_unmap_complete(mm, &uf);