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 D12FCC7618E for ; Wed, 26 Apr 2023 09:55:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 24CFE6B00AD; Wed, 26 Apr 2023 05:55:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1FD446B00AE; Wed, 26 Apr 2023 05:55:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0C4996B00AF; Wed, 26 Apr 2023 05:55:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id F134A6B00AD for ; Wed, 26 Apr 2023 05:55:10 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id B724880268 for ; Wed, 26 Apr 2023 09:55:10 +0000 (UTC) X-FDA: 80723083980.24.2D39907 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by imf02.hostedemail.com (Postfix) with ESMTP id 0E0AA80006 for ; Wed, 26 Apr 2023 09:55:07 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=jg2dhbfk; spf=pass (imf02.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.179 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=1682502908; 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=4WcXXQ9El7bhpzRjBoXxi5W9GL1V2G+UTnr8MF+P28w=; b=FYlH2hJWzH4sxGqSfAI7Y85gKkaBErqcjlENAFruesmfxQW5QiKcYFXz889762FKqDUDnk eSITfZK0eEdTXLYpj8wa1p0Jx19PymD9zxvtQjUbMO4JCBZQn+iCfweIsCluCbfbjjmTxN 8kSBOgwnXa4ItEmvJpQNTWeIvNsYom0= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=jg2dhbfk; spf=pass (imf02.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.179 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=1682502908; a=rsa-sha256; cv=none; b=0V1tB5/6hTit6EZZI0H0hVhXefAbK4roCe4L+1Xd0cRGloRzrMlLi6/2vd2YgNtOvmMvkI qPvQpRTKrQDRgTCCxVaqhsEySgvqZd2umy597NAhixJJ7Np6DpEXp9yWcYMxG2d+f7FzMp sfWjgqjvF8ldmkqz7krv4JYkE+KQEyk= Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-63d4595d60fso41931249b3a.0 for ; Wed, 26 Apr 2023 02:55:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1682502906; x=1685094906; 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=4WcXXQ9El7bhpzRjBoXxi5W9GL1V2G+UTnr8MF+P28w=; b=jg2dhbfkTzUbfVin0XiCodsU8Wf3/shfbmdsWTF+WhtarAlHBcXcTHnDaQsHcpqmwc g4bx3d6+m/v2h7wXGPBX14ebyfCBbvhTkIevdRU60+VhuA0sTbGNFO0S6Sp1+Cn+XJja J0eF4VmPt0LRQ1EXw83tJPGz2GbaowPjlR1koJ2gOZCWpEqM3M237JAtI9m7ahQvty+x 2LGROPH585NlUbMTiEE5MqNSdruPB4B/ifsS9Jxx/YGa4WkpXdbY0+c9fxa8HWp+Rrz7 c8fjW3p7HFggE12OsbgXWaOGdW/3iDlV47FST4Za690KRkvkYVSlhIBS3Pf1pR7HI9R0 fNKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682502906; x=1685094906; 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=4WcXXQ9El7bhpzRjBoXxi5W9GL1V2G+UTnr8MF+P28w=; b=F0FIzqhDEusSc+4vh7ON3O2Cu0raZEETqQXx34ER490XV+vc4UoqGW7wVBmhn264cI ONVVbzYdF5WbdbghIZ1RK7wdZsO2VTmuD7BNq2tLj93GkRoKrZYdb60oF6jUaojcQF/y MJ2PIknWEG0NMQuH864llcoe0XLHyqjA85xbi3Mof5ubntM5JNxLObKR7J5LxDCUPe36 ofDPOBGDk+HiDO4EF6F/J+evpBUBwHPJ7DIXh7R4gVJDCFbgVH6GiQoQG15CxooMbQth K4WlbPDDLkX364RnmVkGsUDazZVEHFzTPCzO+vBRk/C4KZsB0+ALM4vpzcwJeTc0qcmL /KFA== X-Gm-Message-State: AC+VfDx1BnlWup/BgR1pFxQbznat1MV82dBQS1x3DsgzTKhBOiA7St4t P7oXP89I2ZawiG0MOzFjcIG8kA== X-Google-Smtp-Source: ACHHUZ7q5+Jo6ruEQ0ATLTis/CDwtKDXMtwWbwqRGLbxqxtp3LHBcunTamcuLGVSES+uw/oVgmvuag== X-Received: by 2002:aa7:90d1:0:b0:63f:2959:a271 with SMTP id k17-20020aa790d1000000b0063f2959a271mr1925753pfk.6.1682502906555; Wed, 26 Apr 2023 02:55:06 -0700 (PDT) Received: from [10.200.11.252] ([139.177.225.236]) by smtp.gmail.com with ESMTPSA id o8-20020a62f908000000b0062e23e81b24sm10718333pfh.114.2023.04.26.02.55.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 26 Apr 2023 02:55:06 -0700 (PDT) Message-ID: <6b507b20-f3d1-b82d-cb20-7354c8acd20e@bytedance.com> Date: Wed, 26 Apr 2023 17:55:01 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.10.1 Subject: Re: [PATCH 15/34] maple_tree: Return error on mte_pivots() out of range To: "Liam R. Howlett" Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, maple-tree@lists.infradead.org, Andrew Morton References: <20230425140955.3834476-1-Liam.Howlett@oracle.com> <20230425140955.3834476-16-Liam.Howlett@oracle.com> From: Peng Zhang In-Reply-To: <20230425140955.3834476-16-Liam.Howlett@oracle.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0E0AA80006 X-Stat-Signature: 9k88rh1ourji6bau1iemcxjf4yx8sj5c X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1682502907-129780 X-HE-Meta: U2FsdGVkX1+csPfnMToBHwDoRKIIeyCKm2AUAE22HlzPbBDxVYK6mIqgdSjeczHVL6+vxGK7yj7qFuNKw7PCIrWCPZe58RW+Y5wF3GJkZgNxQRII42PkMlGUHrrXFkUrVY1t3ryWc/Fho5R9wMUB1ltQij+Ue6zGybYe25WSRkStx57I/4HwTo5t4m8i4FS/FMdU0pkup2JKc/1cO7f1WBksYNhVdnGYF1+32qKxRFesvl4sRnX8JHxf555o5Fbd7SLxdWIzM3x94Vn4iNi3IEcn3mzmMrR27vsRzDe9mt67xplaA2kEX3sMNghBekUBMkzu2R6wNIABCeynpOQut7w5Sw0ff+l7grzIICovim/G5Hv92x/3lE8vjVdnEAXyCVb+FiQ1k0WX/jwsIHv/24twh710I+U49wPbqqFcfeLjURH7a562l6nODoQfFXDGaXRSYQvfLfUb1EhxEokF+UvfgqaZMVlh0MrgBlUyi4obd6O9RSPtGx7+Bs6AsHekKPCYddp5u1KtMTgjanjT9seqLdXCcPuOqaaNDZhz4Ne117dcT37StzJNx411l3ux2Ss0fUXr/DseK+T1N2lp8+q5DDzcC/8bkkhV6lon+JgLTFmlK65p2xiv7cL2v22Z8+NOuLA/dceDCsme3RECIDrEkKbsYBFriMiWHHyGd9NewJ4DZSp459ddxgdYLMZfhBkNCMw1kUBXozxQKNsBZPzMlE8FKXDjOMz7CtNNe2ViMj9LVPQnwmanaSijWbrP3eAk+GiXRzsy/LQeWGOK5equbkh+U/FX0G8Ezk35lh2vKG962W8cgIvV6xK+VAVU4CXtLofHKcAJssWjel16YIifywYST+5ZRP+swfkq4kLwtfb5iIEn4LyGEQH4VRxRzGE1KtfYal3GqQSUQbNa5CgjM9VyJ8VsmRgTqY91AP3pDATEy/OoOIOcGJorDgo+EYrcF6VIQaV1/oExjS1 Htirhwpt U1lFPbYdVvwGNr9WlCC6N7snkbtzPxiyoutYQhWE8GaCyMa4jCm5NNwSzlKhKiL77HaxMXEzuXgtqaoS4ld3xNT0C1CyD2o4m6Iz2kLEDuJi8pudPKmJdbgsjsRNleec0mKU2eIJb1RuGWEmJWET7he/OSZVQVNtkv6qEehDoMxxEfXOGGC8uTbKLxRnRUoYPzRGJRUuem1M3BfTi7Wo42eWRHM0QicYUuo7L1kAi98nmESKvSUgd1fTHbEESFLKAYwMtUN2E1Snby8hPtgQ8X1exK3d2Hi0epKzccqjHLaWPKBM555oO8aT3SZPD9PjoftyNgm4SffN+aV77bRiZKkCxK1Z9C4NIgHvScq6WWV0s9//paNPIb5FDfyurIbgU/UpjOH2t/FAVMBlJxIgwadgNtdoUVvls9v8efRPfFxl3IyvJm7c3llQ+GEU9fdW9QC6kulU5U9E5PZuFj/FFKPLPwVFdo6AWeDlO3Qc+muqrUhU= 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 写道: > Rename mte_pivots() to mas_pivots() and pass through the ma_state to set > the error code to -EIO when the offset is out of range for the node > type. Change the WARN_ON() to MAS_WARN_ON() to log the maple state. > > Signed-off-by: Liam R. Howlett Reviewed-by: Peng Zhang > --- > lib/maple_tree.c | 25 ++++++++++++++----------- > 1 file changed, 14 insertions(+), 11 deletions(-) > > diff --git a/lib/maple_tree.c b/lib/maple_tree.c > index 41873d935cfa3..89e30462f8b62 100644 > --- a/lib/maple_tree.c > +++ b/lib/maple_tree.c > @@ -663,22 +663,22 @@ static inline unsigned long *ma_gaps(struct maple_node *node, > } > > /* > - * mte_pivot() - Get the pivot at @piv of the maple encoded node. > - * @mn: The maple encoded node. > + * mas_pivot() - Get the pivot at @piv of the maple encoded node. > + * @mas: The maple state. > * @piv: The pivot. > * > * Return: the pivot at @piv of @mn. > */ > -static inline unsigned long mte_pivot(const struct maple_enode *mn, > - unsigned char piv) > +static inline unsigned long mas_pivot(struct ma_state *mas, unsigned char piv) > { > - struct maple_node *node = mte_to_node(mn); > - enum maple_type type = mte_node_type(mn); > + struct maple_node *node = mas_mn(mas); > + enum maple_type type = mte_node_type(mas->node); > > - if (piv >= mt_pivots[type]) { > - WARN_ON(1); > + if (MAS_WARN_ON(mas, piv >= mt_pivots[type])) { > + mas_set_err(mas, -EIO); > return 0; > } > + > switch (type) { > case maple_arange_64: > return node->ma64.pivot[piv]; > @@ -5400,8 +5400,8 @@ static inline int mas_alloc(struct ma_state *mas, void *entry, > return xa_err(mas->node); > > if (!mas->index) > - return mte_pivot(mas->node, 0); > - return mte_pivot(mas->node, 1); > + return mas_pivot(mas, 0); > + return mas_pivot(mas, 1); > } > > /* Must be walking a tree. */ > @@ -5418,7 +5418,10 @@ static inline int mas_alloc(struct ma_state *mas, void *entry, > */ > min = mas->min; > if (mas->offset) > - min = mte_pivot(mas->node, mas->offset - 1) + 1; > + min = mas_pivot(mas, mas->offset - 1) + 1; > + > + if (mas_is_err(mas)) > + return xa_err(mas->node); > > if (mas->index < min) > mas->index = min;