From patchwork Mon May 15 13:17:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13241444 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 6BDE8C77B7D for ; Mon, 15 May 2023 13:18:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F0895280009; Mon, 15 May 2023 09:18:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EBBBE280001; Mon, 15 May 2023 09:18:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D80F5280009; Mon, 15 May 2023 09:18:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id C4221280001 for ; Mon, 15 May 2023 09:18:53 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 6E6321412BF for ; Mon, 15 May 2023 13:18:53 +0000 (UTC) X-FDA: 80792544546.06.9D24014 Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by imf27.hostedemail.com (Postfix) with ESMTP id 6CA1C40010 for ; Mon, 15 May 2023 13:18:51 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=g3X23mAk; spf=pass (imf27.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.215.170 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=1684156731; 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=9RjXFpMPucyoGVPKV00U7wCkXQqL8U9B4PmEKn2WMSk=; b=L8X9YNK2oefC8NCEFERUge2bVD3khIjmivQond3nUBzxdaX+xLUDN4HQ7vrTjtZz9ZjsbF QPFa/6xhwMDpwb8r8H7GflpudKWEF5UNB2tVMXOjxdEHkcDATOYBFxBFR7kElbvTnLwXJW fIVVEW27euytBxnZ0QdGtmOCZQpWt/0= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684156731; a=rsa-sha256; cv=none; b=mjhefbHeC2SD9CzLgXHxKi4BVV8IJhWoYOU3UQEAfFOPMltRQj1GNNyD8zFqHqG2iIlYYf 9RzpfRh23PrfFww4TfFnUGQ0IJNtH1q3QVeG8apqM6pOkPp8l02kiZ7/qeP889dLx38hlb pBTitya3pGwwg5znMFNYVXr/XBRqJEo= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=g3X23mAk; spf=pass (imf27.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.215.170 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com Received: by mail-pg1-f170.google.com with SMTP id 41be03b00d2f7-52cbd7e73d2so9502045a12.3 for ; Mon, 15 May 2023 06:18:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1684156730; x=1686748730; 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=9RjXFpMPucyoGVPKV00U7wCkXQqL8U9B4PmEKn2WMSk=; b=g3X23mAk6kwEgqva0ZnSNN22eZiDL8T82so2num2UEwvQuEHuuabGkvETt7Q66yOlo 7sCxUGlSRdfbawSg3H0s/f5vwrXh9sR2wEApaj6MSgjyAGwixK4D0O2KZEF4rn3SMhPa 7odAfMZB0Nola4ha7jDUcXu/FzIHyu115GV8+4COEOE7VZVh9PVShj6IGKWcE/s5HgMV KcnfgrjKV4nHeILCPRy5qr06r+9wwiHpSwWOiSSOdk9njUM6w2RMr9csBkiWBy2Zh6OQ WZBKoSB8Mo2MD6Aozp/k5sI8+7i4+WxTVhsda+0VLxHL046q2kNIfpbtrRezaW6YALmf VZsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684156730; x=1686748730; 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=9RjXFpMPucyoGVPKV00U7wCkXQqL8U9B4PmEKn2WMSk=; b=c47EuqGBKirgE6XClT9IjPip0C++KyUMP+mRpy/9OpmfOOGWsMvR9RqfgR1vTDI2xU en88ai7OgstX+9UuPNNtyCrhBha103wps1oqYsd6j7SOxpLWx7MSo6MYgY4CxjWXTY/e rZrusPIffEPZdWtxs0du3oLLakbrkDLx560MF8KI1xmxK4iKNQL2shw0oVjIO6kpexiy S72DLJgSMccAcTFILI/GhMUu5NCjiKeU5HKX9D8F+HMlxfKFi5crRKBOqb6JSsP0IoUb AqpthBgbO/E0vSAd7qBeQRM3m6mFR2G58J3w5rLMPD3M6+XbaLhArHnySBhPvc6CosLO ukew== X-Gm-Message-State: AC+VfDy5rlklXfdzv5upfrgNlgBriKkER3CP5ZWqOpmdoJbfGUrYmYzZ ELuRfS9O7ObEjEMjr20+5uCuEEjC/70s9ZN+aJw= X-Google-Smtp-Source: ACHHUZ5n5S0O2+y/OHwn/QDCzc28Z/yx4dDmMDqn2V1pFtwTJV3ORG2KtE90A+CWdcAodTDHpHLsbA== X-Received: by 2002:a17:90a:cb93:b0:250:939f:70a0 with SMTP id a19-20020a17090acb9300b00250939f70a0mr24132189pju.14.1684156730303; Mon, 15 May 2023 06:18:50 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([139.177.225.239]) by smtp.gmail.com with ESMTPSA id gl20-20020a17090b121400b0024749e7321bsm14190014pjb.6.2023.05.15.06.18.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 15 May 2023 06:18:50 -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 09/10] maple_tree: Rework mas_wr_slot_store() to be cleaner and more efficient. Date: Mon, 15 May 2023 21:17:56 +0800 Message-Id: <20230515131757.60035-10-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230515131757.60035-1-zhangpeng.00@bytedance.com> References: <20230515131757.60035-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 X-Stat-Signature: ww793x7hf1qbzoabo9mq3ui4csqw1rjb X-Rspamd-Server: rspam03 X-Rspam-User: X-Rspamd-Queue-Id: 6CA1C40010 X-HE-Tag: 1684156731-102949 X-HE-Meta: U2FsdGVkX19rgo/Tqxmp13VTyXdXnscxMAq2vigOoJ7Qf6AwMIVX+aorSWSRT4DLz+Cy7LNB7C4br/UvGLsS9Qlrc4adqvyeRd+29E5bu+V+YPmPpo3SBeaB9Qs5UwhgNjwfbjLZ7dVcl4jXHRc9AcIAB2/xU4dy6UZm0TuCIxrmGiBiBj0DReJ9yPAfQE++U5Vyg2LDsEsB3ls+ZOTvFgGTMISyFrmi0Ak34hSMdJIYJCPE+6ZBLrxHRdGRYjUS0OFNPAzoE9E2MVB32p7KmC6DzWwyKnlDepvgYvwAUiroAurWwjZ3tiHzYkdy7FkLuvvuqz3KP6eonFK4xFEvmnS1erGmQY4aeWhObY9hEjWiXDrIY8nXVOC/1xJaAechVLyz3V0g2C/giDgzxsCrHWpx2Lot5hXNazHnfOF5rWCj8BlHsC0+Rak4vVjh8pPLYUW0Ut0nK/cNf/bYhhxRKMmaW5yw34RNcFOBtquzjHNeAG/pXPf9d0+Ez1IT+cRIteWBkKSUkDFCxGa+ET8Jc/OqWGgFhXu9qmGmSzeTCbG85lH4kzxEvs9rclxmSe2vevSOPm9NJzyIxfoUp/H/IPLodoijrzp5tSWlPDhpr0sKIpncuz/ZbVMTzw/TOyuHV2SqXpTElCwPip+wjvUU6oE6vKRKA13C4a1lqwR/BJF7Cu+uXn2x4LZTn2JtsDoZEjhfnBsO1sYz8+ApWycxc0T9PHQkyzq/qxDo8Ib8S4dNyKPupKjj7WO1E3ggDqp3D8FZ78KfMODh0ig+EV6zRcHluXJoYACfEvY7T1mCP/oZXlF6OfnOBMNASk2DFT/fzBIMzDqi5/6yMk6GJzuiorJ5ZxK/MVH2pklTjw8x4gWYJvTLyPHHAKPI8/chbA/3LC86b5VvrHSJ/w2D+o+Zp7VBU/KUxrzLiCY3yIWdmzOAqMDl/R9bPK+YO2ObmoAaFuMi3jiXe2i5yY9g904 y4O7ssRj fSvRo+33/GNe4+TFjm1EthYm61bEVn9SnwwwES4PF9ufu7Nnl5PKCMbMciHV4FPAuPzTZ5ArVwLrqe/Q9IyF74+17FfMCDgvZT/CcqnXSif7H1bYmOBw+sPG39/x62gEQ5OGz6xu91reNDnWuPRPV1G+SMkFYU5Iq0ekFcS/ZMgbBeTi/goTu8pqVQK7BRIPUsqiPvKGJu8/5XLwXnMcIWAuyjLx2DgR/VihzdMotfht6KesXridTS5XlRJWlKmgJKMcdU9wUwfum4dejN8P9aME94BZWZN9xVAGWotRE3F20Kupy7KMgMkRj1gogLEJyJ0hYyA9NIgr2v69pBXGKJe+2Ov6tPTEuuApmw0mJ4vp+Oz3VfSCo8TDuyNUvx1kT4EXPeMNBNer5rLJpnY1+2L48w7TnHu6cflEE96CfG4r6ShqQPJz29ja0pSerA+RuVNNugfXr2Qj7bBc9GATU390RFFe8hddYOFoYNgJSEVTM7y+x/vgwprC8sg== 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 | 79 +++++++++++++++++++++++++++--------------------- 1 file changed, 44 insertions(+), 35 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 538e49feafbe4..d558e7bcb6da8 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4190,53 +4190,62 @@ static inline bool mas_wr_node_store(struct ma_wr_state *wr_mas) * @wr_mas: the maple write state * * Return: True if stored, false otherwise + * + * Case 1: + * r_min r_max lmax + * +-------+-------+-------+ + * original range: | |offset | end | + * +-----------------------+ + * +-----------+ + * overwrite: | | + * +-----------+ + * index last + * + * Case 2: + * r_min r_max lmax + * +-------+-------+-------+ + * original range: | |offest | end | + * +-------+---------------+ + * +-----------+ + * overwrite: | | + * +-----------+ + * index last */ 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))) - 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) + if (offset_end - offset != 1) 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) { + /* Case 1 */ + 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) { + /* Case 2 */ + 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; } @@ -4418,7 +4427,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;