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>,
        Yu Zhao <yuzhao@google.com>, Hugh Dickins <hughd@google.com>
Subject: [PATCH v11 29/69] mm/mmap: change do_brk_munmap() to use
 do_mas_align_munmap()
Thread-Topic: [PATCH v11 29/69] mm/mmap: change do_brk_munmap() to use
 do_mas_align_munmap()
Thread-Index: AQHYmYd0YdhGtnDPYk+lKpAsI0Vxng==
Date:   Sun, 17 Jul 2022 02:46:46 +0000
Message-ID: <20220717024615.2106835-30-Liam.Howlett@oracle.com>
References: <20220717024615.2106835-1-Liam.Howlett@oracle.com>
In-Reply-To: <20220717024615.2106835-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?0Axm0s1KwIbIclwtrAc+c7f70oAwm90Nvsy/fmiD806eVYzm1D85lXkI+U?=
 =?iso-8859-1?Q?k2m+s0deT2mndm3hzxLJHrU8j0PeFBWSmbHNKKkqaUYWIHqALtX5iEj9Ze?=
 =?iso-8859-1?Q?jv18oNbjo8OeO72sUccM6ZSMx4Q+bg+UY3o4Hu4E8aRNRVzts6TirmKjP+?=
 =?iso-8859-1?Q?dIhDoR/1bZfmYNdPdR+fFxjoub3SAOyjsLeJ9W47LDSBKa4eduI6ZZ14aT?=
 =?iso-8859-1?Q?vJ29q+q6k+98+RFteuZC5unxEoPJB+yMBaV3RjptQ62GRgC/lJes5vMZIE?=
 =?iso-8859-1?Q?bsfUx4FgsozvI96cg/HcyG4OzrZiI2acXywqFuchYMDWgRFSQ5jTmChcL9?=
 =?iso-8859-1?Q?3Tv2adtV+G4wiWMa5+faSEvZ85p3CXYyV5yEdHvL3sUefy7tgigJyfmLKb?=
 =?iso-8859-1?Q?x/Oi0FqqJheV3o1BUHIY89GUQfb+KQHD30LworVPASkWldJYIvx/AcprDh?=
 =?iso-8859-1?Q?RYc7NyPedFgcjlbpwSqxgcfmuaDPuP4wcbwc3innnQOyPkRw0r1KtNFAPj?=
 =?iso-8859-1?Q?OkmgHWxmvSCKbVcVv6PHnhKV0dNZ9xezayFuOFeRAyiAzlXOusBqWdDCHJ?=
 =?iso-8859-1?Q?8LfOdlyNjlgfqykYJCBU9CRvEGeHeJl/EazfL6B0pwY83NFNB5Ox8//mST?=
 =?iso-8859-1?Q?U3siIMs9XUbmNU0AEWM7QzJqTvbL/sz7L4KwYNC0DKiPVWJ26r2dhHgfj9?=
 =?iso-8859-1?Q?P5jbfcmmSr21KlOh6wmTyIVud6gWE24o8h8NohdCAfmGnKMSy94zATJ0MH?=
 =?iso-8859-1?Q?4pxE039IyFIc84ex7KOm6Qb064XLnz/snXt7Y8jkyLoWz5u+JHvg9DWDQ6?=
 =?iso-8859-1?Q?V1hPOprzRUv65Nzat5PZNQCYhpKzxt4Kn9kxRTBQ2ZS8wrzim/wyVOBMuW?=
 =?iso-8859-1?Q?yVisKy9huGHSekSd1zNUAUt1XoM6ROr+UMOLsJ5S+qy3uibV8d+d1Aa3B8?=
 =?iso-8859-1?Q?xUqFZ8Fyw5hZhUNoyBlK8cti/hO780uLdYDqL/ZqbCMbpAzC8Gpo+gsOCe?=
 =?iso-8859-1?Q?aJR7LnglvGC2M9u9dJo7YgjFi1eS8W4wY+E+Cd80fIZYko7PKygjWXBYYo?=
 =?iso-8859-1?Q?YdCR3t8dP7Py7c+9v/sehXfRgl+tkAo2sXn4wB3bVXPRyaV0RtifrkDl+s?=
 =?iso-8859-1?Q?VLfTjVYDjKR0UivtR3OwlT2wBHz4oWCGoStAs3lmN1T1v9MMBcdTdxdzx4?=
 =?iso-8859-1?Q?QdUSeEpAvyOaLNko0Ntg6JACojRMdWQB4/0c20dPA8G7fr3tVVZ/M/9byp?=
 =?iso-8859-1?Q?uJtxTD56Y3F6G9byzOcSAkjBG8wwZbaBPBbtyv2j0tD2CScYc6dKU3BhBK?=
 =?iso-8859-1?Q?nzwMBBBhaN0zSWJKSbmH57/+nj3z5R6G/NtpftsOfaVIP7QCu0JVriugCT?=
 =?iso-8859-1?Q?JyKVTOxN8mNY8rZxy7XHFqXPTTNcDSlPx/ZwOB30Ws2yn+zD/w/fQgmdZS?=
 =?iso-8859-1?Q?e+Ay6OJVeYesHUU14zWEN5J2feNiQjMOmRcGyG8gkwnM1OhHZKi/HkFBBq?=
 =?iso-8859-1?Q?EgBDM8abYwbC6R2tBjN16wk/X1tbtsiS5n0MZtW0nkaYoBowIoYjOJvB4b?=
 =?iso-8859-1?Q?jePY/P/W0aps2MkolWquHfgFgZPXBwoUtlMu2ixZgqQJG38NR7BdeHFxen?=
 =?iso-8859-1?Q?rMPqFRjbMILz7gPHC1B3BBGixFwDDAbV72kYriAUc4P/Rk3C/1vkOm2Q?=
 =?iso-8859-1?Q?=3D=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: 79638167-6307-485b-0865-08da679e9aac
X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Jul 2022 02:46:46.3653
 (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: T6WkNjLmHYms7EK77kGY5TLR7LK8Qm0PSnAHSrwey80zjNqKlmLKspRvy1+v19tkUqnevJFuiRAIrrYe+bVsDg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR10MB2799
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1
 definitions=2022-07-17_01,2022-07-15_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 bulkscore=0 phishscore=0
 suspectscore=0 mlxlogscore=953 adultscore=0 spamscore=0 mlxscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000
 definitions=main-2207170010
X-Proofpoint-GUID: jKyFa96FdWchfKkxvnTKKZsQf68zOcSs
X-Proofpoint-ORIG-GUID: jKyFa96FdWchfKkxvnTKKZsQf68zOcSs
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>

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
Link: https://lkml.kernel.org/r/20220621204632.3370049-30-Liam.Howlett@orac=
le.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 7f5301ed0213..e4bfee3d2ae2 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -3092,14 +3092,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