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 R. Howlett" <Liam.Howlett@oracle.com>
To:     linux-mm@kvack.org, linux-kernel@vger.kernel.org,
        Andrew Morton <akpm@linux-foundation.org>,
        maple-tree@lists.infradead.org
Cc:     "Liam R. Howlett" <Liam.Howlett@Oracle.com>,
        "Liam R . Howlett" <Liam.Howlett@oracle.com>
Subject: [PATCH v4 47/49] mm/mmap: Convert do_brk_flags() to use vma_prepare() and vma_complete()
Date:   Fri, 20 Jan 2023 11:26:48 -0500
Message-Id: <20230120162650.984577-48-Liam.Howlett@oracle.com>
In-Reply-To: <20230120162650.984577-1-Liam.Howlett@oracle.com>
References: <20230120162650.984577-1-Liam.Howlett@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?dMiR6DdJrl1G6J5qc9hU/FZ+zKE2GD2EVZOuwjPKZb0Vp8gD+giPqPfq8oMW?=
 =?us-ascii?Q?kOOpWlEw3K1RC16xz2An5Ox6ML/bK05P1Dp5F5zu66/o6PZPBzyL6ezsZ3TC?=
 =?us-ascii?Q?j7h2qB4LCckScPtZ5V7WPLnNaXwqpoucU7GOmgoZY/bpbYYgC7V0iABGPqcr?=
 =?us-ascii?Q?8XOjp/FbCToC82ao74NHPr3aIW8jIP4WeNEV26EOXaFl3v2JEpv3D2n3eoSy?=
 =?us-ascii?Q?rRijVPIdmdqYp+34d9Q27A+2OJDUjxtuEm65frAcyrLGw0k18KFMqa8rcxoV?=
 =?us-ascii?Q?tvTppaQDkD9/ORfmi895ytRoS+IQ4gHspJk9AbTCcYNtJ/Tbq7ZSbev5+5uZ?=
 =?us-ascii?Q?pymdhF9CEcnjYuznbZ3IAdFhIC19tHCk1msPQsHN9vif/XQlzDlcvm17dBmO?=
 =?us-ascii?Q?H4qN4mCdG1pPbwpsxUUJKhAweG3/QXtm6huRBzmqXGgBj6I5KHbwHCLuQx7M?=
 =?us-ascii?Q?shhs2MM9PoVAmx9dvirBCmS1955Vo6l1jW7pbiAlkTNxFp+EJE/yGXJxZlzW?=
 =?us-ascii?Q?KA9H55tZutysB/B3KKGGhEWbkHphWfooSwgiciC9Pd1L6kQ3ducansHNvuHX?=
 =?us-ascii?Q?JcvudldyS9Dddd8xa/ik5oQRJD6dDKrGE704++p9cgAyJ6kWEZi225qg0NvX?=
 =?us-ascii?Q?sQFVWkw3T6fxMpK/aTAfbtGkm/IJo9ba/IJNKL+LRZ0/XW5XDyjMGe8ffXEe?=
 =?us-ascii?Q?4ooVtMPRzqPqHVjTnJxUZgichpuVYT+1g6svq5NZJ8YEnLXYhX1xp2Ml5CGH?=
 =?us-ascii?Q?QtH1cblFWB2117wDvjnKCpO7GUa9UXC/wDfizaEJaCazkD4sc/TV1rFLpxzz?=
 =?us-ascii?Q?bxTa7kcd2yvd7OEWsmZc29WPfhnlQzosVvuvnNgDsl/+hkJF30xyBRCNR52f?=
 =?us-ascii?Q?hhPuWfYnXCuKcJps/DI0iR3Mg1QG1Ztn95iUhqUrWg0Rl2m8M7TgtnBfMYtN?=
 =?us-ascii?Q?t25DZckha4C4FlYXgiKMLEYqrlNRC+4y9mxyNwBfX+79+DxcJI69aO37nipr?=
 =?us-ascii?Q?1WjPCQsKVSggh4e0AxeewUga0PpaIieaeJMpbhY2LN4ha72J+Q/tJpYg7RXE?=
 =?us-ascii?Q?iTXz4R+kUcwZw1fcWdXEKYD8Pkb7WDK4HtDAUKBIXsYzqMSLDUxmahA8njv6?=
 =?us-ascii?Q?DWDTqK7ubglXSXCZQei1jcXqbMzIimywGwluFw8UX5A/PjeaKy9iHBJ+Xaqo?=
 =?us-ascii?Q?+VAIL9Vwm0+L5quQPa3Yho/IIQ3zrHxJUrb/YZPk+po3qL/IeQ8iX96V5r4U?=
 =?us-ascii?Q?jjyhiF9VN0jMOOwFPwB+EIZGIxGqdYn4RRTkz1JcLgUNYD+x1v+oIn9Qff1/?=
 =?us-ascii?Q?rCKu6UUMOjRV2t7E0HGJAfCqFklQsYhdwAnsIuQqG8AXGCfGPsoeFk+7iovz?=
 =?us-ascii?Q?uHtd2Or9F3mRZTfstGaXQS5jpopFi1P+4mUyyJMUD1b7PJdXqYhkI/+9w8pr?=
 =?us-ascii?Q?SPZbEHZNc3LYghP84vx3nNoMydngSeZ7FyKtWz89ArLM7YsOE5yKrKx0V2++?=
 =?us-ascii?Q?v1dfD57qAUm4ofwa3pcxWJvwjbB5KMr/zd5N3/2YUeNx64mtrx+REoeJtQwK?=
 =?us-ascii?Q?6PGcfC1ISOGRphvhSl8djT94km0L7h7AuKhWAFu1sBn+nsguyRbNF6QfYyDT?=
 =?us-ascii?Q?/Q=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: TbAY4ONf7Rq/64aG4AUgDGEaIKMy+kHzTgvYD9/A273XS6EBfi8Fsk9C6BlVTfkeTo+Hc61CIYt+rs3WJUZTo+T0pHVeBNoW5qzC/DfLifaHmeAn0CUiWGzcXDuFUO9Jdk/Hg3Rll4ZWWQQQ2r21YSP9RN9+ly/u08e49hSsB8hWZcxIwDt6OoY84WTh/VAYWJV5SYc91iVD8F2SgwYUHCXp8VcD2SePAwNS76kM4YKoU7UmvMZmOnk3TAF6T2+woA7t1/kLT0NQ5F9Gf8es7CEkFtTnK97eMAMMvQEHdYFGnr4sMa5nqN36H81sxfmIuyAuc6hKWu3QH4FgS8UuzXmpL88LGlJ3h+btMeBYZkvyU0HV0kVNZdfTLYb9uO67N0HWjepy34jq+aqTpJNcICnxK45U83vP7WDpzGZAL1h6nkedfUjt9fXPeiCNAKwY+HA9oB1nJM8L1Ic0jFRrm2ZpuX/wp4QGIWCTsmBJX/tycX2kh4tribZpzV4pfZPDO6qRUAzf72XgFe35hZyl+h1RD90koIkSnS5uSz9UjCZ31KWdNKbqXGdLvDqCraN8CZb7z4IElmv0CwCsXcPH6E7TQodSOWvW5mULLwc4uZJzVc7UvF/oOKtf2YD8BZ/8AVnURJUdgaZBp4VujYic+lEseZymJGPLLFLWACApgpi8yG1odAHOrgpusLSFI564goUyME8l/kUZkIJVX4nRSij/EeTPvDuLebz7mzpTMTD0oqPooioHrjADeldtKbVR8gqYkBvWMXR00yhe6fidtWKEkze5L2cp7ggl0/Pk5GWsPovrPv+w/7803wJchHqfK63YQWu3NT8R9zs3R1gT0TBlJpP2wEq9Z9xPBBa99OCwrvGX7nwDbr7mrY0Vj1wRky88JgZSiW5QFovJQLx5aA==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e7320fcb-5ee7-4648-574e-08dafb037745
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2023 16:29:13.2884
 (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: Ljlq6GJMDYKlSOJfKZcF5uEch9tEPzDWg50s03KpzWcXdTxbnEFvP3wzaONGptuRhwsvS0cUoXL8ST6UqJI94g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB6400
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1
 definitions=2023-01-20_09,2023-01-20_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 bulkscore=0 suspectscore=0
 spamscore=0 malwarescore=0 mlxscore=0 mlxlogscore=943 adultscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000
 definitions=main-2301200157
X-Proofpoint-GUID: VxMPMMe3WqhNmYsAdGlkJR9vdHg59Rij
X-Proofpoint-ORIG-GUID: VxMPMMe3WqhNmYsAdGlkJR9vdHg59Rij
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>

Use the abstracted vma locking for do_brk_flags()

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

diff --git a/mm/mmap.c b/mm/mmap.c
index 0a2b19633174..5aa048e9ff30 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -2928,6 +2928,7 @@ static int do_brk_flags(struct vma_iterator *vmi, struct vm_area_struct *vma,
 		unsigned long addr, unsigned long len, unsigned long flags)
 {
 	struct mm_struct *mm = current->mm;
+	struct vma_prepare vp;
 
 	validate_mm_mt(mm);
 	/*
@@ -2955,18 +2956,13 @@ static int do_brk_flags(struct vma_iterator *vmi, struct vm_area_struct *vma,
 			goto unacct_fail;
 
 		vma_adjust_trans_huge(vma, vma->vm_start, addr + len, 0);
-		if (vma->anon_vma) {
-			anon_vma_lock_write(vma->anon_vma);
-			anon_vma_interval_tree_pre_update_vma(vma);
-		}
+		init_vma_prep(&vp, vma);
+		vma_prepare(&vp);
 		vma->vm_end = addr + len;
 		vma->vm_flags |= VM_SOFTDIRTY;
 		vma_iter_store(vmi, vma);
 
-		if (vma->anon_vma) {
-			anon_vma_interval_tree_post_update_vma(vma);
-			anon_vma_unlock_write(vma->anon_vma);
-		}
+		vma_complete(&vp, vmi, mm);
 		khugepaged_enter_vma(vma, flags);
 		goto out;
 	}
-- 
2.35.1