Message-ID: <73971153-b46e-0332-aa4a-0dbe0a59fd22@sony.com>
Date:   Tue, 7 Mar 2023 15:30:24 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.7.1
Subject: Re: [PATCH 1/2] maple_tree: Fix mas_skip_node() end slot detection
Content-Language: en-US
To:     Peng Zhang <zhangpeng.00@bytedance.com>,
        "Liam R. Howlett" <Liam.Howlett@oracle.com>
Cc:     Stable@vger.kernel.org, maple-tree@lists.infradead.org,
        linux-mm@kvack.org, linux-kernel@vger.kernel.org,
        Andrew Morton <akpm@linux-foundation.org>
References: <20230303021540.1056603-1-Liam.Howlett@oracle.com>
 <cec2dec7-818a-b32c-3ad4-8b23fc1351f3@bytedance.com>
From:   Snild Dolkow <snild@sony.com>
In-Reply-To: <cec2dec7-818a-b32c-3ad4-8b23fc1351f3@bytedance.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?R3FRQ0lLTjdPd0toUHlybHc2YVlXL3pQM01wY2tkMFMwUk1mWVV6V3BST1Ix?=
 =?utf-8?B?d1lqS3pkSWRWalNHTWFPb2xTN05UZTZ0NE1FT09hNUtvb3hNZVcvZzk2ZC9u?=
 =?utf-8?B?QVg0QUhkN0ZBSW5IOXlvL1dnQjkvZldqS1AzanJGT21IM1ArQmJhcUNPbjJ4?=
 =?utf-8?B?YWxtYU5nTzFoSnd6OHNaeERWcWdFVDVzRlB4Qk5jK2VRSS9QTE9yb2F6Rzls?=
 =?utf-8?B?WGlvdEhtWGlrS0l1NEF5eEhLaTJEWVBTSFFrRjFTY3lBNWdpU3VaeFJ2bVB1?=
 =?utf-8?B?ZWxkN1psNTU5U1NxMTZ1WHR0S1R4UVFkUEN4T3BBN2ovdWt2b0FtR1pOZFlB?=
 =?utf-8?B?clM4NCtRb3dzeGg1b3Z1QnU5T2R6WXR2L2VkWVJWVVI5aXAvM3NzOHdjb0tE?=
 =?utf-8?B?N09NeVV1WHpPTFlTZ1VQS0ZBcDEzY3MvYS9Qc3p1MzhUM1J1d0hRVnZPTkdW?=
 =?utf-8?B?QlJVeUxocTlsd3lETnpiOWRwUHlhM1lFQlptM3ZYUXhEZU5tbWN4cU9ud3Nk?=
 =?utf-8?B?Qnc4T1htM2JpczdJd2pneGY2SUxNOTJ3cmhKeVdLUWxQUGJGejh1NjVhbmk0?=
 =?utf-8?B?dldJemJMa1oxNXJEVkhZRW10SlBNdFNYcnkvekJkQWo5dW5UTVY3enEyTk9j?=
 =?utf-8?B?cCt2cU9LaUx1c0hvNXVKR2wrQXRHSHNvRVhTSXUrbTM5YVlKZ3k2anFLbGs0?=
 =?utf-8?B?VXVjRW5YRlNwNEtTNlFnS0Rob3lhQk9MTElnVEk4SWZKanZIaUtqUE9QdkJi?=
 =?utf-8?B?V0ZJREVVbXpmT2NKWksxL1p4dUc3bWxGU2c4NDlKMTNZSXg1aE9WS3BkbGU2?=
 =?utf-8?B?VmZhdFN1OXRDQW5wcFFmYk9WZVk3WGZldGtrTXFCbkpRODJLbWFWcUVNNkdG?=
 =?utf-8?B?K09WTzF2dlFvdXpvTEJORlJsdXFyOElvL0xJKzN2SFo2MzNOOHVmeGxJcUJo?=
 =?utf-8?B?a1VjTTVwUitnQlpNRzlMYytWS3BSL3U0RXpQV0l4c0o5dmpFTkM3QmY0TEhZ?=
 =?utf-8?B?MWZwZ3FFRHN4ZkVVaVNqRXZRZ3RBejFjdGVEaVVLN2I3alhweDlKSFQ0NnBo?=
 =?utf-8?B?Vy9rOVFtT1FDeG5xaW5iZFV1MmMrT0pHV2tJTHhGeU5mMzhVWmtET2xMMitq?=
 =?utf-8?B?cU5mMUxQV3ptR3UrV0lwTVp4dGx0bzBieEM1V2tVeGIyQlNvSVZwUkZvdWQx?=
 =?utf-8?B?U0NmdUV1KzhRaGE5MlF2Y09GN3VKNmdmNUJWbjA2d2o3QjFVUjRrY3BybzRX?=
 =?utf-8?B?cnZZODZoVW5yQ1FGNWNtbGNnYXF3bnhWVURLRDhuT3JTeHBZdkpISkVGUnhv?=
 =?utf-8?B?U3hzSC9yZ05tczg1b1licmJyeGZSd2hpMHVhTnNtb2x5Si9Zcko1TTlwRC9G?=
 =?utf-8?B?L0VjRDVRY0xKRDR6OHhpN3Y4VDA1MS9QYWh3SnNWeER0NWdOYUJicnZVcGNi?=
 =?utf-8?B?WFRpdDZKTXVJZHNXN3ErSDBLcmVJQWEvOW1vd1Nxb0Z2SjNMWFFxSVFpZ05q?=
 =?utf-8?B?bERNUVRmM0REUTZDL1diRlB4NnVqenVGeW5weVVhT3NxQUhObXRQZ2k3bVY5?=
 =?utf-8?B?YmVPVFl0WGZHeG9PVHNSTEl2VHhXbEZzaDlmYkNIdnQ0MndWRHhwRFp2K2VZ?=
 =?utf-8?B?V2hNWkFlaCtIUmdpMS9uZWl4K0x3RWNzYklOVGZxZDRyWjZuM0w1aEFYdWl2?=
 =?utf-8?B?Z0Y4VVNwVVlleW9MZk1PYUltWGlrc1lMTEhaRHZmMnBiTXBXUDJ5ZkZHd3FV?=
 =?utf-8?B?QmRYR1plbFJIZmY2bC8zRURHT0V4TnZoeDFtN0tKNmdnRktZTXVNSEtxUDVo?=
 =?utf-8?B?aXZlV0U3NjduUFE5VERzTUhTVlIrMVZPZitOcmRacDE0NFk1RCsrZERDQ1FN?=
 =?utf-8?B?bkZKbjNUcW83NUNHVHdWVFNvVExUdG5tRDlzZnVtbXRhVm1NdVNsc1Q3c3RJ?=
 =?utf-8?B?NWQ0V2lHT1YxZVUwdlA3b3ZPYUMyaUc2MGwwNnhSY2NGZmJHbEZzUzFoOVBL?=
 =?utf-8?B?S3kyQ0VORnFiMEI2SVFyeEZvYWp5SngyNlFBN2I3L0ZMcjdRMlliRzNFeU95?=
 =?utf-8?B?QzV6M0lOSDZMQVJwakZoaDNxdkI1ZEdQdUxvN1lLVGhtOXowTG1tKzB2RHlo?=
 =?utf-8?B?QzdDL3YzTjNoc3VzaUpLa25tNHVGZDU3VzcxeXFlU0ZRazhJaExRaDVXV0Rt?=
 =?utf-8?Q?5DM4JjzO4bH4l8921fsFI2o=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?utf-8?B?aEJQL1ZnOVhyY2tuMGpEaDZkWVlZVGlpZUJ2MlloUXE0cXh1cmU0WUFhYTVv?=
 =?utf-8?B?ME1oUXFkcmpPZFJqc3Y5SjREQ1J2VS8vQkpTWlBQU0N1K25KMkF0aHpWc2U1?=
 =?utf-8?B?TjlUdDhzZ0o4Vy84cUY5ellmRDBqM2IxYmhCNnA2bU5LSE1zWDMzSWpudEVH?=
 =?utf-8?B?Q1BNNU55S0l2bnVmRGVyWWIwQmVBZmVmK2RnU295UUdBTDNlUkc1MlRNeHNw?=
 =?utf-8?B?QWwxZWl6a1hVbFBLRm9xT1gwaFhSbXl5NW10bmRYV2MrWWFaQXZVVmh5RjZP?=
 =?utf-8?B?TENxcHkzdHRWU0FNYlA0SjJzMzhFNlo1T0k4OUFRemRVS0JOUVoybng3STBR?=
 =?utf-8?B?Qi80dmlPRktqeVM1TU1rTlVPUmlCRFlPZ1JvY3JvRGlPamN3YmZDRUhLZGVP?=
 =?utf-8?B?QlN6dlNIMjlKaWo0clp1ZE9DQUQvSzJaVnk0aEwvSFpPUExXNWhwWDBpL1My?=
 =?utf-8?B?R2pFRGNuT0lGWlJmOFE5RzVXNlArSWl3d0lGR3ZwZ3drME9XbVNnQ0M1eEVu?=
 =?utf-8?B?ZWNZeWZEd0R0Y1NMSUkzbGlJWmUzbEt2TXM1UExyeTFUOERWMU84RlR2eW1k?=
 =?utf-8?B?dkJ1YmN2amxyT2dYNU1mSExibkdxbXZhWjM5SVFjdXRieWpnRVhkbFE1U3Ja?=
 =?utf-8?B?WnVaS3FRUUFyQzFRUUhXWmI0cHd6OFhOVFlTN2VLeDFOalBLN0MvV25vcXFK?=
 =?utf-8?B?WFRjdFJwV0lMSS9qbndJWTlFMytybFZmdDhtVkVKZkRXRXhRSDF5a01LWmc1?=
 =?utf-8?B?aTh3ME43ZHVha081Z0NIRDNTc0gzekFJVnZ6aHUyUkdzeUZURmNUMGp2UjNn?=
 =?utf-8?B?Z0NsSU9rN0JReEVsM2EyeUJVakYxbU9QeExFYTFacEEyNDhzWnR4OEQ2TnVC?=
 =?utf-8?B?NjgzeG9CdFdac3A5cGUvVzBJZ3JVNWNqZDlxUzRTaDJpdmhsNnc1SzBLMUJk?=
 =?utf-8?B?NkJQajVHQXV2RVlNOXlPUGxHcURGaGJCZkQrUlRKSjVFd3Y1MVc5UjF4TERj?=
 =?utf-8?B?aW1GcVNhMTZDMkF3a1RtekZyWG84UjhtaHpFY2ZkcmNIN2lGdGZ4S0lBSHpL?=
 =?utf-8?B?N3lCUXBLZWF4WmtBM0dlOThwWjlseVJZd2RjUndmR0prQTc1djJNd2k5eUx1?=
 =?utf-8?B?ZDZhdnY4MFo1ZHRmdExuUFd3SjQ5ZVBTZWNtcTNmaXdFUGl2RUF5OVJpT0Rh?=
 =?utf-8?B?OU90TnUvb1BHbTQzbmdLaVVvL0R4RnJmUVF0cXk3T0Q2R0xvNWhINjNMcWFa?=
 =?utf-8?B?LzVXQk9pY3M4VGlYVmJqZ2owQXVEL3ZkMVhYMHJxbUxhU1VhZlRNK0hZUjlB?=
 =?utf-8?Q?6TCU9hFYhShi8=3D?=
X-OriginatorOrg: sony.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e1c2c58f-9f27-4aea-0e3a-08db1f187e84
X-MS-Exchange-CrossTenant-AuthSource: AM9P193MB1332.EURP193.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2023 14:30:26.6879
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 66c65d8a-9158-4521-a2d8-664963db48e4
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 5DXxZP37GjzVOiy3rfXXgBhC7OBUznAuPP/gNQQLn5V9QwzhVpnwPKx4aEaMhrac
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3P193MB0604
X-Proofpoint-ORIG-GUID: iaxNBPVzBTR9FVzDFr3dtH4F0iLiuR-L
X-Proofpoint-GUID: iaxNBPVzBTR9FVzDFr3dtH4F0iLiuR-L
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
X-Sony-Outbound-GUID: iaxNBPVzBTR9FVzDFr3dtH4F0iLiuR-L
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.219,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-03-07_08,2023-03-07_01,2023-02-09_01
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 2023-03-07 14:05, Peng Zhang wrote:
> Hi, Liam,
>> -    } while (slot > slot_count);
>> +    } while (mas->offset >= mas_data_end(mas));
>> -    mas->offset = ++slot;
>> +    mt = mte_node_type(mas->node);
>>       pivots = ma_pivots(mas_mn(mas), mt);
>> -    if (slot > 0)
>> -        mas->min = pivots[slot - 1] + 1;
>> -
>> -    if (slot <= slot_count)
>> -        mas->max = pivots[slot];
>> +    mas->min = pivots[mas->offset] + 1;
>> +    mas->offset++;
>> +    if (mas->offset < mt_slots[mt])
>> +        mas->max = pivots[mas->offset];
> There is a bug here, the assignment of mas->min and mas->max is wrong.
> The assignment will make them represent the range of a child node, but 
> it should represent the range of the current node. After mas_ascend() 
> returns, mas-min and mas->max already represent the range of the current 
> node, so we should delete these assignments of mas->min and mas->max.


Thanks for your suggestion, Peng. Applying it literally by removing only 
the min/max assignments:

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 6fc1ad42b409..9b6e581cf83f 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -5118,10 +5118,7 @@ static inline bool mas_skip_node

         mt = mte_node_type(mas->node);
         pivots = ma_pivots(mas_mn(mas), mt);
-       mas->min = pivots[mas->offset] + 1;
         mas->offset++;
-       if (mas->offset < mt_slots[mt])
-               mas->max = pivots[mas->offset];

         return true;
  }


This allowed my test to pass 100/100 runs. Still in qemu with the test 
as init, so not really stressed in any way except that specific usecase.

//Snild