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 6D4F5C77B60 for ; Wed, 26 Apr 2023 04:15:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A1E0A6B0074; Wed, 26 Apr 2023 00:15:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9CDC76B0075; Wed, 26 Apr 2023 00:15:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8BC786B0078; Wed, 26 Apr 2023 00:15:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 7E2C66B0074 for ; Wed, 26 Apr 2023 00:15:02 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 34626140117 for ; Wed, 26 Apr 2023 04:15:02 +0000 (UTC) X-FDA: 80722226844.22.8AB5DFA Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by imf16.hostedemail.com (Postfix) with ESMTP id 9B68E180004 for ; Wed, 26 Apr 2023 04:14:59 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=FkmPAVs5; spf=pass (imf16.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.176 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=1682482500; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=f12XBIeKD4zCA/Sk8xAhXMMryIXAoPgMmXZoc14vR/g=; b=2kTiAlnVmuXAqlB4cI48KCGTrUIbtnOA0ecXl8E1oLW72KVPIVlI34DkcHFQZpi02nwa9g yL96aOUEQpNzqzkF9+ks4dattGCN5VUjxY3jCV5LP5OLKxpHB18t2Av6MehtUe0Wu/1IRP E3btbz3eFWGMSwttupYcVg9eKBkrge8= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=FkmPAVs5; spf=pass (imf16.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.176 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1682482500; a=rsa-sha256; cv=none; b=V9jgpRxcnxfjJ6yNWIfMIdq/tEycetYJMRYF7QdzeUncUZgVmSzR5/C8GSEoxfmHkPuYON rSivEDJg1sBqjQJptMPK7vACddut/00b9BExwoUBqZghMzhnWjmLbY4O/ExHAYs+XKHzdi tBWOGpfkCTovv/6PqssNdE7Nj4IsImk= Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1a92369761cso52575035ad.3 for ; Tue, 25 Apr 2023 21:14:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1682482498; x=1685074498; h=content-transfer-encoding:in-reply-to:from:references:cc:to:subject :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=f12XBIeKD4zCA/Sk8xAhXMMryIXAoPgMmXZoc14vR/g=; b=FkmPAVs59CIIhjmSzFCOHZImQx2lDgBhy6/um/D0WIY8srLhctqucVObwj5qoSl1PF xkIOlpuHs4Cv022AqonMwPBtq6wKe8ObxRYOs9E+lAr2TEVvHHnI7Xje0O8S53XUFM63 f7C19kKqS2NJvJ/5bVz/ONQtRvkjAdq0EU84StTVTaRCxBAVv6F6fdwWsF1K0OJuVS0h hbF0APkjnsJ78cx28KHF4/qDBj6PpuseQpSzaANmB+EI5J2uNe6vIUkmFN67ow5peLYm CvuAZiVzXKBUr30MC0HfA+IIH6HJyJWRcbZG7DOJ7OiVGb7dnBdKOoEvz8TSGYHEzwz8 tvXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682482498; x=1685074498; h=content-transfer-encoding:in-reply-to:from:references:cc:to:subject :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=f12XBIeKD4zCA/Sk8xAhXMMryIXAoPgMmXZoc14vR/g=; b=VxMK4/+WYypsDonQRsJtwrghSSiJq9AMNlwChYt0W4ZHBAFMmPwEWbm2vYspG4Re/P lVCDUfbIuQHuFl9RTfnb/r8ZKMFqkWzmvs1xfJHegwwO/pO4D6lk48cBUIuUPFHIuq2z g2w2W+bIh/R2QyeYbnG4OS4U8s67+jEllQH3q6S2QmQhympr+yTZvzDVzmMSubLaQvT5 LTClAfIbgRzdF7WDViU1t6Jdj0fQ/q8ORD3gn5CEimo4j5vprXL8J2jmo9op/aaIyOTU Zr8wV3jAc60FPyROdWN2u+glL+yuUMjudORNTd1TS82WSY7n4rL4pAKiVPILFVmhUjdI HM4w== X-Gm-Message-State: AAQBX9enr+VGlM4NX3IrXVpiIvC9LO4XSjxbtUOd/+r+VngMrxgFDs+/ lZJz2vGeysYDNNPhv/1g6h7jXkWD0RnrzfGxAIU= X-Google-Smtp-Source: AKy350ZnwYrxiExp3wU2Qo5QoKE+PvB9AhN3LOXeWKZXGg9E7DIcBU4VEgZ4th+Ae0IrQgs6ziSniA== X-Received: by 2002:a17:903:244f:b0:1a8:16d2:a867 with SMTP id l15-20020a170903244f00b001a816d2a867mr25713859pls.62.1682482498248; Tue, 25 Apr 2023 21:14:58 -0700 (PDT) Received: from [10.200.11.252] ([139.177.225.236]) by smtp.gmail.com with ESMTPSA id ji9-20020a170903324900b001a1d4a985eesm8980274plb.228.2023.04.25.21.14.55 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 25 Apr 2023 21:14:57 -0700 (PDT) Message-ID: <75ebddd7-641f-0274-72c5-415007d60cdd@bytedance.com> Date: Wed, 26 Apr 2023 12:14:52 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.9.1 Subject: Re: [PATCH 02/34] maple_tree: Clean up mas_parent_enum() To: "Liam R. Howlett" Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, maple-tree@lists.infradead.org, Wei Yang , Andrew Morton References: <20230425140955.3834476-1-Liam.Howlett@oracle.com> <20230425140955.3834476-3-Liam.Howlett@oracle.com> From: Peng Zhang In-Reply-To: <20230425140955.3834476-3-Liam.Howlett@oracle.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 9B68E180004 X-Stat-Signature: htsoxnqjgt9xsi1e9sipszpa7tqj3s6y X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1682482499-242285 X-HE-Meta: U2FsdGVkX1+5GsJbDv4Drja+RaVSUrhd+YYuUXRlymA4I1EQydLUeP9POJhndek3PUyOTVlen5U3rMDl/IBtxWlsJu6P5qBXZpfoL1QaoT5sL+c5Ok9Fnu5fpf/paxibvw7JvE9o1lP8Vz1X6E7gjE06URXkLD1p9iLY4sOhNmdU3fRY+yf0UbRUZkozTskUe3aN76khddlqPOWDAmZsW0W6CBkHaBjFqkoSdwCYp77k+7n1JK6XuEEWgUYyuZt+5viVHz4PjrfCFUM/imJTFrm3HlhLXpN4oprNBxI/la0/9nwbSTnVtDSXuzutBXz34aD7SjGusxv50/1unbn/zEY393tg9sLWFrmdTmatuBZr3sYJeEt3sW9TLiUP5rpp7J9R6CMVZLX+5axHqEwnsHLlg/olSF6kGKZZIMWBBaNicWJvpFHqhdRK5nf6aO7aynBt+k2EVd5PYQyX2emb58bK7fgbIatUylqEwKfH4cHSk53BnJvESxkqNRUp6eKVdurNatZvVjL8mcCeiMDYy3kQplHz8csJg6PW2hx9EFuRWtpdvc+D504DzsNYX+VvDQaHr4PA+DvzQDbIa2tviYFaEgO/zF/0J8o3rWrEyZn4DeL024Ye1MAsKJDXjDauPj7GSdrtMrYvPWDgXzAX+hT62k4EtpitU4oPPkeaAvwWuFCu3uckIvfRVWrT4iyNObE09DwXTXzswaUNp2kx3k1XFu+raknaiYwAPPK5h37Oa7sgQ4zF5KBXawptCD+D+7ffUB7qtc2XfF8lXn6X+E/qipvKDFX6k29uG256Nt+CMlxmlIM1qMFLCc6SHYGxgij+tBJturD54+7zd/OiZMLolQASs4vfdP6X7CQUSk2VXup7IL+DJxfqJ/0yCO/8fVcaeEsii1b6M3g7QzTNnDi4xrZg09Q+9CmBDK084lOlEbHua3DkErLjRWH9MEjoy5zCEZS01R+T5kHlNCl 3nYILPl5 vqBHGB6PRn9RJSMxhf6vkq6aqupOZxnNV07ryTu8C3vInFZjY/PVFLVGMwkTrSkF6nSAf8LeYAXK9rRpJkJuVib7K9OsvyThTYBt0o5jBiHsHyKhffup3ozLiIGXdttj4rC5nmFQUGwXPZRWZtFerb/dcwMfd2rfDCN60WbfhF16c2ZAnzljH6JUhQHZDoVyO+58o57liTWS3OO0RBcB8u5QiHqBz+i4XjRuqyejJwryBTHVdLFkvAgPeAL0eah6HvSdQ7KY77p2bu8imTT/nXivMn+RYg8wBekOg4zE6G74T5TXhx46L9HwYTdVy6Nn6PcJDLWBP3rxIwDmCYiV9qA5UADdIV/iJWsdElZPi7vtI5vWQ9ozeR0fHr3kzVJshVNpS6ZxpMRqmtoHutg4bsNreNTfSXPdQeR7KiKRqXKamSTHdonIaFXLRbFz7t1YVQ8CQfvObxEXHwNGqpjfLEIIYmmHNlYqj+kVR0HytOBubrzp7QxLrGf5uoQBgiEblH39xoSxQ4CNadKzgjNtTZLzH8w== 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: 在 2023/4/25 22:09, Liam R. Howlett 写道: > From: "Liam R. Howlett" > > mas_parent_enum() is a simple wrapper for mte_parent_enum() which is > only called from that wrapper. Remove the wrapper and inline > mte_parent_enum() into mas_parent_enum(). > > At the same time, clean up the bit masking of the root pointer since it > cannot be set by the time the bit masking occurs. Change the check on > the root bit to a WARN_ON(), and fix the verification code to not > trigger the WARN_ON() before checking if the node is root. > > Reported-by: Wei Yang > Signed-off-by: Liam R. Howlett > --- > lib/maple_tree.c | 28 +++++++++++----------------- > 1 file changed, 11 insertions(+), 17 deletions(-) > > diff --git a/lib/maple_tree.c b/lib/maple_tree.c > index 9cf4fca42310c..ac0245dd88dad 100644 > --- a/lib/maple_tree.c > +++ b/lib/maple_tree.c > @@ -428,25 +428,23 @@ static inline unsigned long mte_parent_slot_mask(unsigned long parent) > * mas_parent_enum() - Return the maple_type of the parent from the stored > * parent type. > * @mas: The maple state > - * @node: The maple_enode to extract the parent's enum > + * @enode: The maple_enode to extract the parent's enum > * Return: The node->parent maple_type > */ > static inline > -enum maple_type mte_parent_enum(struct maple_enode *p_enode, > - struct maple_tree *mt) > +enum maple_type mas_parent_enum(struct ma_state *mas, struct maple_enode *enode) Do you think it's better to rename this function to mas_parent_type()? The meaning of enum is not obvious and there is already a similar function mte_node_type(). > { > unsigned long p_type; > > - p_type = (unsigned long)p_enode; > - if (p_type & MAPLE_PARENT_ROOT) > - return 0; /* Validated in the caller. */ > + p_type = (unsigned long)mte_to_node(enode)->parent; > + if (WARN_ON(p_type & MAPLE_PARENT_ROOT)) > + return 0; > > p_type &= MAPLE_NODE_MASK; > - p_type = p_type & ~(MAPLE_PARENT_ROOT | mte_parent_slot_mask(p_type)); > - > + p_type &= ~mte_parent_slot_mask(p_type); > switch (p_type) { > case MAPLE_PARENT_RANGE64: /* or MAPLE_PARENT_ARANGE64 */ > - if (mt_is_alloc(mt)) > + if (mt_is_alloc(mas->tree)) > return maple_arange_64; > return maple_range_64; > } > @@ -454,12 +452,6 @@ enum maple_type mte_parent_enum(struct maple_enode *p_enode, > return 0; > } > > -static inline > -enum maple_type mas_parent_enum(struct ma_state *mas, struct maple_enode *enode) > -{ > - return mte_parent_enum(ma_enode_ptr(mte_to_node(enode)->parent), mas->tree); > -} > - > /* > * mte_set_parent() - Set the parent node and encode the slot > * @enode: The encoded maple node. > @@ -7008,14 +7000,16 @@ static void mas_validate_parent_slot(struct ma_state *mas) > { > struct maple_node *parent; > struct maple_enode *node; > - enum maple_type p_type = mas_parent_enum(mas, mas->node); > - unsigned char p_slot = mte_parent_slot(mas->node); > + enum maple_type p_type; > + unsigned char p_slot; > void __rcu **slots; > int i; > > if (mte_is_root(mas->node)) > return; > > + p_slot = mte_parent_slot(mas->node); > + p_type = mas_parent_enum(mas, mas->node); > parent = mte_parent(mas->node); > slots = ma_slots(parent, p_type); > MT_BUG_ON(mas->tree, mas_mn(mas) == parent);