From patchwork Sat Feb 8 01:18:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yang X-Patchwork-Id: 13966202 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 B4663C0219E for ; Sat, 8 Feb 2025 01:26:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 273E26B0098; Fri, 7 Feb 2025 20:26:10 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2254F6B0099; Fri, 7 Feb 2025 20:26:10 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 075F96B009A; Fri, 7 Feb 2025 20:26:09 -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 DBB236B0098 for ; Fri, 7 Feb 2025 20:26:09 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 93A0EB3C1B for ; Sat, 8 Feb 2025 01:26:09 +0000 (UTC) X-FDA: 83095036458.26.89A3604 Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) by imf30.hostedemail.com (Postfix) with ESMTP id BF9EA80008 for ; Sat, 8 Feb 2025 01:26:07 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=QknlBqNG; spf=pass (imf30.hostedemail.com: domain of richard.weiyang@gmail.com designates 209.85.218.54 as permitted sender) smtp.mailfrom=richard.weiyang@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738977967; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:in-reply-to: references:references:dkim-signature; bh=QXMuOfU9aeLeOXNoamHyBu+GzjgL34HVe/Hu19ptyv8=; b=K/7lasAlmBma1CwQKMuC4bYtnGoYs+tlCxyCM645WDDyLPPAzFJgMCEv/HmS5ySXEvjwzq fbLObZTfQYdqR21vxpj6fqGQHjpbSQJokaeCjACAj1sd0Fuwh/Fb2TBcpXNsB3E/ncPO5p wSegDx86LNuAB+QTcIxn90Vx8no0BBM= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=QknlBqNG; spf=pass (imf30.hostedemail.com: domain of richard.weiyang@gmail.com designates 209.85.218.54 as permitted sender) smtp.mailfrom=richard.weiyang@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738977967; a=rsa-sha256; cv=none; b=W5xgKH0UtJhUZmi/xOwShYlivziMprV2mwcEK4+FZpywPgz8tdZ/fTNl502HEm3xGrtHva O1Y4aQewmT9nkgLUBJhM7Hjp+5sUC2W6gkltctFxn/q6zoKJYGTsZ3znenCexWFmlkndKf r3+LGZwRrSYz/s1a9KhR0CWSULPBVyk= Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-aaedd529ba1so334204766b.1 for ; Fri, 07 Feb 2025 17:26:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738977966; x=1739582766; darn=kvack.org; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=QXMuOfU9aeLeOXNoamHyBu+GzjgL34HVe/Hu19ptyv8=; b=QknlBqNGKTrk+ULC6l+o0e5Dhdx6E6oCDtcZXqDdUKaQVvbej2th2q+ixoONZp4R/3 wlXyp5jrlOBLm2WAlICaiYOk9e9Jv9X1CJeuxwq5eORodL8TWicYKZHRwHp09WR8d3v8 UygA67DyzXYhVpjeyumP3R7haEEqJT+5ag7N7ADe2guBswln3QBWuAvqy7QZMZMUoW3B +fAL/rva+ziLjuYDPTiUD/POVbc8cmS/NbWqk7OsvYUC7KoXr94W1rk9d9Rl7JFnDAk7 JvroJoDn7sCIRNler3xpys3/FAaYgPLuAFz+0A4nArFpwlS45TeclEeKbrWX+HBQuJC+ xxMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738977966; x=1739582766; h=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=QXMuOfU9aeLeOXNoamHyBu+GzjgL34HVe/Hu19ptyv8=; b=jnMZ1cwKBSzCpcLznAQs9xzq1YbjHuNvNlqaDNZE6eoQDdFUnQvXI3C6lYE19EOYez U+uLW5FeLiVjse5yTnA0zX3LGTHtIJN3TxXsr6TVtan0P8LAVGS6Mbe3otNUmwLcnRV+ 8kLbt6S2WDd5bPv7mUQNIktWEgysO5XOC0pjOvei2C2QCbaqRV5HGoEwmoARaakc4HWc Bh19A59yib7/yLAHO1RutIVwzosqsQUiS0UMppf5TGA11by/1qrSO60AkBE3sSZI5KFZ TC39W2Bi+g5OL/cVJ80xou/PvIX+5NPMTscpVJte4aEZu91oT5NSmPSZ4resH/YN5GaC fP6g== X-Forwarded-Encrypted: i=1; AJvYcCU1gzw9Jz/ep+jpIxwDLmznTfPYuQH/GK2aBM4hF3bM8cPVXkv316AqEw8i5RqaLTeohE4wJcbTPw==@kvack.org X-Gm-Message-State: AOJu0YxKhQv94uYrEdNqV6puWeSaWxcqkCAMln7sZAPYxa5ncVr7+fwt iO4x05C6fg3Zi5Voh8WYh0K3fwq3//y/jxB0iahNuBMml2FG4IP6 X-Gm-Gg: ASbGncvKimWhUR2VuqLnDlLI6LDgPU67W1bU7BOpSds+oSDNm1l+BJP+5/vIcjbS2PB fSx9xuY1HI1i6EnQA8bXgkjCnEu6ATwL4IgGpKw+XIkbeMBISBlHpCMUCgHQriz0igLu4jJJFNS W2ubCsZ2bkyplkTTOtlQkru+TVN9LvZvhjmxWnoWCMzGWmTzw6Rbbkjf3AGa8/VwLmTs9VZgIwu kZOQsYMIY2n8DyfTDmFHKAvRl8breZMlnfXQLsm5E2zj4sKVWcZIhwzs+42h/feXKny2hB68V7p fk+el46ZdTQEU3M= X-Google-Smtp-Source: AGHT+IGoxcD/POUZ+HJ4Vud78hPohCPfqRi5JFagFwUl2D/p7JnQAoppHgfJZccywsnOgywZxSLGTw== X-Received: by 2002:a05:6402:194b:b0:5dc:7374:261d with SMTP id 4fb4d7f45d1cf-5de44fe941dmr14451789a12.7.1738977966013; Fri, 07 Feb 2025 17:26:06 -0800 (PST) Received: from localhost ([185.92.221.13]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ab78c3e8b5csm209441766b.18.2025.02.07.17.26.04 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 07 Feb 2025 17:26:05 -0800 (PST) From: Wei Yang To: akpm@linux-foundation.org, Liam.Howlett@oracle.com Cc: maple-tree@lists.infradead.org, linux-mm@kvack.org, Wei Yang , "Liam R . Howlett" , stable@vger.kernel.org Subject: [PATCH 2/3] maple_tree: restart walk on correct status Date: Sat, 8 Feb 2025 01:18:51 +0000 Message-Id: <20250208011852.31434-3-richard.weiyang@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20250208011852.31434-1-richard.weiyang@gmail.com> References: <20250208011852.31434-1-richard.weiyang@gmail.com> X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: BF9EA80008 X-Stat-Signature: fz48kfu4nrq41e9o59ra55ikcq73a7xc X-HE-Tag: 1738977967-826993 X-HE-Meta: U2FsdGVkX1/ClFjawnYEl7NfYiundEyCaD1omu1xF4QnWJwmhPSmOVPSQYqwJXKC1/N2lXtuhAh81NBpwo2lcV/Bh0pifC0NXHrPe3fVvMAdjV/iVfQis7xYh66WpndSnhlhp6wz5eUDy40juLjKL3AaBFWRILRq2KShWhO4Vzi1UnorADCVvNG2gq+VXd2btIOhLTQeAOV5Ao6B7en5/aqzffLkNhyloI4c/HPVzf230+rFUhKJbYcKSJ2a2lQECNplvBIooURjQnnqPSOL0X0kKbjHvw4freQL6S9toReqZqI4kA/d0EjgINvuc/w2I4Gyu4Ud7BUItS6fw95wUZTNg912xySVGMF1oXaiYqb4Vb8XlkMTxy/bw2Dw3SQL5hnQP7JG5SRQE6FrMylm75PN+3BbkiHa/usWDr1NYokt24fu8Aja5g0W8m4PiDiIHWrAY24iybhINE55PXjaSmjoddFXtjNBv+7CraRmFOOvt14fW78EC+akVsY8k1tI1ykjvwX1UsuhdmaLs5XU3jGMap8AJfFOg/DvjKrweNME5gdK27B0qLYeVHB+ulVAUlyEKKhuLLBOUCa8ymjzUxcajyyiddPKVQeS0Oe+qg5bdXRJh4DC1589zOqRoBDDe60G6SD+U7W0fY5EkpPQzfjVHcxOliBUYYXPu8GGH0ddbJJ46OcjiIf+QA1US5yz0LiR3fQSR91mWE2xyI2fdLrnUWU9aDISefFf8J3WF1Jm2sKp2vQ3b4JHZBGF/43T5WGP+GjjNKo2RiCp+C9DC7Gl1Oe79ixoUYAwxmyIiMZd9OQjERED3eeVqHi93VouI+TQTCVciTL2OSNVkyQY827kiZMPOaBqt4IzxLPakV8pUpJMBHxC0QcsndLWpenIy2uWWhBSS91u/zN8X4gytJMWX7TYFormEnrFdhYYELwiQQlWA0et0xwVcE/Za1Hbq9Loiw0RFWJY+MIlWDR iX1pgJaI 2B38p3Rpk1oOIlzeZ/rC16hS9Md0r00KfBUj+EBjGTJPbM8cagDWHhdgW5slYCYCCwRzDw5zuCwFdV5tBrQaIITd/cEtSWw95NeFNuE6BHnN0M7egSW78TI5Jl1xIsMdUFhzi26Wky6BAxKr8UZqoxda/6P8tn6Y46GLh99TXUSh+9NUmw/LKtc16dPo9vJ9ua/LnGdanmSHERfLxPYpKDOmniJdsZRJUn+UaD8Sd/k82l0Aeo94DNgzykPqi/4D5wZgXRhTgVXs57805nmMQhTAEgNOPYR1n55ZRaKM9/Kv9tg3SN2JOHRXowUSKUmQ2Cb1vo9sA6KNmLta944yNMK94t5j/nkrdocw7JMLbwBqK8QGcIfGs6iMy37a9j7497cES8S0ikd9YMLoJzC1kKt98uo5uQxK0HJgVJq+vyy8K1fTc+/IwmiRcCVpUTLOAzKgzCCCQg9E6bIN95szKf3XSVki599+rwtDnO6QHNYOPkdnXDDaMHfzTOrYPxTohMZgRc0vpCmI/QLtdRgiB7B+icM1Zlldtud6lYm/RllqiWC6+d9Ax8k7Gp53++Cu11EMP946SOnyX77g= 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: Commit a8091f039c1e ("maple_tree: add MAS_UNDERFLOW and MAS_OVERFLOW states") adds more status during maple tree walk. But it introduce a typo on the status check during walk. It expects to mean neither active nor start, we would restart the walk, while current code means we would always restart the walk. Fixes: a8091f039c1e ("maple_tree: add MAS_UNDERFLOW and MAS_OVERFLOW states") Signed-off-by: Wei Yang CC: Liam R. Howlett CC: Reviewed-by: Liam R. Howlett --- 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 d31f0a2858f7..e64ffa5b9970 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4899,7 +4899,7 @@ void *mas_walk(struct ma_state *mas) { void *entry; - if (!mas_is_active(mas) || !mas_is_start(mas)) + if (!mas_is_active(mas) && !mas_is_start(mas)) mas->status = ma_start; retry: entry = mas_state_walk(mas);