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 2277DC77B7F for ; Tue, 16 May 2023 10:07:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 98B1D280009; Tue, 16 May 2023 06:07:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9397E280001; Tue, 16 May 2023 06:07:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 801BC280009; Tue, 16 May 2023 06:07:01 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 7372B280001 for ; Tue, 16 May 2023 06:07:01 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 41FE812020A for ; Tue, 16 May 2023 10:07:01 +0000 (UTC) X-FDA: 80795689842.25.8DA2E04 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by imf21.hostedemail.com (Postfix) with ESMTP id B02E41C000B for ; Tue, 16 May 2023 10:06:58 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=TvG2zV56; spf=pass (imf21.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.180 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684231619; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=ZASQE1g5P6cFu6dDUxRyZ0nyLvt04lHADFrFzInVrco=; b=BX/SL4kUM/8CIspabXqX4Zb1gr1CB1nFobylnpORJ29DB6aZvGuxcUlVv2kSlj0g25BJVs lP/+o0ubTc8rLSa3xMEcvDTXc/TBwouRK814IOsHvdWo9rZHf7e3/rJwlniasjnzjKsh2d eYU20JnxXxVXwMBoA5Wv4FywTol5RDU= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=TvG2zV56; spf=pass (imf21.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.180 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684231619; a=rsa-sha256; cv=none; b=E+hK2gWTvKm7gVsrMqX7czejv+Kk5glWLYFLn7DXxz5f9194NCpH2JCyvcZQD/k0k6KXcw lrhclBp6UqUhu2VNy8rXrn/+Lbadplv1+jOuAYDMER8meJDr5sUE59eEbjnTY2D3TVlH7/ 3F3KXE8d+wa6Q4Z2QruDbVPtgOzDs3c= Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-1ab1ce53ca6so99363245ad.0 for ; Tue, 16 May 2023 03:06:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1684231617; x=1686823617; h=content-transfer-encoding:in-reply-to:from:cc:references:to:subject :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=ZASQE1g5P6cFu6dDUxRyZ0nyLvt04lHADFrFzInVrco=; b=TvG2zV56+gkLfDn6F4lf1Cf4kRUu40XOC2rVQvP8Dvx9G7sv8FZ6BPp819PvMLwn0C ewD05qcv4Xli3wr4iwH1eM1nxB7cP1mpp+dgFXSgwW1e6AkAhxk3KZ4lrUne792T7x1k rX5q3+EnRT3MwM5vocxjAnr5FRzfAY0I1XR9VmixFQNfZyBoJGUqGrZCNZp+7vr6lmdV PpAgOAvhq3LV8KQ4rKJwMw6ti0uU58fh4e9C+U1OeoKyriDKX51eUe0mBzbLOBtoxhWv K90KXQmUhZHiv21HRYf+M7nWelmkR1zM7VQKkdRKAi7JK2r1gO1Btpb/vzJ3DBTpH+MO eStA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684231617; x=1686823617; h=content-transfer-encoding:in-reply-to:from:cc:references:to:subject :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=ZASQE1g5P6cFu6dDUxRyZ0nyLvt04lHADFrFzInVrco=; b=CseAL2fgjDZl9yviBlcw8ZLlQMlClwMP6IrfT91A8H+XvhYLhSWs2znU+yugOytEp5 LaRcEQNMOPKEVnLoPsfqECoPe/AT5cM8cHnMCZu5uKmMg3UJQLuRGIZseNmnm3+KnV4R C+//mgqCIFPpoklXEsgc3noOi9HAHaT18Vp8UL7agGKi6r/PYpfwA7AQqLYClazQce04 /eN15RBxM4AN0ruSfd9Jh4a34U0z7gXuQVn09uSZNwJNFTeOdgemnCIlmM7NqXsgpD0O I4ZbIQW/B4Tm9lBlaMCbzcO5bMGKFEXDe9XANl5nhy9Ja36803yI9LaesX76vEgP+KyI 3WiQ== X-Gm-Message-State: AC+VfDxJAkZU+wzl5mk1K53rzi9JcCzHaoxQZDZLqLM+yCDNhoIA33WF 4sI50hk/GKKcF25fXNMqkquRkQ== X-Google-Smtp-Source: ACHHUZ6/p6cnqAO4Ph+uLwzXBTgqn1DJ0dE3rua33qSg4Te6BZHT3jANm6Rp7ghBTX5aiEPPrZetrg== X-Received: by 2002:a17:902:d4c6:b0:1ac:8ad0:1707 with SMTP id o6-20020a170902d4c600b001ac8ad01707mr38886036plg.1.1684231617283; Tue, 16 May 2023 03:06:57 -0700 (PDT) Received: from [10.200.9.178] ([139.177.225.227]) by smtp.gmail.com with ESMTPSA id g14-20020a1709029f8e00b001ac68a87255sm15094123plq.93.2023.05.16.03.06.54 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 16 May 2023 03:06:56 -0700 (PDT) Message-ID: Date: Tue, 16 May 2023 18:06:52 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.10.1 Subject: Re: [PATCH 08/10] maple_tree: Add comments and some minor cleanups to mas_wr_append() To: "Liam R. Howlett" References: <20230515131757.60035-1-zhangpeng.00@bytedance.com> <20230515131757.60035-9-zhangpeng.00@bytedance.com> <20230515172919.47rkp77cbtwy7pvn@revolver> Cc: Peng Zhang , akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org From: Peng Zhang In-Reply-To: <20230515172919.47rkp77cbtwy7pvn@revolver> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Stat-Signature: 6tkwa9ttmga39qfdersb9tjgneca6ktq X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: B02E41C000B X-Rspam-User: X-HE-Tag: 1684231618-729064 X-HE-Meta: U2FsdGVkX1+XXyHxgFFFeqgJv18SqGrSQ3WipG8MtpAk4LUHg0mV6k+oll92t/tdgTMrIOjA2jW7YtNL2sLhVnsNbuW1/ZeyBkPYkzvD0KDcMSFpxfQ4vRT/gRYBiiPydFw4q4fup/s9B/XABd7X1Vl9J5RA8Y34LZ5l6pibBEzbWkhuLHdwyX1YMEMETMgdeRAQ5v+8gSPkiDyDq8YsWChf2gY1CBgr4e1z4rAkRvSqaxRd74tfMa8Pp4WVstu7xjUWDrWiiryZbZRZS9eiK906Lz/WFM3nYAfHAFijHhZUN3+DgErBPbfAP4kjuVeu+BfP/oJgsYxCp7wEWvkVLAeU1Km626EXwTBo5uU2mHUKdsYxOBy+9AXeNjunoGBTkwb0BoRX6OH0+s0Z2BMyVGJp/+QWWR2oFbWRbTgfqESif/jSpSB0NvStjntVVkOxa9iD3ll8eQuGC2MA1gl5aUAvDe/099hXMjGgAID/DE4V0N4NXb0z1g9OC+ynZr0K+AvHvWOalN8bUuUq/N3RYLE/+66zy1zfCMiju+9VuXCTnUnVlg3uzDhdPp1Z4P3AAOLxW/y0yvYAMEsO5cvfVaT/Z8GXtWu/bg9/U+4JeE/sc3+34KTkhOlMNPXY4LBGlCM+W+hM/p2+U6jgzHZY7aWDGboVhdIXHVSvJtF+dbxMqMbljj2JTh6jRz0KeYDW0Q0FdRtHJXuwX8yLT+3GGHprm9Jk5TxfMwqJeQmCLjA9XjBhLyJNm2HTTYi2Sj/R4NclEFTdamXKjBzJQyo8AhCyzmzh4H51GmyF9+vRmQMjeHdLaqq8mnkEDEzxRYZvCq0/UCAP8BQxpTuE9eAutdZpZIDrluZv7/5Dcoyopo9ZZe4EjNjmpT3xeGizs9hUVa0Yj8Iy+QgBPHQSMmCN896sXW0N8/S2h8X+FCvrbpU4roIXkLUUNCdbufxgDX1NwKjB/EuC8TtyfRA+0Sn Sf/TjK3I pw1XcVEjlmKPCz76pCR6ZwoHZUcQi8Ig35cJPe32b7Qzz3NxZwal9luyGcX7/Dr+X2aiT49IABi441+cD9SbAY1OOqpYNdT6UBZNgBBEm2Llv5a2ZhHVGOaNrVW+/aEGCZkg45695b4iT/sgFlaACdH0eRoOerbXxzQft8RtMkj9yPkyr3tYR0GxhiSmBfew45AvKbYwRtrM5q6xUiFhibss2y/z+QPhFoGiU1M/FgCaxldw+h3J/zymNr5s9jtV2XBHcLg1v7qqxHsyZxHSa6p3VySDpw/uDeDy/KJUSKuHiMd3CyIpq8f1MU0NcAYNKdSAomOPdyXz7Pyhm16ezTU1LpB1KXGNVA0iETEiCOYZJhUlJowQSKptUNBSyXHjY78OSuobA/iPwzx4sqZKjpb1h8sfc5rvSddV9OUB+gNiNTamr72HKO/bUTRWI0noUZ/Z6qb9uLZ0ItwnDnU8W+JQT7fY+wKffhBjP0sv1l1og4q1VwP7sm6odzEZBJMtEYjQd 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/5/16 01:29, Liam R. Howlett 写道: > * Peng Zhang [230515 09:18]: >> Add comment for mas_wr_append(), move mas_update_gap() into >> mas_wr_append(), and other cleanups to make mas_wr_modify() cleaner. > > Sorry, no. > > I won't accept cases in the comments and referencing it in the code. > I'm not making any vma_adjust() or vma_merge()-like comment blocks. > > Please change Case 1/2 to "Append to start of range"/"Append to end of > range" > > This path leads to chaos. I'll remove these comments in v2. > >> >> Signed-off-by: Peng Zhang >> --- >> lib/maple_tree.c | 52 ++++++++++++++++++++++++++++++++++++------------ >> 1 file changed, 39 insertions(+), 13 deletions(-) >> >> diff --git a/lib/maple_tree.c b/lib/maple_tree.c >> index 20082ef8c396c..538e49feafbe4 100644 >> --- a/lib/maple_tree.c >> +++ b/lib/maple_tree.c >> @@ -4315,6 +4315,31 @@ static inline unsigned char mas_wr_new_end(struct ma_wr_state *wr_mas) >> return new_end; >> } >> >> +/* >> + * mas_wr_append: Attempt to append >> + * @wr_mas: the maple write state >> + * >> + * Return: True if appended, false otherwise >> + * >> + * Case 1: >> + * r_min r_max/end_piv >> + * +-------+-------+ >> + * original range: | |offset | >> + * +-------+-------+ >> + * +---+ >> + * overwrite: | | >> + * +---+ >> + * index last >> + * Case 2: >> + * r_min r_max/end_piv >> + * +-------+-------+ >> + * original range: | |offset | >> + * +-------+-------+ >> + * +---+ >> + * overwrite: | | >> + * +---+ >> + * index last >> + */ >> static inline bool mas_wr_append(struct ma_wr_state *wr_mas) >> { >> unsigned char end = wr_mas->node_end; >> @@ -4322,7 +4347,11 @@ static inline bool mas_wr_append(struct ma_wr_state *wr_mas) >> struct ma_state *mas = wr_mas->mas; >> unsigned char node_pivots = mt_pivots[wr_mas->type]; >> >> + if (!(mas->offset == wr_mas->node_end)) >> + return false; >> + >> if ((mas->index != wr_mas->r_min) && (mas->last == wr_mas->r_max)) { >> + /* Case 1 */ >> if (new_end < node_pivots) >> wr_mas->pivots[new_end] = wr_mas->pivots[end]; >> >> @@ -4330,13 +4359,10 @@ static inline bool mas_wr_append(struct ma_wr_state *wr_mas) >> ma_set_meta(wr_mas->node, maple_leaf_64, 0, new_end); >> >> rcu_assign_pointer(wr_mas->slots[new_end], wr_mas->entry); >> - mas->offset = new_end; >> wr_mas->pivots[end] = mas->index - 1; >> - >> - return true; >> - } >> - >> - if ((mas->index == wr_mas->r_min) && (mas->last < wr_mas->r_max)) { >> + mas->offset = new_end; >> + } else if ((mas->index == wr_mas->r_min) && (mas->last < wr_mas->r_max)) { >> + /* Case 2 */ >> if (new_end < node_pivots) >> wr_mas->pivots[new_end] = wr_mas->pivots[end]; >> >> @@ -4346,10 +4372,13 @@ static inline bool mas_wr_append(struct ma_wr_state *wr_mas) >> >> wr_mas->pivots[end] = mas->last; >> rcu_assign_pointer(wr_mas->slots[end], wr_mas->entry); >> - return true; >> + } else { >> + return false; >> } >> >> - return false; >> + if (!wr_mas->content || !wr_mas->entry) >> + mas_update_gap(mas); >> + return true; >> } >> >> /* >> @@ -4385,12 +4414,9 @@ static inline void mas_wr_modify(struct ma_wr_state *wr_mas) >> if (new_end >= mt_slots[wr_mas->type]) >> goto slow_path; >> >> - if (wr_mas->entry && (wr_mas->node_end < mt_slots[wr_mas->type] - 1) && >> - (mas->offset == wr_mas->node_end) && mas_wr_append(wr_mas)) { >> - if (!wr_mas->content || !wr_mas->entry) >> - mas_update_gap(mas); >> + /* Attempt to append */ >> + if (new_end == wr_mas->node_end + 1 && mas_wr_append(wr_mas)) >> return; >> - } >> >> if ((wr_mas->offset_end - mas->offset <= 1) && mas_wr_slot_store(wr_mas)) >> return; >> -- >> 2.20.1 >> >