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 18/69] mmap: change zeroing of maple tree in
 __vma_adjust()
Thread-Topic: [PATCH v11 18/69] mmap: change zeroing of maple tree in
 __vma_adjust()
Thread-Index: AQHYmYdyFewIvnM92EWO05qXvnfY7w==
Date:   Sun, 17 Jul 2022 02:46:42 +0000
Message-ID: <20220717024615.2106835-19-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?6RyGVUoQzK8rR4loJKwHCUDu+3qdaLgZy2ftrvb7/HURY0t6muZ7hocgst?=
 =?iso-8859-1?Q?A6ZQfVagCQfHhfGBhavC/FTdo6T5EjlHD62JU7eDgc3mO5krkXFP8eiTAk?=
 =?iso-8859-1?Q?vocDi0p/Jaqb4K7WBDNml1gVQhGL/0F5Aaftd4FB5yg2fddOMQeacrcRR7?=
 =?iso-8859-1?Q?QoqhN02vz6EJX6xwmy8vegZu/ZzbfhR7E6MXNwCcv74zS6OXRzqYPDCtdP?=
 =?iso-8859-1?Q?A8W8ip73ahJ3at+M3fBPwt/NJ7pX5lTaoAVnRak9S+eRUAiZv6FrydU3X5?=
 =?iso-8859-1?Q?kJggIoQpG9JBpNTMfwZYrkDTxQWvLkEwoLQD6NFsDbhNNx0J0hFacqQI7+?=
 =?iso-8859-1?Q?PUi43O2m2KCJ7+gbu/BTCBZHxydPcXLcDYkkOXWOGkiJbMIoGfrimDOTVH?=
 =?iso-8859-1?Q?a06ixPEKf2ejtVGnrFZghGnoKYY2hyZyPC2bfgcCBxpKFWhncQzQ/c8xM7?=
 =?iso-8859-1?Q?LlWxR8xI6ODfAABh2REo3bGbbDem3Q1MGkUC7SWmfFaOREWwODxrcRlxK/?=
 =?iso-8859-1?Q?OtZv3qNAI8dVZQjb9LE9XyjOk55zGWNgFuhH3BBKYz6pXJJQdv1XNsQlWt?=
 =?iso-8859-1?Q?lOtmpoenVLSaUDkYHqkSu5Pc3l1Bj5GyQjd8eXqlfglS4uuQUvbr1lDo1c?=
 =?iso-8859-1?Q?OBAU4jQxNWyFMxPW1lcdA2/eIXlkVjiXbz2M36LJgduNDWtnpUH6IaU9RB?=
 =?iso-8859-1?Q?cfKXdAITt97F9NFHsyXFXwm+XMfmfMMb4/2YXCGY9vQZlFULscapohHjxk?=
 =?iso-8859-1?Q?PltuU/r5fiH+rsrC8/DMBvTO7mnnOf/gY9n5RgYGS/2rQIWFUVYGI00DKX?=
 =?iso-8859-1?Q?T1KwRNSYBMkalAl/ZAyiOz5Y7HSDr06+cV3/KtnLIoBluFWRmlPfJhBssj?=
 =?iso-8859-1?Q?hg8/6FQqiBG5JnkOKJP0DsNszkcChxonaZW+G2GadFPA7dNHVpvmv2lROp?=
 =?iso-8859-1?Q?A6/D3Rr1xW3YagFJp4N0UXL3oLatH6EWuwgdJB/apvOVT5MmDeBdOhnlsU?=
 =?iso-8859-1?Q?JSCQfQndk7VYkOC16obtO0yuwn4UyfUYbH7KqvlPEhToG5TcJA2EcIErjp?=
 =?iso-8859-1?Q?nCuU/M005bGHplXe5GuyY2QEvuIWcU1AJ+/EZq35+ElLh2v+Qor3YLmgaY?=
 =?iso-8859-1?Q?fDiafS1tHxyLJLsdPaOakZsRcX/+Wz20HMsgSkobQA+tRtFYSh01x1JJ6y?=
 =?iso-8859-1?Q?1MdqsnmvAwec3ij2Uv1LDMK3eP2V0Of0WUJlIYA82MTVGDo9erDxUj9jn1?=
 =?iso-8859-1?Q?fEJBfsG5yw6U9/VphI+3nLlWRntKVEF8FQw74gr+ME02Lh2TfQVScnK66j?=
 =?iso-8859-1?Q?VFAVjqAuUZ3j0rJA1c70RmLYx0o9iwHcfU3Lc89VUBIsbvb3JcGnIT5fyT?=
 =?iso-8859-1?Q?5gNEK31S1XvOqoh73evBAXOrukyfdOADNRd5+MdSaPXsbqGbxxT44PGrO0?=
 =?iso-8859-1?Q?jfgoKiv4NqZAcFs2p5SC0mn7PNqOMCtDu6WDpQwJQhueZ4gCs7I3ZWE1i6?=
 =?iso-8859-1?Q?Iux506SpfN1/Pw+8QtMxp/hFnuwsjNOkAGJuxRxTTUE5H59mSnSzAaf5G+?=
 =?iso-8859-1?Q?8Y+389CQBtgwgnMJmjWzLh+IIFAey01F2SfrGfpTl9+9OhGZYDmVtVJFk8?=
 =?iso-8859-1?Q?u/2rkamHJ+V5UZzxAuN6sEX57D7vwyHJBRcXGJ8ge1TFuhZa87rv0Ffg?=
 =?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: 517d60fe-0bc4-4d64-0de7-08da679e96b2
X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Jul 2022 02:46:42.7406
 (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: VTVDhI7CpHJCNrJ9V6eZRXB2roWMPGO2oyfzwnk9rUlXHUYaG/kWb4kZPyV+SbnXkEjK5JkiWiUJj+uROXDEHg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB2908
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 bulkscore=0 mlxscore=0 mlxlogscore=925
 suspectscore=0 phishscore=0 adultscore=0 spamscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000
 definitions=main-2207170010
X-Proofpoint-GUID: WBiaWFVAG4rYqXS3Z0WohVNwcJM9scPd
X-Proofpoint-ORIG-GUID: WBiaWFVAG4rYqXS3Z0WohVNwcJM9scPd
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>

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.

Link: https://lkml.kernel.org/r/20220504011345.662299-3-Liam.Howlett@oracle=
.com
Link: https://lkml.kernel.org/r/20220621204632.3370049-19-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 | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/mm/mmap.c b/mm/mmap.c
index e50e989b7aa4..973512b14d55 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -614,11 +614,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);
@@ -648,6 +648,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) {
@@ -778,15 +779,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);
@@ -833,7 +846,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) {
@@ -920,6 +933,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