From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id D4C92C6FD19 for ; Mon, 13 Mar 2023 14:07:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2A1736B0072; Mon, 13 Mar 2023 10:07:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 251CA6B0074; Mon, 13 Mar 2023 10:07:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 118B36B0075; Mon, 13 Mar 2023 10:07:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id F12976B0072 for ; Mon, 13 Mar 2023 10:07:31 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id AC0AD120BFC for ; Mon, 13 Mar 2023 14:07:31 +0000 (UTC) X-FDA: 80564052702.10.135AAFF Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by imf06.hostedemail.com (Postfix) with ESMTP id AE7BD18001A for ; Mon, 13 Mar 2023 14:07:27 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=VFC2eSmX; spf=pass (imf06.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.174 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=none) header.from=bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678716449; a=rsa-sha256; cv=none; b=0q1eGnx2vKrpHbwV1qJk3GOf0E/xUyXfSvDugHPMN/qiZS250aqk9RFOy8PYn4gN5yAczC OOG0wFrnm8O79wgUeiom7NI2D89rFIoKPcOWeV+aeUK7vqoY4q5bR/bmkotpTnt+GbZUdH kYmlQnqjWuQSYKW3kFqyz0cCAMOzjBM= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=VFC2eSmX; spf=pass (imf06.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.174 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=none) header.from=bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1678716449; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=EpNmDIT5jExbIEVleb42Psi9b8FogiNN1+q174Ze0To=; b=0n3fhSKiJhBXsTX2f9hT6QqMjSEVsfilBI5/ZKhVJTiORUis1prnszvJX+J271YTNA4eoG NcItboJnxDkrMt4ro16fiiZjQjd1cQSwQHxuAyWWfqkQCvbgFQ3jpHnKUHfUrlSvu2pZqH QIq+IlQXpHK05LNGxugpWHDkfxpF8b8= Received: by mail-pl1-f174.google.com with SMTP id y11so13090197plg.1 for ; Mon, 13 Mar 2023 07:07:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1678716446; h=content-transfer-encoding:in-reply-to:from:references:to:subject :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=EpNmDIT5jExbIEVleb42Psi9b8FogiNN1+q174Ze0To=; b=VFC2eSmXAG503SIMXYYmNhpxyAshX+ESHFXxkkMaskT6J2qJ7yvfJ40B4q1gHfMGhL S8rb7C7MLsutlQ8iiGRnPBOz2L0fuP1z+PaSkp60vlyMZeF/jWzaL3pB8pXMvPofPk0S mkqD9dgEs4Uj3xAlxXJE5S4aVVD7j0ko/qTJ/NCswttK9xNDnRKktsqrt57GN80bs6ky y0lC3Xdd+vIuKV6juHWGroQDBXwuZm9ILoQDkuEUbEiimX2YUerunXPdY037l22iBdT+ KA9XMF1RBD6ZKJjZPyAndPnkM/SBZkqJ7Jc8vyLWnlU/LAZuVN5v3mBHYueCS4T4rSjT WPlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678716446; h=content-transfer-encoding:in-reply-to:from:references:to:subject :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=EpNmDIT5jExbIEVleb42Psi9b8FogiNN1+q174Ze0To=; b=ZGZOn/+2d1phT1QZ9xf7uxpm+isKGvIvt+V+ZQONVYgwICHFRSBAKxAL6JrKex71FU XFlbxDAbWVT68LVHO2Y10+01lrKNAS1RKWMmi73MfPGWmbL1fuolfvC7mBjQ6IoGUUL0 aBDuyA0MN+EzuftSPxrIthLBbTaiWoRaASLEf34AKiShyzqQwqK/TVz5crfNXUpvHaLH axQV0G+PTejgWK9Fx1ZXfMdVma9XHm+j4z8RvH+6OcbmHZF0VRJrbZTKWyfTt9M30aVs sGceD89jQPcj3cuoLvnZI+cA+19Y+VDlnX7ayzrXYPPjs45BZCXL+32ruwEl+eOVWgd1 juUw== X-Gm-Message-State: AO0yUKVVqlbjU66lfKumS/YLzj1MjGfc5ua/MvLGgdjuWYxa3DXhPMMx lE18ri+pz4Meq6+LNeja/hpT6Q== X-Google-Smtp-Source: AK7set9mmNIvJzKbRr8sSYGCHS2NczcLqdaRVqEotjRTBNz1Zz7QFbJnhFtCpJVBuk1mVXIpRuJOfg== X-Received: by 2002:a05:6a20:6a1d:b0:c7:6f26:ca0 with SMTP id p29-20020a056a206a1d00b000c76f260ca0mr36520088pzk.54.1678716446279; Mon, 13 Mar 2023 07:07:26 -0700 (PDT) Received: from [10.200.11.19] ([139.177.225.234]) by smtp.gmail.com with ESMTPSA id i26-20020aa7909a000000b005a8b28c644esm4488847pfa.4.2023.03.13.07.07.23 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 13 Mar 2023 07:07:25 -0700 (PDT) Message-ID: <5a0698e9-cd01-714d-2c46-36397444d17a@bytedance.com> Date: Mon, 13 Mar 2023 22:07:21 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 Subject: Re: [PATCH 2/4] maple_tree: Simplify mas_wr_node_walk() To: "Liam R. Howlett" , Peng Zhang , linux-mm@kvack.org, linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org References: <20230310140848.94485-1-zhangpeng.00@bytedance.com> <20230310140848.94485-3-zhangpeng.00@bytedance.com> <20230310192004.iruharoxh5lajg7g@revolver> From: Peng Zhang In-Reply-To: <20230310192004.iruharoxh5lajg7g@revolver> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Queue-Id: AE7BD18001A X-Rspamd-Server: rspam01 X-Stat-Signature: fonqu6jroo8j1x8nayaes41wc3bb7amo X-HE-Tag: 1678716447-337083 X-HE-Meta: U2FsdGVkX18wHQ5BUcB4r5DAKWs6ND7rRKynBuohqQq3RAvSo+mpu7x5uOGGvZ5X67FXGHK4NYXTqLQRddJhWmH8dJ1EFQyJOYaNSM3bcmGQqI2QKNh2cHqjPOPsjK+/tnC2C0VJ3LQlGqezd7n4pWBCEvtEh4ZS5LrXv/8e6n9m0r4Pn2uqVXwfLUvA7JAnsv6UGksjO7GvRkbyeDZEBi01aJt1lr0XvQ9gYzMkaVw8kQ+F1eLdGWDVlzuz/mjmyHyrBaz0XU4N9NqvNhJ0f2ifiG593UglSXyPyhYXWlsrxD1rHjihhRGPc/0NV7Bbi5AMFf2E/99wmd6Iv5LqJHPChxQZckvbwVY55NuMosctBkYggzrL4n35Ve1MIVV3UzQ2htrxn2ZOpqIWUO6ytjXwr1NZ9xV4S1WtELI+/JBJeyB0bYN/TM1/mcy2kq3QfW1RfFiApzYI0pctLGBEk9D5QbGqb7NTIJSamCCSoilWQrKc87nkvIuu4KgcOHlYCazUt7YV32UYY5zSElVAkeb8AqaxMRQFbUKdhecJL5mbtlCj2qwf6H5lksTKIEQJAHE0uHkqmpd/RnMO2KReQ/eVUkYRuWQ9Vq1Uu/lySMHuM7KzFRkfxpdhkZdIpFuXCWUYJpg9v+iByqdFb8Gm0DBYvypyfNJ2Ez8tmFpQ2iZIGny6VfgtSPR2HthMZsZ3w4LCYkFfhD0zUe3vp43J3XCfz3nDF1vl3Ti/PqVzA7ArvqW2Odeg+DkFO1iAwZ5ShqrO7zIEINkN06Z2214BGWtL9aWH4RVRsfKPa4k4s5iXbKtKNBZdY0u/0AcX/OAn7G5DWR1U7yWXKd2mgH8iAG4ntELeTKAkeks8128SyMZrheg9iLaQAn5u+EGlQc1zxOcpCHfXqRfth8KsEGbs15dEkp0cHsUXH/WiT6sTbIHh0WT29CySCq4NU/IYBFo35VvdXh5cWTUccpwSQim TmsKS0Qp A8e2xnleWkZLcs7EWJ/WEVJ4IJ7lybQOUpAgt+WopxZ3kyYiPx2Gt9gDocK+RUhAqqb4VUWh+mR3owj6JFU0tw3p//HcKnZH36Uo7OGWvCeP/5C6ETcsyAjq1WLbsCpooKIPjms/kSCSG652o4AQwH+QqADZb1880VHP8Yywko5y1oGcLXSjXl1hOiiFQWagSzcqLNfFheXjxFuc8irQiOD5CVyPAKY2MwArtB7uHpN97zyrnzyiLcsG1NbmPe+VJJHrP2+vmQmG0Hb6WCY6E+FHv67M8beRT7nhTQZGlGwHnvo2r5hyPCyHwwqtfA3eN/U6mQvz3ujbuz53t5WVUbf5Ijvzmt9mvjetgr7xDoT4ZdctVPpTncqUYnEIfhDaiR+OqOdBWJX0cthe4hFJMaYqTsizyXh6rfsWa6N7wCZpufKa6+qQrurXXJ6FWZl9dvXSN9NAgpF0VsAQ47IpWoYx+b3wFQh53xCxLdY2J6rBYXdgY8fRRwIX/oQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 在 2023/3/11 03:20, Liam R. Howlett 写道: > * Peng Zhang [230310 09:09]: >> Simplify code of mas_wr_node_walk() without changing functionality, >> and improve readability. > The change log needs to be updated to Hi, Update to what? Did you not finish typing? > > I like this change, thanks. > > Reviewed-by: Liam R. Howlett > >> Signed-off-by: Peng Zhang >> --- >> lib/maple_tree.c | 34 +++++----------------------------- >> 1 file changed, 5 insertions(+), 29 deletions(-) >> >> diff --git a/lib/maple_tree.c b/lib/maple_tree.c >> index b3164266cfde..4d15202a0692 100644 >> --- a/lib/maple_tree.c >> +++ b/lib/maple_tree.c >> @@ -2251,9 +2251,7 @@ static inline struct maple_enode *mte_node_or_none(struct maple_enode *enode) >> static inline void mas_wr_node_walk(struct ma_wr_state *wr_mas) >> { >> struct ma_state *mas = wr_mas->mas; >> - unsigned char count; >> - unsigned char offset; >> - unsigned long index, min, max; >> + unsigned char count, offset; >> >> if (unlikely(ma_is_dense(wr_mas->type))) { >> wr_mas->r_max = wr_mas->r_min = mas->index; >> @@ -2266,34 +2264,12 @@ static inline void mas_wr_node_walk(struct ma_wr_state *wr_mas) >> count = wr_mas->node_end = ma_data_end(wr_mas->node, wr_mas->type, >> wr_mas->pivots, mas->max); >> offset = mas->offset; >> - min = mas_safe_min(mas, wr_mas->pivots, offset); >> - if (unlikely(offset == count)) >> - goto max; >> - >> - max = wr_mas->pivots[offset]; >> - index = mas->index; >> - if (unlikely(index <= max)) >> - goto done; >> - >> - if (unlikely(!max && offset)) >> - goto max; >> >> - min = max + 1; >> - while (++offset < count) { >> - max = wr_mas->pivots[offset]; >> - if (index <= max) >> - goto done; >> - else if (unlikely(!max)) >> - break; >> - >> - min = max + 1; >> - } >> + while (offset < count && mas->index > wr_mas->pivots[offset]) >> + offset++; >> >> -max: >> - max = mas->max; >> -done: >> - wr_mas->r_max = max; >> - wr_mas->r_min = min; >> + wr_mas->r_max = offset < count ? wr_mas->pivots[offset] : mas->max; >> + wr_mas->r_min = mas_safe_min(mas, wr_mas->pivots, offset); >> wr_mas->offset_end = mas->offset = offset; >> } >> >> -- >> 2.20.1 >>