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 B9A68EB64DC for ; Tue, 11 Jul 2023 03:55:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2E4018E0003; Mon, 10 Jul 2023 23:55:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 294468E0002; Mon, 10 Jul 2023 23:55:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 15BA18E0003; Mon, 10 Jul 2023 23:55:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 09D978E0002 for ; Mon, 10 Jul 2023 23:55:08 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id D20BAA02F2 for ; Tue, 11 Jul 2023 03:55:07 +0000 (UTC) X-FDA: 80997965454.21.9AC025D Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by imf30.hostedemail.com (Postfix) with ESMTP id EF96B80003 for ; Tue, 11 Jul 2023 03:55:05 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=Rxbx43is; spf=pass (imf30.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.215.178 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=1689047706; 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=fTNORhAMfZiekvn/WZoJTK6LhdTh4U3lAjASoHlporQ=; b=e0lPlnJqvQ7u2Ra9JEbBcHHFxI8SGB0XrqQ5T/tlary/g+yW4IWO/i87nQuc8ikykeQD/P hANX2+FzBngHTq/sXsqEqLVtaKcfLHk3uXsp0jSntWgMSWTwlIFSlYMW3eBMzs0xxwkFKr NfFTBVGFrpndkfWSByT5/4Lm/tJuhNs= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689047706; a=rsa-sha256; cv=none; b=vigFRuWsdfaWCG2ak6yzJfvcl+kyIuntrGadMfhQ+zeJM5t6ujWNlCfqHXasDdxhIr583g n9v6hDR7XXlCyKoi0NcIX8Pu7Y0mIA5GtiFdzZRysYf1jwtsk+Q46vXTOagoNKzCc3WcsT PC09aMdmPdr/HhQbVJA6g1LJwkcM3eo= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=Rxbx43is; spf=pass (imf30.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.215.178 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-5577900c06bso3990743a12.2 for ; Mon, 10 Jul 2023 20:55:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1689047704; x=1691639704; 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=fTNORhAMfZiekvn/WZoJTK6LhdTh4U3lAjASoHlporQ=; b=Rxbx43isig3S+GFU16br5sALnoQtHUSEfGe8cb+ol6pqYx3UiUAaexdoL7DR65ZV81 3BODyot5ZjoWbtgXrORsNGEWWtJ8jdaf2v8QLo99182QN4+QD5t7R2T05RsHZ+/W79Zv TwWyCEEUja+pliatca1lfjHTT5nZ6/CwqIIW8MyHzRJ/10vt2Kw7wPEfjwzbDzjkbW8L oRk3casJ7rRn20xOrC09xX6p1x+1YVSWI1WJNd8e+wU6yNu5GRbwhqi7LWhFFPDyuAWz +6A0BSCS9J/6Mu2Ku/InixWET9G+pAzYMPbE3oiCwyI7VkhzmRHkrRpGcj64xjJvPZ0Q BbmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689047704; x=1691639704; 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=fTNORhAMfZiekvn/WZoJTK6LhdTh4U3lAjASoHlporQ=; b=GUgry8NFE2+K01kTB1OvEWEaqlZtMbxI8MdjMiXlMHta4rhHvSvoD/O2E4dW8GliqM R7KRJqOvLkuRuccjPfL5qYVX/fPb6YwchCgWxaDIwMc7uyhVLyM4mlM/12tQDfeGEvo8 bIMLorl1ETVVIzjPhuOtJVN0Gy96p0X8i0XnrKUPV9snAt0JJVBRiXE6AB/6B3pJrNuJ OI2dUruS73FIU6eEbwq/be+p7gBO5iOcnYGBJ2XGIvZbf2rs61Zq4ZcamD7d/EBmkJnY 5k8ANpM6uRIxTOMdXzYzDdg6PtPzhql1u52jYt+FEBMzfQBLq+0Fh5isrIoNE3FpJkHo 0/TQ== X-Gm-Message-State: ABy/qLaSiJG/4BS+WxBRf5ORJXznyW4Jei6kDbpKbtWzQOBpZ7x0xpeL tXFzedTrZU0apZqEF31Leh7KkMgpEHFpbJDxxp8= X-Google-Smtp-Source: APBJJlHl4mfJ9Y+/M0jhzcC8s4QeCj9XHWKUmY872oNAImgfWhir2FpEPfZ6WWSLjO/pMZSofQvtWA== X-Received: by 2002:a17:903:26d3:b0:1b8:a88c:4dc6 with SMTP id jg19-20020a17090326d300b001b8a88c4dc6mr14392136plb.45.1689047704708; Mon, 10 Jul 2023 20:55:04 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([139.177.225.243]) by smtp.gmail.com with ESMTPSA id b15-20020a170903228f00b001b872c17535sm688329plh.13.2023.07.10.20.55.02 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 10 Jul 2023 20:55:04 -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 2/8] maple_tree: don't use MAPLE_ARANGE64_META_MAX to indicate no gap Date: Tue, 11 Jul 2023 11:54:38 +0800 Message-Id: <20230711035444.526-3-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230711035444.526-1-zhangpeng.00@bytedance.com> References: <20230711035444.526-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: jkab367yzxg8jgk34y99jw6ia5qy6g38 X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: EF96B80003 X-Rspam-User: X-HE-Tag: 1689047705-80420 X-HE-Meta: U2FsdGVkX1/C38uuS9MfSS7nmG8Ysp2aV5ywakFdtk/tY8JOqRkT8/AQUI7HEXwzh9zHwdrI/u5GTVwIV4bqwRQkJLSLJEQOt/QXOXvaPiFYbQHgcZHgDVTVJAkaLoysqkwDq9k+Py9Xpml5ltr0V93/bNHj/ZI2S6B3a1jq2QRbgNHKNfZjWizYbXIwvgBiaMLKgOVgrk0IxQq3uViBKIyiLWK2IIX5R83G09tsxlC625xIU0Dc429cqJR+AGqHi7EH3VonD/BOmx937XthX/3S4uG/ha/+4c8fILS6SwykTFTXr651PJFpwpbNSVya9rpX3w52Uw4QbAn+MfQCq5TZhUXSUk1ykGQq634VNUruCyksTfuIrPoRkVrxrnMIS31skMvCvYwUacyOXLvE87843tgtTXsxTUJ2Ou0ylTIRqCfa/NTj8cA9Jav1RUwWSPs5nUuoqcKq/6xPWUhuIyn3rI7QeDyfW1FnTawssIkFLnj1fJK2lnwNaKwN1KqW/nX+fX4PhxU6McP3p/LMcm0YG0r7DqGfWuu/Z28lGBgyGkwFg59Flwym4CZhRwTch0swQI97kCQ4mGdwXi/NeBn+tnKIE5Q11LPc1fKc9YMXeAh0sS2MOmZMnO5ytJeWF9lJq0TT3oBxapm8dzQJ/cwNnntWfXy0GlzqHr4DvEF5JIuW4E841a0BcVY4+4WV0qBl2pW8bF3kGylE5Tkc6S69ClBB3KD3rh4k0VkgUquTowDdG6oAbDtcAzmc+12afoabA4HEJ+vKkT5tgKldlk57mDsqCwE+NnJ+qau9LcydEwBTYv5jkl/RyKub6PCMjm+WkpCDvU00igYAMKUsW5+o2N/xhK9JbxV85SULyLYcGK0p6gftWBMvtm3QPgUq7XTAR2394yDmnx0tgxHgPObOp6pmKEQGz+jIMd4zMrjTncUixWzgCEgZcM/iYIalDptia4AAbKTXbZQrTbF 4AbFvJnS uKTfScIzfQbjR1Uu6ZlyRTmm+aR6hlCaszXTrfBzRzAfib2plWQTFvXbRVENkuBxqLBmVXah9FeTy9kTJhvODKKjYJBAAsql6pWQzmX63GXGRUsrUgi1162rWK1IG394y5Ilr/OAbjXTIcfnIb03yqgaOOM2avOcg5APlIHRyrk+7X+PMqjdhe0zWPHtNW1gNfmPPAk6XEXN64BSZ/W8VqJRvsfev4TyMaHGQq7/3TQuxKa7TtguhEkHk9G+EdS2UsROo62I0G0FMsg7zrR8FNzKgRO40CtOPrxQYrxQLusFNqfPm3A0+0KGQHvShGzThmYO/J33WdKfwOvENxxioDwGRUWB/22H+RLh5lKZR5z2NZhT8+/6AyumeA8qjnpPig8Ed6QiF1/jx+uYZU22h4evCyvG53JVqBKA76hzg3//VnkwoiKJTp1fPAA/k+EJRY/qNdhhQt0tEIcIaDjN7ADDL9XAMj6LdNow0 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 Reviewed-by: Liam R. Howlett --- 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 f55e59bd9122..6a8982146338 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 { -- 2.20.1