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 v2 41/44] mm/mmap: Introduce dup_vma_anon() helper
Thread-Topic: [PATCH v2 41/44] mm/mmap: Introduce dup_vma_anon() helper
Thread-Index: AQHZITooigzqF61MskSaz0KIp/6GDQ==
Date:   Thu, 5 Jan 2023 19:16:05 +0000
Message-ID: <20230105191517.3099082-42-Liam.Howlett@oracle.com>
References: <20230105191517.3099082-1-Liam.Howlett@oracle.com>
In-Reply-To: <20230105191517.3099082-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?hk/QqBVGOZC9/Gy2VqtQIldOt9L4j714Ng0Ob08Lysd9Paq3Um8IRzQ7IU?=
 =?iso-8859-1?Q?4APtB+QBQ7i4Hlc+zPXWQzeBDV9JuwQ0zeycSPqcrZJYzehZyCnaF73sE9?=
 =?iso-8859-1?Q?92IGR8t9OhhWLLpunadDn8s3EkbdmHUUrVtE9Qlc7WAFDiJezJfmCQWqZq?=
 =?iso-8859-1?Q?xUVwbEfnGumsLNCRO5tTUZpnfVhWDp6E/2Xh5i3VSxeXhD66+QItBRjgOm?=
 =?iso-8859-1?Q?Rdd09D8ZISJKSp6fGCmdq7HjEZ08ih7UmLqSInc9fYpIl3Y4IqbxcWFfYO?=
 =?iso-8859-1?Q?vdnMzaTiRSH8GTdZuNwXwE3qLVt++2y58/GsJdqTJvJ+lcObZJYs+CpgCo?=
 =?iso-8859-1?Q?Zch9KwoG/hOB/fTfwQzP+dZRZf3as6WbngU0cV5vCRExuQEoml7hj/XxoV?=
 =?iso-8859-1?Q?ZrKSWms5hfFvcriFuPkfg1jbXS0CD5TsDGFrt2pMipMQ/AGA1tj8f26KHv?=
 =?iso-8859-1?Q?7uFaCiT+DZ+DrgwQILsJ1b9fBINBrRL2v/brPvrLa17Lt+hGT+acBSwMl0?=
 =?iso-8859-1?Q?c0EeSYsgoDZyQyyei0iET4MOEcxZPoeSz35CTBK2W/BLthKA9qJjewWdeo?=
 =?iso-8859-1?Q?EDMa51IBtFUQohUbbMY9usAZoPFkjx4hqL1F0l+sMlA6/ifmg251ygfKPp?=
 =?iso-8859-1?Q?HKIRdE0O0b418dEqb65ej2zNiQU7bqwg3/9kXou9nars202KPS0vdbYdFt?=
 =?iso-8859-1?Q?ex3YQa3+gd0u8+ufufhzTKREDjavop9Ueu4hOJQl6ZiTO5K0T4pEOu2UfP?=
 =?iso-8859-1?Q?llze+20IipBiGYu6VYgsyUqKVJUgX6kEbTCBl/7dsyHpICi6JlGiW4mimz?=
 =?iso-8859-1?Q?4zeSQNNXPYpbaSVYV03TYyqsbizfLQfNBSBZEs034+tnnUeAtlMQ/j4E+f?=
 =?iso-8859-1?Q?snTnlOwVT3HTSb5gq/YGWw5vNohc5w42kuEPfoaFLDfMP3Pznyzsa1gmvh?=
 =?iso-8859-1?Q?KDhQHzW7wAkxAl3z9NJRX2i9YSizi+NGzZwd7NsCKDSYpGy0gNq3t+lDbO?=
 =?iso-8859-1?Q?TzkCAeaAOjRo4yQikK7lxTbwtnhWw2rCd9F9jvQekT4m5x0gR2Uli1FIS0?=
 =?iso-8859-1?Q?nfFib5bPoQ4HMUa9Gfin7QxZ+TLzf+YjhR54a28ELftxJU9+E+dZ87V0xV?=
 =?iso-8859-1?Q?TPvl0QWQF0vmRkA0Eh4pq0N3pBOirKhUXo0upAKSXl1DRaOLeuROEWhI4N?=
 =?iso-8859-1?Q?USvnFU9OT08La/Eba0dLOdxKnzZYIVTIWJrvDMR5CZfJ+O1/B9Mr0rs/Bc?=
 =?iso-8859-1?Q?fQmlxd9BqcUl5o+hB2BGmA7fU72TJoz02fSRYKCDBppvnDbP/+ivovXbs/?=
 =?iso-8859-1?Q?qdQLQVL6xzENaoIPSdEjsJPiUlpHadZx4yxqzuSHQdHFsvgyYcKvJB432B?=
 =?iso-8859-1?Q?gRCSdfb2LnV2cz3b6R9iJEQjr57XPQkZh6eKvDQ2KLltsMJof0PKj6M+8F?=
 =?iso-8859-1?Q?jyMsYaf0cHTQUOBsd1KaXoPEdLB0SejeA7ojLQoD2s07FU6zux5V5aWp9M?=
 =?iso-8859-1?Q?9tS8oGZyUNlTVPzQ2nzhMPgu10GrhLQxsZ15Bd7i4bDLDPVq+wZ9sFx6YB?=
 =?iso-8859-1?Q?Wm6mNiZD8e1EIxORiT+sY+0ywF/6P8Z4zUecmFQDg2SpLUCGeybNRbOyCF?=
 =?iso-8859-1?Q?8gH96tNviARBTL4w+huOPGPdOLaFEP5R8EGZOM2e2tENI8RT6tY/ntTw?=
 =?iso-8859-1?Q?=3D=3D?=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 1xCnvFcvJ5fWz3v/fE8gDhurzhfDgvaibAS84qHZtcgDUA/vQ9Mx/qgTokLf/iIPpVXtnkYUYGPsh7x3vv7Z017iZX5a7QgCntT0wo3q6bKrUQatj7p0xhkGKum32H6neTUzL03Maa1HCYlYb8BPcnGGk/iR1PoctfhyUEPGC8mn8uqdWKecOvfMcn1/yh9WtMjb+LoWwZjxWgYNrM/lJk2JBsqUuo0wbkBata/MLKlosLZMUOEqtoIFXG8e9A66plGgmiPbxgGZw2JmFMJOAG9xMMkWhvEdDjI+uB3/WEhKZIoMF7vKXo4Ru0QGq9+Oaw+fhIhMn+a0iRr16ytqUL1Su9avYAz6/x5XozNQUSCpfZdxnFPku266i/9umOVdz5wY0wAirFf9DoWHRfQhM58N7abIS7ht78iCPC6su+hfs4qodYhFmly8bz9TxGbfWjDCVF6e5W4/PD4x9qG/rStFxWfenn1yVcOK+oNKcPeralhw6xR5NULIIYHTywYz8pLTOMfAH/D1QkZKD9nfhuURYaqbYX9X1qmufNGylVzPe+gxUy/2mU4a7HNuy/yBQuHDI4l6Al5noR+4K9P4D7k++Kck943hs93WkKPGfnmZ9XF26xV0Ke3jssXdpuuc7uH/L06JUWur0pxoOWNqw5g+woS+xxNGyJhQVMX5+uxB76tO2iWrDYuQLGydxQqQz3XEh8vqL69j1fmA5gIRQVaHC5qQlWE8leTR8W1jOlc+rdOBIFRS++SH4R8zxPYim/QEYA+MrY4yNHVIgenpP1SidiO/DGV3u/zvn4u8DktUYmwld0L77mOIQ8Q+I+MQYwUJZuJQMM++CMVpfCig4a6avW933Qa/04LF9e4090cIpXounUcl0PJSuhz+vQP7P1v2vVbYhx7IK1ccQ/YqRQ==
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: bd052d10-48ef-4b2c-5c5f-08daef51607f
X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Jan 2023 19:16:05.1563
 (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: XRH+3Q6gtXTY5zd3YJBL5IAMwwx9ZUClohfORGRI4ZoQfTRypxyLbJBwms3CDMO1Mp+cZyPdweMtRJe6WYhppg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB4791
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1
 definitions=2023-01-05_10,2023-01-05_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 suspectscore=0 spamscore=0
 mlxlogscore=999 malwarescore=0 phishscore=0 adultscore=0 mlxscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000
 definitions=main-2301050152
X-Proofpoint-GUID: INjkCY-trUIadTSNtXuIJ2a8zSpL1GWC
X-Proofpoint-ORIG-GUID: INjkCY-trUIadTSNtXuIJ2a8zSpL1GWC
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>

Create a helper for duplicating the anon vma when adjusting the vma.
This simplifies the logic of __vma_adjust().

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

diff --git a/mm/mmap.c b/mm/mmap.c
index dad5c0113380..1e9b8eb00d45 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -679,6 +679,29 @@ static inline void vma_complete(struct vma_prepare *vp=
,
 		uprobe_mmap(vp->insert);
 }
=20
+/*
+ * dup_anon_vma() - Helper function to duplicate anon_vma
+ * @dst: The destination VMA
+ * @src: The source VMA
+ *
+ * Returns: 0 on success.
+ */
+static inline int dup_anon_vma(struct vm_area_struct *dst,
+			       struct vm_area_struct *src)
+{
+	/*
+	 * Easily overlooked: when mprotect shifts the boundary, make sure the
+	 * expanding vma has anon_vma set if the shrinking vma had, to cover any
+	 * anon pages imported.
+	 */
+	if (src->anon_vma && !dst->anon_vma) {
+		dst->anon_vma =3D src->anon_vma;
+		return anon_vma_clone(dst, src);
+	}
+
+	return 0;
+}
+
 /*
  * vma_expand - Expand an existing VMA
  *
@@ -704,15 +727,12 @@ int vma_expand(struct vma_iterator *vmi, struct vm_ar=
ea_struct *vma,
 	struct vma_prepare vp;
=20
 	if (next && (vma !=3D next) && (end =3D=3D next->vm_end)) {
-		remove_next =3D true;
-		if (next->anon_vma && !vma->anon_vma) {
-			int error;
+		int ret;
=20
-			vma->anon_vma =3D next->anon_vma;
-			error =3D anon_vma_clone(vma, next);
-			if (error)
-				return error;
-		}
+		remove_next =3D true;
+		ret =3D dup_anon_vma(vma, next);
+		if (ret)
+			return ret;
 	}
=20
 	init_multi_vma_prep(&vp, vma, NULL, remove_next ? next : NULL, NULL);
@@ -801,10 +821,11 @@ int __vma_adjust(struct vma_iterator *vmi, struct vm_=
area_struct *vma,
 	struct file *file =3D vma->vm_file;
 	bool vma_changed =3D false;
 	long adjust_next =3D 0;
-	struct vm_area_struct *exporter =3D NULL, *importer =3D NULL;
 	struct vma_prepare vma_prep;
=20
 	if (next) {
+		int error =3D 0;
+
 		if (end >=3D next->vm_end) {
 			/*
 			 * vma expands, overlapping all the next, and
@@ -839,15 +860,14 @@ int __vma_adjust(struct vma_iterator *vmi, struct vm_=
area_struct *vma,
 					   end !=3D remove2->vm_end);
 			}
=20
-			exporter =3D next;
-			importer =3D vma;
-
 			/*
 			 * If next doesn't have anon_vma, import from vma after
 			 * next, if the vma overlaps with it.
 			 */
-			if (remove2 !=3D NULL && !next->anon_vma)
-				exporter =3D remove2;
+			if (remove !=3D NULL && !next->anon_vma)
+				error =3D dup_anon_vma(vma, remove2);
+			else
+				error =3D dup_anon_vma(vma, remove);
=20
 		} else if (end > next->vm_start) {
 			/*
@@ -855,9 +875,8 @@ int __vma_adjust(struct vma_iterator *vmi, struct vm_ar=
ea_struct *vma,
 			 * mprotect case 5 shifting the boundary up.
 			 */
 			adjust_next =3D (end - next->vm_start);
-			exporter =3D next;
-			importer =3D vma;
-			VM_WARN_ON(expand !=3D importer);
+			VM_WARN_ON(expand !=3D vma);
+			error =3D dup_anon_vma(vma, next);
 		} else if (end < vma->vm_end) {
 			/*
 			 * vma shrinks, and !insert tells it's not
@@ -865,24 +884,11 @@ int __vma_adjust(struct vma_iterator *vmi, struct vm_=
area_struct *vma,
 			 * mprotect case 4 shifting the boundary down.
 			 */
 			adjust_next =3D -(vma->vm_end - end);
-			exporter =3D vma;
-			importer =3D next;
-			VM_WARN_ON(expand !=3D importer);
-		}
-
-		/*
-		 * Easily overlooked: when mprotect shifts the boundary,
-		 * make sure the expanding vma has anon_vma set if the
-		 * shrinking vma had, to cover any anon pages imported.
-		 */
-		if (exporter && exporter->anon_vma && !importer->anon_vma) {
-			int error;
-
-			importer->anon_vma =3D exporter->anon_vma;
-			error =3D anon_vma_clone(importer, exporter);
-			if (error)
-				return error;
+			VM_WARN_ON(expand !=3D next);
+			error =3D dup_anon_vma(next, vma);
 		}
+		if (error)
+			return error;
 	}
=20
 	if (vma_iter_prealloc(vmi, vma))
--=20
2.35.1