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 35/44] mm/mmap: move anon_vma setting in __vma_adjust()
Thread-Topic: [PATCH v2 35/44] mm/mmap: move anon_vma setting in
 __vma_adjust()
Thread-Index: AQHZITonxl3AVzZR6EC2H161WYt/yA==
Date:   Thu, 5 Jan 2023 19:16:03 +0000
Message-ID: <20230105191517.3099082-36-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?uEcC+vOVlB0a2LxhiI5zPOu+an4InSf5me/FtTpwMEdbCeMB8bQ1bdqumL?=
 =?iso-8859-1?Q?BzvFsygnmzcGr6K7ZNqDdZUit8JPFZJ0rEKo9mJL6u9YQOIJrFUZ+Ush+S?=
 =?iso-8859-1?Q?Koac9pDQIE136u/kVFaxf4/oqbFd5rrEP+Ilgi2/1urMufEUBPIRXPDwsm?=
 =?iso-8859-1?Q?E73eVi9+wIkd1ufp/4XFYDW3NQi3uUzctiiFqAWdwohtrC1Lk2Hx5ZAkS2?=
 =?iso-8859-1?Q?ZtjV/z0iZN2xgBUgBdA4KsG2LBXcbmBvS1f9Vcrgvn7UwJWpI/764eVyp5?=
 =?iso-8859-1?Q?k1TfxuiJC6VKcm7rKq52C6Z/xWbB6eMFS1ESnVOPCazRkDFj9Skxqmm3Zo?=
 =?iso-8859-1?Q?hS2or9503jiP+ly1ZW3GyP7p7mJhV/1kwglhjB9r9cFo4++w0mzD/kSta6?=
 =?iso-8859-1?Q?/yEQ8ZfgGMA1O+zLgKMaAKR7eDcBKBqpeB5TXsQzzIwZH6BBoqpeetmGgR?=
 =?iso-8859-1?Q?z5nYguOqhFJTBlZi7hjjlQH/xoCtH1Rat6b1i5yWROFVrxpQ59hfqklPtk?=
 =?iso-8859-1?Q?Dc8ftrXK8z2p/c5EQXiC+Vq1K41qZNY+/e3dbaDCb8gUyVCHV6yD7giyrK?=
 =?iso-8859-1?Q?4TvMO6ZEM1L5B+ap7EDiYRLEMyzNRn46XLkVhQFO+UKozLyf1waOKi9suj?=
 =?iso-8859-1?Q?ZwZhZ2RRXLUAnY0/NpGSm1SuN+42XQCkzbcRVHDNmfktwPCjX5t6vMyLU3?=
 =?iso-8859-1?Q?toaxMR9kRMlHPrvYhGJqCoMlzFH9ofOOfdD/DXmjzvfAFCgW3+5QMPj75T?=
 =?iso-8859-1?Q?JWRdpzpSlMb+o+vCXNBKkF8Oe4GI7xwFh/Lg25XJBoN+GTnjLathUWcFAd?=
 =?iso-8859-1?Q?BH9yCZZ9v5py4WPENBi4cGL/RzfO6ClQflVjBh500PVWOYS7Ick4t8IFp5?=
 =?iso-8859-1?Q?QkiQ6Evky3vleDBfDNu1TQDl9zIDlYoLPwYjIEA+eULRfLd8rKIU9HQMNQ?=
 =?iso-8859-1?Q?dmXhSIFGliN/IVUFzwjdU9PIwkjqQtyJlv6T5+4VWzIU+NgxcVmcX982Ve?=
 =?iso-8859-1?Q?lSaXk25qltYoM5yVxdOMVaMwjKFYHke3d3PoH7YcXMdnNPkfYGOfXoSZqs?=
 =?iso-8859-1?Q?fmfxJ68DdTzUvJCiApz3QrKLwTzA7+ODScAs7980zO472bMg3/bI1QO4aI?=
 =?iso-8859-1?Q?Cn8gYQPX5jilZVzMQ0dFP9r664kgITGUQ7iTFAD4SvHsyv6cr89FWgY1fX?=
 =?iso-8859-1?Q?ldEuSx6OQBxvCFDfoywBCU7yMZmRIFDq0CmDUXSVen8R0FKA9lr0Bs61CU?=
 =?iso-8859-1?Q?oTdx0QsKV8M5rWT2BZ5Q5k8qaKEG0loE8BhSoePNlWDehNL0PAPHCnr+zM?=
 =?iso-8859-1?Q?MIemnj61GL7Biz8J89mhNtqPn2c58WGjiAQYLqOkOISFu0+IunK11/NQ6y?=
 =?iso-8859-1?Q?lQt1aBqpfzgQ+E6wjKAWdcNUioFp46KxPlUffqikVXbaWKJzNhJmNT5pjy?=
 =?iso-8859-1?Q?+ZjuZPCghGlGhKd9im7kWSo886pEJ2uqdqbLNmUKvX76GepB63CHRZCD6v?=
 =?iso-8859-1?Q?t0DDOn4g4dB6/1GXo2HjbkxqE5qrJJwUa5M+Bxh8lrdABKTRynXrRZYYcU?=
 =?iso-8859-1?Q?7JzSxySSFTq9Cm7PXLElqkI+AhfD3xHLTSLCzi/tH2Vod+/FGgw1sLtkNC?=
 =?iso-8859-1?Q?jYGsqw6sv91lbuqaJ9esf8WStFpXyg9PJzSkrN6u4C/Fh6lHgslqdjTQ?=
 =?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: HwTGeRBL/aFng8OKLoavtT00qPixbHe8rBXo4Mn9YPyqt/+3TXo5Emc0XAEsSJsLq5uOEsdZQ/jSNCKOZ5Ca7ru+k35eTPoNlnrxZQcbgWCUZKPnENK6b3CvsaRxlqqx6noDa1xZ9fdFeT7kgGYT9CeXK8xM2CoNPtEAGZLhCRcFdTUKJSGCu3I2+PRdvnZsk4kdcuzhIPz4f/WUq4f5QT/oLpbm3RaFAZOqmyE+6/yomhssCkxxx3XyXxYxu3XZs2Sh0DkPvYNO9XLMOd40V5X1esKWvTiqMfabmxXLt+aGs14kYycVF6dinLZS23OL8kN94UBCoBm5bmbypxEVpOeE6l4mKm4jNAnw1dHGXz5F9/ACk6i2nCmcHr6qhOLcVU3wnRHvLKzIm8wy65MvSISf+jyaoDvqRugrLnmXK2stwpvb7g56HPl4ENuA+PgOkNiMHvuXqA8kHxgeEs+7wlwN4lMrBi2W4+3RNS7PRdW6Bn33XKss4YZXsdHBE0zr3/sVeeW9TwEEw1Mma0PkvfpJ83R8oKtsHfyRpux5J2JmTouL/RFkQmhXJogSP4nakqCCmywNiiKvQ1tOLzVPC9I4TViqJIlTB+qxUNLrWh79eMPtAePodWduBgDoov6E4pVDinIzytxLOnwsRldvQ6M5jNz5W9bcGY3VN6SnxbmIapAscAQZdrL9ptECtt2It6BWGbB6I9xP1eF5dv7fqnaXqFVGhaFmbztfVwXCDn3kZR8/VQVFKvFFLgMJosKv8uCMHz7l0acz8mWDzBInvh3UGxQ+aJzadR9i44xJh1YNnx6FPzEKCvu4lnD8j1r/fR3aBJoKA9IAYxiFFxv3gPpspW7dtYo0pglesZGNEBMDpuR5yCk63t/KJGUQzyVoo9u0ih8DOsHe9E1090ZGRg==
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: 850ad9a0-8fd0-4638-0fb8-08daef515f28
X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Jan 2023 19:16:03.2190
 (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: D0RZRcqKn1L3XTX+NyBz46yuw8iYvXcry6YUUAq3fDNte28oV6J2HGtsTRxujdmBUKyiiFmpcInVcT9c5lbjug==
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 adultscore=0 phishscore=0
 suspectscore=0 malwarescore=0 mlxscore=0 mlxlogscore=999 spamscore=0
 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2212070000 definitions=main-2301050152
X-Proofpoint-GUID: Z99v4kz7aAHsKq4szB2k2FXg7VogM_0S
X-Proofpoint-ORIG-GUID: Z99v4kz7aAHsKq4szB2k2FXg7VogM_0S
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>

Move the anon_vma setting & warn_no up the function.  This is done to
clear up the locking later.

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

diff --git a/mm/mmap.c b/mm/mmap.c
index c1796f9261e4..c15a04bf3518 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -744,6 +744,14 @@ int __vma_adjust(struct vma_iterator *vmi, struct vm_a=
rea_struct *vma,
 	if (vma_iter_prealloc(vmi, vma))
 		return -ENOMEM;
=20
+	anon_vma =3D vma->anon_vma;
+	if (!anon_vma && adjust_next)
+		anon_vma =3D next->anon_vma;
+
+	if (anon_vma)
+		VM_WARN_ON(adjust_next && next->anon_vma &&
+			   anon_vma !=3D next->anon_vma);
+
 	vma_adjust_trans_huge(orig_vma, start, end, adjust_next);
 	if (file) {
 		mapping =3D file->f_mapping;
@@ -765,12 +773,7 @@ int __vma_adjust(struct vma_iterator *vmi, struct vm_a=
rea_struct *vma,
 		}
 	}
=20
-	anon_vma =3D vma->anon_vma;
-	if (!anon_vma && adjust_next)
-		anon_vma =3D next->anon_vma;
 	if (anon_vma) {
-		VM_WARN_ON(adjust_next && next->anon_vma &&
-			   anon_vma !=3D next->anon_vma);
 		anon_vma_lock_write(anon_vma);
 		anon_vma_interval_tree_pre_update_vma(vma);
 		if (adjust_next)
--=20
2.35.1