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 Howlett <liam.howlett@oracle.com>
To:     "maple-tree@lists.infradead.org" <maple-tree@lists.infradead.org>,
        "linux-mm@kvack.org" <linux-mm@kvack.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Andrew Morton <akpm@linux-foundation.org>,
        "damon @ lists . linux . dev" <damon@lists.linux.dev>,
        SeongJae Park <sj@kernel.org>,
        David Hildenbrand <david@redhat.com>
Subject: [PATCH v10 29/69] mm/mmap: change do_brk_munmap() to use
 do_mas_align_munmap()
Thread-Topic: [PATCH v10 29/69] mm/mmap: change do_brk_munmap() to use
 do_mas_align_munmap()
Thread-Index: AQHYhbAP2LStW32dskeOGzGnIYRpEw==
Date:   Tue, 21 Jun 2022 20:47:02 +0000
Message-ID: <20220621204632.3370049-30-Liam.Howlett@oracle.com>
References: <20220621204632.3370049-1-Liam.Howlett@oracle.com>
In-Reply-To: <20220621204632.3370049-1-Liam.Howlett@oracle.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?aFhl3nFQowUycX1lds1dbqAqP2lj9W3Xh/uVJkqWTNnKb6UlfnhjtxQGia?=
 =?iso-8859-1?Q?gqo6Qp0c0YNB5Msrj9l+gmu9jH/wwkG3L3vsBJy5diEg9Uch+aQI4HtlAl?=
 =?iso-8859-1?Q?k+wdgz3U5xgPLqqxhHceJa7ha3tgxBbe8O/MB7bNZkpM5MGYNYDhudNrI4?=
 =?iso-8859-1?Q?0MoQ+3yuKoiEZB2QWfKPwqb2uMbQ/bEgia/fVA2Ptm46tH9n5eeX4tIQkZ?=
 =?iso-8859-1?Q?owwFkVDr7tTgErY18A6ZrKBwPvaC4NZtFu/P3QsGudTg1TpwgGoabHxXBF?=
 =?iso-8859-1?Q?qc0+lRhzAAHgq6Rga2inh/0DMPIoVXaXmUeIL6K2LNSu1L5bTW6CXv/76I?=
 =?iso-8859-1?Q?+8RWIWFbHnpOKp7n3IB8xXZJpvdvgz3ts/p5pR49Ih4byf/Xa/lQX9ZAF4?=
 =?iso-8859-1?Q?nCqKsxBiwylmnzCo/+X/bDlyclK7TsMfkrEmurnKLcHlk6b2GnrxZRdRUF?=
 =?iso-8859-1?Q?rKTmNH/BJYKO2egJjSLdbd1wpuyH4XL43oxF5PiPAzG/yJYWpxYUBXrv9v?=
 =?iso-8859-1?Q?YmNGOMJ0VOJq+1kDMvvMBVP8BC6yQuIJcYl+2jCKAIedCLziRqPtvZ+HY+?=
 =?iso-8859-1?Q?TJnHDx/DIJnQ3JcnOJfegljrCwRuMZTH9KI3PSKqfZAv6dnXJxG9mpHQ8e?=
 =?iso-8859-1?Q?T/xAiQguXbuQ1pcMIDxAMNOp6MBJT7BHeKTMKXkSQ9rC5h+9LqgdppyW5C?=
 =?iso-8859-1?Q?+SCXa+YiO2kJz82rZvYRyHr+zubu7NI1wCDwbyWTZ7YeYiu4eOZxK6tkEA?=
 =?iso-8859-1?Q?Su9qQrHk0SJio/WgmE5zUGfO8lTzGu+sJpVzrful+WRqP5C8BOwB/6I8bi?=
 =?iso-8859-1?Q?lOJ8FShYU46wseXPm4InwqN3IdhzgyqMYgwiCYVOqEKEY8sWMI4gvF2OFq?=
 =?iso-8859-1?Q?dbSGelRhyo4Nkv4Jea/l9g2kY+e9dda3kBP2K3eZrN49hNdcxib4vAny1G?=
 =?iso-8859-1?Q?oshi9nA6Kh+Am6kt4kvP0g26DlZ8ej9sD2uk2FqIQUaXsinuVSrM/KjXsA?=
 =?iso-8859-1?Q?h+IHihqDCdzamLIRFmucFSxjbijrkyUL8M0PhvpZgUSerB7H0x+ZCwL5AL?=
 =?iso-8859-1?Q?IlXdrZ0C420thY9EVV5mTSBPXeRn+bmlpg8k7ULCrIVXc6H44OGe7iYsAM?=
 =?iso-8859-1?Q?J7bQnSM8YvsU/GD01EO7cKMwaSXeMpiFQy+wbs1rWYSWiQo7NOEdAeRwKS?=
 =?iso-8859-1?Q?nmwZ8QS3vAC35x+SLGlgtV/VS6grYEwUUdwXv8LqLkrY4CbI8C6PITW7o4?=
 =?iso-8859-1?Q?xOtDJPfAw40e1DbZnQvONgDNvofejvRda6r1PiiLu7YpaWgiZZzOW13y+s?=
 =?iso-8859-1?Q?mCtgXW0JtuvFq0znZ8/SrlXJO69lpWX40TVKH3RN74vxurZmXiu0HQaijb?=
 =?iso-8859-1?Q?/QROZUV+jGM0EzkrlJbDGcggBJYYi+Hjs3kR7VV2rRTjfohgjbhawz1lc9?=
 =?iso-8859-1?Q?ft1tFh3C2b5MDJW0xZBO/9CAQWMGe8sPfyu8MBE7JEt4tYBKFBC1fKLr46?=
 =?iso-8859-1?Q?k6xt/bxYCU8CDZlL+fQsbXCi7iIXysMEuT8Q0cI3va5P1lbsHLPdDzHnc/?=
 =?iso-8859-1?Q?DoPkNJClJNgvliMFX0ERRgpjDXGnNDP9QS5/lql2tWrdY0rrzmhujeMJjk?=
 =?iso-8859-1?Q?dfdDxqbMQvh1gB4JfXr3naQlXDFO7dmo9wZR4Ng74iNLZGWQ4Li+QCBcC9?=
 =?iso-8859-1?Q?IaWRsXkXqzq0EXccj2Ri3yUokgWK+k53ipZtqHt9TJl8CwlWMV3T4OxkOJ?=
 =?iso-8859-1?Q?2WTXlX5WZ9Eo5lPJq3+eZXF5uL/bDZD5gHl4CqLeY2wiZhrEYM6z9C4qAd?=
 =?iso-8859-1?Q?D/jIHSxZVZZtb+I/pYyT3eyM4kuLt9c=3D?=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: afd6514b-6a75-4030-22e8-08da53c73812
X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Jun 2022 20:47:02.1913
 (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: YqIhv2h5cCD19kpMx+lwvDH8J2GgnKrCft0eG62GVtGEWF1NdcDKhp5cDTvHBVwQ6YevrKANRZ/omoK03KcFaA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB4025
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.517,18.0.883
 definitions=2022-06-21_09:2022-06-21,2022-06-21 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=952 suspectscore=0
 phishscore=0 malwarescore=0 mlxscore=0 spamscore=0 adultscore=0
 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2204290000 definitions=main-2206210087
X-Proofpoint-GUID: EdiD1MKyXtF5eumzmWnBsQR25piLFBnM
X-Proofpoint-ORIG-GUID: EdiD1MKyXtF5eumzmWnBsQR25piLFBnM
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,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

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

do_brk_munmap() has already aligned the address and has a maple tree state
to be used.  Use the new do_mas_align_munmap() to avoid unnecessary
alignment and error checks.

Link: https://lkml.kernel.org/r/20220504011345.662299-14-Liam.Howlett@oracl=
e.com
Link: https://lkml.kernel.org/r/20220519150509.1290067-1-Liam.Howlett@oracl=
e.com
Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: David Howells <dhowells@redhat.com>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Cc: SeongJae Park <sj@kernel.org>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Will Deacon <will@kernel.org>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
 mm/mmap.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mm/mmap.c b/mm/mmap.c
index 19d2ddbb9a97..6ae0a8cf9956 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -3072,14 +3072,14 @@ static int do_brk_munmap(struct ma_state *mas, stru=
ct vm_area_struct *vma,
 	struct mm_struct *mm =3D vma->vm_mm;
 	struct vm_area_struct unmap;
 	unsigned long unmap_pages;
-	int ret =3D 1;
+	int ret;
=20
 	arch_unmap(mm, newbrk, oldbrk);
=20
-	if (likely((vma->vm_end < oldbrk) ||
-		   ((vma->vm_start =3D=3D newbrk) && (vma->vm_end =3D=3D oldbrk)))) {
+	if (likely((vma->vm_end < oldbrk) || (vma->vm_start >=3D newbrk))) {
 		/* remove entire mapping(s) */
-		ret =3D do_mas_munmap(mas, mm, newbrk, oldbrk-newbrk, uf, true);
+		ret =3D do_mas_align_munmap(mas, vma, mm, newbrk, oldbrk, uf,
+					  true);
 		goto munmap_full_vma;
 	}
=20
--=20
2.35.1