From patchwork Wed May 17 08:58:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13244471 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 8CC42C77B7F for ; Wed, 17 May 2023 08:59:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2CF7A280003; Wed, 17 May 2023 04:59:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 27ED0280001; Wed, 17 May 2023 04:59:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 146AA280003; Wed, 17 May 2023 04:59:12 -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 08492280001 for ; Wed, 17 May 2023 04:59:12 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id B70B9A04FD for ; Wed, 17 May 2023 08:59:11 +0000 (UTC) X-FDA: 80799147702.21.6D86DE1 Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by imf07.hostedemail.com (Postfix) with ESMTP id DD13B40006 for ; Wed, 17 May 2023 08:59:09 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=e3RVLiwn; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf07.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.215.176 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684313949; 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=c2NEt2xRNbAeMZlKbxLJ6YsB/xGL2Lb8EXzhG/zDA3k=; b=JiDFE163hAIspjmT6n5XuGU/wZoffPuURXrgeJAe5DpKJSaV5L6pUpXnYv4xV18AVULZw+ /wjQwNXk+gwj++7F6FCSkmx/jmvjM4Uj05HlIAmbgvs2LYlhehRSuCjrMoOAmGkJOlAqi6 bcd2Fr8VLQSLwyefvO2KsbpxZco1gCA= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=e3RVLiwn; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf07.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.215.176 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684313949; a=rsa-sha256; cv=none; b=sVW1MqWLZUHV195Byu9mMtqmRsZQONdqQzOWtWWhUjrTZam0QGG1ebhPZ+dAeL2O4+JGgS OAQ+AqisPppNVQwJKmSiAvNZNGUBaG1IJP2EBKNWOGt4WOZUj42Ja99iZIy7lNM3nxK5Kr 6zxLrwyxBwZDlxXcd0ApK1KRK/ax9BA= Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-52c6f81193cso306557a12.1 for ; Wed, 17 May 2023 01:59:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1684313949; x=1686905949; 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=c2NEt2xRNbAeMZlKbxLJ6YsB/xGL2Lb8EXzhG/zDA3k=; b=e3RVLiwnNDJjglhqaPR32b6FAYRWgjhUEJc1A7SpY9YkqYyI5oHyho43Tedkc5zwus aHgi1ZYqf7Cq4ND0XTOXDujMqiX5bzPJy2RZGibIBcrC/k5/aMp84AxWTf/aP2NCWhIR DyblUWcmvnVlSZKV9373659tbRllyKFikIOF1Wfpt8NGfxpcQs03vxNQpA/54vh1ICpj 3Zad9u1jj7xtrGQSXDJwfJJMXsx5fPPJuqUZwLmDSF7zeZdf4rOhSEhSkNvecFV/UIdg t7/KJsstAhtGxvKIJXclrTbcZed6B0ndQUqrgy0QJJ0XpDY0DFK9iHTZbSnQnWRdjhrP E4Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684313949; x=1686905949; 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=c2NEt2xRNbAeMZlKbxLJ6YsB/xGL2Lb8EXzhG/zDA3k=; b=KUZPjB0K2DrQcusZhGYH/7fx6etp4hkBbOVi0/2QKz1+5oZzZfFNyCM4UR5iR3HNnf jG90QyGWmxJNTNKDk76rwAAPWl0P5UdGC7EgkIoTh399OHKFekFPgbi53Y0nGjiHJnIg ryjuACXT2N+xjUuhyIEB4FwotZblub/+b1euG4C50nkG5O751bDxqDQUv3YBmtLegy9Y 6L7KJweCqEFG4Fc1g4MVsFkLzfvMoKMvAn/vnmxvGEU/eUBhiGnH3igz+CxHxzAvwiSW eQr0HLapwMDvKX7ngZbCkcfuU49Uc0yxYqKyTCVH4Y2QJ7bbjP89MCISG+H9NiDHa6rD OSng== X-Gm-Message-State: AC+VfDwMb0cu7eCsQw6N8jid3swReas4igoBA8M8LiY10oVYQU+XW1Yh 9WJ3nu2NT7BtfjPHifgfPJE7NeMuDFmS6M9K8eo= X-Google-Smtp-Source: ACHHUZ5b7PIeql3DsYG38mUQCLvjrV3k1K4DbQmsm4PKRgFsDr9YaB+sYp0r5E81HI1DCdL6LBOLFg== X-Received: by 2002:a05:6a21:150f:b0:ef:7aa2:3cfd with SMTP id nq15-20020a056a21150f00b000ef7aa23cfdmr35267926pzb.50.1684313948739; Wed, 17 May 2023 01:59:08 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([139.177.225.255]) by smtp.gmail.com with ESMTPSA id m18-20020a63ed52000000b0052c9d1533b6sm15056765pgk.56.2023.05.17.01.59.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 17 May 2023 01:59:08 -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 v2 08/10] maple_tree: Rework mas_wr_slot_store() to be cleaner and more efficient. Date: Wed, 17 May 2023 16:58:07 +0800 Message-Id: <20230517085809.86522-9-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230517085809.86522-1-zhangpeng.00@bytedance.com> References: <20230517085809.86522-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 X-Stat-Signature: wr4cpahbqh5r9pfptyoqcnywxpkos76p X-Rspam-User: X-Rspamd-Queue-Id: DD13B40006 X-Rspamd-Server: rspam07 X-HE-Tag: 1684313949-146961 X-HE-Meta: U2FsdGVkX185SS7AkNOqnaiEVvymZye4162ElyfGrBA1I2F2lDh/FPQVC8itB1yUshByzWPEw2NPg8uxdBZRMyNhwMpuiuhq6tmfWAR9HhHRT0XKI4fRSm/t+vSkKG8m8fA9DbnTBTDIOqz2ZUB5An1KD9CdX+Rsz0Sw+AvejnDAEt6ABTCQzsWt3OmRIrIkEAu0zyKsK+xk+4VR1+Yo4kThvWcOZ2McqqtzjXrJj+LM8TVYgOKwzgBGbLDwoqJvP6eUmcbI81OI1vjkKJY09ZpFwIMEQdaOB2qN9JSlkghwAPaMkUCqZIlofxxl6EPlEq3Yvg2ku53FWXjVMpbqgvSPrO+FFYyDz4n92wQ/erUIwGzktlk671Ly6nXf1hkzrWnEcDW70pXBnn5Cd27efRKSh8fnVb8Cl8Mxm+MlZKmAaDhmAcOrbDBR/sjKQ0TqlSXyewgeY0LtDrI23jAR5NHHhRRR6hkDnJRgVqgjtw9IWVHXmuTbG1Vps/TlLoAb70h3zOym3VNeufT97R8cxPouiLfVtAmaNrJAJnAwst8+9mMz3KNF78gbWd4SDMYcDElvbZQbMXriZ177oMrFF6uJyI6JZUVXTlpEUEUCx0FimjEh22tD8sy5J6jaKQIreLYO+/BpU/MPCEOBy5Sz+Yhn2t1ZYxmYOJC3qDRynmSsarSw9dGtP+y5qna74gApL1NKoOaxW4oKoxkwkfqbEjwE7XBn0InrdBYxwMgusL9eOaSqsvl3APu5ih8NBoWMAEvlakMVC/lkFR+gHdPf+vb7Ggs4/jrHABnk+sEZkJZ7d07lFqjjRFebBeLYPY3M7KhUYkg9tPUSC4vEwb1fMLvBoArbdF6bs58OV1eGMyCxUGUdq4jncgeJ4g58JObnoIW6jaUly5jt0I9B8roHQ2HAee4q458nI+lMGJFl+bLXxFMAm1eRxjv+Hz2aypybpMLyClUfOBBoMDMO2Xg uuNNusgQ zfP9SAd9/aZCppXs5fy16P67WSelrMoeH/t4v2LkG2YzkjiyCppKUpUzddiS+19o6FcDkoXnZwKwSn3+wx4g7Su3jSwnvtJxF8+hCkTO58k1Km5dF0SWxz1LBRD8vg3YhtZpInTbYdcGpovmNtTiHsiEyG5DmQu08tBMBVumwtshT2vLTVsWP0vMafry41KTRBXKLc9GGBRwsAr36KA33Ge/IIr4NDLSrG7lHV0INpUtD8Aeud1Cz1VcchJPHRySd4/prKADtWBUyGcZ/627aG/xAtrvifl7eJwC6pmC85MkvHW+g9j1mYolXjyD2nmuhRDgK7i1yaD0iRisX9Y41N098NPwbRZcpBTknmO1MUlW2bfTAA6XvI959IWA85nLMzUsh232bhBc2gKm5btUIFX7GLfToDszLuJxceHOC3r3Cic+LwI/cBNqXzDLKlG5ypgFwrCJ9YlmJYPaKKst0gG4t4wfVseeb7LtUzN5VWc6huqv1gJaQwg6Rpw== 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: The code of mas_wr_slot_store() is messy, make it clearer and concise, and add comments. In addition, get whether the two gaps are empty to avoid calling mas_update_gap() all the time. Signed-off-by: Peng Zhang --- lib/maple_tree.c | 59 ++++++++++++++++++++---------------------------- 1 file changed, 24 insertions(+), 35 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index bbe4c6f2858c..25a8b7d5d598 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4200,49 +4200,38 @@ 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; + unsigned char offset_end = wr_mas->offset_end; + unsigned long lmax = wr_mas->end_piv; /* Logical max. */ + bool gap = false; - if ((wr_mas->r_max > mas->last) && ((wr_mas->r_min != mas->index) || - (offset != wr_mas->node_end))) + if (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; - - /* Overwriting all of offset and a portion of offset + 1. */ + if (mas->index == wr_mas->r_min && mas->last < lmax) { + /* Overwriting the range and over a part of the next range. */ + gap |= !mt_slot_locked(mas->tree, wr_mas->slots, offset); + gap |= !mt_slot_locked(mas->tree, wr_mas->slots, offset + 1); rcu_assign_pointer(wr_mas->slots[offset], wr_mas->entry); wr_mas->pivots[offset] = mas->last; - goto done; - } - - /* Doesn't end on the next range end. */ - if (lmax != mas->last) + } else if (mas->index > wr_mas->r_min && mas->last == lmax) { + /* Overwriting a part of the range and over the next range */ + gap |= !mt_slot_locked(mas->tree, wr_mas->slots, offset); + gap |= !mt_slot_locked(mas->tree, wr_mas->slots, offset + 1); + rcu_assign_pointer(wr_mas->slots[offset + 1], wr_mas->entry); + wr_mas->pivots[offset] = mas->index - 1; + mas->offset++; /* Keep mas accurate. */ + } else { 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; } @@ -4396,7 +4385,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;