From patchwork Wed May 24 03:12:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13253241 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 D9E08C77B7E for ; Wed, 24 May 2023 03:13:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 63DA628000B; Tue, 23 May 2023 23:13:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 59F65280001; Tue, 23 May 2023 23:13:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 41B5428000B; Tue, 23 May 2023 23:13:39 -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 302D1280001 for ; Tue, 23 May 2023 23:13:39 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id E35231407E8 for ; Wed, 24 May 2023 03:13:38 +0000 (UTC) X-FDA: 80823678516.25.1ADA4AE Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by imf19.hostedemail.com (Postfix) with ESMTP id 18A041A0010 for ; Wed, 24 May 2023 03:13:36 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=cKaK0PzJ; spf=pass (imf19.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.182 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=1684898017; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=4r/B+P0ZNt0u/JsXVxRA88PA4LS1ywC9VJ4XyQ5w3aw=; b=xngtenIMX3+CUnB8SZpy0vQmRGRFJPe9SSdBO+YGvup+c5uA5j+l6Sqt2FmHaYIImlSfl9 VNatqHe+XoXrgr89rJpzpjy91wYr3+ohxxRqjSVXqdUQ0GvL2aP/kNh1F72CPbFXHtWQ2W WGtlCqVE19ORs/uvJskAqCpaoqe4OvE= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684898017; a=rsa-sha256; cv=none; b=JuZCADsMiYF8Yxoc6NgbiEJ1Ur9I7NpmRkDXt9yK2NVOvbiV/++zY/ll89hkLRHIN9fmJF kGD5bvA8zuDeva+9fBF6bwODtZy34778KkA1BifSU/13b4MksmQtV5tseggUUmGdAvWnZ1 SSZL4svqwkMGv8GjL+RTfw+o0PdZZuI= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=cKaK0PzJ; spf=pass (imf19.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.182 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1ae4c5e12edso3554465ad.3 for ; Tue, 23 May 2023 20:13:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1684898016; x=1687490016; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4r/B+P0ZNt0u/JsXVxRA88PA4LS1ywC9VJ4XyQ5w3aw=; b=cKaK0PzJJClj7BIIZ9xYrlQhdCx17KGgfoycYEDKN5jEXKpKR6cV6dy46l6VOK1ADK 0IuruPcnO8kruo2u+evuuL/X7ccEK37inNOY2P47BF9uZHhHo1eaAzgmg1V76hoDz2KS XRjqHbwSw/X+izm8dPf9zqZ8jowCvO4nb8SOF+P4tA9/3ku1Of+FpDUMl9Jx82LhyDTK 3TN0i1owLb8gw+gFqvSG/v0sNXQ5AsWP0Rd0gq4N/fWnWYNm3exaJ5f7FZsHTiQQ6CAf eJFaw3mxGwFtw/AK2XXpKo1btbWmrcjCSuREvHhg+QNkXqinuEBJecKgXCvEs3l5RkdC +5nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684898016; x=1687490016; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4r/B+P0ZNt0u/JsXVxRA88PA4LS1ywC9VJ4XyQ5w3aw=; b=hTUCzzwWlpCSRLcc6yRlGs3qjA4zVWSjP4DGECTNTdOuNx2OPtigan14gZrwPlP8Fr DwYSEL02uSLbDowVeXFNPq15zZjEh6/8tbTeYBGQrD1x7DGgi3zI+Foh0cKVDIFf6UrK Cej9j3Wx/ayCTyPiIzgbT9iOY6f2YoN7N5JrYUIdJOsNnl8MyqhkmeCDX8SttURZE3NK mmLOGNnrcOFd84+b5HPUJIPRDF0rhwd3si2KZ7uNcquicWPjWL9rMxyEP9PfGjqRGD5k sg0J9VMUBzUUAbFJHu7FGTDSyp9COSjc8EJIDAjCWN/rH24PL+zlC74Y1FdKYdqKTgFz z2TA== X-Gm-Message-State: AC+VfDyaeuCRCxpMpwwBaO90GlqpyVFat9j6lTyMOxWTUXUxfc7mlR6N lcxxw1ZfoLzRqkR571Ct4La9zg== X-Google-Smtp-Source: ACHHUZ5GbrNE/nQ058ApxvQBF7XTwlVqs4vuWERFZGTqmJi/FDyeGR4CvtfKaCmE4h3xFL8vgvU9jw== X-Received: by 2002:a17:902:f547:b0:1ac:9890:1c49 with SMTP id h7-20020a170902f54700b001ac98901c49mr22348049plf.15.1684898016058; Tue, 23 May 2023 20:13:36 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([139.177.225.249]) by smtp.gmail.com with ESMTPSA id i4-20020a17090332c400b001ab061e352bsm7480769plr.195.2023.05.23.20.13.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 23 May 2023 20:13:35 -0700 (PDT) From: Peng Zhang To: Liam.Howlett@oracle.com Cc: akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org, Peng Zhang Subject: [PATCH v4 08/10] maple_tree: Rework mas_wr_slot_store() to be cleaner and more efficient. Date: Wed, 24 May 2023 11:12:45 +0800 Message-Id: <20230524031247.65949-9-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230524031247.65949-1-zhangpeng.00@bytedance.com> References: <20230524031247.65949-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 X-Stat-Signature: yn37e1wau9k1pph8xyu1e1qynu9ix8t4 X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 18A041A0010 X-Rspam-User: X-HE-Tag: 1684898016-481860 X-HE-Meta: U2FsdGVkX1/NFvjAy5vBRMS5JTiy/0V3mUoH/uS9fsEHzXsnGGLJOGQtT7xp8UMEnVcEBoqUU/jOn0NhUep8GlmwTdHywlwF4zYVzYXcKv9OEDDYbqJle0sDRnUDQwvFYIxtLnFSB5hEUD9oJcVzVZwfZwcz43KDjXJ/NDrAJ/AFRNmn5wpFAa0dkky0CgcWmFjn9msu/t2/jC7S6a2E+PskyFI1F03eH4az5DlyMYRhchvMESegz7zDk5DKhD15DIkQ/sHr3CZuIXT2e12bi8IILpnF8/7Z734r/hGI1zr6yDsdkdq7FcxARj3QG7TkUgiUIIj0QS+ZjbOAYMWuytxk85Lzc26ML/Ua56QVxZ7z3tzel5+JXKxOqTYNE910522yUg1euf2QEIsr0NCPx3ZXB6Nkp2CB40EtmZl1a0xAYznvXUCk8nZ8qSOW15gi7V/806kaTvoB11kd8GgldqTahLyjPGVpLgCErrsTzuh4Qfxb+sob70l6nhAepjFMGRj/LBR8HXWFBe1BK+MVcs9AOBIoCm0DxgxkDkYRu1RrmCbvhnByLsUnwnoK0BMQKXhYcAVLNKmoKORgQmYxvh4T8pm1uSuVYwtMkcFgnB1ktqWYJAnJWxnHt0ey4eUQf4Z0RQm9VjJSyB+5B/XFEoDZqufGlL/2wCDKOQzVHgyQzbkfd8bhZ/ExS15Gb75d88JN/V2rn2ex3IoSjVbDCDCvWS07xouCPUGgcztub9uSELMATs5mXUFBotG53qskItiyTnnuy4sOlhjV7gjmF6vj19P4AknQUlmRcRbf55l6ALbv/UxLEEwNoC6xTMnj6XiAYfk1Ip9tkKXnKbiabcI2okmi0Ba54FrhEYos/P7pqa5Jkatvn+KRycy9cE3qSXazvgRxwIJzwprbmKnIIYtVrG0OlUKn7Tx4NEk1ztlUyPMr4rphvcYFlmaV+XHsR2z8GWaY58/YpTP7OXw w0OyJd1T Vxb55KrzN1GdIEV5ptZs2+rdk5gLS9iopybkRFE3tPvWrfJ4T3ccAc1fJWEhXdhgicuKZ8eZPzY8IPMXXus9Md+ZpDWkdU0ZNkq29qEFIsC9e5TBmZUrjZU5ObKS4jlejedRcFW8iZGEI2CKb0omuDUgB+UWof1hbcy3vPpAmLJpCd7N0RXX8M67tec5KFlX7CI2mFLrGgfQGAh+EDBrOV+zBQZSZKQSk6JXkug5MtkCjayX2z9vl1zV/6VPPnrcsGrjplhnyUFiWGiIxjwBBIievEgRUgmrMCa1PJbILpSLycVjTE2G3FlF2INBoZiHtvJRKS/u541eBg0/6Fd6TvMUJuYT1jBoBl895wrz4emBWtVncP4PB0rgifEojhesG+Kioi+98LHPALYMYfityCBi2CMvw54NavkjgR0eKBau6efrVDbzk3CbA0Y07w84MwydTL9VGtwXCSyqsDEg+qj5oVLHiFQvFoNzgq3QcXEvyLEs= 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: Get whether the two gaps to be overwritten are empty to avoid calling mas_update_gap() all the time. Also clean up the code and add comments. Signed-off-by: Peng Zhang Reviewed-by: Liam R. Howlett --- lib/maple_tree.c | 53 +++++++++++++++++------------------------------- 1 file changed, 19 insertions(+), 34 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 676976a005e5..1a2b9bb9c014 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4202,49 +4202,34 @@ static inline bool mas_wr_node_store(struct ma_wr_state *wr_mas) static inline bool mas_wr_slot_store(struct ma_wr_state *wr_mas) { struct ma_state *mas = wr_mas->mas; - unsigned long lmax; /* Logical max. */ unsigned char offset = mas->offset; + bool gap = false; - if ((wr_mas->r_max > mas->last) && ((wr_mas->r_min != mas->index) || - (offset != wr_mas->node_end))) + if (wr_mas->offset_end - offset != 1) return false; - if (offset == wr_mas->node_end - 1) - lmax = mas->max; - else - lmax = wr_mas->pivots[offset + 1]; - - /* going to overwrite too many slots. */ - if (lmax < mas->last) - return false; - - if (wr_mas->r_min == mas->index) { - /* overwriting two or more ranges with one. */ - if (lmax == mas->last) - return false; + gap |= !mt_slot_locked(mas->tree, wr_mas->slots, offset); + gap |= !mt_slot_locked(mas->tree, wr_mas->slots, offset + 1); - /* Overwriting all of offset and a portion of offset + 1. */ + if (mas->index == wr_mas->r_min) { + /* Overwriting the range and over a part of the next range. */ rcu_assign_pointer(wr_mas->slots[offset], wr_mas->entry); wr_mas->pivots[offset] = mas->last; - goto done; + } else { + /* Overwriting a part of the range and over the next range */ + rcu_assign_pointer(wr_mas->slots[offset + 1], wr_mas->entry); + wr_mas->pivots[offset] = mas->index - 1; + mas->offset++; /* Keep mas accurate. */ } - /* Doesn't end on the next range end. */ - if (lmax != mas->last) - return false; - - /* Overwriting a portion of offset and all of offset + 1 */ - if ((offset + 1 < mt_pivots[wr_mas->type]) && - (wr_mas->entry || wr_mas->pivots[offset + 1])) - wr_mas->pivots[offset + 1] = mas->last; - - rcu_assign_pointer(wr_mas->slots[offset + 1], wr_mas->entry); - wr_mas->pivots[offset] = mas->index - 1; - mas->offset++; /* Keep mas accurate. */ - -done: trace_ma_write(__func__, mas, 0, wr_mas->entry); - mas_update_gap(mas); + /* + * Only update gap when the new entry is empty or there is an empty + * entry in the original two ranges. + */ + if (!wr_mas->entry || gap) + mas_update_gap(mas); + return true; } @@ -4391,7 +4376,7 @@ static inline void mas_wr_modify(struct ma_wr_state *wr_mas) 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)) + if (new_end == wr_mas->node_end && mas_wr_slot_store(wr_mas)) return; else if (mas_wr_node_store(wr_mas)) return;