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 E297FC3600C for ; Fri, 4 Apr 2025 02:20:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 97A5F28000F; Thu, 3 Apr 2025 22:20:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9038028000B; Thu, 3 Apr 2025 22:20:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7306628000F; Thu, 3 Apr 2025 22:20:00 -0400 (EDT) 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 4D48E28000B for ; Thu, 3 Apr 2025 22:20:00 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id DB1F781B2D for ; Fri, 4 Apr 2025 02:20:01 +0000 (UTC) X-FDA: 83294756202.11.EEA7DFD Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by imf22.hostedemail.com (Postfix) with ESMTP id 1DC74C0004 for ; Fri, 4 Apr 2025 02:19:59 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b=jjuzDj3q; dmarc=pass (policy=reject) header.from=oracle.com; spf=pass (imf22.hostedemail.com: domain of anthony.yznaga@oracle.com designates 205.220.177.32 as permitted sender) smtp.mailfrom=anthony.yznaga@oracle.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1743733200; 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=K79b88UIyoJS+J3UJtmo5bx4rIGf4HjUwc2YR+jqvkc=; b=2+PcMUMjFgdimcQ4O/c2AbunvwdphcQEyxsHROrfbCdFl3KgsG4RlsE6FIKcqcXKi8XEKz lmgtmI/vTZfBrc/tB0+Yrhrtjzmv5OCXLMZSBx7fR2YfJd5Rzdn9ob2Hix7MwyBUYvldZ6 v0P9+Tnym/NRoGl02hLIKJyl49DOx+E= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1743733200; a=rsa-sha256; cv=none; b=fBMgNo4fqez/4x5ITZry+AyWt2p2JYXC7jXDifT+oinvrrjhXlG3oxoa+kNrbz7B/0k9/J 7oXumZ3+Blc8koS2S8z/UoKcB4oeua3tgmefN93G4f+05LxsXDpCcw4veDazzDLhw3esAl 3mWJ3q+0noKhMzUag/yZyW8bKOcDmAY= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b=jjuzDj3q; dmarc=pass (policy=reject) header.from=oracle.com; spf=pass (imf22.hostedemail.com: domain of anthony.yznaga@oracle.com designates 205.220.177.32 as permitted sender) smtp.mailfrom=anthony.yznaga@oracle.com Received: from pps.filterd (m0333520.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5341NVrf000752; Fri, 4 Apr 2025 02:19:44 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=corp-2023-11-20; bh=K79b8 8UIyoJS+J3UJtmo5bx4rIGf4HjUwc2YR+jqvkc=; b=jjuzDj3qp82UuFSa0katb Z4ToABUz7mu2SzMP6UijRLaJJfhB0/O+5g/tMRQLUrB2dNA3/8ZFs5xYMKuvLMNj HVRrOfgC1Zu94cIkXMTDAh4cl6SeV9PG9TUd8uMtVXj8tCIqT1oAi+HSwyJPQpla eIDKkD9z3w+8H4Lev0pUX3tOVHFenoWpeI/BWWHO+U4pqSVb4w7TALvUEK90DPC7 PZRqkJo/RN/2fW+NI2Y2GQZd4d26GgP+fFVlYkD+881h6g8268dHG4oASKT8Ju5k pMFxyayFU7ZXg8oQWAc5Fhtn4w8nLWZ7YMjIlw3wv99A1g7xmQVZQfLVEg5ZrQKC A== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 45p8wcpnq2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 04 Apr 2025 02:19:44 +0000 (GMT) Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 5340g3PN017380; Fri, 4 Apr 2025 02:19:43 GMT Received: from pps.reinject (localhost [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 45t2pspjgk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 04 Apr 2025 02:19:43 +0000 Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 5342H8h6030074; Fri, 4 Apr 2025 02:19:43 GMT Received: from localhost.localdomain (ca-dev60.us.oracle.com [10.129.136.27]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTP id 45t2pspj73-16; Fri, 04 Apr 2025 02:19:42 +0000 From: Anthony Yznaga To: akpm@linux-foundation.org, willy@infradead.org, markhemm@googlemail.com, viro@zeniv.linux.org.uk, david@redhat.com, khalid@kernel.org Cc: anthony.yznaga@oracle.com, andreyknvl@gmail.com, dave.hansen@intel.com, luto@kernel.org, brauner@kernel.org, arnd@arndb.de, ebiederm@xmission.com, catalin.marinas@arm.com, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, mhiramat@kernel.org, rostedt@goodmis.org, vasily.averin@linux.dev, xhao@linux.alibaba.com, pcc@google.com, neilb@suse.de, maz@kernel.org Subject: [PATCH v2 15/20] mm: pass the mm in vma_munmap_struct Date: Thu, 3 Apr 2025 19:18:57 -0700 Message-ID: <20250404021902.48863-16-anthony.yznaga@oracle.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250404021902.48863-1-anthony.yznaga@oracle.com> References: <20250404021902.48863-1-anthony.yznaga@oracle.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-04_01,2025-04-03_03,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 bulkscore=0 mlxscore=0 spamscore=0 adultscore=0 suspectscore=0 mlxlogscore=999 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2502280000 definitions=main-2504040014 X-Proofpoint-GUID: FD5x5FdaburlWteo41CRHnMs6Jy6iOM4 X-Proofpoint-ORIG-GUID: FD5x5FdaburlWteo41CRHnMs6Jy6iOM4 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 1DC74C0004 X-Stat-Signature: xn1yuj3csge7zpxa41uupjioo5kmfxrq X-Rspam-User: X-HE-Tag: 1743733199-180981 X-HE-Meta: U2FsdGVkX1+CWfGHkNo0gdOo7SMy8+JbaEZTOoeJcen5egqeJHaQrsgVX1LQrmX2I91/7KYkauyS6a3v7fO8/wAquSm5lHRFsuY8NTrev1zpTBqHI5DtCFaJaoUWjEDrviSXXnrs+IseOTgen9s3ZAnWBDczm6R0viKNZhsFBuQzCd2syGanUr/xoXLmyUpqqHmESqhNN8yTpr/ELzNZqhwwxe6dCHbpf7g47CySafLQKqGKIzBw4jo9aAyTE4RdYKxhS4dOJcLwB4c65myE/4eHiSy76gmdjY5fndh9VyG1JxXhD35dkmuRSZgZef7TR6HrxKJQHT6wvigwpXgKoWKrWHFMkcNHT0ZKhTxGbbV0PcqmVfBa34u7NaqIFcYkxk+ndfELB70Txsv0MRtG/eYX+t4pxjZ+qV/koRn/hMXfP8/7BeIq6rR2Xbg9l5SQENaJt0f27kB7vMMCNTuHP2+4qDoWXWmATQDMAwHcol895M0+CoPWjGYWtSoCDbo5oXK1XiZoWPyRe6vRJfpx3U95/gUqWvqBmfFiaLWtNSLDxfAMP7og3rYolS7DjW4Vuv6WJCqBowgQlllocydbsyXxxcsiVqttysLfWBfr1fW4j/050azKncM19gvettiJsnZilYrlSzN7fLeSVa4wof0xLvCWG/fhIzmAn3LKB7QRrAjhAYfWSXHweINAIpK92lm5VJHy3TdIeBsq1MeMhnCIwr2QPidZg0JI7I9XuaT+RFyDktiIPruCTkE3OvikIGHL22LzKdkil72zJKsyfxgGe1NXf7a+3GYAa3Rexjdw8PfnVoXWS3zyQNSlOt7cIoVyZ4bfHx/7tY44iTiO+ubhuBAXp2NHUqkbqnd0oJelirAneNPXUl3ijW/qazu5kIETgF2QBJqsr8JqDG00ksvZ1aZ6osWUvWXwJ+g7+V58kSkN3Kq4Wg0eSzmYFigu 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: List-Subscribe: List-Unsubscribe: Allow unmap to work with an mshare host mm. Signed-off-by: Anthony Yznaga --- mm/vma.c | 10 ++++++---- mm/vma.h | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/mm/vma.c b/mm/vma.c index 9069b42edab6..c56f773c06c0 100644 --- a/mm/vma.c +++ b/mm/vma.c @@ -1188,7 +1188,7 @@ static void vms_complete_munmap_vmas(struct vma_munmap_struct *vms, struct vm_area_struct *vma; struct mm_struct *mm; - mm = current->mm; + mm = vms->mm; mm->map_count -= vms->vma_count; mm->locked_vm -= vms->locked_vm; if (vms->unlock) @@ -1396,13 +1396,15 @@ static int vms_gather_munmap_vmas(struct vma_munmap_struct *vms, * @start: The aligned start address to munmap * @end: The aligned end address to munmap * @uf: The userfaultfd list_head + * @mm: The mm struct * @unlock: Unlock after the operation. Only unlocked on success */ static void init_vma_munmap(struct vma_munmap_struct *vms, struct vma_iterator *vmi, struct vm_area_struct *vma, unsigned long start, unsigned long end, struct list_head *uf, - bool unlock) + struct mm_struct *mm, bool unlock) { + vms->mm = mm; vms->vmi = vmi; vms->vma = vma; if (vma) { @@ -1446,7 +1448,7 @@ int do_vmi_align_munmap(struct vma_iterator *vmi, struct vm_area_struct *vma, struct vma_munmap_struct vms; int error; - init_vma_munmap(&vms, vmi, vma, start, end, uf, unlock); + init_vma_munmap(&vms, vmi, vma, start, end, uf, mm, unlock); error = vms_gather_munmap_vmas(&vms, &mas_detach); if (error) goto gather_failed; @@ -2247,7 +2249,7 @@ static int __mmap_prepare(struct mmap_state *map, struct list_head *uf) /* Find the first overlapping VMA and initialise unmap state. */ vms->vma = vma_find(vmi, map->end); - init_vma_munmap(vms, vmi, vms->vma, map->addr, map->end, uf, + init_vma_munmap(vms, vmi, vms->vma, map->addr, map->end, uf, map->mm, /* unlock = */ false); /* OK, we have overlapping VMAs - prepare to unmap them. */ diff --git a/mm/vma.h b/mm/vma.h index a6db191e65cf..572a11274114 100644 --- a/mm/vma.h +++ b/mm/vma.h @@ -49,6 +49,7 @@ struct vma_munmap_struct { unsigned long exec_vm; unsigned long stack_vm; unsigned long data_vm; + struct mm_struct *mm; }; enum vma_merge_state { -- 2.43.5