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>
Subject: [PATCH v5 19/70] mmap: Change zeroing of maple tree in __vma_adjust()
Thread-Topic: [PATCH v5 19/70] mmap: Change zeroing of maple tree in
 __vma_adjust()
Thread-Index: AQHYF952DkJEc4N9AU6H16tpKX8kUQ==
Date:   Wed, 2 Feb 2022 02:42:05 +0000
Message-ID: <20220202024137.2516438-20-Liam.Howlett@oracle.com>
References: <20220202024137.2516438-1-Liam.Howlett@oracle.com>
In-Reply-To: <20220202024137.2516438-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?RXo7vrmXwTwtbFI0pM6Wqv9YWpGXcqMsm/HL/28q62CYYz4DpC/VtWbNzD?=
 =?iso-8859-1?Q?ei2vKp0+AouQf81axifvPUDZ6ehwNBfwPtawE11ah575C88yCBXcv3dCL9?=
 =?iso-8859-1?Q?1Xxlf8euMMNUiOhEWCW6c9I2hS68+W4PzU6a0jSnskMxMuMk2un0VpvCqM?=
 =?iso-8859-1?Q?3MKeTurhIWrG39d1njExjbRgrDvA28FpKswj7Jevi/zncM5Up1y2ZI+yDU?=
 =?iso-8859-1?Q?0tTxlKm2epS+YCs634aNwzJOdxYLs6G8dbYR5wPW6mmaIKDWCSMmL1MaRc?=
 =?iso-8859-1?Q?sngI4HNv3PZ+ZNMDMX7nd6ys9CW7ov5hM0rsGj6QpGFVGQlO+hefRWMX7Z?=
 =?iso-8859-1?Q?jDrPZDgI4N72k9dW0eKxNuVyz5BOCsEC+fmME8Kou/HBAq+Fte18nvDmui?=
 =?iso-8859-1?Q?PKtuNRLZxmnkI8rG+k8ScETVKrD17Pe0JIWeiPrFp3TLsB1fiHiHkVcHuB?=
 =?iso-8859-1?Q?K9vB+hsW22d84TvYe72cVO8mDKC6LwPlSz9PnSwWqP7udlyMqaslh7hetD?=
 =?iso-8859-1?Q?hojvsp7POhr4Ij6oxqYiGAUFSm6l9wJD2LullPpk00a69aAheAr1pO70vG?=
 =?iso-8859-1?Q?0KDcPdFmzDyaV4Xc9DTUcd0g2X/WrsKJruZkOFpQN+Q2Gu+Z907ex6iyHo?=
 =?iso-8859-1?Q?IW0Sq2mUAe1OcEFU4/3+/idJj02uUFMrqiTjChHbbJEHdSwQXgnCMruJqK?=
 =?iso-8859-1?Q?L3wYQ+76xi5vLGC1LJYlRA+DPZdTBqmH5ZurBk+1n82JNiV0TvTNzByqmZ?=
 =?iso-8859-1?Q?UqOuwCPp0VZRTDGu8v4iSSjs68T24tii4+SRN5/ENlu7528yo9SjAKt39a?=
 =?iso-8859-1?Q?M8l/nSubJ34e4Nk2pAxGVukcdhfKhEk0XBR1R26TEV6LmhcbirC3pHBkmW?=
 =?iso-8859-1?Q?2behfibdrCGbS+QFR5IPd6t4B7571cvChDFm7xJCTOOoIi9r3RcXVR5p91?=
 =?iso-8859-1?Q?nMovHGxmUe9aR5E8aKNWkdUZHiks+eY4yAk5iLiB29kKIsBpTRa9OfApR2?=
 =?iso-8859-1?Q?jnQNs8NsO4W6w28C9teipn0+gtH4RIPcQ+CPJogQ1rko1V3hngQ/UmIC4j?=
 =?iso-8859-1?Q?0h2NG/x+u5r2up6A4CFkPE/z7A2q9I5UY6e1bwODu8EStlQl8+z9FznL8w?=
 =?iso-8859-1?Q?ekqGUJIoAIOFgox2ncykKMLkxZjUn4JFkTcxnDSsxJtfLAZgeoXT9WJiss?=
 =?iso-8859-1?Q?5yDjdBFlMXLN46xfYBpi/9C2A/2m8ovE5cjAt9kzdYcTiawMuz3E/eEM48?=
 =?iso-8859-1?Q?ioL6jbopPUktt3UGZiI0pfOiE2OFJ+vqfnEu6KzrXoZIEYeUneEvY0go6m?=
 =?iso-8859-1?Q?bnESlSbbiFG2W6ZJcGEPCudW9lWKLncLCT0DBNFxl6atrNT1Rcyaq0iKU5?=
 =?iso-8859-1?Q?HK/t3Ly2VBLA7Y+jPMYTvOnmj0ngWasPx/9s4eRP+6Xlec11xMjChpcnLA?=
 =?iso-8859-1?Q?wVRFAuY5jpTWhXhqd+HdpX6gqlWy9QlhS+3MtRgNaEEuy2Bpy3FbiuF0+s?=
 =?iso-8859-1?Q?ItxTIfrzJ/hGLYW31eNTYXENr9GNFcs0gf19Ur5DlUcmPWT0JQs75LjUtq?=
 =?iso-8859-1?Q?37T6rPUj8kC3nVeTrSHjXM0vX2EviF2e8q08IMu3WptTH5fYs5dMjJ0LsO?=
 =?iso-8859-1?Q?41+QJWW1SXjT3Hj6wpivYz9ufOkMyiOSmO7e2t8QKdtB0fRxvx7bnT2CW6?=
 =?iso-8859-1?Q?sOI62ikY2WjLnsOtFYg=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: a68e3792-9724-474b-6c78-08d9e5f59b2d
X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Feb 2022 02:42:05.7362
 (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: RAhl9LW9MTKqTuM90S9hvs9bAoBruBFJ03EzIw2GgNddCY3ElxdEdKD/UosdgNtHoEbdwm4yjLhSgdiiK7+LMA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB3970
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10245 signatures=673430
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 malwarescore=0 phishscore=0
 mlxscore=0 adultscore=0 suspectscore=0 mlxlogscore=999 bulkscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000
 definitions=main-2202020010
X-Proofpoint-GUID: VHv6JbfOf9SS0ld9R_OVc_zq-qCGmfDm
X-Proofpoint-ORIG-GUID: VHv6JbfOf9SS0ld9R_OVc_zq-qCGmfDm
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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 | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/mm/mmap.c b/mm/mmap.c
index 2158a14d0e0b..95a6dcadf529 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -584,10 +584,11 @@ static void vma_link(struct mm_struct *mm, struct vm_=
area_struct *vma,
  * Helper for vma_adjust() in the split_vma insert case: insert a vma into=
 the
  * 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 vm_area_struct=
 *vma)
+static void __insert_vm_struct(struct mm_struct *mm, struct vm_area_struct=
 *vma,
+			       unsigned long location)
 {
 	struct vm_area_struct *prev;
-	MA_STATE(mas, &mm->mm_mt, vma->vm_start, vma->vm_start);
+	MA_STATE(mas, &mm->mm_mt, location, location);
=20
 	prev =3D mas_prev(&mas, 0);
 	vma_store(mm, vma);
@@ -615,6 +616,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned l=
ong start,
 	bool vma_changed =3D false;
 	long adjust_next =3D 0;
 	int remove_next =3D 0;
+	unsigned long ll_prev =3D vma->vm_start; /* linked list prev. */
=20
 	if (next && !insert) {
 		struct vm_area_struct *exporter =3D NULL, *importer =3D NULL;
@@ -741,17 +743,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_mt_szero(mm, vma->vm_start, start);
-		else
+			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_mt_szero(mm, end, vma->vm_end);
-		else
+		if (vma->vm_end > end) {
+			if (!insert || (insert->vm_start !=3D end)) {
+				vma_mt_szero(mm, 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);
@@ -786,7 +798,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, insert);
+		__insert_vm_struct(mm, insert, ll_prev);
 	}
=20
 	if (anon_vma) {
--=20
2.34.1