From mboxrd@z Thu Jan 1 00:00:00 1970 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 4C47EC46467 for ; Thu, 19 Jan 2023 21:24:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 77293900007; Thu, 19 Jan 2023 16:24:03 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6FBD1900002; Thu, 19 Jan 2023 16:24:03 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 54E25900007; Thu, 19 Jan 2023 16:24:03 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 2DD5E900002 for ; Thu, 19 Jan 2023 16:24:03 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 102A1120DEC for ; Thu, 19 Jan 2023 21:24:03 +0000 (UTC) X-FDA: 80372826366.11.B20B3E0 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by imf16.hostedemail.com (Postfix) with ESMTP id EFF62180005 for ; Thu, 19 Jan 2023 21:24:00 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=oIcx4WbC; spf=pass (imf16.hostedemail.com: domain of rick.p.edgecombe@intel.com designates 192.55.52.93 as permitted sender) smtp.mailfrom=rick.p.edgecombe@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=1674163441; 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=+CXWRCPnpy0btc6mfBj/1TwmGopDVclXbZtiYlkdzbE=; b=pK0Z0o2FzwtdXDPYUvR1A0ucBG76km6cFF/wIM8cPk5xjOStw2BOQ9240BLyoCSCKfzSNb QhvRn36v+waLM2KT8x4dDI7bnNzsVLY9Dlqt3VUt9XS6hPysPhsQvP+fRkddn5BIOCBAkF o9rJabZnu31Vb21Ru986YTFR7xV5Kh4= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=oIcx4WbC; spf=pass (imf16.hostedemail.com: domain of rick.p.edgecombe@intel.com designates 192.55.52.93 as permitted sender) smtp.mailfrom=rick.p.edgecombe@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1674163441; a=rsa-sha256; cv=none; b=eshbypOHrRdM47VS7IhsWCpR25+mfEyUxG/Z/5TTYLpvwAGhodMjoO0iwoYurZVdzsjR+2 hroXENfyMq9Fu5gISWwv8V5e4Q21Cgx+CLGXTChh8WRnSvJtH9HAW40SPeVxWR2TYNe0MP WtZfiwAzlBeqQpOy0Uxi1IjMaIfkUVM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674163441; x=1705699441; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=yYO9z3rz8CNjUY1wgWFKyzY7eNICGcV4jFfyGKxF5+o=; b=oIcx4WbCfndcp9TajOLmuB5iV+9WUtUQvDwBkyBnpjUejJRDz6YUWm67 QRilRgmDw+AvpX8EskNSycxy8fctCYgmrBBeVe7hFZqo+qkV2UtsRwAKa z9zZkKs25eTu5LW5CUF7vUiC8f1/MINeKTzOfwxHpoZYDadry21hFEUs8 zXxLQRYYS0u9kkvtzzuYt2XbHUcy/0DzsTtVrtQ+xNWD/7DsjUhu0gHWs F95orl77V4tRUTjmwjP/PQg7HAj32bovaSesqTcy/GBQPMXaCbEt/6sTx OL6KTIE9WovkRiMp+KW1sgb8v4Um95G0MljJRcp6y+poocUWaKL5NbuBT w==; X-IronPort-AV: E=McAfee;i="6500,9779,10595"; a="323119692" X-IronPort-AV: E=Sophos;i="5.97,230,1669104000"; d="scan'208";a="323119692" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2023 13:24:00 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10595"; a="989139105" X-IronPort-AV: E=Sophos;i="5.97,230,1669104000"; d="scan'208";a="989139105" Received: from hossain3-mobl.amr.corp.intel.com (HELO rpedgeco-desk.amr.corp.intel.com) ([10.252.128.187]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2023 13:23:58 -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 Cc: rick.p.edgecombe@intel.com, Yu-cheng Yu Subject: [PATCH v5 22/39] mm: Re-introduce vm_flags to do_mmap() Date: Thu, 19 Jan 2023 13:23:00 -0800 Message-Id: <20230119212317.8324-23-rick.p.edgecombe@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230119212317.8324-1-rick.p.edgecombe@intel.com> References: <20230119212317.8324-1-rick.p.edgecombe@intel.com> X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: EFF62180005 X-Stat-Signature: quukpcw33s3yges875tioxw1y3swgyiu X-Rspam-User: X-HE-Tag: 1674163440-832151 X-HE-Meta: U2FsdGVkX18NKGxqG3WDRJT9rgIK834HQLb4H+NF0eiZAl8IQO/LXha6zvt17KJ4whrjjcKkjE+70HtowMd2aM6C1wSLOurSsIugr6l5lqxehpWwnovWA6AL2x6d8mkJt+//WAdMklmxBXyl46v+ZTzxp3UODDjAgOXvmaNRmsyllQcqmDF2k1pwsexNQuILJQPs0cCnFbs4MNh1Vo2BcBbMab4WEmtVHIkHIHjAPDer/TI1T/j2q5ZpZ41HGkgrWZWjzzSBmcgB/UTo3LD9Ra2wAIDGys+5i2gDcqLR7YVkA29ZcsFNk2N9jhwdKzJngidptV6KJXVRCEkn7HUhn3t7nZf9bqIlbZ/1KtR6xchYYkfo/rc1MpcNoSjslQ9D4Fu1FHiF7tklVLWLkYa6isJnoBXRx3XrkCap/XM1crsr+4aVahhMQoOby3Orxms/cJQg8WuaVY93ipN9FzWKZjfkHMva9X+cm/teldDHsb08pz9C/Z/lyiEEDK//TTOm1x/XemGqyTyA8IRvlRju0ydPjyt9M0+MyBTEBFR+HP4z6ea7nAwkXPB2vDtNWjq86Lv2qJeFSmY444xgA1yaOPJFlmulb5TDlZQDrED4leNK//rumnOIYi8pRSGMuzb7RIuDCdP1CA5YjJJkrBIV8dJ/3J02lsTIpmRhETqzDTx+6vF10DgqFec6RlbO0qMoeam9OFfKiZj26lJL2jwmY1/rbicx4TNa9bq3XQMPAuuxXoxLuqBU3xHqmYisI8wJG5t0YmWvq9+DtKNeoQuX4lCiXVxtFYES+VkQCUYVtMwcaBwVq0fDyQm2R/OOWkpKjzBbCoysZH5YxPKvhD5H68YVEt0f8xfSWc4nV9fxJJG8JGU7LZbXnQuACTv7dacYOk7F6wJWbHyYa0DM8nYWrbzQXrXgaOMq5O4Mq7bAq7QoUIGtjqYtcjgSKLrwtygsrMEX5sndcjZG+N0WEHe OP54rksN Rzg/oNs5XK9bZ5fuxhH8klJ3rh6nrLrwRQ7MEeFHtyb876oR97hP3W/U79uo7xPvqfj+GJQjn4xF74X7FVel7KBI8OUHvkUOK0u8VP34fPhI5wcyqhEXAo6qCysfSK7iSltAEuzYkmAJMN2F8f7mQqvqD7HkH0lxBBT7IWxYppyiLf+vaT0tam/LHbWgJ9iP1qrFBFUgUQGISMdHvRnI+YQ3uRg4n43bEuQ3oizihDJLE1FZEjKBGOWdl2nFBW3DfqmZp7yJPmoBUfAh1Vm3ThmghyO7AK0UztX6JI1svGOCjmPIUOWSo5RBonxhNKf2Zn3uZIZXmr2qwXKb1gF/GUoEPMDPTFJ1BgMaURSub7egKcWvjrUnQiO35Qi3qM/yKIbRMS9ZMvhyNeU+CoZPVMU985Byi2+Y4iwlrEW6mUp91DGNgGZ1CaiNHaDzE5WzcxsCjH+xjPY0/k8gWgpZnDrUL2HHaXk3MLmHwI5Lq1GktqgUIq1s/d4XXzQ== 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 3f980d4823ad..6e1796ee7e1a 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2897,7 +2897,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); -- 2.17.1