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>
CC:     Liam Howlett <liam.howlett@oracle.com>,
        Liam Howlett <liam.howlett@oracle.com>
Subject: [PATCH v13 18/70] mmap: change zeroing of maple tree in
 __vma_adjust()
Thread-Topic: [PATCH v13 18/70] mmap: change zeroing of maple tree in
 __vma_adjust()
Thread-Index: AQHYtjh41TNK0ix2lEu4VB6qiG0EVA==
Date:   Mon, 22 Aug 2022 15:04:26 +0000
Message-ID: <20220822150128.1562046-19-Liam.Howlett@oracle.com>
References: <20220822150128.1562046-1-Liam.Howlett@oracle.com>
In-Reply-To: <20220822150128.1562046-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?yuFVPa/J1C/qekgEFNzZN0QfUzWOkZmw181pjRzZKOqQ51R55enzabY0eq?=
 =?iso-8859-1?Q?kqRYPazxzcRblb4KPa8i8yaL8PMZaMJbo/7g4UXaUsEFTtaZk7GtAWBFXB?=
 =?iso-8859-1?Q?F/DSxQs3a+FL3DFR2ntbX/h/mPYw7XO4VORhpcq5vHOcm9fvaZsBZ3S4TY?=
 =?iso-8859-1?Q?m1ybBDl4qeUHYxvTZsX8spBWGC91AAQ9QhMK05k290b7YxavUev/I2H5Ob?=
 =?iso-8859-1?Q?hHZ1go7SL3/7uCSb/ADJpj365lwqIm8NS+fVsRg1fP8mXHQIYDpDElya5X?=
 =?iso-8859-1?Q?897f/4ZGJfp7nEgGZg15MotoB/G+rUhgVUEruyyR7kXoDF2VcFYYy26Sq4?=
 =?iso-8859-1?Q?EUuLvEW+2InPceKfDtEjuGVKo6gVPuQKkWd3h5gomS2NO/S2Go2BnTpvGV?=
 =?iso-8859-1?Q?JvOlZji7wTOhNePhiXW0ROtTDyL/eYVNx8Rcl4jdMqtGtdeeDDaqr3jBon?=
 =?iso-8859-1?Q?nyVcpWgrygUSalT5QIYXsumaQm18NDv/1ZJhEBOy+7h1y86J+zIddVXhjG?=
 =?iso-8859-1?Q?Bi8JEIp7RkFrwsphN/AKOtohx6/moYv/cMrrFclYfvXfRcNMeLss7/bEup?=
 =?iso-8859-1?Q?8ONZrZavx6GNYxyOtDqnjtiSE52/fjOiBh8Q/e7HEGMncxoTeAhBQRGhhZ?=
 =?iso-8859-1?Q?S+qlOckfQeASIqZ4G4CSQM0W3WF8X/q45ss5KJL5Bbu8cSib+jgTFw9s+R?=
 =?iso-8859-1?Q?XzTCzNMGtRFJ0MAE7uzSzWyNqTQeEDcSWMpyA8hangFmjPEzzBLcVF4hGo?=
 =?iso-8859-1?Q?QuigLRY2RG4OuRN+fR4BCZJ+sNt3Xd3NsCAuBGz8G0QZOj0fYUV/8m1DY8?=
 =?iso-8859-1?Q?fMR1IGAu6JJjx/6WAOOLW4Rbrg93BUVgV8BXCNlrPaqpaTcAJM5ZMmW7JZ?=
 =?iso-8859-1?Q?Oj2jnvyrb3KIKl/UifOx6ZSSX5VPf3MT8IM1mhO9E+k3JQf+ZS43jq513f?=
 =?iso-8859-1?Q?+FEKWUroOur1QX2i254tXQeGAfK0Ixodcg42WzvIzwP+tJFyss5aphmJS0?=
 =?iso-8859-1?Q?i6ciiIeNoEgw7yVsgGG+cqOf53tG61dNY5KEm9NftwEcwGhPNHrodSM/A3?=
 =?iso-8859-1?Q?59F40d/qnhs/A+RbiqS5gUiXLgdlkrpjiXM1A4tQP7XiHDn1JLeWJTX02e?=
 =?iso-8859-1?Q?4QapddppdUD9p0I8vm+SjlvAX6T/siSK7kkTLJRNJeCsj6tMgpTl/9jpmh?=
 =?iso-8859-1?Q?8u8YpEb/18TKFvPeBdGWqCveXZYW3OjRaBUtKzcg1UOSZKU/0pOX0LGQGq?=
 =?iso-8859-1?Q?zO9cMbjhNrhmmYZNqUqVJJNVFn3/Lux8bvuM5noUS/ZgZJUbultRsTcZ/0?=
 =?iso-8859-1?Q?XGv7ipS5w6D4D29R7/z7gFGGaUvkEZIwoGUKs6f7WpQ0E7kIvEEhhOyMNi?=
 =?iso-8859-1?Q?KD58TzkG0TIj+ru2fNV4PPIx85n2frtRdu4hH7HI6gAFl7efmZ5EZ8/I98?=
 =?iso-8859-1?Q?VNJqlUob8wU2534Tx0YAhx33ppUDF5kgswNVefoedFKt7bGtuoNtlw+xYL?=
 =?iso-8859-1?Q?JwSpSkT7avxZJ1FyUhkvSDkbiJ86kzPVUFT4PaNMVbh46rfht3H7erj8ve?=
 =?iso-8859-1?Q?DdDxWsKGdH3lL2WV+F+rPy7rBpR7goW0bEvxi91LvlFTF6no1drIJppoO3?=
 =?iso-8859-1?Q?YalVl0A2XWb3LFBGNgt6uKPcuWok4X4XV9G7sM2agGrvO2BqdYSpmrew?=
 =?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: 2f4a683f-1d0e-4632-2f19-08da844f9b0d
X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Aug 2022 15:04:26.4336
 (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: 8bgboN8/eJ2zWMTXKZXF+UdFnbTqYGO8pv53put8d1WK+/t3fuk8ziLP3dV25w1tsF3fJOrgMVoX6G20jvF7QA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5418
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.517,FMLib:17.11.122.1
 definitions=2022-08-22_09,2022-08-22_02,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 adultscore=0 bulkscore=0
 mlxlogscore=999 spamscore=0 phishscore=0 suspectscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2207270000
 definitions=main-2208220064
X-Proofpoint-ORIG-GUID: fw2joZYXYqhmmUwRpFxecb1L3bbwpsgR
X-Proofpoint-GUID: fw2joZYXYqhmmUwRpFxecb1L3bbwpsgR
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>

Only write to the maple tree if we are not inserting or the insert isn't
going to overwrite the area to clear.  This avoids spanning writes and
node coealescing when unnecessary.

The change requires a custom search for the linked list addition to find
the correct VMA for the prev link.

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

diff --git a/mm/mmap.c b/mm/mmap.c
index f60d83c7f233..52a774e70e5b 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -567,11 +567,11 @@ static int vma_link(struct mm_struct *mm, struct vm_a=
rea_struct *vma,
  * mm's list and the mm tree.  It has already been inserted into the inter=
val tree.
  */
 static void __insert_vm_struct(struct mm_struct *mm, struct ma_state *mas,
-			       struct vm_area_struct *vma)
+		struct vm_area_struct *vma, unsigned long location)
 {
 	struct vm_area_struct *prev;
=20
-	mas_set(mas, vma->vm_start);
+	mas_set(mas, location);
 	prev =3D mas_prev(mas, 0);
 	vma_mas_store(vma, mas);
 	__vma_link_list(mm, vma, prev);
@@ -601,6 +601,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned l=
ong start,
 	int remove_next =3D 0;
 	MA_STATE(mas, &mm->mm_mt, 0, 0);
 	struct vm_area_struct *exporter =3D NULL, *importer =3D NULL;
+	unsigned long ll_prev =3D vma->vm_start; /* linked list prev. */
=20
 	if (next && !insert) {
 		if (end >=3D next->vm_end) {
@@ -728,15 +729,27 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned=
 long start,
 	}
=20
 	if (start !=3D vma->vm_start) {
-		if (vma->vm_start < start)
+		if ((vma->vm_start < start) &&
+		    (!insert || (insert->vm_end !=3D start))) {
 			vma_mas_szero(&mas, vma->vm_start, start);
-		vma_changed =3D true;
+			VM_WARN_ON(insert && insert->vm_start > vma->vm_start);
+		} else {
+			vma_changed =3D true;
+		}
 		vma->vm_start =3D start;
 	}
 	if (end !=3D vma->vm_end) {
-		if (vma->vm_end > end)
-			vma_mas_szero(&mas, end, vma->vm_end);
-		vma_changed =3D true;
+		if (vma->vm_end > end) {
+			if (!insert || (insert->vm_start !=3D end)) {
+				vma_mas_szero(&mas, end, vma->vm_end);
+				VM_WARN_ON(insert &&
+					   insert->vm_end < vma->vm_end);
+			} else if (insert->vm_start =3D=3D end) {
+				ll_prev =3D vma->vm_end;
+			}
+		} else {
+			vma_changed =3D true;
+		}
 		vma->vm_end =3D end;
 		if (!next)
 			mm->highest_vm_end =3D vm_end_gap(vma);
@@ -783,7 +796,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned l=
ong start,
 		 * us to insert it before dropping the locks
 		 * (it may either follow vma or precede it).
 		 */
-		__insert_vm_struct(mm, &mas, insert);
+		__insert_vm_struct(mm, &mas, insert, ll_prev);
 	}
=20
 	if (anon_vma) {
@@ -870,6 +883,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned l=
ong start,
 	if (insert && file)
 		uprobe_mmap(insert);
=20
+	mas_destroy(&mas);
 	validate_mm(mm);
 	return 0;
 }
--=20
2.35.1