From patchwork Mon Nov 20 07:09:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13460872 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 A25E0C197A0 for ; Mon, 20 Nov 2023 07:09:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 293506B0337; Mon, 20 Nov 2023 02:09:58 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 244016B033C; Mon, 20 Nov 2023 02:09:58 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0E3FF6B038E; Mon, 20 Nov 2023 02:09:58 -0500 (EST) 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 012106B0337 for ; Mon, 20 Nov 2023 02:09:57 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id C84BDA01B9 for ; Mon, 20 Nov 2023 07:09:57 +0000 (UTC) X-FDA: 81477458034.08.105541B Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by imf10.hostedemail.com (Postfix) with ESMTP id 01E4EC000C for ; Mon, 20 Nov 2023 07:09:55 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b="CQg/Ps9g"; spf=pass (imf10.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.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=1700464196; a=rsa-sha256; cv=none; b=hSUiKvG0+3bZTZBYFNfVLIxLaq2CH89+Wl1N3zptp+3a4Xj1m+PLZmbCyxmg1AP4qwRYF9 QgaKiqe3hb8v2bmSlXy+gPLgGKgKFuc7/K0GCjw1jaV+Qf9RT9Cc3bXQBhGeAGF7MPO4ss J4rJ4T8Ta/uNEQa0amf734ah2Y5FVto= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b="CQg/Ps9g"; spf=pass (imf10.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.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=1700464196; 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=nUE9ZvwZFQu7umd/mVKa2M3eheT6QrVVeWcfJsSgwak=; b=HIn+jGdeSY0VVWW2q8J0tqmtDERD7BfD1E5TWQwEPJpWQvkhW0cb7D87+HTaZV7vlByv/M dyMitjeHHra0J6OX+3gnfiJcJqOxiH1HeKOpcNHVCJtg935yruFYrylOPJUBXGbGPX1Qlo ONWLMvD6oV2/Gh2fpIst1radGJxDCek= Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-1cc3542e328so29180965ad.1 for ; Sun, 19 Nov 2023 23:09:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1700464195; x=1701068995; darn=kvack.org; 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=nUE9ZvwZFQu7umd/mVKa2M3eheT6QrVVeWcfJsSgwak=; b=CQg/Ps9gTkB6kiuxCp5XgwIqLXXJLAfjAp8DQESO8yARkAsHGSehsg6cjQG25CF6Rc WxSMhUgLZUV11Pe2wIOZS4VTMMQPqQyp2Y4+euxxTxjqQ5kRkCIq0UUmlis9mb7iyxj2 ehEGiSq8Cc4JVrL4zoVJ2mVoeQofo82ZRQS/ntMJTD4fkH0eJ4LcfNi+q1Kf4iFRBpJ8 jkSQmgJVlmGtqkOb45pI2JDJhM1whTobY5LSryI0QAe3ylyhfeUJ03tmsFr5I1+FErcl i19Fx9qy8ifZYrKYef18p6+Y8ybRcYEn38KtW8D/fZ152w+G0YUKWGff4HX8ouKqbNVB Ptow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700464195; x=1701068995; 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=nUE9ZvwZFQu7umd/mVKa2M3eheT6QrVVeWcfJsSgwak=; b=vcAC+cFUnXK52xQoF5HrgngcZxi/51M7ezhTLE1DAftkQlUDktyrL/cmmmJbL8zysI sUtt82ZmEsAu8aWZtZH48g5dihWV6aCwG7CQE1/h8qnqPOhku2W/xk1c9CE2IZ0j6LYf ZMOaK8t7XvdjFDiyLu7yvLgfqhYWWvx+5I91stUDs5/3gCCkeGsTUwp6VIow4GL+Z800 FYq0nSmY180rT1Zb4bblu51yXsa8h5W3BPxg1yDkxOiagqy0YrzTT8RWQaDefWMp9OnC YefxmrwP2Oa0rqsm4aRwBqvxuodF6OH0mpj2SeNLkxV7WSbqYANpCYPhuRmaoxz6Z+MA 65Wg== X-Gm-Message-State: AOJu0YyoOn+apdMdnZdcC3yQnVjG9sT3VjAB6iY8ztK3FUNt6danbcKG yup6tShl1mNzIrakyyB3LZWo+w== X-Google-Smtp-Source: AGHT+IHoQx5VP90DjW6z7hmikj/ILZ20irNIme8mby57GLohgMrwLjCqPd9SOayxbZcQ2cOPovcmJg== X-Received: by 2002:a17:902:d904:b0:1ce:5c04:fb60 with SMTP id c4-20020a170902d90400b001ce5c04fb60mr4374550plz.8.1700464194899; Sun, 19 Nov 2023 23:09:54 -0800 (PST) Received: from GL4FX4PXWL.bytedance.net ([203.208.167.146]) by smtp.gmail.com with ESMTPSA id d4-20020a170902cec400b001ce67fab3a2sm3698143plg.261.2023.11.19.23.09.52 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 19 Nov 2023 23:09:54 -0800 (PST) From: Peng Zhang To: Liam.Howlett@oracle.com, dan.carpenter@linaro.org, akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, maple-tree@lists.infradead.org, Peng Zhang Subject: [PATCH v2 1/5] maple_tree: Move the check forward to avoid static check warning Date: Mon, 20 Nov 2023 15:09:33 +0800 Message-Id: <20231120070937.35481-2-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.39.3 (Apple Git-145) In-Reply-To: <20231120070937.35481-1-zhangpeng.00@bytedance.com> References: <20231120070937.35481-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 01E4EC000C X-Stat-Signature: ex79of5utck1ehwadu5qzks18sbcrbde X-Rspam-User: X-HE-Tag: 1700464195-909972 X-HE-Meta: U2FsdGVkX18eNKOdC5WGxsZgZNddC+0r4/PJEsCQzIPzxU9/GxAxBmliPcxdtTHfnSxFISJi4Vk7u2UIb/lV13mZvsA0iFUoBCJR3GSgffwV6Vpe9uRjRm9zcVwmrRTkpE8Rv3IluxCJ1o8E0JFFWFQEesROvjyALGaOVshf2KdAeDD4rjNBA09ryICXQtPtilakyGdJLMa1M6Ibmrw88AajCCkbqnX9vAroy3a3FnuP/mZFtzmuLURlMgkzRaUQKR9lZE7iUrZNEX2BLkiUWqlOVGDxILnn+vkAYmsIUNto/v7aOA/Bf+xWeHLc3pk4L1n1yZIT0Q+t1eBxTrHFu+yK0D+PJJdl5PXFGhh/JcmFzIcnRxGvItXkBYkhvG6CjoFgYnPbAdYGyCQrU37ij46g1wZnCKYDeUAMM0MSYe78Gkgnw6QTSop1pIyMDSefjV3az8JfzqUweBTF2G22rFAknYlYSYS1BF34F24QJDKT5G2pd07KMoFNaDaU+GH2JQp7nIP8diopPIvo7CV3N3e8MlL6K1F/hfpKswLdjQanCG6JS5fcJRZNBvU9dH3a4hFwY/DAGmwRZLDYGlB/yLselBecpOk8gkNMZdyK6Kq6KsWZ+q0OQfeFIwR83DjZCMIHq4RBGEqxN6TeRWFRKOmJCkLY+/oZ1RCpCw77WvGfflHozccTOTHTjVQP1qaszU9ydG0kIw8nVDJKEd3iLhDmOQxQuBgwhDl0eq7TTcQqkjrz7N0buwxevF6Yoywn603LQY4w5+COIJQL0M7RsfCermtP6zJy2szyICwgAn0mYe6HrtILjTG6phn2dViH+UWUwzFdff41a8x1niVQVA9JXnKwOFs4sMSxcbVMn/ArGb5ww0SkqzYnzQ8dMXt1oWS/ycrFPDcaV9LTOdey8yoet/ExDUeg3U3XjKxGN0XQGiGwndh5ci4Zjt4sH7fKOttkp+uHmbsXHvuayTv jIQAw1rL uWqtwNcHeUcJyhe0X2cm5e+Kl3kV8dz4Sn83UrSKwFgC49ho/ienii1FozPQl2go0nYEjr2xmk80EmmefInGruz+j+hU7U23WUpfBCDMiS5vkWnuENrM0UQUXokS7iZw1k/4R6efJYPosLoqU65ygA9A/jQ1ZE8hOrdSsVFyxMUATdZq6SqO3pXdIBZ/N1z/Nc9LGBz46FbJnksPq4fr/s3Zjm6SYMNyFyYfzUDAUZ67X8GAu4HaOc/8YJc2wfhrbVW8EJBzWt/K5xaLHdz0jI6PT1z57kPkJ3ZYy27Nz1/xMdxOfgXCrSnuRoMt429q8XE9C78AIwoN4hXjvHsoewh9j4X5l4tTRUGZFpMv4sepjbNlTKCtJKydMGoxqQPuXFYUdTV5dM9sVPc6o6iSs7+3O0UWKC/8tPwWmbSaoJaj33vhlgYIeoYnKsoBSd+JuExFxxdaM9R/HqbL9lMjkSFDnKSrvpelAiL0udnv6SI28Mpq9REhJCLDotbQOusb99oRVWmtStH/BJ5AfQVQZBvhuMn945D8unntFw0ffESZRVEo4uElrsP3K1rd1hGx4deE5pwBADD80AC9f1/qQlDLJP1aB8zELHckF X-Bogosity: Ham, tests=bogofilter, spamicity=0.000027, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Put the check for gap before its reference to avoid Smatch static check warnings. This is not a bug, it's just a validation program. Even with this change, Smatch may still generate warnings because MT_BUG_ON() doesn't necessarily stop the program. It may require fixing Smatch itself to avoid these warnings. Reported-by: Dan Carpenter Closes: http://lists.infradead.org/pipermail/maple-tree/2023-November/003046.html Signed-off-by: Peng Zhang --- lib/maple_tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index aaba453b0d30..067b186202d7 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -7249,6 +7249,7 @@ static void mas_validate_gaps(struct ma_state *mas) counted: if (mt == maple_arange_64) { + MT_BUG_ON(mas->tree, !gaps); offset = ma_meta_gap(node, mt); if (offset > i) { pr_err("gap offset %p[%u] is invalid\n", node, offset); @@ -7261,7 +7262,6 @@ static void mas_validate_gaps(struct ma_state *mas) MT_BUG_ON(mas->tree, 1); } - MT_BUG_ON(mas->tree, !gaps); for (i++ ; i < mt_slot_count(mte); i++) { if (gaps[i] != 0) { pr_err("gap %p[%u] beyond node limit != 0\n", From patchwork Mon Nov 20 07:09:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13460873 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 EA47AC54FB9 for ; Mon, 20 Nov 2023 07:10:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7005C6B039F; Mon, 20 Nov 2023 02:10:01 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6B1886B03B8; Mon, 20 Nov 2023 02:10:01 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 503C16B03BA; Mon, 20 Nov 2023 02:10:01 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 3D69E6B039F for ; Mon, 20 Nov 2023 02:10:01 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 16506B4E23 for ; Mon, 20 Nov 2023 07:10:01 +0000 (UTC) X-FDA: 81477458202.16.96CE6D7 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by imf28.hostedemail.com (Postfix) with ESMTP id 1E71DC0019 for ; Mon, 20 Nov 2023 07:09:58 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=ZtnICRYN; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf28.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.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=1700464199; 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=DVM7PlgIWBr9i9hcZud6b5TfuAYyAUUwXwcxlfzYtaU=; b=lBmUcQzs2GB3q5MUXpExbKFj0eapS4MKPkE9ZfBpu5fvqk7q5oZCpKAaj038xpwZ8XTw/5 Xov/X6/0vY3L6P4LgwikP468seO8y3WyLySetN31UwPgUIbyb2MhxdYEQvB1fzf5TzEG3r kPgLeFS+YsiAhf5GFMXfcL7em6Sp+sM= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=ZtnICRYN; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf28.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.170 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1700464199; a=rsa-sha256; cv=none; b=MFkGwa/+E1ODVv6p2tmsRmKOuc5r3t6Jq76Xrk0mT1PQXYa7w9sb1jJ2zdJSqvvy0+quRJ f2V4imo514HX60a9BuZgT30ZgTH/Qx3dscmWGcJaNYAh8hC6Dak4NqoSTtnemFQuC38C6l xLKSIM7ZETXU7CmLEPnZBVc+6rCs4lQ= Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-6c34e87b571so3202570b3a.3 for ; Sun, 19 Nov 2023 23:09:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1700464198; x=1701068998; darn=kvack.org; 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=DVM7PlgIWBr9i9hcZud6b5TfuAYyAUUwXwcxlfzYtaU=; b=ZtnICRYNqHfwsKYdx3AgRsB00peQ3mTNNLrrvlPb6PQ+RY7ErerG+5Pa+jHPnEu2VJ CO6YVfNQpt90rnz+QZYoyoigoVuVWI7LTIoNplGidyJELurc9hXZmBvK4tNCxm/8QScb uMr5Bl+CB0kBF9iVQBC8Ovmk1fvVT0mCC/S3TooVwUrhz6uM+ClBWmDvI07jDDMyNIuA yILKs89NcuifaAkaJ4XZ+NEPsZ4toG6M7eSM/oFX8cyWf6S1pzg/GUJ0gQqpXUZXnDHI wS09dubnIffPe8N5DKeWhmrJzhCg90FViDs1uHNN9AarMjUsA3CUveAynKufupq2HJcW sZ+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700464198; x=1701068998; 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=DVM7PlgIWBr9i9hcZud6b5TfuAYyAUUwXwcxlfzYtaU=; b=LjT36AdOjBS7/dxRh3O97UIoLdJlyKrZwmNg4wGtMAGGCQg4TZ0D8JZIj3hBiuqV6d zkX7CbTvkT35vtjxhlMEB8fh/phwGRB0SUBXlwAqxjuKq9ZGoI5DwKVfJ79hJzDahxDy bAeM6+HT+/YV/H64+8IOay3cIOAJrZRByDeFtso3Ydn/ngQxVWh7xlNNgW9JV06rfnqS nqgWcW66vpXUpuKsy/Rn3balFLYhGZk2IS5Cf59F0Wgj1oIZJt7zg+sgih7G2inXUdvB UXK+353ocS62rwH2G9S1SfkeTPRWN3mekRmPepfOqzp0yihS/hVlb42j3IFxGz/OKThx rU7A== X-Gm-Message-State: AOJu0YxBqeI4E8My4YPtr4gR1G8ctcNx/XbF4Kf+9QuQft9oiY/LlfkH SmhCaSuq+IQxq4BIVrdW77Hmfw== X-Google-Smtp-Source: AGHT+IE2q1NCMNd+w8RbWd7Y6YzdqD5HzLY3jU16q2z24eHxDGMl4yI/3MCaLdN5iu6cGUkG7j/jOA== X-Received: by 2002:a05:6a20:430a:b0:187:c2be:77f4 with SMTP id h10-20020a056a20430a00b00187c2be77f4mr4769336pzk.44.1700464197848; Sun, 19 Nov 2023 23:09:57 -0800 (PST) Received: from GL4FX4PXWL.bytedance.net ([203.208.167.146]) by smtp.gmail.com with ESMTPSA id d4-20020a170902cec400b001ce67fab3a2sm3698143plg.261.2023.11.19.23.09.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 19 Nov 2023 23:09:57 -0800 (PST) From: Peng Zhang To: Liam.Howlett@oracle.com, dan.carpenter@linaro.org, akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, maple-tree@lists.infradead.org, Peng Zhang Subject: [PATCH v2 2/5] maple_tree: Avoid ascending when mas->min is also the parent's minimum Date: Mon, 20 Nov 2023 15:09:34 +0800 Message-Id: <20231120070937.35481-3-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.39.3 (Apple Git-145) In-Reply-To: <20231120070937.35481-1-zhangpeng.00@bytedance.com> References: <20231120070937.35481-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: p17ci8xjwrimdgrb3pip9n1y1xc3jrou X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 1E71DC0019 X-HE-Tag: 1700464198-27309 X-HE-Meta: U2FsdGVkX19EY+Ev0797EXWfSeMyXLeBByjBRRkBGFKvDf8S9HImR5ez0xDKwulHhQNextODFZ8Icyh2RT2z+gZbBk74lmoxR+TJMV+59fQDLvYlR/qw3vpAunesb2pEYA77qh/F4WGwEC1kFc6lRCTlA+bF2shg8PE8HmmLMRkDnt/v1xqhSve/8xaMwcbkXJS1igYweds3owyIzWjh9W8BFuzdYdsqDsNbcDpOGfGO6rtSXwbBGWt7+JvjzbPw0eLNf0vweuZR4YH4qldf8GSj2HR6LylC+IBYhlyhaQkCczs9ZB72aSRdOvCwJmzMoFUdioS8MlI8OPdOCqfnsMYrt/NoD8vbZQ5u02YUqmc6GrWNnZiy9Lrrkm5m0LqS2gCizeaLYqJZy0Q7+uWkPFlqrX537Kfl2jFXIMczKA3ATTxn25LzEGiRJIDjGmnL1jNl4uQPNpVcjPtEOCYGa3IsvBNmZfGkiXOtUJe9+az/7UfYZcb4VyxybIrjK0Ks5PvEm3Fy0v/S3Fws/ewtAMnvLmCOHJ1xy5kD1mgC/9VTG0AwpyItHbmx8tQBZQPfyWKt6OH0bXkjYiThYlXd1oE5kfBaoyf8xT7nbn+VaDNOquIAC7W0KcgEmWsvw7aMeyaLgUSZxzG5UO+Sno/28Gr6V6O+GL2ASkjeV5Rm5mJPeQhKIYJr3rpA4kDS9FDXudTCkvNuv2QBs5RorFtNP+TAdQmWB0haEaQNuRvf2bm8/kPNwxfiXYyoCAtmEZnaQpCeEbOuFgYYA/BaBi8Ov/cGZFJes9wtpgD+VLzEXEYHihzZS/U3zSpq7va5HIGAvCZXIGRfeiCunJD2RaxnAi08Z02DTIhU+aGwiaGqhtAiBIxaIZAluxDz7uVF3VPc9bdgLvYNz389IR+lh3ZwnEkyyAgN9VDHOBQg3PQ2f+5oWsEPLhmGzEqqLXO5znhAT4lO0NlUeWPCfnF0FRW FxT1kOYE KOBXxvh8/PDy6lSatrzxlwrr/vzI88Zr/UxrS+sXHr5LCkvad+gT+COK6igZqJMlLvkATOuNNlxLZVeXKd5B1KJiXhCGCHE40ZZXAF80dbjH++xu005Dlnfq1RSt97s+Hyq5yy++BTf5VJXvA6ZDOISG+e6hChf5Ky9E6MXXcXzVs+0S8ngNzx+WpoElNuJcGooNpFo4j/iIe8kcl56UlvA3ijjFgu09Lvt6d4/jQVTBoVeyVFXX6qJcIBItsLFxNmxzDJ73w6PFFvZIbqzsTRDMSZfmNBUQRfw0ddSTX9eyfY0zOCBxEXuUvB+3lZbvtJVFA/Pzq0CJeL30ZydpdIDN6zvyei1oSFdCuYdUlcmsaJbXaUuhMaUS8cZfH72VQV6/VEOXZQNZ2tpR/AUkoi62fAUqfofC8ZwlPs8lYDyarWw1RoFH5s/LqlSPk61IYbAFPZyl3472GTNmfv/r84TRNpvZ7txE1oyK7R1uB5GC/nmg= X-Bogosity: Ham, tests=bogofilter, spamicity=0.011976, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: When the child node is the first child of its parent node, mas->min does not need to be updated. This can reduce the number of ascending times in some cases. Signed-off-by: Peng Zhang Reviewed-by: Liam R. Howlett --- lib/maple_tree.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 067b186202d7..cc928b5f753d 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -1088,14 +1088,16 @@ static int mas_ascend(struct ma_state *mas) return 0; } - if (!mas->min) + min = 0; + max = ULONG_MAX; + if (!mas->offset) { + min = mas->min; set_min = true; + } if (mas->max == ULONG_MAX) set_max = true; - min = 0; - max = ULONG_MAX; do { p_enode = a_enode; a_type = mas_parent_type(mas, p_enode); From patchwork Mon Nov 20 07:09:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13460874 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 A796DC54FB9 for ; Mon, 20 Nov 2023 07:10:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3F4886B03BA; Mon, 20 Nov 2023 02:10:05 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3A4836B03C4; Mon, 20 Nov 2023 02:10:05 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 244E56B03D1; Mon, 20 Nov 2023 02:10:05 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 0E2906B03BA for ; Mon, 20 Nov 2023 02:10:05 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 60075B4FA5 for ; Mon, 20 Nov 2023 07:10:04 +0000 (UTC) X-FDA: 81477458328.19.70EC248 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by imf04.hostedemail.com (Postfix) with ESMTP id 98D164000C for ; Mon, 20 Nov 2023 07:10:02 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=H6NSrD30; spf=pass (imf04.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.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=1700464202; 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=w9+DAd0kh6Tp0D5lzI/a0yHeYFuqsn6U0+a+XQf0dsw=; b=BcQimaZMK8utRqKOm3H1YzGVNeihJ7pajaqmjbe+CR2mB9n1G68cfQt0kgAUOtxMGKL/9/ AwTBkV5aBFIXWNJRHIc+g/iSJ51KjiYlcEq9TmzKcPePsuekXY5GSsoYDk2mrmaTMISjnk m1cgrUlosVW1Ze1lYu/6BAk2E5GncY4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1700464202; a=rsa-sha256; cv=none; b=BVAuwNlGslv0YdShWZOuWNehQwLBjLdUgNX8ePwOrWbdLmLKDl+YMTF3ofVEcfPPDrNCFx hsjjghpAOA0ouZRCAi23uAI5YhRy/zGdjYzC8nzx70hq3o+o5MhzNkimy2/qy1HsVFOFL+ 0Yjsf+JG3KGM/M34b/5cflr3ovCzVdg= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=H6NSrD30; spf=pass (imf04.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.178 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-1cf67635006so487485ad.1 for ; Sun, 19 Nov 2023 23:10:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1700464201; x=1701069001; darn=kvack.org; 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=w9+DAd0kh6Tp0D5lzI/a0yHeYFuqsn6U0+a+XQf0dsw=; b=H6NSrD30JJ1MLaU41u+onfvjoDC7QzAda5X9QU82/z5k2SJVZJXUlA32PEkDAtqi/x m/SPXZVVOL3V98Fk6GGp6X1MJaSMleYqoamEF9TpwzgEKJTcUQV+JIIguRolYTu5ASpB b3BJjA0pznhzfuRK0+se8Z0NmOE3q0Dk0iUHRJ1SpmdGo0VZ2gFcyuv37huTV0bWwUYu FP05keYLYJLALNWG1wYFv8dXHFQcbLzEyyQaBNDwJtzXamaM874D1HVlmdUUGReQ5UJo p99NIlW00+dBzhRfzDjux3pTAOjvhntl3NaMlAy2o5bmJ7PZZgFrd2Hv4AsEfCZT3BaF eHtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700464201; x=1701069001; 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=w9+DAd0kh6Tp0D5lzI/a0yHeYFuqsn6U0+a+XQf0dsw=; b=msQT+25eUY3JS7VmqdfQpG3oQ47ymIuf1VGVtgwGzHIUUOdOOpCv1cQ2CANq105AJz MgPOhOFKq3Z7+lTnayZpstEFKiz7t+1t5CzT83YuJMgS+x1agrRU8uNZMIl0Xlw1WoHt h2bxxw+QhdGX/t9LpFrf6kmknCGc2MIWkzIAZBHcTwTmzXkyqb//5bGW8cA+BK3+B2RT vSYbabdspN4qql4gvUG+RJHn3AJSdv9HxBlIcfvbPh8bYIArLlsxkLK5UNq1QsqDhEaG hCHo40QfVGiuluctSu6SSqmTVo/veoW5FgXcyfSSBwodSSr0AI10DbtTkPQbglBSLYlG eZ6g== X-Gm-Message-State: AOJu0YzCLcW8BbwjFeqSBmDuK2esKYPu3H4aO88DNfB3zSxk6kMaSd+N mZSYifI1Rq1IDPERmVgDYQxXLQ== X-Google-Smtp-Source: AGHT+IGNvUs250aFwRwvpMkhOgmdzOmS2EHci8LS5ZEc+jeuyEGmhe+PjdF04JneUJX4CWCT5jVIdw== X-Received: by 2002:a17:902:ec82:b0:1cc:5549:aabd with SMTP id x2-20020a170902ec8200b001cc5549aabdmr5176361plg.8.1700464201587; Sun, 19 Nov 2023 23:10:01 -0800 (PST) Received: from GL4FX4PXWL.bytedance.net ([203.208.167.146]) by smtp.gmail.com with ESMTPSA id d4-20020a170902cec400b001ce67fab3a2sm3698143plg.261.2023.11.19.23.09.58 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 19 Nov 2023 23:10:01 -0800 (PST) From: Peng Zhang To: Liam.Howlett@oracle.com, dan.carpenter@linaro.org, akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, maple-tree@lists.infradead.org, Peng Zhang Subject: [PATCH v2 3/5] maple_tree: Remove an unused parameter for ma_meta_end() Date: Mon, 20 Nov 2023 15:09:35 +0800 Message-Id: <20231120070937.35481-4-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.39.3 (Apple Git-145) In-Reply-To: <20231120070937.35481-1-zhangpeng.00@bytedance.com> References: <20231120070937.35481-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 98D164000C X-Rspam-User: X-Stat-Signature: ok1ohb5ir47og65jdfnuzfsiw8itmo1e X-Rspamd-Server: rspam03 X-HE-Tag: 1700464202-446659 X-HE-Meta: U2FsdGVkX19O3900bgz1sH2LjwzJdUzA5MCT5Uw9pptSoNa+jAtkMQ/Ev3ltGj8F9ljbbmiPbIhqs+dnQgkVM56oRpV50ctJZYO+0DBmz+binElzQTUwci353smux9Qa0eEEU+0htdCtI4RU1BWli1htWm3drTL3G9O6vQ0zjWGLj4KzjUCPy7+5YU9F/2f9E2bmh2MfgH0vCgQHV5OShyLZ8SDqBAsIKvEM8FXuBxbhC/8JORgGddQBs2R6+3ZvW+CJeL1KtOMOdQuOie0cqw5bWw+BZMaXYlM/4usjT/eiLZKtb8Rw2aWLtRT1NATPX0NEcH89xPZ9Gm1iZC3n0B/hawOWaiK6+QtLTeEwmOsbEJjWtByQkReOf3k+cc4CHd0z9iwOF4DpA9cTq3lXMy8HzEPZQ0rtdX8uSwoRSiEl6bCNRyUMLoPNbnEXvI5scbG4pr1dkcwZUVm13wWh7P6AlkEWU2HHoixB6kvtjBn55ICaKUVg1EJ/vPPCdiD4ShaATXGrz6mrCrLVib7sbZChhs9oo9DUlnG0Ckj7NHXN8T3xjmHj0oEOXRwksCS8JyWWY6GNdiaMiWcsw7SEIl3zS8OK48+RifO0AH9t7rG0jmx69xqEByKaD7LVMJxIjQldb96ZZ3BlwRcMPuvgaapFDDnpqF4yNYU0FIprFeGYC/RXMP2tWaRoLNHsBgbsXaZdJxMNGISALP5VYpwXxoYL6mg41i6yZJ9ijX9LdhrvqI2thO5uQWInhzkJFijDVq3DgKWhmVykLnIgBhcmJb6Q3FuKkGmh5Oekw5tv5Q+U0wzjUMSJ5AAaOJe3UoGAZNcbv0voowgYrvTl/0iH3bogFUjLPr7Pjfs1gokaEbAC21tDIzAxmP137DjJfgd+46W7aceNnX6hZvaU2VzxrjoUAYg9HU8UQkxYwxqxN3uVMaT5pKHeN4m5ivSY6h9MysJNcY7s+7ESw9tEBz3 +jsefKj1 m1CSoSbRvQDTHDhGxqaK0v7rRjvuNlQmpp4BF2ILHjE+uyMp9H/jkWeZj0C4BhdNhTBtt0tgCMZEpSY+PnOfHCgct5Kn1yFRIzKLEZz+n0MDfgZLgYjh01QgZmkVDsYeo2+7kswDu+8il1iPy6KaAWruXicc7f0eu2WIVSSWppcsv+rIKzwJwvPQfuNXpUSxB0dZi+FOFJnnewsNZvGUy1xBkCTLf+EkyAmxfoRWhJAq7h5SVXZRUcCrTfoHtKN3jmfrEPDamjmMJ0uLVAPszdJRSbdLGTPUYFA1Mr/yeIq91M/NKCxIdkBDVOJxEgzM18TXsPuw47BCqqepifG3eMAVli6kGNKvZ0bdKXQXcrvoPs9rqoDIbRfUJBtzR2e7zBBI469Xnqjfv34i5si0YHwHFCkMVlBpUu7M5YFOzGMm77whdNPN2HFBOe27XdB5VbNG3BYysyMDd0PSWJyEUTwsr5MeWwT2tJ3WmoxMeEUXmyWw= 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: List-Subscribe: List-Unsubscribe: The parameter maple_type is not used, so remove it. Signed-off-by: Peng Zhang Reviewed-by: Liam R. Howlett --- lib/maple_tree.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index cc928b5f753d..3d894f849e57 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -930,10 +930,8 @@ static inline unsigned char ma_meta_end(struct maple_node *mn, /* * ma_meta_gap() - Get the largest gap location of a node from the metadata * @mn: The maple node - * @mt: The maple node type */ -static inline unsigned char ma_meta_gap(struct maple_node *mn, - enum maple_type mt) +static inline unsigned char ma_meta_gap(struct maple_node *mn) { return mn->ma64.meta.gap; } @@ -1587,7 +1585,7 @@ 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); + offset = ma_meta_gap(node); gaps = ma_gaps(node, mt); return gaps[offset]; } @@ -1618,7 +1616,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); + meta_offset = ma_meta_gap(pnode); meta_gap = pgaps[meta_offset]; pgaps[offset] = new; @@ -7252,7 +7250,7 @@ static void mas_validate_gaps(struct ma_state *mas) counted: if (mt == maple_arange_64) { MT_BUG_ON(mas->tree, !gaps); - offset = ma_meta_gap(node, mt); + offset = ma_meta_gap(node); if (offset > i) { pr_err("gap offset %p[%u] is invalid\n", node, offset); MT_BUG_ON(mas->tree, 1); From patchwork Mon Nov 20 07:09:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13460875 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 6FC1CC197A0 for ; Mon, 20 Nov 2023 07:10:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0C07C6B03D1; Mon, 20 Nov 2023 02:10:09 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0706E6B03E0; Mon, 20 Nov 2023 02:10:09 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E2CC06B03E8; Mon, 20 Nov 2023 02:10:08 -0500 (EST) 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 CDBAD6B03D1 for ; Mon, 20 Nov 2023 02:10:08 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id A5743A0443 for ; Mon, 20 Nov 2023 07:10:08 +0000 (UTC) X-FDA: 81477458496.14.1BC1858 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by imf19.hostedemail.com (Postfix) with ESMTP id CE2371A0014 for ; Mon, 20 Nov 2023 07:10:06 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=l4JdgfyC; spf=pass (imf19.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.171 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=1700464206; 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=BJAegsGMEAsqPHcwildrmHLCgFp9mNVCImkTSvfwCSs=; b=3v6fe4kMMrX1YiNR/zd3kU3rA3Qgmkqc5Udu/znkT2kBp8RmZoMwae5mCb91dc0ARahrhN fsKF8vCjMu8b8x6hb3OhpgczKa80st1bj9kEEcXMD0j61vhFFig6ppv8FIjA9K9WstqtT2 1JiepBfT7/kTVBIQMahytrZBrGvZf+c= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1700464206; a=rsa-sha256; cv=none; b=XSkMCDXA/sPIXl+RNjcIGULQ70Ep3PFm43rJMcYqC7bXPWCFx3J+Ol4z9Yw6RvErZxN7iR f8mHOGbHGpx4GVCqQZdLqRdgvkgeRVJoliLcURpQOBvYU8DLCB4GH54vOYhYjFpAumWBym zTpobN4WbnpywfrB81A85O8bw01HI6A= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=l4JdgfyC; spf=pass (imf19.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.171 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1ce5e65ba37so17696765ad.1 for ; Sun, 19 Nov 2023 23:10:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1700464205; x=1701069005; darn=kvack.org; 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=BJAegsGMEAsqPHcwildrmHLCgFp9mNVCImkTSvfwCSs=; b=l4JdgfyCNyIbhh96S5k0Bjymzo2bHzyX8t8Q0umNqpuUVse2p+Ls0I5i/mkniArasF ls6VFGeh5Iz1dONZZUeT7LiahW+4pyMqwav+kZ6hrhEI20rj0CyWnYLPQ6nVGQjjHnAt O02WaIG2v9W4Jn6Ra7JvqpVnDUpFnMLpsolO+mDmwEJ/jH5ih5aqQMMOdItKlerICtEy HQ1ZajCfJV7ZCSN8zasoU7SkWc8ljwYgBuWHm1u7w8hfU56ZTj9Ww2Qh0ctFbo77d7+h NXq2qky5PfTOuZ9ICejKuQYuNY6opeqU9OtCq/aUsFLGtWtFSJjBqoASbJyrcTHO43ZE e21g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700464205; x=1701069005; 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=BJAegsGMEAsqPHcwildrmHLCgFp9mNVCImkTSvfwCSs=; b=mtbGtzsshuUT8AxPYgOPaBpPD4MwUjoMP1p7isKJcTuOW2WEtplnBzNGKmsu7LlUQL 1dkSjr+mUT2yVk44Cl79Nc5YIIoXAEo6bltOHfu2EHCUfms2Kqm4VZM+qoMqp0jSfOWy 43NGtjGrdWiWD6YuHAv+tpqFSMzAgZSiuelJN9WeJRyzm0vjYT5KIFnLvgv4euJtIfWq +SsgykQb8tSUSvEHpDd0fsADSlcbxIZk7PEOfRwePy9+78eSMDZClsqSUh7t3saIn+2g kFBAY6eWt/3R4AIskzE5EqaZReyqQQIl326wEZtwMuDj0vBOmPJrqq3jok67EM0OAoob uSXg== X-Gm-Message-State: AOJu0YyzIia0b197NnQiM0upAntYtCp8Y2bsaIDcEEyYqYvkilDQdik7 X/haa0cuT9s6f0xSaGIhk9ypFw== X-Google-Smtp-Source: AGHT+IHMWj5eJhGQVYHhWGVAjEcPR1r+lH672kbdri/DDnFDTKkMrBGTSEq1F8Cut7W5CdHqO1+75A== X-Received: by 2002:a17:902:d2c4:b0:1ce:6630:1585 with SMTP id n4-20020a170902d2c400b001ce66301585mr7924553plc.23.1700464205725; Sun, 19 Nov 2023 23:10:05 -0800 (PST) Received: from GL4FX4PXWL.bytedance.net ([203.208.167.146]) by smtp.gmail.com with ESMTPSA id d4-20020a170902cec400b001ce67fab3a2sm3698143plg.261.2023.11.19.23.10.02 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 19 Nov 2023 23:10:05 -0800 (PST) From: Peng Zhang To: Liam.Howlett@oracle.com, dan.carpenter@linaro.org, akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, maple-tree@lists.infradead.org, Peng Zhang Subject: [PATCH v2 4/5] maple_tree: Delete one of the two identical checks Date: Mon, 20 Nov 2023 15:09:36 +0800 Message-Id: <20231120070937.35481-5-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.39.3 (Apple Git-145) In-Reply-To: <20231120070937.35481-1-zhangpeng.00@bytedance.com> References: <20231120070937.35481-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: CE2371A0014 X-Rspam-User: X-Stat-Signature: hw1tmhjefiurwphxzjs3p393agojatqp X-Rspamd-Server: rspam03 X-HE-Tag: 1700464206-206404 X-HE-Meta: U2FsdGVkX1/GzF4BZrO3/Aj7hnJPWcUWK+Mz8X62XP9TZlTpaWJVF+rExuzuS+aLup15gxZhHiQ219XBXvLn0nRQ3D/7i+hq0AySKzXHne9tnvI2kL2Nrxn0pP39wichrUnp7L+nvKLCqiXq+I+aPmNxyxaqv+prYRLGfbWsMiC9KolaxmfGgTWAV7I75rzaPLy/UwBZFfH+5mC9b2UBA0J3LW/udOk2CbCXLRgsanSgpCbyRH2a5Rx8vwkd1oPCHlDosEYvmyYv3COyRT0En/ZiYats8mINEDhBnJvfsLwGRMJdMi6dP/09+nc6jbQB7G6Y4TyVKB9rXXBBMlXySCcjwPe0FZup5nqTaNlLjlsx2qq4FvgeoUquNvtUFZMJi3IfLJn6/fKDkgmgiIh9i8bXpGDFgD8WCHkt+aGsuRnzGb5HlDHS8s2WegnnlGknlkSnFNq+U+7hZL1+wxuDJutwGHUPvGxa0H4mk+1I3p0n6oT9PYRo1Q2vvwPdmvVE+HpkpihiUPvfy0ej7gfmUN8LX+06YslwevOQOY+BfUdiLxTmPw4JqJhTflsagNgmuM4QnDlws3FOqmHjHkqJptlPNV6d5/Yz0qroY/aXHj8C7zgcdP4218LG3PlzsfVe/io51Gd+gZ0JbkeV1czWezL4SExo7W047c/v0a16eJsEbPWlpUy+1Jv07VWDSCgQKyubm8iKdGkCpzI3U1ItZ93GNPrCaImUZiQeYegRnqdo1JiJXWlu91qd0FSLhXWLtxV+4Mlcx4RTznzhbmXkGz78PumRuBUtnja6+eekUjmKspZQn3Y3Y4o5BYQviVsPco4s+UlvRWIngkMhYrmVRmINmhaUeXgtzCNOgAraSzLh7I95acpLWmsReoj9VVeg2W0e4eGPpzs6bYdOe6H4DWK8e2Tyr9bba90oalcJvyLoN8PujvtPObMIwrGWxjLGa5wXOK3BYrmaUjwzngi Vigp9//+ A4t4MWEkAmqEvEeV8atAEex9+Z+YyWSU2qZjFi7kNkCJDNnPbYuSsgviV8jX9glWIE59R4kCjejpGcKonD4QT7Hc/gH7y4DOhryxrv2smQmWW3kXlPiPiUdKRYfDeVaxz+LnAugu5IB+FsMOtVwH8vgLIme+1XXMmQ5M7pnDHZ14YwNadz5VGO4eKFEASa6ltVoTq9bmUHNhrOrmILxRkiqJOeWWWT6z+Xu91BUZIHf15QjnmRuRsIF4SrZRUu6wJYpZS2ENuNWnZ8iRgy0EO9U39G8YM8df/dnT2LmpmopPlZ3D0qt2u+DycUG4vYlIqD6LFZALMOWkhB1vRFy5E2EaMiwUH06ZC/IcJx0ukjWU+mR+3fKI3Ff7q26QuX8dAidPFZrZ36F/E1rsQjxiwfgXSHARt1kdrYfWGBn8WUCYzdJMQPjv8/T+69eRJbuvVcZdNEw3+0bdQar9hDv+T4qv4/DjZSfK5zb7LoPsc6hGieP8= X-Bogosity: Ham, tests=bogofilter, spamicity=0.242490, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: There are two identical checks, delete one of them. Signed-off-by: Peng Zhang Reviewed-by: Liam R. Howlett --- lib/maple_tree.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 3d894f849e57..bf64d080b376 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4117,9 +4117,6 @@ static inline bool mas_wr_append(struct ma_wr_state *wr_mas, if (mt_in_rcu(mas->tree)) return false; - if (mas->offset != mas->end) - return false; - end = mas->end; if (mas->offset != end) return false; From patchwork Mon Nov 20 07:09:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13460876 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 0838CC54FB9 for ; Mon, 20 Nov 2023 07:10:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4B6506B03E8; Mon, 20 Nov 2023 02:10:12 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 468F36B03EC; Mon, 20 Nov 2023 02:10:12 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2E2B36B03EF; Mon, 20 Nov 2023 02:10:12 -0500 (EST) 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 1AEC96B03E8 for ; Mon, 20 Nov 2023 02:10:12 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id AA3B5160312 for ; Mon, 20 Nov 2023 07:10:11 +0000 (UTC) X-FDA: 81477458622.19.6DFA031 Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by imf19.hostedemail.com (Postfix) with ESMTP id D76FB1A000C for ; Mon, 20 Nov 2023 07:10:09 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=MadCgkWu; spf=pass (imf19.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.216.49 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=1700464209; 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=G+DYEnQ+jfZcUuq4nlzb+NkHPQ+JKHORa1x2uG9sVgs=; b=IrbRFkS36hr+w0PAUPkQ5owa8gz609SLPPRQdfM9vSyf7FmxNRooYV4bT3R4Wwt+v8+Usx rhqKECKV+psba5WanoxA2dUDvQWsMwlDxc3Hp4OXV3x6fFjO4ISU3Kmqg3bFtBn7q1m+YE Cq7BrvnsLUl8wjz8o79Tz8zCO5rlFrA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1700464209; a=rsa-sha256; cv=none; b=G0vwg4iedOvU2cptbDjOq0BnZK33/mtZs9zpCzJumL4Vty8bPCs6n543oZfsf5FlLwMIdq 4cJXalZ1DRwVrezHFQ5ozc8pyv/NNQSk2HuYptOngYPA+OoIAbuECfC5y4lToHjOhSb9NI cPkgarGlufiJ41jFo7AyWCkxSnV2vTA= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=MadCgkWu; spf=pass (imf19.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.216.49 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-2851c0569acso839377a91.1 for ; Sun, 19 Nov 2023 23:10:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1700464209; x=1701069009; darn=kvack.org; 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=G+DYEnQ+jfZcUuq4nlzb+NkHPQ+JKHORa1x2uG9sVgs=; b=MadCgkWuXPjWIlwzD+3clrMmswKVATDgRI8ixdwqnYAOvl8N9+LhwnBUTbkxi1v1f5 3o7h1QhLgNoL/T/EcUGm1sePHDShz9h+brUOjGP2t0WHrnNVOht12fu5DQMTyOdU0avw MZ1C1fJF2Qg8L9Mgkw0HUxHys/wiKdCyqTTUcVwDTAezqNQ+8HUs9ufZ8G5aYyBztIUe 68ihI7YyiEMrS5zHE7FxLo1v+IKrFidBRWRO4chJY0ELoJOLPeU++11SJXZDfdyXKI5T v0NnseU0cEzKDtNVgmGmByHSw0vGjlLRiSq2YkJMhm32CzVyvQfkIYojwIG73kxrK1SJ G19Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700464209; x=1701069009; 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=G+DYEnQ+jfZcUuq4nlzb+NkHPQ+JKHORa1x2uG9sVgs=; b=DWHbOQb9AWG+CEnUPFn0Mzz2q0lhhyNsnKbIjv8xsZvWEGgpifPRKQ6EE4x7AecWMR HLlg5wyLv3HzNkVDYCaQY55SQ2nxvFOycnqtYv6pBhSmegNpERInSmRWRdqFGdEnl8uG dwNa9MCgwVrTiDThVAB3lIRS/GGRnUvJJN/oNVlV/gl0V6Xb3FAYEO4S3p+HM8a4uME/ Uos+LeBNzUzYGZRTkmkOi8VmG5j29AVYd8zli4Q8cIQGzJbX6ED3FdqVxINT1am1u7+s QjLlQONuUmZsuXAZLHdDbzZLqPioBhl4q39xGA994meyzIXpAl6KHR4oDxOtdp2dr9Jc 68ow== X-Gm-Message-State: AOJu0Yy6f3kAaEZAOk3mL3KLu6j/S1BXUkK463/cpmUS9ooZNpjiTiB6 GAkszIdnwR+XCfiQetBWrbwapg== X-Google-Smtp-Source: AGHT+IF83+lkbrauzNf5VU39sKkm3EJmrNtdZZs24FDn4zfpE+cr9/s7OrmNO9P9Edg8qWo55ZF4Bg== X-Received: by 2002:a17:90b:224a:b0:280:4829:52d6 with SMTP id hk10-20020a17090b224a00b00280482952d6mr6485131pjb.29.1700464208748; Sun, 19 Nov 2023 23:10:08 -0800 (PST) Received: from GL4FX4PXWL.bytedance.net ([203.208.167.146]) by smtp.gmail.com with ESMTPSA id d4-20020a170902cec400b001ce67fab3a2sm3698143plg.261.2023.11.19.23.10.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 19 Nov 2023 23:10:08 -0800 (PST) From: Peng Zhang To: Liam.Howlett@oracle.com, dan.carpenter@linaro.org, akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, maple-tree@lists.infradead.org, Peng Zhang Subject: [PATCH v2 5/5] maple_tree: Simplify mas_leaf_set_meta() Date: Mon, 20 Nov 2023 15:09:37 +0800 Message-Id: <20231120070937.35481-6-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.39.3 (Apple Git-145) In-Reply-To: <20231120070937.35481-1-zhangpeng.00@bytedance.com> References: <20231120070937.35481-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: D76FB1A000C X-Rspam-User: X-Stat-Signature: 48ku55yns9ftm1to9dq8cmod9kqu31gt X-Rspamd-Server: rspam03 X-HE-Tag: 1700464209-86059 X-HE-Meta: U2FsdGVkX1/hPymUJDv4HBJpLHgcHzVf9CTW5nWebI064bcfNeq/0wLHni5X4jhRYkxDJE5F1Iya4NrrG8NMYWQQ/yMOwL8hcpM+oQXiLEWv/E0bMEkckFXXlCndRNQ4RUGmDrGX3cTo2AeR/Pk84eB3NR6qmzjReOc4lbbBDlaovPXOp+tfhfCgpxG4YRB8pKoobekrWqmPXbenPPWyDKbKO/6EHLE0guifzNALZ3bVGfWJ9dXo4+7aFJ5acL4f7ij+Q68K2G6JddlkvZHDVeQNELIjRHuzMticfYb1Of7wBAcGFdKpcn4YqpwSybghcGsDM+OVJz0jteM3PGWOz6uuXbLf+KCWX7Ux67uuA+qv4qqj/NnQ4R1KDVwlhxUASCJXWHHxUehesjcGKaLLQljR4H30Wc5Q0rtXWVOL4dbJEYxS3DPe4LxxLrZNKQAOunKQJxEGsRDNfFFcB8a1awhhSUklSeT2hrBfYulmOpnr1ebueIBWidVDY1t1Khzg7JSyYd/h0gGszCWTSqDytXiYNFm/A0dmUMGdmopfoT0emTmo/brp4gpQcIWeoNFuvsboMjHHBD9DvawvHO4xBDWcyN6eYkwAODBIDTDpu+BlTIQuyZgYcEp41Idw8V6KAAQZo52gMTdi7n+kUmF1y+RnDriK04wTw6wFsh9MsbqnN6m6UQn3RU5bYtjU4onayhgbo4Ym6KowU0zLwPW5Xo6qgoYFEnbnrR4j3+l9COJ0Zpg96KQGNUsI7d9amT8b1gLzPNhK9q5ZAwWyuS+x4S2WyuXL/8zUvefoAHO803LfVPUT/kl9vhRe8lBEo9SRb4UaiFpKGarzpiSeKQrGwIHB1cYMgzAU+gkdyu6gxcaQDwcjA3qETred1izxVoFulRKYtZ+Gf3cS8ttuLvDyZrpPwskr5jPT3nGJ9ANlFSGXKKKa4Qsr1hYQXhV8c/t6nnWDc7V4uoqF+Q+5Xas oYCI5URn Slvs8TREoyqRoIa4b2ZD3482v9lJoE8DP/DKLBChXQKhHGVosHEpgiDtdq0dw/ojN47J7gi/wYKC2BRDCcuqw0hgwgOjxF2zwXdkzV/B7Q8tTp5MnU6t9Gz4FOLl/wqZGCp4AmeUCqTqrpJ9cuHKcTA3IKAz353lByFG87lexc2DhPHNltXexGdhDCKYQY1SoYK8QS5R5qzjIgWDyB0B8yuT3JadS7uxUsnZOL/L5z8BL7N4BUAPQrdriTsg8caKiWQnyutm2I/QO1E6JK4m3zwgs3TgpOtf4vdApyntdKF3rsjHMrwl5M/jISbREuigN5cmnXcRTx6Y0TZlTvMCoSL4Fj5vRX1ofJxP+7/q9TYH5pXvkoyWy4IZKjXnjC0yAT2Ub+VjC5yVnVhwNpONaf70cLoC8meEAFyG+fXSekQi6gAvqVKl+J65LFnN7pvv9eSM2n+rVGg7XMzXg++kndq2q7X4CMQGuGHXXrmekERLYLEE= 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: List-Subscribe: List-Unsubscribe: Now it seems that the incoming 'end' is already pointing to the last item, so we can simplify this function, considering only whether the last slot is being used. This has passed the maple tree test suite. Signed-off-by: Peng Zhang Reviewed-by: Liam R. Howlett --- lib/maple_tree.c | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index bf64d080b376..89f8d2160277 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -1964,27 +1964,13 @@ static inline void mas_mab_cp(struct ma_state *mas, unsigned char mas_start, /* * mas_leaf_set_meta() - Set the metadata of a leaf if possible. - * @mas: The maple state * @node: The maple node - * @pivots: pointer to the maple node pivots * @mt: The maple type - * @end: The assumed end - * - * Note, end may be incremented within this function but not modified at the - * source. This is fine since the metadata is the last thing to be stored in a - * node during a write. + * @end: The node end */ -static inline void mas_leaf_set_meta(struct ma_state *mas, - struct maple_node *node, unsigned long *pivots, +static inline void mas_leaf_set_meta(struct maple_node *node, enum maple_type mt, unsigned char end) { - /* There is no room for metadata already */ - if (mt_pivots[mt] <= end) - return; - - if (pivots[end] && pivots[end] < mas->max) - end++; - if (end < mt_slots[mt] - 1) ma_set_meta(node, mt, 0, end); } @@ -2041,7 +2027,7 @@ static inline void mab_mas_cp(struct maple_big_node *b_node, ma_set_meta(node, mt, offset, end); } else { - mas_leaf_set_meta(mas, node, pivots, mt, end); + mas_leaf_set_meta(node, mt, end); } } @@ -3962,7 +3948,7 @@ static inline bool mas_wr_node_store(struct ma_wr_state *wr_mas, dst_pivots[new_end] = mas->max; done: - mas_leaf_set_meta(mas, newnode, dst_pivots, maple_leaf_64, new_end); + mas_leaf_set_meta(newnode, maple_leaf_64, new_end); if (in_rcu) { struct maple_enode *old_enode = mas->node;