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 97BF7EB64D9 for ; Fri, 7 Jul 2023 10:11:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3260C8D0005; Fri, 7 Jul 2023 06:11:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2D56B8D0001; Fri, 7 Jul 2023 06:11:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 19D8D8D0005; Fri, 7 Jul 2023 06:11:21 -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 0932C8D0001 for ; Fri, 7 Jul 2023 06:11:21 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id D06C3160D47 for ; Fri, 7 Jul 2023 10:11:20 +0000 (UTC) X-FDA: 80984398320.30.1FA9C5F Received: from mail-oi1-f175.google.com (mail-oi1-f175.google.com [209.85.167.175]) by imf23.hostedemail.com (Postfix) with ESMTP id 0A9F314000C for ; Fri, 7 Jul 2023 10:11:18 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b="PH/CUggz"; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf23.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.167.175 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=1688724679; 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=376wTeQ3MEMNHnxgt+OCJ0TDActL9tQSOLamj68yJ5U=; b=RnOrlkiyffA9VkvULHU3ko/lYzIoNnQ7BF54xokYl4W0bNJ6605h2xCAZrzEtQqUjqFA4g K7ANLRPkQAFIvJScDPbIfbXIUTzu1ezwjuG/U4KdXeNnC7PLmhBuWK7dJnpCadzPIevE3m PvcizpbmOXihjSjAtbAo2CZu39lO11o= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b="PH/CUggz"; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf23.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.167.175 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1688724679; a=rsa-sha256; cv=none; b=b41LELVgUnohIoQIiyqmSrwwYxDW25yesh5N5YrE/MjuqJ/enXap+DM7H2PqBbJb8J06zw K6kcprcJVplV8A67WHs0O90bumkDLkFX2RGlDJyeA8ByO065LsXSs7GmipUFklHkrsj4m6 P02zFEn1PDhnD0q5GurLkvLdphpxnMA= Received: by mail-oi1-f175.google.com with SMTP id 5614622812f47-38e04d1b2b4so1462639b6e.3 for ; Fri, 07 Jul 2023 03:11:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1688724678; x=1691316678; 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=376wTeQ3MEMNHnxgt+OCJ0TDActL9tQSOLamj68yJ5U=; b=PH/CUggzy+Hxz5qtH/dAxeLKw8S9A4JGuhCxm6hb0Ho8ugH8PNZPXdHsNK/dF3dXgb j6aJl9zqPLPGAp0yGJXE0K3vu8RluCKZlgl4NGeIqNSGN8HJZn0b19LlAKncVwYP4SSU VP/hrp0Tvg4zU+zYj4sdffzcqwQV/Ns5I2BhsH/1gU23wwSEka9ZxHnVAbJ2y+HtMRDI dW9Tpmv/4fOobkulXGSHkUdl3dPtG1Ti2HrYQtwhoxgxdjnm0RCcNJIP5yxgrMlY8rV3 a9rOZaQQML7Pd33PczJIEt2/kZ4Ypaz04/ehaYYH+NkctzWpjhoUMuPNQXxMCNi14HgL mdug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688724678; x=1691316678; 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=376wTeQ3MEMNHnxgt+OCJ0TDActL9tQSOLamj68yJ5U=; b=FRQkqtBaTve4132Dkd/74zhoxbC54ZSWrLs3vjGdve71wYMPh0Ylqn9zrWvlIMqoY9 by6HhBlcvqXvWvYhHyQdCG1mOluKmLZVBqNPoCpdK3dE+2BfaFj4z2T69llhPlpC19qz aP1mOY9gh7/tf8iDDphh8LHGPMHQIGfjNeo0n2Xw3ohh/tQdqxz0SofHG9DD48ewI03h 68fmWjoq3j2z5Ug/plRfgu9MaHMAjp1ndb7/09wHsqMPZh1Z/l/LhIvBoN0rPXqUxzPa GSBDH/WfxMqg7zE2QExI/jHF+I4FIVqSfwFCimK4BnR8SNJzAiGc7QLr9buk101C1pIb 4Q3Q== X-Gm-Message-State: ABy/qLa4WsRnbQUn2jT5v+gHQNhHIS04s2+PKFf9u0kaZfcTIGaDCuuz rGckxU35kBM4Q30iNk1cbC+lrA== X-Google-Smtp-Source: APBJJlE96i/YYNYS+fT4KqAljST0vit2oDr5jySn4ZcFemFzRqybxbcHYXwxFe67VUmmDE8I/GOxMg== X-Received: by 2002:a05:6808:1496:b0:3a3:ece5:83e0 with SMTP id e22-20020a056808149600b003a3ece583e0mr1237051oiw.26.1688724677972; Fri, 07 Jul 2023 03:11:17 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([203.208.167.147]) by smtp.gmail.com with ESMTPSA id x11-20020a056a00270b00b0068288aaf23esm2602549pfv.100.2023.07.07.03.11.15 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 07 Jul 2023 03:11:17 -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: [RESEND PATCH 2/8] maple_tree: don't use MAPLE_ARANGE64_META_MAX to indicate no gap Date: Fri, 7 Jul 2023 18:10:51 +0800 Message-Id: <20230707101057.29326-3-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230707101057.29326-1-zhangpeng.00@bytedance.com> References: <20230707101057.29326-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 0A9F314000C X-Stat-Signature: c8eug4kxtdcuinc4buwrm1efwcrfcw6w X-HE-Tag: 1688724678-256310 X-HE-Meta: U2FsdGVkX18H017LaGj3Z//MzFIfwQWM0Qs5XOjK6+HIttJ7T2Idj2YVWs+RAuMsL7o3+aY3DocAfFeEqYWWrcKf+cFOxRoJWvLInVHMKPYgv/2Wh8nIAgGRgiS74AnWGlfVv+27vm90QOD2bqG/4wZM/EPqdGXDFW9KsSC2Dd/AJtdkvu17MOCR9Q3TAzB5x/KoyiljaLV9vt384e4D9fiqO6vlUIDsRSpxst6eLyaX2xcOH7BP5TDfQMXAe/GGyQGtmK4ECsNiEoJxg6zFbzSW0jd3zjKxNuPU6dRVvwKwY4mIB3oSNRA3Kk5fpaBAZMzfUc9PF6NpJa796rRQUWqpi/f3AqUPFuZYveubwqlKzr9RL3PvD784Y9BY8HQEftj6fHoRUnsrJq0ethEb4e8bq3bMC2V0JSATGgn9DWCWmKNpDG0z8Ylqcp+qtw1uNjwiSOHbUvZelhQXjR7spmhsNSxlVBYTfNd93zn1A+A/D70PhMjXMaHzE0G8GKrgFv1mOizEB0HRrzgnZYHsap3kEWU7bvszHaEKWty8up9QvTD2+SOHRu3aTvmMs3g8vWuTC9SDIzI2sXORO6YFIaQSjGqRr6bd1qELhPC+4wq5S1Cx22b/SKUvn37unwBfVEtRUjzDVKHYqZvM2ppObyceypOw6GghD+abDZ8gd1T4aY+ffpSy8nnbI7j3HPAseTHy7OHAT4RXwhg7/NXGEhZaslUjoFPxaF7bTSvQYTA8jdEJuAaAB3l41RU5uHdPLD9Y2TiHuD7bcRzTns234IYekox1SaqjofoTjllK6DnDfd2v3nboXs2ST4NPktD8Yx34W2+vHqZKwn8MkEqU30rKPYW+HGVsge7h1d5zMsD6GjHPdfIYTMVAZ0RmrtqhleTR7zv5Esv/r046ZYf4O13z7laqrYsmwLfsjsmhka8eymlIeTqLUhiL2eoi+FG/SPk6if7Lb6FxhT0YWfM UeO67Iib gjF8yP8NZbvpY2KuIcNjXCB0qZWJ5Y0J4rEVN/Zv53LxwVNugb9XALWCR2Dz1OE/Y042v/dnfgHS0bWPEbiJEDpZpi7mCpaL2gSjGhgNKPP6YhN6gafliz5bUfd3ru4cTR8ILgVrekBS5UUIG2lJy3yTh4xwEHzsZPpT2sKaKqMBHPCKtmHGgBycdmIqR0VzPz43KHUv8EcqVc3Mskc0HvjSqx1jTUp4iwl4MBaj3hC+RwTu78Ja+ZnpUwMVYBurY/OtnoJ8TtHkA/EUCXlEsLPVglvKQwE4N2D76T2w4zzS4cLk9Sf7UNBIeS75Yip2Xm85z5OnPv+61sc0w/vZaWZC59wr7nbfdKkOD1l47QdZDLw92HGvjGHDeojCiTzJIOPZi+GQ97Z5K6szmvVVDxDsZnr0ZXHyl5an0wZ3TzugAv1nVb5uGcsYoLdWmLGKXacCnbBnQzSkaXvU= 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 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