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 10/49] mmap: Convert vma_link() vma iterator
Date:   Fri, 20 Jan 2023 11:26:11 -0500
Message-Id: <20230120162650.984577-11-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?S2LpEyzJluQNtIscIuTbA8GqVQm1hO0z3AhdoCy9yMObW0lJbr2Nc2u9Lxy9?=
 =?us-ascii?Q?i7PWh7/z0ib/TsHXCocD4H4kFPGEajyhNtoRQJTPSriKsvYAB/U2YurOGgX4?=
 =?us-ascii?Q?95PWuxM6h840ND2LIuz7uoNm4d4vxYXOIWF6lNf/l4fj2GKqltpO5Z1FcABV?=
 =?us-ascii?Q?DhwXfcIPrze8L93r5zQqVQM8Doax0UGFx7KMHjQQVhdp+mZ3RnGRDCXW8UH5?=
 =?us-ascii?Q?WLZwl4FU3rA+Eoo2QapUrkZiXXxx2vNAZwl9GoXLQdkZFhXg5YfMkeCp1Dkz?=
 =?us-ascii?Q?G2wnDcpPrQ2pvFMzrg5HyPsHs9XEHyY/aCJld3TgivncnJbu4cHlKzcr/G1x?=
 =?us-ascii?Q?TWL87d6nHqONI1B8EqZ3louLBia2Yl7KcRn14uSc0uZ+HYC0L0BYUboa4aX+?=
 =?us-ascii?Q?iKmYHUuIPzMk8+GVIzruU0f6Hu16ZKKol+Khe/EuLSKyY09ypSqo+NEFtG3J?=
 =?us-ascii?Q?fKQ1JqbBfDW5v6mkV36ANUqSKg0CO9lAh+/30HFKzwMv/TeI7eJ3BmzawGj7?=
 =?us-ascii?Q?JQBf+5xKIYXa/VdpOz8qK2f+sauaumCvTBOFynR/sxlZLU+PElkj2eiuRXIL?=
 =?us-ascii?Q?AB2oIoOxxVWvTJHSaao342B8kzij43JsSilGSQJ2knvNKWltt1xsXUVls/kk?=
 =?us-ascii?Q?26vDjyLc9gnYYxIyO7fm6w244GiaFEvXqWJcXnpawEPOFw0SmU2iOWjAD5Y9?=
 =?us-ascii?Q?x6MzFJ6LwKk1UEUaMISWwitnLKbIQ6wqfBPIBCtvOAnzNad1F8TLlA1MDfZm?=
 =?us-ascii?Q?P0GvmF02U3AcixMjH9tH6Oq5qbzcDXEbbpInS0OHhUe4yWY3W9FM5d6X4ieg?=
 =?us-ascii?Q?BQw+WjWB0l8z7dJkpKs9BI16ybE163BAhA08cmtBp80Te8InoUCrgB3PadSZ?=
 =?us-ascii?Q?QkZPG9J0z0xyzGTWI1WpDh6cPl0muhRedAcn+mO1/PFPBnOcR8jbaXiH9+Ap?=
 =?us-ascii?Q?hMUBENKjfdpUXk7tzQFaWfNLytl8q6wP1ZvAsbC3gIIz/AwkeztLEeuReZvR?=
 =?us-ascii?Q?iUEZaRubGueA9e7dxI/6tLpfb0nix4rGAvXw4WHJ8WN3XeSn8wC2LgWagKb/?=
 =?us-ascii?Q?bDFldmbhwLMIY1c1z5OTeHwFpX+FkxkkPl5cuKW3ZxFGdg18iIhDOKs17W5E?=
 =?us-ascii?Q?CF3J6KTCAWSRMpRIwXI89I5GkJ5gIaBTDL52rlYbvkqyM+13EdGsfxuoS4ol?=
 =?us-ascii?Q?pgnB5O1fikpn/PjdIy6SfB2ovelPTwBUmqTQPkkTfV3zb4kA6nzgESsaorSV?=
 =?us-ascii?Q?VYfQsX3pVP3U0GtTUrMnWk1FR6fS7oJGooypanxSlj3tlFzezmh5C3wmDYqg?=
 =?us-ascii?Q?ifLYJnCpUhUiTGlG1JZzWfQE09g4Nuf4Se0or9/jayLAB5TaMlMOP8H/Yh86?=
 =?us-ascii?Q?mt8CXxg4fHc3czKcML3yqKpWPiovFH2r1BptcbwJ3L92FVple53wYcH+Qrs1?=
 =?us-ascii?Q?sVomUxWd8POPkEVqoL1MpEdOvomBFTdUVo9UByNXORpmdnqjfwhm1J5rhmgu?=
 =?us-ascii?Q?WeTLt5618DvnYOeaKcKzrurIZudNsH4spO/whf3tL0dQ1yys/MY8AB2Mh5O5?=
 =?us-ascii?Q?vFLgeat5IgvU8HBBXUPKSK8Bwkt/XIQD51cQlRkmIpyTZ6MTuhPplxJ9DmLU?=
 =?us-ascii?Q?2Q=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: cQV103FOyH/JRbyk4SV2JBpBlg1m+R+IDrLOlBVA2vXAgzLTwVGPF3UOYT2h0oy3l+Q2n9FqIS34Uq4Tuh6wtOw7xNJQo+9c52pR2uiJhX5co7x0fd8CiPOfiyOQCK/w8pRqzcFhBKVqla56ioXIZP+ZYXDeDP02wkTP/XrJAI+nsq7tg8q9tAHQ9CkyUFqZRXDCQ0slWq5cFBc/NHf9qDtMAP5zd6+AbbG+TE9eTOR1cWJoHU7bI+cQlF+54ogokHFGt+aj+1CxGAlK9mbiYvMKCf1C55Ei5gc0RQWX06r/BzCrTg6a9O54PWmyd8vGcCNZbtmkDE8dr647OSuoeVU/z9xFclsQvsLP+Nl/q494cZKNXotqlrtUiN695/SuOiyzQSJFm6lOWfOsv1+HrFealkMoVypc2C8qAYpeuOMxbQh7wIVAUgKckXO2bGYODGrJyUc1QHBGxl0ATpLg7PjDOak6M8fYTBDPmZNVBgjngzi3i07NMXV2j5wm1kuHjJMr0hRAna8PYK4/O2oWMjutbpXKxEkRbaGTLdmCAXWvJYz79VJuuRDXJ24zE6gBNrXRzgXx01NESg4cJDCwSykhNgyR15cl0mDYnLNx/D/mIbIrQJp0iiptHyueByvdwDrtkpkiVbclDVxV7fsTO6fdPCHNheAwY2y/6pwE46wVlNq6uC+t9LzF0hDszsmqVJM3gCNm4BGv4zqc5rlOoks/T9tSnSqF7SLmp3s/o2Y1hD3GfqMGrbyrRw3zXjZnguYxpbPt+ORUwQmdylE8Fg+rZ40aUN35xPDAjVeq+acVjfHZG6BgP2TqN4I5Tw9xnCARDV1EAUG95+AdjiLKqwP62mhTOb83Bn3oIRMhpVq6XNeYFcrDZnYbQgsl9/W/nT+eANqv4MgXo6s/kfFsCQ==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 00ea22d9-6809-484f-163c-08dafb033d1d
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:27:35.7480
 (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: H9+D0hPRv/ARuxnJLyX3/jtOQtu25bHUxlpycpu5AuiJlUW7aBuSZO3HdWzDKA/52RGQ3MgBg5S+R9u3wIv8Gg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR10MB6026
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 suspectscore=0 malwarescore=0
 phishscore=0 adultscore=0 mlxscore=0 mlxlogscore=999 spamscore=0
 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2212070000 definitions=main-2301200157
X-Proofpoint-GUID: WrjtzaxudaA5bNyxTiKFETuYwSKAgkSj
X-Proofpoint-ORIG-GUID: WrjtzaxudaA5bNyxTiKFETuYwSKAgkSj
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>

Avoid using the maple tree interface directly.

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

diff --git a/mm/mmap.c b/mm/mmap.c
index e2ba9b094cad..09a5b6e00374 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -487,10 +487,10 @@ static inline void vma_mas_szero(struct ma_state *mas, unsigned long start,
 
 static int vma_link(struct mm_struct *mm, struct vm_area_struct *vma)
 {
-	MA_STATE(mas, &mm->mm_mt, 0, 0);
+	VMA_ITERATOR(vmi, mm, 0);
 	struct address_space *mapping = NULL;
 
-	if (mas_preallocate(&mas, GFP_KERNEL))
+	if (vma_iter_prealloc(&vmi))
 		return -ENOMEM;
 
 	if (vma->vm_file) {
@@ -498,7 +498,7 @@ static int vma_link(struct mm_struct *mm, struct vm_area_struct *vma)
 		i_mmap_lock_write(mapping);
 	}
 
-	vma_mas_store(vma, &mas);
+	vma_iter_store(&vmi, vma);
 
 	if (mapping) {
 		__vma_link_file(vma, mapping);
-- 
2.35.1