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:     "linux-mm@kvack.org" <linux-mm@kvack.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Andrew Morton <akpm@linux-foundation.org>,
        "maple-tree@lists.infradead.org" <maple-tree@lists.infradead.org>
CC:     Liam Howlett <liam.howlett@oracle.com>,
        SeongJae Park <sj@kernel.org>
Subject: [PATCH] maple_tree: Fix handle of invalidated state in
 mas_wr_store_setup()
Thread-Topic: [PATCH] maple_tree: Fix handle of invalidated state in
 mas_wr_store_setup()
Thread-Index: AQHZJEs16LTgU8asl06B/cuTn0zvJw==
Date:   Mon, 9 Jan 2023 16:55:42 +0000
Message-ID: <20230109165455.647400-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?6r4+7PLZPaE/plJDFcC2IcNJmFiuj/lGFjE50xWTI7lOZAKNZIW1l71Wmc?=
 =?iso-8859-1?Q?peDJOFf4qtaWCaoAUanzkdzYryc0tZvF9ocoGMplep1gamIfM98mNWMHrN?=
 =?iso-8859-1?Q?33kcC3/GyJg4IlGqNPK8478mVg4IWvf8eI3TiSe+/2BLbkRiJHeSjt3N4V?=
 =?iso-8859-1?Q?2CqQLvliRmbKcM6HfjD0t6zhWVbVhSCqebD+lguDwBeaFnzSfhyJtd8C2L?=
 =?iso-8859-1?Q?PLC1cu5L02i+imz+SZ9ws90UZ/sY5nl2PDWpW1GAksxSiy1jaud6oV6Q4x?=
 =?iso-8859-1?Q?MqB1wTFN2A0XdjRtBflPTLzNOPAMGsQnWf7BfA3eomySyY2WK4Y4pQEYwM?=
 =?iso-8859-1?Q?WirEmDeaN/2lXkjb8SAatEEJdhM59WPzOJlNXiop00//GyvUt2awr3VIP8?=
 =?iso-8859-1?Q?weQ8tbgGRe3P1xj0Dz/cG10IPJinM8f7dQfP4wUFWFFqVr8bcZ+zzTeKOx?=
 =?iso-8859-1?Q?0Y7wJCXgRXzgU5ykSQ0kcbvyDY16PDA3dwZsm/eo33F0szsnvk0tTutG65?=
 =?iso-8859-1?Q?XA9DrfDiTsqiY1xXLgeOz1CxJnV4gTAzlNBN25JhOwX1RzyJsUrPn2yP9N?=
 =?iso-8859-1?Q?+Lf43x9d0gh5JYpXlql4xLpPZP4iBPs7LfEcHpl9R9cmAhDnxmxa2fMqNL?=
 =?iso-8859-1?Q?X4EpVqjXNc27eaN9uw3lYCH1DJr6SKzrYpyj56cUuXk2uXh10m3ND+i5m4?=
 =?iso-8859-1?Q?dHxOLBeuROgU6BC/GZxXSjt3hlzG69T7k7gD2xgxezhKerWJUcREoBlrUS?=
 =?iso-8859-1?Q?GlWlc1Y9XHfWJtNDhPU77ekrYlh6d/nX8xi2Sy5wnLtkxIYKFvpzDBzK7/?=
 =?iso-8859-1?Q?Ltl7GJMynstWDfqzg5vKuan+uZeykYb/RkpTKzQ2xyzxkDZlK/gHE3fAaE?=
 =?iso-8859-1?Q?YykPElngF5gbrTxPR+NfXaEvM/G/rw9Y16pPi3rq5wkdPbNRfv8WTd/YY0?=
 =?iso-8859-1?Q?8pvqW08O8wQzyEe1jD/wV3DkjoZ8QBb+ySFhXKFUGn8x8WPlmc2B02Gman?=
 =?iso-8859-1?Q?E9d/ujZ7qUSGRn/r0NC0d8GNdI2otsMhMj5VDK9lOSeuGUVerpW7Y6JB5R?=
 =?iso-8859-1?Q?/ks2CZ2GDsS33uYku5BS2P17bi8DWXjab6jUwunQG/0CrXXoW4hCVtpz5r?=
 =?iso-8859-1?Q?TQcY3iIeqaZ41M2fF4NJssSUlc8Jh9sgnEWPA2ch6lNBveiTUDMIjUdhDK?=
 =?iso-8859-1?Q?ttx6xCxvuevhq/F/YaEOBbBlsNnV6WjcRaxfS83nb3zekK0vV5JYMR/0rc?=
 =?iso-8859-1?Q?WI2NwHtsa/ReXhaBLL+n8aPjRhX15GjK4dzYLRLzaWTqKsTg8EwN4YNPiq?=
 =?iso-8859-1?Q?lzcKm9H9K/djcWBn/rmxhFll5ZduM61ErZPtOz0FztuMdpX5b/pmGTcWjX?=
 =?iso-8859-1?Q?kTZGSEFfVCPC0qvcc+tSC0riD7gd/mkYeydEpoX4g0xqaaxvIu24FUF34S?=
 =?iso-8859-1?Q?3dNKN4PnO5104Yfmvx6kHJJAXt3nJ247QAX5H/EPvlYnJK9QvtxwW19BDt?=
 =?iso-8859-1?Q?ScuYzZZNty+SAvIrr6DdQ2bZFnYwSo5XcKAPgTrHHXO1WvZEOofIUF8qTi?=
 =?iso-8859-1?Q?Uq57QNCoxlLW+/u9ACYkD9/AC1w4ixcxkAIaKMfCIbLmuTpkXFhi10q0my?=
 =?iso-8859-1?Q?xfhXCRHf+NsAncIGfVXJRKlrfeN7jjJEcuP4rG6O/VvOh6VYs13jVzPw?=
 =?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: ZtRzQMHSaNT6g5Np053XhpStu7QvJkbChqq0Mf/7EnTDQTxpD168pPUhOFoPlVZp/gbsDOnKbiJCJL59sAKwKrQ7mphn/uvCwZavFmZ8TGZaK1TcEk4HztSuS3Cgw8ogbJRN9WEqurkpgnrAAQ3YppH2gYTdy5sXk64YqaRjcb4iUZ0kXmUQtmVK3N9wkurAZnxN1OvApdGVgD5MIna4QOO28jufT5dq6+CHC7biK1yQsntfsLGOoVuDPDlXJMXiXKln69cP+ksYiXvFrVehHrVx28QOzfu7C/7VEEtI/ltynbYdT0yZ9t9Wysgm52lzyNVUHjxAc0EVkI/OwHgjofEZ0nNXbicE3FenxEHGIxGDO65AYLFPs20/Uygx9OlBoHrrY6B10Xpxa6AW1/JchEqbOzzCafiqGgINeuv6t3HbBmrmkVNLpLEiNB7UgGN+ZyflfhmsL9HVTcqHzPRgRnMpBZc0H9ipG2+mFXEbVizuMYnlX9T4rNXACkZRCnTkmoBj7mW2gBKteGA/M6AIFv1kV+Wl7lFX+FpqogoUSrCsP7tXM9YXGhvuFiPxHBnFBedXfGnsDE3gXJvRz+yuVkaXYPormp9VksJZonvPrpgeqoTCX8o6A/PGei5M0xLs37LOGnZqRFP15xMCy6FfbQj0TEeW1E3JSMOMCQQ+KcndRBXEq90Rr+8nFqIrJj7cN3idzwa3JdPzHUpyGLpcswxXnfeTTyJNWbMi3s7euHwMpqgU132LI4aIvL9+7kmKUNYpil4G17c7a/+ozaaPK/Vhu0pDOdw3POoGKMfN5VnHm6eb3Enlz7KtynRbkiKR0zFdG8alNCmA4pICfnk8XZAIEZwLuhjzduvBrB8CgGeyc5jRowHwOKefSgVHOkuIj9I2KTSCo3/Ch0JjFpbzFw9tFNQBUyxhGJjhqFQMD34=
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: 1e10343e-096c-4844-85b9-08daf2625836
X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Jan 2023 16:55:42.6406
 (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: ycXn0bLxpIohKemL+uLNJ9T3U04XjBHv8ECBG3WWZmtICZfEYKEtWS7PUWiA98avlYKV/tCTrThCzH6DHZeLag==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR10MB6306
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-09_10,2023-01-09_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 mlxlogscore=999
 suspectscore=0 adultscore=0 phishscore=0 mlxscore=0 malwarescore=0
 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2212070000 definitions=main-2301090122
X-Proofpoint-ORIG-GUID: 2EUb_7UCI0v6k3Qp0dVrR4zjEuqRVFBr
X-Proofpoint-GUID: 2EUb_7UCI0v6k3Qp0dVrR4zjEuqRVFBr
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

If an invalidated maple state is encountered during write, reset the
maple state to MAS_START.  This will result in a re-walk of the tree to
the correct location for the write.

Link: https://lore.kernel.org/all/20230107020126.1627-1-sj@kernel.org/
Reported-by: SeongJae Park <sj@kernel.org>
Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
---
 lib/maple_tree.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 14cff87cf058..59c4879ac714 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -5620,6 +5620,9 @@ static inline void mte_destroy_walk(struct maple_enod=
e *enode,
=20
 static void mas_wr_store_setup(struct ma_wr_state *wr_mas)
 {
+	if (unlikely(mas_is_paused(wr_mas->mas)))
+		mas_reset(wr_mas->mas);
+
 	if (!mas_is_start(wr_mas->mas)) {
 		if (mas_is_none(wr_mas->mas)) {
 			mas_reset(wr_mas->mas);
--=20
2.35.1