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 430E7C74A5B for ; Sun, 19 Mar 2023 00:16:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8FE54280015; Sat, 18 Mar 2023 20:16:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 864A4280001; Sat, 18 Mar 2023 20:16:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6191A280015; Sat, 18 Mar 2023 20:16:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 41091280001 for ; Sat, 18 Mar 2023 20:16:36 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 1E72BAB048 for ; Sun, 19 Mar 2023 00:16:36 +0000 (UTC) X-FDA: 80583731592.21.A18DB69 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by imf21.hostedemail.com (Postfix) with ESMTP id 0D3631C000F for ; Sun, 19 Mar 2023 00:16:33 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=R5684uWn; spf=pass (imf21.hostedemail.com: domain of rick.p.edgecombe@intel.com designates 192.55.52.115 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=1679184994; 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=AOIntr3VxGUPIG0WTgprd1+JG8OST+0GjG70hTrdOgU=; b=HDusJ8RWpFTXz3qTd58oRAoXnj1Eamh1E8i+sbfIHBVKgXt9A41+tN5AK+WZRKvWIZQ03U TLIHT4FmEvcQbO5pdn9NBwF7ENPT2/Ts0J7w6IBK9sCvFQVXIq4a+0fbxmUTiwCvfHKoJo dh8J9Xz88DNmCY3E6M3iXaFIx0MCpsY= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=R5684uWn; spf=pass (imf21.hostedemail.com: domain of rick.p.edgecombe@intel.com designates 192.55.52.115 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=1679184994; a=rsa-sha256; cv=none; b=oQt6IVGneqt1AbtQbm9/0jAAHlbBrpPDXy+j3VCjGEUJqyNluV2V+clmwN0MwvjlJEoNg/ 00reBf3GGscY8ZpnkuYeD/2T9yvPex0YVD+PsSca2jlDxkZSN9rc12IYVuAqX4QvGZ2iYh gBxNMrbhhmqBJnKkRqefbOscCbpSyAU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679184994; x=1710720994; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=JiFIyLCYmEZEMe86X9SZ26iJG6/i80APvHoHhUeLipc=; b=R5684uWn/GcioQnozX0J97XpqCYWcfr3u0VdKaKF4s5LC6QXgneYwW2k L63EMlDnQiMoy6NQakrLF+r0AMDwkA2+VB32l2vsEPDWKBI7c+loX5rnz oShOlQvoST32Fkmc8oNHTFW5uaBVPstA4X7r8wM8/teaVYzSDec40EdBP Ce7JgVPGqSEDv+cG5k7YnbANw41bWwU/z+5UichLW3/rsupwIjXlCTymC 139eDvNaj+k27+Sv2xZ5mHwO6OylNEq6Yp2SmqMX/o1VzQ2d1yHuXEeOl BizlpTkMA9mdrP+wKQ1rkA6Zwyz8YGlJmbcxdO1cyDxPe+lwRnde7r7RL Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10653"; a="338491245" X-IronPort-AV: E=Sophos;i="5.98,272,1673942400"; d="scan'208";a="338491245" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Mar 2023 17:16:33 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10653"; a="749672874" X-IronPort-AV: E=Sophos;i="5.98,272,1673942400"; d="scan'208";a="749672874" Received: from bmahatwo-mobl1.gar.corp.intel.com (HELO rpedgeco-desk.amr.corp.intel.com) ([10.135.34.5]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Mar 2023 17:16:31 -0700 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, szabolcs.nagy@arm.com Cc: rick.p.edgecombe@intel.com, Yu-cheng Yu Subject: [PATCH v8 23/40] mm: Re-introduce vm_flags to do_mmap() Date: Sat, 18 Mar 2023 17:15:18 -0700 Message-Id: <20230319001535.23210-24-rick.p.edgecombe@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230319001535.23210-1-rick.p.edgecombe@intel.com> References: <20230319001535.23210-1-rick.p.edgecombe@intel.com> X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 0D3631C000F X-Rspam-User: X-Stat-Signature: ms33irpt9jbt4bir6bmktfrgpy9pdfde X-HE-Tag: 1679184993-508672 X-HE-Meta: U2FsdGVkX1/8jVlRBCj1yDXVu+1G7OEYOm06VhU7jdy8NXkZcWu47n8oph6S0OeURE+4wA4KqfNLq90LoZkgDkZpfFNbsLdlysI/MNihf3JH/C8nPZVwznyLYBcEBN0R+92aRLNA8m6RkxnjIDNEIsh7ipqSsOCcjqWHV7QeI0lAIgHlfa9jf6y1la56BKPyGuXD2eSm9aOU76+mfloqrbJcipQzXVg3djnKSfIIz9go8wNrgU+SkW9UySNHsxrmzymoX599GlAnCJ53JQQVhij9l3OlZuWCxHGdTtFyMnZ7ATfVWvoLZXOFpiF4/mf/d+kkT4aCxRen5dxSKwgULAjq52N4uA3L3WAmK4U2SMOZSYQ8F4zq2AJlKjiljuUdJlOrOP83YCQZsqUmUWHX2zaYbCNsTNtuA2O8HeeokZDWcsnN4raqV9DYJxZGEnPtaTchFKRcQHpBKFjx5nuoYG87pkui8N8t7/Ci9E9t1gidNCxEzue3eH1x7Bx6G1K4R7RPWQRcmIDsotsT89KeJTh5KdtXynOQtI/adKClsPxSjTAyNC4SvsVWLzw07FOdD2olBxbYzURQ0HgJJprHVGqzQfXal1OKe4yDkzEI/bPYk5ostZqRiJRxpp5sGuvaQzDn9uinG6B+xRmJBOW+YbBuU9ZuWqd9HSGf6iwvPI8U4UTD956XbW8EFVTI6378aptgvhY3neGkEAmdLaP5yLVUGJ1gSX4ycsWK0HGouBa4b02lnSHauX5uWUCoCWvwWdfWrbuH5oryiYn+pMKDB1foBZq5BLCgC7BZR6B32+GFzmodQZF750UAC/2FqZw4nUUeUtVHoMD1O3zA+RjEQYzEldHbX2z3257cmc30/7t0lxfEx0uAwoWpdgys8KGV1xTHdK95+uijrEBuoTdplqWHev9YM0z/MD/4+7pcEMTS+Hdy/FjiHUhY4uZk7JyvvtqGiU+6cZCTuaoglaH +ulHJw2p ON4oH3oOIYzWNGD+WXdSQs910hh/Uah3T+79Z/26OnfYuQ2HkBsrkZ+gSNax4KPBGXEu0wLgQuO4MvhTqyO9thQDh+jFwkMS10NTEjpoHHolMeD85DvFpEKIXdN7NOaHbcFjm0rBLUTANCKLMPFjg+3tKUlQSqNky2Lg/UdFkZGkHpfHgdqwmFadwCcozmNIuZMfnfiWluihqBhwqd+o//XQHgrHYDwPpJsYWgZ9ljlPozEClhRp5rHHaB6x4KzFCnxJJasWBEAxfacpNQByk1WSnjUiswLsP8/g1V9BZQX3OCvbtv0IDiUYiMtmPiFvz//nBPSzitkobJhumzWaxx9BpCs55HM4OfVXa98kQZ0mUuuhJkftFCadNcI2i5ssiBNZ0DK0nxb0iV0IJHCd/4AHGCTXmg7nUESQVU7w7K/+vbag= 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(). Co-developed-by: Rick Edgecombe Signed-off-by: Yu-cheng Yu Signed-off-by: Rick Edgecombe Reviewed-by: Peter Collingbourne Reviewed-by: Kees Cook Reviewed-by: Kirill A. Shutemov Acked-by: Mike Rapoport (IBM) Tested-by: Pengfei Xu Tested-by: John Allen Tested-by: Kees Cook --- 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 b0b17bd098bb..4a7576989719 100644 --- a/fs/aio.c +++ b/fs/aio.c @@ -558,7 +558,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 d09fbe9f43f8..d389198e17c2 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3043,7 +3043,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_vmi_munmap(struct vma_iterator *vmi, 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 60e45e7045d4..576a543b7cff 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 740b54be3ed4..e2c8e8e611d4 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1191,11 +1191,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); @@ -1256,7 +1256,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) @@ -2829,7 +2829,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 57ba243c6a37..f6ddd084671f 100644 --- a/mm/nommu.c +++ b/mm/nommu.c @@ -1002,6 +1002,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) @@ -1009,7 +1010,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; VMA_ITERATOR(vmi, current->mm, 0); @@ -1029,7 +1029,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 b8ed9dbc7fd5..a93e832f4065 100644 --- a/mm/util.c +++ b/mm/util.c @@ -539,7 +539,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