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>,
        Hugh Dickins <hughd@google.com>
CC:     Yu Zhao <yuzhao@google.com>
Subject: [PATCH v12 29/69] mm/mmap: change do_brk_munmap() to use
 do_mas_align_munmap()
Thread-Topic: [PATCH v12 29/69] mm/mmap: change do_brk_munmap() to use
 do_mas_align_munmap()
Thread-Index: AQHYm97rV+vsMAZAXUSeszcz3Jtpyw==
Date:   Wed, 20 Jul 2022 02:17:53 +0000
Message-ID: <20220720021727.17018-30-Liam.Howlett@oracle.com>
References: <20220720021727.17018-1-Liam.Howlett@oracle.com>
In-Reply-To: <20220720021727.17018-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?sVdRplEnE3dSAnIARXHLLdC/2GB72c3WniH/5Z7xZGmXDskssOvGgc7PR3?=
 =?iso-8859-1?Q?qgut+X2A4eXkjgqRrubQcF11+oABFBguxwvt5Z/n39zaE4P7pBB82oPuvS?=
 =?iso-8859-1?Q?Vp3OdYSrE+iYvVFwRwndDnMBJUzqruvPM9VbwT15k9JbC54t4TJzxH7xpL?=
 =?iso-8859-1?Q?oTvby6v4ifYlQH9KC2auh7RZTvtYTp06xTwYW7cydRBaRH94v5pT648ZS9?=
 =?iso-8859-1?Q?ZVG13Gd7Psum0ovLPYHFw94GlanBqDHojlrUN+7ALqUws9ClA5y4YkfzDN?=
 =?iso-8859-1?Q?Z6IeatvKpuuIaBZrisL3RCM0j3I/gXIRPWqULVxRPx33PhLR7wshXJLTao?=
 =?iso-8859-1?Q?pdH6oidVQyvzp/NozhxJjh1K6rzCXMxf4Soa177QOgsox6JSQ0jcUkjcHZ?=
 =?iso-8859-1?Q?esG45+sG681LTdhazjSw0ZbhimKsZZ0YOAT6KRKs++6uoXKrsEWf0A/Spn?=
 =?iso-8859-1?Q?KXxRgs8xR/VQUOIgqq+GyDDybSTl104TB6/GZgAE/fmQdCHDuWaOPl7hjM?=
 =?iso-8859-1?Q?mFzqcmnYaojN6CQhJ5U8w/748sMZW8itkI/3AxmizbICcJi8uKbhQ9fqyN?=
 =?iso-8859-1?Q?o4ld4d1sCBZZC4nVJ+63zRqvfDa4nM+WjtWS0vxoVk8f6jz6+AKopKO8wB?=
 =?iso-8859-1?Q?OC6JnMU47AnaNNeGI80QLYfUwrXgrAO3DLr6ohFVduXWHuBM15Lci5RqKQ?=
 =?iso-8859-1?Q?Ak1yplWTJkZ72Wnigjj+PDK0GUNIycTvopBSZ8ZqqF+yEt54B1wz/DCfRd?=
 =?iso-8859-1?Q?YwPmwfOXNk5RlYF+NLYSov7YI0NR36x59j7bQ89w5l3AyI8P1yLY7TqBCJ?=
 =?iso-8859-1?Q?QJQK+OH2kQZkLcHc8/jsBDrt1Q2YKNRCEiysLACl2Hb/VsgTSSBIB9Qu/Z?=
 =?iso-8859-1?Q?Wq7wmuO7zprXC0UcvUP53d81qtBmSdglRI//B+BaStYdvXCP1lLULER7sd?=
 =?iso-8859-1?Q?6r8J4iRkQxi+hLew+V4Q5lFmAu0DsXTlq7InICqQ565XvLHAI+Dt4vGC9c?=
 =?iso-8859-1?Q?4C70B7YaT4SI6EaC7VuorGBNUiRDrD1LXrXMiITAnz8ACRtrViyZ2L5yrO?=
 =?iso-8859-1?Q?bjlh90G6SE5wr+/+ImOcXO6Ytj2jT8NmzY52ahlonK+OYWTJ2JEaQVo7BN?=
 =?iso-8859-1?Q?8N4i5Ite+tFh9Mad1/62N91vbzryTC72y+dcTsWLUyxtLFJW5kDAUI4fCg?=
 =?iso-8859-1?Q?Ek2YIZ6OoSbBFa8K2RI0b6B7Cy8Q9mzH0bN23gHevaMIKSUcQA8ksYb3Hd?=
 =?iso-8859-1?Q?G9zenzubzEoILXpZQNtha/auhOOrYx71cFIanHjvZRyU+YZTjxloxKYR2n?=
 =?iso-8859-1?Q?e939I7+b/il5u5Zm8Ii//+vQCgYDD8KwGYW8hWshywb9VuFTrOGtJpr2Cv?=
 =?iso-8859-1?Q?epQXrx/MAeCnw+bzCwCNxpKRHVG6vmxR/3qSAvgizMOK1nmUsccfrw5vxD?=
 =?iso-8859-1?Q?R3AHYDWNYcSCmboO/GPXdhKKVo7tMyerbwHHKoRoDjjgqPHlCIzc7aApw+?=
 =?iso-8859-1?Q?e3wtaMwcKVX2MeFxdZj/iPcHL81JeABWlq7w2rtfYtgd8126Q08UG9ZnFA?=
 =?iso-8859-1?Q?+aKq/hg8Ipt2j252/U7yYDvPCQg3rEE9PwkA0r7vL36qeqX4Yb1DNHAho2?=
 =?iso-8859-1?Q?xZ0Yl70yi1S1IA7juFz4ECgr4SLI5GxylDW3oQ804Gt8ELbF+h0eH7nQ?=
 =?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: cbe67a3d-01fd-4aae-9dc1-08da69f6108b
X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Jul 2022 02:17:53.5714
 (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: 23hHUpyKY4cLTXqrry4ZMCs43gjp5duv3/gzG1ewzoO6KIQORpiYuIN/pd3WAROtKEEej+Gr+o8fov4hRk+Yqw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR10MB6316
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-19_10,2022-07-19_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 spamscore=0 bulkscore=0
 malwarescore=0 adultscore=0 mlxscore=0 phishscore=0 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000
 definitions=main-2207200008
X-Proofpoint-GUID: O_XGW1j3JpAP0hrwOGHKaUOoolWRZsfz
X-Proofpoint-ORIG-GUID: O_XGW1j3JpAP0hrwOGHKaUOoolWRZsfz
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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mm/mmap.c b/mm/mmap.c
index 280fc2d2854e..29494ff6c0e6 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -3085,7 +3085,7 @@ static int do_brk_munmap(struct ma_state *mas, struct=
 vm_area_struct *vma,
 	int ret;
=20
 	arch_unmap(mm, newbrk, oldbrk);
-	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);
 	validate_mm_mt(mm);
 	return ret;
 }
--=20
2.35.1