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:     linux-mm@kvack.org, linux-kernel@vger.kernel.org,
        Andrew Morton <akpm@linux-foundation.org>,
        maple-tree@lists.infradead.org
Cc:     "Liam R. Howlett" <Liam.Howlett@Oracle.com>,
        "Liam R . Howlett" <Liam.Howlett@oracle.com>
Subject: [PATCH v4 33/49] madvise: Use split_vma() instead of __split_vma()
Date:   Fri, 20 Jan 2023 11:26:34 -0500
Message-Id: <20230120162650.984577-34-Liam.Howlett@oracle.com>
In-Reply-To: <20230120162650.984577-1-Liam.Howlett@oracle.com>
References: <20230120162650.984577-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?BzMnoEwJaRj0Vc7WZln40jSyx9nHZ+eUZggZxOADBG3+VWUvbCtsDpG46YJg?=
 =?us-ascii?Q?IoC/xLgE7pdEwCSR5eiQ8JsDfba/xuLRLl2ikBG/1xQQwSkRZiAlw2WS4l+n?=
 =?us-ascii?Q?tayL/awVE2wZw7EcU/EImrktFl65M9UHSqqMeqUDgLpWOEKFP/vKv5/Hde5o?=
 =?us-ascii?Q?cNsSeYyc5ytHby/hfFxj7hFEcZh45J3vUhd/GJMW3V12icT1Y6RpSrAGZFsO?=
 =?us-ascii?Q?imjFcGaiocQ8zqX1sgOzVPQmP8PrHyhBfqyTb/2lNGX21tatoQW+r3rNn0Xg?=
 =?us-ascii?Q?NdUmJF2+5rvlPJtzslV71ua8pX2YK4pAWaVTEP3BRg9C9KDGlbSkqWWWvJ3J?=
 =?us-ascii?Q?VpPhGLjpyEL4Wex1bQk6rJPfHhiCmG0KRofUvb2FunwJGXpCW2hbXOiEqTCp?=
 =?us-ascii?Q?c3N2e7kDzpOPjUae+bZUfDlwDheqEDcHSR6Kr2xgKN2DDsxcNcgubpki1XS9?=
 =?us-ascii?Q?WsNc8OC0vOCAdNuyNZKVj2s7dhdO6V3ehBNHbhdQxelFlgCxZWA8wF2rvp0t?=
 =?us-ascii?Q?9Ecc6GjvD1RvFImFFcGYafXq6sZal8YYD1mZfvHH2waQmuV8StHeV2wmmNfQ?=
 =?us-ascii?Q?1Xem/1/J9OaWH1UDO3kVSBMY1L8AQa00h8Ys6vfnKJxzk8JyCBMQgTLDizlG?=
 =?us-ascii?Q?VhHF+BY5cbxb3dfLwkutmOaYziKkbsPvbM/PA0ScauOikM0BGCee2DYIzrkK?=
 =?us-ascii?Q?aXCOuQM2CNpu/OGQDkCr5Vd/Nf1hJO7ioYVOMUfKdz5n9P4H3Vvg0GIIEBP3?=
 =?us-ascii?Q?opoWKz1CEhcDAqmHV9H6YaGlmupjsvujG6cedjAykgGyaSD+CWkaL3j5e7Mz?=
 =?us-ascii?Q?F2AvRcTUc6o+tuz0UUMOFqx8qUC5Q5E2mVpw70HCNainnI1r7FtD8OLjLq+Q?=
 =?us-ascii?Q?0LibzG/x1eqGKW0PUg9KMI49GJtXKs1dmXDpihXrh2smPc1ef0hR3JUHODbU?=
 =?us-ascii?Q?p/RBjTS5V0yE6g9Rnm2GFM9UtMBDDulANPAXrGVrwQOvcbLNjn5PC4oeyb/r?=
 =?us-ascii?Q?USPDob5iFXi2hl4XcUnW07DQFcyr0a+ZAPTVwYnZsSz21Xi0M17oBgTqkNaD?=
 =?us-ascii?Q?rJn+ZY+g/NJOCgyYA3RwR1KsI70C3QwaPvg6p8g/My04sDdFFR5RVDiqqmpO?=
 =?us-ascii?Q?KHUPrUnMVQrhkDqYIWncM870c/t4MsH+3YrBcJlWAkAJS7Ko+ynuFhOnOml5?=
 =?us-ascii?Q?2SIbau0I4LkiKsGFY5oxqfKRcJRWBtaEj9rc7T9A2lAPzwb4UoTsAtQE1eYU?=
 =?us-ascii?Q?Xe+khA+NrcfQ+s2vSLvsgiV/BiNO2jqO9DcS9MfJcUa1hr4QGNjYkXxmpmG3?=
 =?us-ascii?Q?OSiT3HqqhWdXOXFS0GLRs9EfsZu9QV6DHy5hVR0I15YKQIDrvjvqENQWBFXR?=
 =?us-ascii?Q?Ylzt7Ru+4PgqWwdcl+mzvfG6EI6Oyn4Hv8zpMwBNbU70pFZHSM6+0SFJNWiG?=
 =?us-ascii?Q?fV9qWJZ5j+1Ya38QMulyF17NOMbqLLQpow6DJu6Wqcpii0Z0eMTG6/n0xwkb?=
 =?us-ascii?Q?JvCqqfSHwus0xviiQC4STXoHfeM/CKxrcE/zGdQNi/iquz5Cv8wqSyVLXCIE?=
 =?us-ascii?Q?Z25EPAmOq0x7fjKgXBTzLTiSilWAFM7zutztNxFS7X6YPgby4VAt8y8djvZX?=
 =?us-ascii?Q?5g=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: ixy+ZEV+PONmp2NtR/SjcFpiliMZ3Hmqsr8g2PEoiGHhXnN5JHQmuF/y8z/2GelFJ1/n4kGwBANmaCuUINyRS1v+s7k0PcXTL2XpwtVnent1P2tLbEWyWPB0NkibFFRyirPSFfFjNCMu4YC5Q4Pa6zOu99rfgEbyAUNDc/obU1cHuWskT6qfv6FowGBGr0BIfn+4Xs36u+iJvg3jqRa+2XdyCu9ggf+wHtGNaQ3gvz6ZXdDqJ8FQVMHrRN2TpnAObzSNemdy5rIGTpJDS1H1THVhcv01x0xXlHMKcsSLipAadg0P7E9sZhflu/pwoYbLuZmgmOejhGxQJdiBpkZl6l+mQNB9kh4qHe21er2C1LYJ/h07myp9q5aMHXV0vC6mbaFr3Aa53kvL3sLph97FX/q0SCFgETdQHkJNMwxP6P6Kkhh0jrCtvz4qqIauZEhnMwOY3dRiSnI7jJIZCVTJ+vMnskU3kFSGAvRsk42+13a2I1fDn97eipnRPk3WSI8XdnKc9IC/r+UmNU2pCh9vOeK51kgBQEDrGeNubZKEFR5Bc2EeuyF8Agbcqw9JmeVvYBQWbQszra1QsdxI9cx2reDmPrHYx4VYZzq1oC9dmPfT0A16zzh5TBTsVor5hN1gzM7AwbI8kwInA0PbbvPfCMIXfaQQlAdYmKeK/vl2ZPJ/0J57vIXYRhOBjUFQdphbLquED2SkZ6X8215XP+yOMrHJbnJBljKVTtopjQT7n0TJmgf5cNPb91mrLIR/14NqVDQhwMKzOybDH5HOvOm5z0z/ho1PpTsUau/232p8V3NYMsMmoY7fMjd3LsVAvx2Qo4WitqZjI1I1Ql3CQEo3NRUUC1VubvTWN87SXUhKl/VLcnsGOnmfU96j2ZTcYrSSq0qykKhBHnazgitRR8W1/Q==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 9d724aee-fa6a-4573-8e9c-08dafb036192
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2023 16:28:36.8689
 (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: Cu16Ta5VBPDcR0dsb4+1hLSQnrZbr3XwWe7C/wJb4PlaeTtN086WAPVhemIkyrvNDdQKFmAkjlWiWjEuZ4G+KA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR10MB6381
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1
 definitions=2023-01-20_09,2023-01-20_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 phishscore=0 spamscore=0
 mlxlogscore=999 bulkscore=0 malwarescore=0 adultscore=0 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000
 definitions=main-2301200157
X-Proofpoint-GUID: Rs8qyejwSrEQWaQBGCKSae-xIckzTPEA
X-Proofpoint-ORIG-GUID: Rs8qyejwSrEQWaQBGCKSae-xIckzTPEA
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_H2,SPF_HELO_NONE,SPF_NONE 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

From: "Liam R. Howlett" <Liam.Howlett@Oracle.com>

The split_vma() wrapper is specifically for this use case, so use it.

Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
---
 mm/madvise.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/mm/madvise.c b/mm/madvise.c
index 02b317726c9a..7db6622f8293 100644
--- a/mm/madvise.c
+++ b/mm/madvise.c
@@ -161,17 +161,13 @@ static int madvise_update_vma(struct vm_area_struct *vma,
 	*prev = vma;
 
 	if (start != vma->vm_start) {
-		if (unlikely(mm->map_count >= sysctl_max_map_count))
-			return -ENOMEM;
-		error = __split_vma(&vmi, vma, start, 1);
+		error = split_vma(&vmi, vma, start, 1);
 		if (error)
 			return error;
 	}
 
 	if (end != vma->vm_end) {
-		if (unlikely(mm->map_count >= sysctl_max_map_count))
-			return -ENOMEM;
-		error = __split_vma(&vmi, vma, end, 0);
+		error = split_vma(&vmi, vma, end, 0);
 		if (error)
 			return error;
 	}
-- 
2.35.1