Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   "Liam R. Howlett" <Liam.Howlett@oracle.com>
To:     Andrew Morton <akpm@linux-foundation.org>
Cc:     maple-tree@lists.infradead.org, linux-mm@kvack.org,
        linux-kernel@vger.kernel.org,
        "Liam R. Howlett" <Liam.Howlett@oracle.com>
Subject: [PATCH 09/14] mm: Use vma_iter_clear_gfp() in nommu
Date:   Wed, 31 May 2023 22:16:00 -0400
Message-Id: <20230601021605.2823123-10-Liam.Howlett@oracle.com>
In-Reply-To: <20230601021605.2823123-1-Liam.Howlett@oracle.com>
References: <20230601021605.2823123-1-Liam.Howlett@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?itOkKYcsysgjIM7P3IYuUPPD9KDnWfwJ5NNbl6KwsERDU29Qo+m3rKXdSoHs?=
 =?us-ascii?Q?XYXq2aIrCx1kn+vWiBvsigCXzNtTeO1r7Yq350UoK4H5lCbH6slPlrbp+f5q?=
 =?us-ascii?Q?JeVEO8TG5EajtRetySBWT6hJn3JAvRO7O7RStwBD0CAWfIkZm2Btkwypt3hW?=
 =?us-ascii?Q?fm6+YLucJC9V4mDKA2KS1l9NHIQXLmhkw1EW4McS1C6jmN6hqAeiH8t8tClM?=
 =?us-ascii?Q?3f6JKrfZApb3/StEgGQxBqeZxMV7Gue2WjNG0IOJd/0EtYBmhOghq5qppP0J?=
 =?us-ascii?Q?6lP55cBs463bWPszenfQh0d8GNS+rn6AYAdIN33CKCLQI11Qhcb+Asnfyc+g?=
 =?us-ascii?Q?/pwPVSo1tFhXFOe0AF6cF6Hk5IMlKVx49GKTuOzGUBT638KzGF6ngpo5cfuV?=
 =?us-ascii?Q?7T8JyToGjhlWC+CUJEwMOfs85tgjw6T2myqGF/LEjUjMSdDDWcDOaqO2bm+V?=
 =?us-ascii?Q?rmqY0W0PtBtTY97vDcRSjf1OtmIpVYKB4F8gvBbFwfBzx2a2TggpZ7NKailg?=
 =?us-ascii?Q?ccljN9OfjgJmIOA9YkvOFX0R7foB0Na+Lni5+C5geUyAb8GJhIJV+FRCzojT?=
 =?us-ascii?Q?KkcqSFRDPgBUgO0Oy8sKdTJ5c8wJapagxaibp21xRJbtZitPGA/sARrDYXwz?=
 =?us-ascii?Q?M1c+epOb6hVPPanGxeEZoQIDHJ3SCdiZMknIGlptTwFsEDcmLvoHPUN0XXsF?=
 =?us-ascii?Q?QZi1uU8BJHVewrQc4sQnX9c7Z72rem38+N2oL2QkPZjJK9jTTvLlXCPRNaRx?=
 =?us-ascii?Q?coLFLo44l40nZYF4VjqGavv312n0bEYelXUDoWPMOpcqo3P5LiDXsMYMEc9R?=
 =?us-ascii?Q?AjjpNiBjdDscmMQSZGGPJqSED0/qeCPFV2bR7POCN95/xZZ3VDvAZkRgfGtr?=
 =?us-ascii?Q?PHJkUBUBD23qX4ksveS876SQknvvGc2c/zs+rCc2UPXFPRGVo2DXzcf+X3Dc?=
 =?us-ascii?Q?HmMp0zBFupW3MehS4FgPIsX803zoOpklCFoupTWKTtFyLpGkKTkfSqBlNx21?=
 =?us-ascii?Q?rfzfGzPYBNgrd57/xvfrwnzSDzk9ZZkJ/ulpulJJ2XN6nRdycO4uQ5gmQVPp?=
 =?us-ascii?Q?A2UzMW7brUFmm5Oj+BYFUEkGS4ZVeKekBazyaoKuuZUdBmTxfTozK8nnbwBc?=
 =?us-ascii?Q?TfoSpYhmTH+LvxtZHhPq2ZtcG3t+aNLagkzrmcTJFx0kvQ+2wRBwNjKgm7dS?=
 =?us-ascii?Q?xju4j+W3eyNAe5Uj777B+Ijju76cQUbiYd5ypEBWW+Gz/stIVFP8XHNrhbvR?=
 =?us-ascii?Q?tAvOzBvyJkGnDNaSjMzTfN3SPlEP06sTbmq4IDIiVPvy/vwn/7wc3xy8xg+y?=
 =?us-ascii?Q?kO4YZQpL/H/vs/cvfqpU8NI0SDlRGkc5EQbTNuPh//4qysI716r7qaFWB0RN?=
 =?us-ascii?Q?URn91p73YKO51S1Wiy2BQ+9xInAId2g3jPnQDutzSUTkHEXQzEKbLiIWXESd?=
 =?us-ascii?Q?zP/piElFJGuFZgaiDjHBo2Ex0mw+9Bw49TGOcnVk3aBTrgw4Q1xQNtTIHy4A?=
 =?us-ascii?Q?G7CmquTIczlts0alBKXUbIRV1gXzO9pt9hQlzOig9TPub/1+SEXlTlCbh+Zu?=
 =?us-ascii?Q?cFRrSwe9repPUZ85rfSBSJ0Nfl19hKRXCRZ68xbG1IWi+bCq2IdZu1DjIYDf?=
 =?us-ascii?Q?cA=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: gOOBYxDZ8ON9CZhWXP8jm7qQJ708PGlt/4qpQVdKC1sTq87aZVc9yUAiHyaTa01SFNvAF0v3i/KftqGlxeMAn8r7UAmelfBh2ggv38QHq5bXZFTiyZu4Divfxv5vBw/IjhXLB7G7pW7RWnMkL9Uyjce1u2WwPTEQ6Ajnuz9kyoO52O7644m8CbqROPZPWqiDzYdlXB5+tl+PYy4eguNSF0dHnqHjTyE4BXnEC1umQRY/GElj6fWZL/cRvKHfwsg7BdabT32AITtvZTUnnhEgXTN6vUksCYEL/+PT/f+F1BGB1FVlGyiURhWSh81CsdkvHZ9uw+ntSRWqF/O+UpvoU5/Lby/CZhtrOOVzujJQ5efKXgrJsRQSgzM+4iP8y+8FpH5ztwJ6WSfMdYplhG653Dfo9AkQH/Kc692f6E/3M7R9Z+NVI0Py9GDbSHvz9DemF/A9lE/EV+Q1tK/QpDQqpKXs70FsWI629APDCM0Dye3glIjx6SmZn9W4BQaO4sIe90jhF7MlEoF9zmvvWKWpeyJW+zf9py8rLnQU8chpLoljaYJNwy052kN6rEHnD/5G3BYwPfzNxZNNngCyrPnmeapy4VSug3kc6am+Mrcl+nhpPl+wjKYaJpWFSFM3r9/I+bO4Dl826euiPjbhh6JIuRlTM84U6a7MQnIfkIb/TawLRL50QZY7rUmTyFG01PkVmvCRIYO/awGAMuDwVB4XHqlI/wG8wu39YguUI3FRJmgik6XYbrOyAFxbbl2N2joy5MNNY/+7WLgr3q6GAISYJ6vtQxAvtxhvgRyeobQqO8pjf+aYD6wE22c1y2IIJluxfRCVgHfZ6qLsOPMRE+22iL62RZeXZAMXe8l5T7Uzh63chdbB3v3XSy+nWYn4SvBvwnTUsnmWTPrhKOjIkQGCDA==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 764d96bb-2b7c-47f5-bfca-08db62463b95
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2023 02:16:39.1074
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: K8zrHK8zn9VdbxZkBayF4hNk2VJsNrK3gzLySnBJKHe3ve7BDwzA3DyBecDOgEycz2fOWcfm9b+MFg1voBZCHg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB4687
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.176.26
 definitions=2023-05-31_18,2023-05-31_03,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 adultscore=0 spamscore=0
 phishscore=0 malwarescore=0 mlxlogscore=985 mlxscore=0 bulkscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000
 definitions=main-2306010016
X-Proofpoint-ORIG-GUID: lrsWdV8N_1lIOYm9arKpH7kRzafi5vjx
X-Proofpoint-GUID: lrsWdV8N_1lIOYm9arKpH7kRzafi5vjx
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,
        T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Move the definition of vma_iter_clear_gfp() from mmap.c to internal.h so
it can be used in the nommu code.  This will reduce node preallocations
in nommu.

Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
---
 mm/internal.h | 12 ++++++++++++
 mm/mmap.c     | 12 ------------
 mm/nommu.c    | 12 ++++--------
 3 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/mm/internal.h b/mm/internal.h
index 2691deca9699..d78fd0fafa3b 100644
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -1057,6 +1057,18 @@ static inline void vma_iter_clear(struct vma_iterator *vmi,
 	mas_store_prealloc(&vmi->mas, NULL);
 }
 
+static inline int vma_iter_clear_gfp(struct vma_iterator *vmi,
+			unsigned long start, unsigned long end, gfp_t gfp)
+{
+	vmi->mas.index = start;
+	vmi->mas.last = end - 1;
+	mas_store_gfp(&vmi->mas, NULL, gfp);
+	if (unlikely(mas_is_err(&vmi->mas)))
+		return -ENOMEM;
+
+	return 0;
+}
+
 static inline struct vm_area_struct *vma_iter_load(struct vma_iterator *vmi)
 {
 	return mas_walk(&vmi->mas);
diff --git a/mm/mmap.c b/mm/mmap.c
index 75b2a86e1faa..22c71dff762b 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -154,18 +154,6 @@ static inline struct vm_area_struct *vma_prev_limit(struct vma_iterator *vmi,
 	return mas_prev(&vmi->mas, min);
 }
 
-static inline int vma_iter_clear_gfp(struct vma_iterator *vmi,
-			unsigned long start, unsigned long end, gfp_t gfp)
-{
-	vmi->mas.index = start;
-	vmi->mas.last = end - 1;
-	mas_store_gfp(&vmi->mas, NULL, gfp);
-	if (unlikely(mas_is_err(&vmi->mas)))
-		return -ENOMEM;
-
-	return 0;
-}
-
 /*
  * check_brk_limits() - Use platform specific check of range & verify mlock
  * limits.
diff --git a/mm/nommu.c b/mm/nommu.c
index f670d9979a26..a764b86b132a 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -1383,17 +1383,13 @@ static int vmi_shrink_vma(struct vma_iterator *vmi,
 
 	/* adjust the VMA's pointers, which may reposition it in the MM's tree
 	 * and list */
-	if (vma_iter_prealloc(vmi)) {
-		pr_warn("Allocation of vma tree for process %d failed\n",
-		       current->pid);
-		return -ENOMEM;
-	}
-
 	if (from > vma->vm_start) {
-		vma_iter_clear(vmi, from, vma->vm_end);
+		if (vma_iter_clear_gfp(vmi, from, vma->vm_end, GFP_KERNEL))
+			return -ENOMEM;
 		vma->vm_end = from;
 	} else {
-		vma_iter_clear(vmi, vma->vm_start, to);
+		if (vma_iter_clear_gfp(vmi, vma->vm_start, to, GFP_KERNEL))
+			return -ENOMEM;
 		vma->vm_start = to;
 	}
 
-- 
2.39.2