From patchwork Thu Jun 15 13:08:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13281265 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 4482FEB64D9 for ; Thu, 15 Jun 2023 13:10:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D96296B0074; Thu, 15 Jun 2023 09:10:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D1F658E0005; Thu, 15 Jun 2023 09:10:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B99368E0003; Thu, 15 Jun 2023 09:10:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id A49DE6B0074 for ; Thu, 15 Jun 2023 09:10:36 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 6E9B2808A7 for ; Thu, 15 Jun 2023 13:10:36 +0000 (UTC) X-FDA: 80905016472.16.E75FDC9 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by imf09.hostedemail.com (Postfix) with ESMTP id 87808140002 for ; Thu, 15 Jun 2023 13:10:34 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=lacYI1rd; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf09.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.170 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=1686834634; 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=h6/zuKtdX43AYOwkx8Y/LcH+jU9PgkVm8ZKPRILAQQ4=; b=2EaHvGRC5X09ukgvIEN2RWNY0UP6bmuXhniyWyhS5jF9oH6vMGAR1I+29r13iiH+Oz9ynt JmZCgfKlb8qUpM6rJamAMyoiJmn6QB+6v7noYmPdCzpdbv94XKbxecAs6PUOI5TzRD+4tK 5NqEuWgKPbLhs0zvSqD2yH8f9NS+HNw= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=lacYI1rd; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf09.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.170 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686834634; a=rsa-sha256; cv=none; b=5ApJGzEVObs/VGboqnsJmFnWfGJysLHw6ap9ZwXcostNNfibnED9C9CfxpZR4atHUTyVl6 GcbbID6T8lBxw+HwK2yJA5SLuGKE3PTH6jdHsV7VCeqI4xLDCSIvwAf62LZVbDTkfCWcX+ tCJz2fRHMcaZ7ybPYCPB64cPxsRQUOA= Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-1b3db8f3d07so25465505ad.2 for ; Thu, 15 Jun 2023 06:10:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1686834633; x=1689426633; 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=h6/zuKtdX43AYOwkx8Y/LcH+jU9PgkVm8ZKPRILAQQ4=; b=lacYI1rdr01pCdKfMnHhOKSCgbbBcVdmvwoMpr0oZyI57wLUeehSv5VQlOckRsf5J3 QwhNEOl0DD1FfI3cPy9Z9ARfNVfzViCEPcpq03XbXk5so1vLbh7DPPRvpWO1zi4bomBO 5EbytiQEqeWF2jRC+LaPbXlHtXlCG4qOPd7q7hU8lFSMsJL5SL0LGE4TM/XGlK6GPGuJ iXGq9IAho5nY3K2O6BfuUmtjOhLdtYDQ2x1ilR7xqptKeCyr9ahA4zheIQqe3U2QGjsA xUmmiKov49NhTlzUKrGnBWPBapM+IwdvYyEfaCSov4WzDmpMBvBIQUcB1Z2ef64knjTX tz/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686834633; x=1689426633; 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=h6/zuKtdX43AYOwkx8Y/LcH+jU9PgkVm8ZKPRILAQQ4=; b=eLC+y3yiZfYeBpTHy/d6Kjl92OxPCbcpyu/+3tFM6BlIbn1MsvrB4hqdNhaqcTq8Ki UFaHT0UJrk2ZIn6p7BJqRbsxA0yAmVqHIsupu1acFHisuwJotUVtkOrdIZHYECxtxv1M pZO6F+v6kfmiulhKGcCYAnObyMhr238JRjY5FeagxINBUEmdwEv8Ly8Tv/zOuH4SQCCz c7O2zjbGGh8BBdr/c2PP46tbulYe+8lDN7qKF8KzK+nxfxNB2wJepgYTUiUCvXECdtks DLcaIrC7HZMz/F9eYMSHDNtGL8gJ/aQenXbbXXEZINLuzgp6zI531vJyw+bv9LHcoZpY o8qA== X-Gm-Message-State: AC+VfDzHhZWoPJN37CbUZToH8xCvLOVcSWKvHk3tpkAfckCYoaWxVC+F CXlBJfeMffNwSdhCoZfrCRmadrHU9GzTyu5++zY= X-Google-Smtp-Source: ACHHUZ6ClsMMuqONIhSHw0V4cLgVblslnQbletm4QH4BqdufHG1FhyUbrsEu2gxGbJhTSD33t7/k6Q== X-Received: by 2002:a17:903:32c3:b0:1b3:d8ac:8db5 with SMTP id i3-20020a17090332c300b001b3d8ac8db5mr10723526plr.40.1686834633447; Thu, 15 Jun 2023 06:10:33 -0700 (PDT) Received: from localhost.localdomain ([139.177.225.249]) by smtp.gmail.com with ESMTPSA id x1-20020a170902b40100b001a804b16e38sm14036019plr.150.2023.06.15.06.10.30 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 15 Jun 2023 06:10:32 -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 2/8] maple_tree: don't use MAPLE_ARANGE64_META_MAX to indicate no gap Date: Thu, 15 Jun 2023 21:08:53 +0800 Message-Id: <20230615130859.21858-3-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230615130859.21858-1-zhangpeng.00@bytedance.com> References: <20230615130859.21858-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 87808140002 X-Stat-Signature: 7epkjd7qwgf9of3uqofw7cstkhnmse89 X-Rspam-User: X-HE-Tag: 1686834634-56453 X-HE-Meta: U2FsdGVkX19jf8QdUZ/TD4Ii0CA8U1aNjMdzQoWx7DN0x5MwcM8r52G8j/Rl5QAAe87Zixz/vIhPlLo1pkdjB6377Ojfo5xroW64/POUSpEiLA4WKbrnEOIMYd3BLM8UJzPaQwFg7VcJtvrqHOsXwHfjHbiNb6ODIZimNu3/iCXZX+0bToGnMvy5LmaX2+kowNq3YK2I5fKb0wA5uc2EiJgNhwJesHBTVI5cBV5cwzfH9CNXXd2KGflrvOCABq8joQGyzix8tQHB+976TlVnLcIszAN3IzlLyWCJOWB9i7wzGLzdFopqcPKb/QHP42WRUIcZw8zeV0XixphNwQCzLOWiPqBiJzXTxrLmP77PnZ/rRN1g9zg1XwQBnY/joMbIw2YgAmEkd9bpn2Al9uLeNU4k7b5BarQcYHlWgZtE/HR0HhFouoj+4Jv521eexy3+FAmYIY0i5S57+2i+7wzC86LotPmHKCgLrMgTZqQ5yHGcjxEKUF+835nFyXvGIzbu1BX/bAu+F0u8GgfP2ka51F5dGGh7MHNSjZaL47CUM1+JV7TJh8+L9wB/C3Ubu3AttuxLQqHIi+8EN6Q5zOs4opM2dM0XGM4ko32YnrJ2+Nz9FqS10/kgH44JY3KAANcNUOcAa38QetIZFDsrZpfBgRtRPVVYLvGvWV0vAviGuslNdyhZKxiVMKSficwPV9jC28/rlxGNFexuNgj0lrvtUGnWeebCW306h3wdceKAFj7+cZpO4xiB8s8mWj5U98imby0oDPZEkxyx1t+PDT+4+HfsvKXalwJPmFQzHpTQbjCzgwmK8/EC36Xr2418eMz/qJ9ceAGNoWHSb3/K7aL0ZrfWIstNYCZ5lsQ25G2kTCmSc/xTSjb4/4ONfkg+8o0r9z3+/ZgKmFBG/S/XnaInuIzQ2jnm5RYKGmejKPoHgHCzQnkhiuREqxIbYiuS0o3GQ/6pXsB80kD8kRJAuNc pFCAudMu OzE830p1CemXIZpJ4Yo02HuKp8c4EUdUAth3am7cFez5/G+93wxnllqW3XratVmPZmjpCmVcYuf5zhgg0wECFOnkmhVRtP/JHp76fHVCV3PCgUs8rWD/Pf0HfJ38hll86jQyvCwytzIMUvRWVoqxnK9EmOyIllbNSrOH2FGXbAOEb/HNr5SEh3G1rCYL5cXLBxBHIQqoGv6OY1r+b5c5JINajsErJbhGkhHvcvLyp5miRhZSvjNR0+y22OpF7QGLTGNRQCYqKWPvrf77KBVCStMZI8OQBuJ8XfGJhExxWMwmsbQ8DI056p60guKROBcyb/+2mv5nyuSBZoWEISsbDEKvanIPIHebcpEkmMpjdh3tIm4pUIPdspqbZ86VIdWY9YD4ml1aUzk+zRszRYRLrKtB1JYOe7HgdHZbTgPvISDkM6vLAKwdv6vLvM+zk95Cj5p+LRUvAooltTFg= 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: Do not use a special offset to indicate that there is no gap. When there is no gap, offset can point to any valid slots because its gap is 0. Signed-off-by: Peng Zhang --- include/linux/maple_tree.h | 2 -- lib/maple_tree.c | 13 ++----------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/include/linux/maple_tree.h b/include/linux/maple_tree.h index e18ecbefc7f7..4e004d86c780 100644 --- a/include/linux/maple_tree.h +++ b/include/linux/maple_tree.h @@ -29,14 +29,12 @@ #define MAPLE_NODE_SLOTS 31 /* 256 bytes including ->parent */ #define MAPLE_RANGE64_SLOTS 16 /* 256 bytes */ #define MAPLE_ARANGE64_SLOTS 10 /* 240 bytes */ -#define MAPLE_ARANGE64_META_MAX 15 /* Out of range for metadata */ #define MAPLE_ALLOC_SLOTS (MAPLE_NODE_SLOTS - 1) #else /* 32bit sizes */ #define MAPLE_NODE_SLOTS 63 /* 256 bytes including ->parent */ #define MAPLE_RANGE64_SLOTS 32 /* 256 bytes */ #define MAPLE_ARANGE64_SLOTS 21 /* 240 bytes */ -#define MAPLE_ARANGE64_META_MAX 31 /* Out of range for metadata */ #define MAPLE_ALLOC_SLOTS (MAPLE_NODE_SLOTS - 2) #endif /* defined(CONFIG_64BIT) || defined(BUILD_VDSO32_64) */ diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 23202edb9f1e..8aba9e419e08 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -1610,8 +1610,6 @@ ma_max_gap(struct maple_node *node, unsigned long *gaps, enum maple_type mt, * mas_max_gap() - find the largest gap in a non-leaf node and set the slot. * @mas: The maple state. * - * If the metadata gap is set to MAPLE_ARANGE64_META_MAX, there is no gap. - * * Return: The gap value. */ static inline unsigned long mas_max_gap(struct ma_state *mas) @@ -1628,9 +1626,6 @@ static inline unsigned long mas_max_gap(struct ma_state *mas) node = mas_mn(mas); MAS_BUG_ON(mas, mt != maple_arange_64); offset = ma_meta_gap(node, mt); - if (offset == MAPLE_ARANGE64_META_MAX) - return 0; - gaps = ma_gaps(node, mt); return gaps[offset]; } @@ -1662,10 +1657,7 @@ static inline void mas_parent_gap(struct ma_state *mas, unsigned char offset, ascend: MAS_BUG_ON(mas, pmt != maple_arange_64); meta_offset = ma_meta_gap(pnode, pmt); - if (meta_offset == MAPLE_ARANGE64_META_MAX) - meta_gap = 0; - else - meta_gap = pgaps[meta_offset]; + meta_gap = pgaps[meta_offset]; pgaps[offset] = new; @@ -1678,7 +1670,6 @@ static inline void mas_parent_gap(struct ma_state *mas, unsigned char offset, ma_set_meta_gap(pnode, pmt, offset); } else if (new < meta_gap) { - meta_offset = 15; new = ma_max_gap(pnode, pgaps, pmt, &meta_offset); ma_set_meta_gap(pnode, pmt, meta_offset); } @@ -2076,7 +2067,7 @@ static inline void mab_mas_cp(struct maple_big_node *b_node, end = j - 1; if (likely(!ma_is_leaf(mt) && mt_is_alloc(mas->tree))) { unsigned long max_gap = 0; - unsigned char offset = 15; + unsigned char offset = 0; gaps = ma_gaps(node, mt); do {