From patchwork Tue Apr 25 11:05:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13223201 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 708A6C77B71 for ; Tue, 25 Apr 2023 11:05:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CB3996B0074; Tue, 25 Apr 2023 07:05:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C634C6B0075; Tue, 25 Apr 2023 07:05:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B035F6B0078; Tue, 25 Apr 2023 07:05:31 -0400 (EDT) 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 A2C1F6B0074 for ; Tue, 25 Apr 2023 07:05:31 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 78CF8C037C for ; Tue, 25 Apr 2023 11:05:31 +0000 (UTC) X-FDA: 80719632462.15.B7DA501 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by imf08.hostedemail.com (Postfix) with ESMTP id 9B836160009 for ; Tue, 25 Apr 2023 11:05:29 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b="Qg/Eb8jh"; spf=pass (imf08.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.174 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=1682420729; 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=adf/xVVZ+zD1y6dwSMZy7eTiJ3ZJr+5S82v3Bo6axPQ=; b=enboWqh7vGqPobno9wNEho+ky0fZh+1NauIjmfGR3wvQwoasC3sofqg4EO6+aHbYMBspeN rKRqe6UixZ3mcnxduFbHuOpgDkasnV756kMMTT3V5M752rt3J7O3eZdZMqlDMw1t42awNv gaeZbP54uvqLYixjQRf7yeK1gVUewWY= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b="Qg/Eb8jh"; spf=pass (imf08.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.174 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=1682420729; a=rsa-sha256; cv=none; b=5XlEzvgLbaNsYoepNiccZfgvOqnygheRMCfVCej12wuuqKT2wOMqp/O98Q/o4ocxf/qq7D pZjIOGQE/a13z84GJOt5q3dvWDDk7PfXrC6+PRf7ck0F2LWHEliHwMRr3ysx54M4vTur1L i1YgxgtIsECJGI1fAyKAe0r1o90r2H8= Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-63b70f0b320so7415653b3a.1 for ; Tue, 25 Apr 2023 04:05:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1682420728; x=1685012728; 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=adf/xVVZ+zD1y6dwSMZy7eTiJ3ZJr+5S82v3Bo6axPQ=; b=Qg/Eb8jh+M7A1BjNkJA0ETdhpSJNmHPQqY7kHY12vMVLnl1kdHdvkXB4if/LEJNcQ5 /1LNuehfPKitPB3/5yv9OLAuhw799I6ciManueoWOAOynBw1CWPSJwwq7GxIxWdDsCzN naRUqvc2fV0nM8rhoZ1l1nNrYS66KlT/jRC4W1CsIMeKe0PoIvySiXB8XjS+DHlft/NM fZHyu90UDLxs+cplyvIGFAikzgye2S15dQ1zbi/9kb+dH6OV4iV+CspPnU1KIUXqBT7J qA2QnXHcRQ4FVt6MfpPeeOr+TBMq90cvSRy6vcvX4sHyef0DMH8MM3BjdFREbtnczCbm zWpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682420728; x=1685012728; 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=adf/xVVZ+zD1y6dwSMZy7eTiJ3ZJr+5S82v3Bo6axPQ=; b=AE7tdXFETGDqy/FdWs6ZUuQXBCMeAbCCJlxL7SOF74A6eIYYIxm/GMGhUgXJaMPMGm mzSyW2D6HdZjMVOf+wELjyWGV0rTW3T3sTjrEF/ORPzn9vP9aeZi0fTCYrCxFdymKE7b 4xEUMN+75pgOFc1XGJMDhajCIkwiqtS+1+kzkyR4eZ7ueFMzA2aPkiwptKQnHjHQ9mQd aYkHiw0BQiemKYfrB00xhav1S/2iaLdbZKjUJVUhmj9t2ksx8Ox3qE/IsGabDVkeuDpJ E/VYW5BxNMyqoX1yQgZ0Ejqi4huj7wK+BWqb9ySfk5xPnDUkJ4YXQJrhLMR7/fVjM1f9 uGJA== X-Gm-Message-State: AAQBX9e+4FJv0igBQ53TQp/siDMKmw1Wtq9sM7NkULookg6+c4vvl9PV Ku8WobdPtksJIGX/3RgxQMp+Cw== X-Google-Smtp-Source: AKy350bOoFyRIN0M8N28n3KXREP3tLoV3nfJ0YqTMfCWgc6sCikZeNaFUfG2ms1pU+I3yUk9dO7Khw== X-Received: by 2002:a05:6a00:1516:b0:640:dbe5:e2ee with SMTP id q22-20020a056a00151600b00640dbe5e2eemr7068367pfu.10.1682420728409; Tue, 25 Apr 2023 04:05:28 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([139.177.225.236]) by smtp.gmail.com with ESMTPSA id u3-20020a056a00158300b0063f3aac78b9sm4422169pfk.79.2023.04.25.04.05.25 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 25 Apr 2023 04:05:28 -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: [PATCH 1/9] maple_tree: Fix allocation when min is equal to max in mas_empty_area/_area_rev() Date: Tue, 25 Apr 2023 19:05:03 +0800 Message-Id: <20230425110511.11680-2-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230425110511.11680-1-zhangpeng.00@bytedance.com> References: <20230425110511.11680-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 9B836160009 X-Stat-Signature: 8c9jpopzhyz1gz79moy193u3a7yucfgy X-Rspam-User: X-HE-Tag: 1682420729-947629 X-HE-Meta: U2FsdGVkX195D5GjhMToFJvi3zPdq5ZPNNyxQ4+nYtHOq1TKzuI1wcAHdbv3CMOvsvtDaZW3R80KM8xMs4kdQti6hVf9w6WqFp85Txgq3e1NFvWWEG/SOt3A5DffFUy9ZGVy/3hQ1Awcs6cBMC4ftk4Jcg54oiwfwH6o8lXtNpuEPmUv/Ey83PgN4y+xyEVkMzEXTYd3PhWcvBp9FsROm8PBvk23teafaLXhkRoWIebW1wsw7pfns2mKoJ3JDk8ABG/uvSrSiYn98fO6cxKwXTZgWFT4/L3vxKgq1rEGv/Wx3X36O88I0jjnCfSAPS8Ylgl5BfNsoib9CO0siiH35pwdtCLDUFAa70SViRlHJQwMLfKVHgGA6B6OXuYa4k8pGKmZwueLPuwyc+9/E0dgAoEiL/ioXDPHantof5cOevLFMez4S2dYJfDw8k/cVtQpvIRqKBiRLaePycg+4uDSl8ue2bbrXhbc+OfT1002nUnEtZPr/rp/kFzZCca5aPad+Xanlh1Zs9zGMSx0J1Vh1uIQ6HJQbEd//tE7l91iVVW7FCpwfOeHSMeCpp3FkrUWOSug/KiWyJHHkZLe37Ryuxj/IUjIP9sIIf315S91Ey7ZrktKDda82F7LtrAAkVPZBk/jhmSK1KjCIUrhOmGnsYzC/InXCvUa4ttKAmhbl7mELxUTQcKnYRVnEbqBMVSUCC/w7le8muHMhjZnrfR3LQ/Z2R1E5NboMNSBYZhcAWcqJNgZJjBaEob2JgFBUesR4QIkP5/WXzgLxku/CvmuAgQGSBl1S50fd7IKt5xzuSCj95v13Mikivo/USbR/2I+JyaObZjFeyZKa+x/9b1upongZNGYyeGyjG6Fe8ovjZ/scUEFuapykCQxMAic6MRkbIVVoXGK/+2rfZWGjylMfCy+rh7WDk4TWl75ltIWyXLD7rjIbe5cIUaP6O9Rlh2400AQlilIrcFMFjAeNB4 Ht/bOH+T 6JK08S1ciVikgizjababadAggXwBCsCj815ILyONW6Ku2mpGlzHE+D8SiKnie5lh1z8TrQlc95rYBU8TZyE8obOGK9HGft84tZ0jvzt4bCpLfu5iXRkXn5Oznn68GwtJ+H0KKC4l8PQSAlmLV/5GwxSGNTUdR6bnLEOkYWuyPOCMuGcvXJdAKTUS8p0/kqY5akqhfbd3TzyEuYMh7QACVbwVxdZUIHGaDCoej9WoL276TNeaVY0vhbYGI0mhLrIkOdrE70VeaLAHY1wQoYGN1HcRxHNz7y8DLGP8pP0c6Lt920i0ym2XXf+hQKreIyffqnQHvMZR3Xo8/4nIrMD50Aa84up/efZAssndmeZHsbUKQoD3sVBu0NPQC37txTcDdv07Su2rQ9n+1kEvPfr17497WNWXHWpCX3WrDA44LDd5NcujxYqeEqVITAK/7h53yjLjZsbPY8FN/9Nc= 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: Make the allocation valid when min is equal to max in mas_empty_area() and mas_empty_area_rev(). As Liam R. Howlett said, VMA doesn't make this allocation, so now this bug won't trigger. Also add some checks for invalid parameters. Fixes: 54a611b60590 ("Maple Tree: add new data structure") Signed-off-by: Peng Zhang --- lib/maple_tree.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 110a36479dced..72099b4b32169 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -5289,7 +5289,10 @@ int mas_empty_area(struct ma_state *mas, unsigned long min, unsigned long *pivots; enum maple_type mt; - if (min >= max) + if (unlikely(min > max)) + return -EINVAL; + + if (unlikely(size == 0) || unlikely(max - min < size - 1)) return -EINVAL; if (mas_is_start(mas)) @@ -5344,7 +5347,10 @@ int mas_empty_area_rev(struct ma_state *mas, unsigned long min, { struct maple_enode *last = mas->node; - if (min >= max) + if (unlikely(min > max)) + return -EINVAL; + + if (unlikely(size == 0) || unlikely(max - min < size - 1)) return -EINVAL; if (mas_is_start(mas)) { @@ -5380,7 +5386,7 @@ int mas_empty_area_rev(struct ma_state *mas, unsigned long min, return -EBUSY; /* Trim the upper limit to the max. */ - if (max <= mas->last) + if (max < mas->last) mas->last = max; mas->index = mas->last - size + 1; From patchwork Tue Apr 25 11:05:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13223202 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 DF5D1C77B61 for ; Tue, 25 Apr 2023 11:05:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5FC5D6B0075; Tue, 25 Apr 2023 07:05:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5ABFD6B0078; Tue, 25 Apr 2023 07:05:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 475966B007B; Tue, 25 Apr 2023 07:05:35 -0400 (EDT) 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 350796B0075 for ; Tue, 25 Apr 2023 07:05:35 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 06875C037C for ; Tue, 25 Apr 2023 11:05:34 +0000 (UTC) X-FDA: 80719632630.06.EC34823 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by imf15.hostedemail.com (Postfix) with ESMTP id 0E2F3A0025 for ; Tue, 25 Apr 2023 11:05:32 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=QmK+bpu3; spf=pass (imf15.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.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=1682420733; 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=k3gtz2twduYMn314aWKPdPXlwzAEr/ThikDxq/EAqMc=; b=uEw2aO4E4Z+m5/a/5MNQBhnj3LeRcsVtzRdiwk8+rPIYcFOIVivN+2TKcjuP1buAKpGMlv 1xmiKI6EJFz25ZKuXRNUj9ECnq78kWeWJC0gwv/0vHayN+FEWE9jUhnA0a68PwC2WWS7KE Egz7ucg+HGXUBqJumA6Cks9dv8m0O3c= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=QmK+bpu3; spf=pass (imf15.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.171 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=1682420733; a=rsa-sha256; cv=none; b=a9ByNWaNlZFiirr9cVkUf5+MlnHLJlxzX2X1cNrtnpaPwVvZ/r9bFURpdV/0ejKaezXcY4 +rKD9sWvQ5GxObehQcE1lA3Dn7T8dZV11zhPGI+ENrCmoeErr6sjjqYSH60921T9Wnm7Gl a9Of6XZXXrx6xXkpW1d/3qItiUJMpe4= Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-63b62d2f729so4546274b3a.1 for ; Tue, 25 Apr 2023 04:05:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1682420732; x=1685012732; 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=k3gtz2twduYMn314aWKPdPXlwzAEr/ThikDxq/EAqMc=; b=QmK+bpu3OrfPdSwq5btASAzKm3wgRczj/+suiuqNcMy2NwVbP4ROvdfevWx4rQNazE z51Uz+aGBN2J44RqQUvlScXgks+MkypgIVZPjhcPt8g1vNU6HSKACdUnLJH86h3Trf5x 29A4FD1yH8yNeYxbdMGM1UejkWDX+SNrdDJtE8vfWm8swblZ77+lqF7zKpuickVwqdC4 oAnQBvIRl6pV+0feNB+9re2SLlggZIRIT1Z67T0xC9ipIzv87BVHDvgkdSQ1gdFZnefA DXoZ2TKFJCZFzR8vjJJb5NhBPKZIus1BetzLfmTTHhYzAZW9qSZtdi+W+BOt1gqG8q5m iEtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682420732; x=1685012732; 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=k3gtz2twduYMn314aWKPdPXlwzAEr/ThikDxq/EAqMc=; b=aIOJ13kH/DmY65EysN9V2XwFqFgU2CvX7+WvKa3jOjlhKi4jNGIUOZofzV+2/XgrxI viQwj1M9luMX6op6FOKDTEmqJpVLkBpnDe7ngAAyJji02hmDEVQ4gFyCXAttAWQUPkaV PwjT19toauGf8D6zYyK7Ch4biRmLcCDmlEALSLrRjR7pgnrLhST+MwgtjfMXgNx2hxck V723HSiCNqUL8P2VXsQI0hEP+sQYxYkpK2l0/dJnwhgDmj6PK2Qbd6GEr3Yrw77wBbIq 5k7TVgqO0sbyeKlCHxdx3Lz6XV3N8VwpqJcfWlTPksReYzSxBDAgSLIf6bKyS+xnTP7H dPmg== X-Gm-Message-State: AAQBX9eWX7r5WLB9d4bKMnYBMPPvN+jNqlgIW9lPnQpN3b72FDUS/dy2 bPy3JKvm9x4HwYlp9eVCc5lAMjHrJt86kd/n9Uw= X-Google-Smtp-Source: AKy350a6riQre9kg4t0NqG+0JOJCUjRgULCxd3ko2U+yTXTnw2AYPmRvhUw2mqlYxBxuXlVpDaZ1AQ== X-Received: by 2002:aa7:8884:0:b0:63d:2c2f:e3a2 with SMTP id z4-20020aa78884000000b0063d2c2fe3a2mr23868065pfe.18.1682420731840; Tue, 25 Apr 2023 04:05:31 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([139.177.225.236]) by smtp.gmail.com with ESMTPSA id u3-20020a056a00158300b0063f3aac78b9sm4422169pfk.79.2023.04.25.04.05.29 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 25 Apr 2023 04:05:31 -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: [PATCH 2/9] maple_tree: Make maple state reusable after mas_empty_area() Date: Tue, 25 Apr 2023 19:05:04 +0800 Message-Id: <20230425110511.11680-3-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230425110511.11680-1-zhangpeng.00@bytedance.com> References: <20230425110511.11680-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 0E2F3A0025 X-Stat-Signature: mbd7c4xsenrgx34ziouf75c8f84moycj X-HE-Tag: 1682420732-12880 X-HE-Meta: U2FsdGVkX19vCJuuDMnU1PHPSam5UvVGmHOWeLdiMFUva4iwFnFx0+vh3Yaqdr0BGVkOCnGra+HrTg8SJ/kp8Dro3DBMyvxh3oqVCy4Z33DrxN13kqH/sbeozDOhzWJg4Cj86xTH2XYjRxjwWvzosMSs0Cm8fVF7nAN06xJfC2f/lqFTIlHolSyMeZ7pdD/jFFSnlAJAvp0KOwFLYrcffEKfYZ6PxqWXoCyJF6dTRZS8gdfVNrax3i7nSMZ2KpcS0nKi+prn1LmXmCvoHSKn7+422/jADHNNPLbhxyEGy0AaneFVX8izV+xmRu3pZsqCSjbFU5LqODGx3KObWRnWWARHSoxlLFquvEZaV0hpKsXqq1ri8+X8vXRKoBGpabdyrooxgo9Eh1xaXKSyKje9b1HtPhpc73gC9g+0l4j5Jj+YxDoRjvOAbVVNw8Ac6/dzCMWiIeSbELTKd1ELUidkoQKGMbjBUgzuAbVEv1vWrxE3XiYxtcJlpiRveOQq2q0w9amB0Vg7jqV/hf4lO4Du+ULoACYiYW2kHH2zqTXqiZVqufgHgrcHrerQ8xeOh18LZuTJrc6COocoGFCWcM86MWEmXUHC+BSBIX9CxBaXeV+h74Qq35hyifaGcjemE/7iw9vC5XoSLubeX9jSf5YjVQhJrYXty2/Q87UIGY4fcCilIGBi07N86XkGr5pt6kRbvp9wLInfO7xs/KbydK/oR1Y1mLBNawX0zk6tSU5nQGMbWJmIa25NzvhOGQV3UIENHw5T5JL6ZUHlOo62PtjHP2I8nXDlAydQGvvG5xTscyZ/5rkshOmQ7aVGLzM22Xt9Gb5XTiUJhjLsou/r2EMJ0w6YeV7xTp/6Ub/6zUmdUC4MVysXLZFhj3q1os4/h1c9LvCGV8aLsUjFylXmqWRNRqaMSqjlG5SHFRluOEJalUWXF2xh5LS1+r3ZZ5zezlsa/Fw+UPWmquy45rF2+GH IFBNyzQe vgN+mSMS+yuu3igvao+8mooodajuPMZhdemQ7MPH8F4zoFQicDZQv2Y5jv+Yvo3Ul50cVgvbmSc9/CdqFUOVEGJAvGUMWCj0OTXMdFwtxK6EW7qMiECcuWhT17SF9qfemEj1aEUICSpKjL4YgO2zRAb5/+3L9c9VTUIeyNO7PnfyJD6JCYS0pW1ayak6W9LaxXT907z9S5VNasifDPOGcpQpBW+2F9VWRezcdNkwLlbx1idUL1FYQNO+N2GRkGfTbyj+rT9GJS30N/Ql2yH2vobASmZjfqU5nOoCEQyFgUHgbcoEyAc2dxG6i5Fu5BRDFiaie2LCexdv9iF89znTVH8MZUNL/nB6XVl2l9aKD6p4PYA9p5EI3Vemt3oEYde+45RucIl65El/wYLSWJkDQnfidLJv60+0XkAeXAo4ubt/yZ4Tl0uLPYt3zA9V1/9CWsMjR/lB/NIa6MqI= 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: Make mas->min and mas->max point to a node range instead of a leaf entry range. This allows mas to still be usable after mas_empty_area() returns. This currently has no user impact because no one use mas after mas_empty_area() now. Fixes: 54a611b60590 ("Maple Tree: add new data structure") Signed-off-by: Peng Zhang --- lib/maple_tree.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 72099b4b32169..aa55c914818a0 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -5320,14 +5320,7 @@ int mas_empty_area(struct ma_state *mas, unsigned long min, mt = mte_node_type(mas->node); pivots = ma_pivots(mas_mn(mas), mt); - if (offset) - mas->min = pivots[offset - 1] + 1; - - if (offset < mt_pivots[mt]) - mas->max = pivots[offset]; - - if (mas->index < mas->min) - mas->index = mas->min; + mas->index = max(mas->index, mas_safe_min(mas, pivots, offset)); mas->last = mas->index + size - 1; return 0; From patchwork Tue Apr 25 11:05:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13223203 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 30106C77B61 for ; Tue, 25 Apr 2023 11:05:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 783336B0078; Tue, 25 Apr 2023 07:05:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 732A36B007B; Tue, 25 Apr 2023 07:05:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5FA836B007D; Tue, 25 Apr 2023 07:05:38 -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 4EB876B0078 for ; Tue, 25 Apr 2023 07:05:38 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 1786CACCBD for ; Tue, 25 Apr 2023 11:05:38 +0000 (UTC) X-FDA: 80719632756.26.07D85E7 Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by imf06.hostedemail.com (Postfix) with ESMTP id 44BB2180010 for ; Tue, 25 Apr 2023 11:05:36 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=TvmnBK3T; spf=pass (imf06.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.172 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=1682420736; 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=s+OVqkfyvyT9tLRaTTTVeLMx7p1ihu2PyK06f3NH+m4=; b=HT5X68yUdoUPlZ26lC1FTXzJCsRuUeKZRYDKoow2Q77CgfFqDp9byIJ0NLKOqNyJhHXHeL ymycS3ZS6SoGdhHZ/Wd4fdvHp4jS3TNe4BqGmlP16xteCTXjMpHIhyL+ko7Y97nOhb7b6i 2hExiyq+zjfLQmSIVTHnXgbSR76pdSU= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=TvmnBK3T; spf=pass (imf06.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.172 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=1682420736; a=rsa-sha256; cv=none; b=ZV7Z4Pz7mWptx6jfU6fi5Q/ofetXUp/YKIdw6AmaIctQYUyCPDOYpvYm76OtWXgrGfj09O wU6q3tYkbYQwwbHG6/rTJNgT0G9lKa/2HoVisViIE3K1MXNDKfOp8uJHJxTv5tzrij7m9/ vCMqArLlb/RrszinTBPyBxIuH6twTeg= Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-63b620188aeso6822614b3a.0 for ; Tue, 25 Apr 2023 04:05:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1682420735; x=1685012735; 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=s+OVqkfyvyT9tLRaTTTVeLMx7p1ihu2PyK06f3NH+m4=; b=TvmnBK3T5BGsKLcDBxe8I1B94ng08H2tuzNDpEqZoy1+LctQIiW4WT3RZcb/tHl2on 88ugTHoHu/LoNQs3vW+n1rhZKd/FtaELuBuuVd9rZJaB3jLXbc9nJVemoKn7pNdJPu7Z tyP3oAFD0+vym5HdffMKGu7KU5rXjbuZg3OIOmHOrpOLXiQYYysfM2OhZ1NIR8Q30bND 9Vb81GryXrwM+H52qTtiRELs/L3RGJ2omGxGUOjbzntjCSK3Xs6nlbR+6Jx5RgRGdyZI lvvTm032rA91XCwcpNpNFMrfC2Q9p97isiUAo5q0FefmZnH99JIs+GggNcuX0YNXfn/I FG1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682420735; x=1685012735; 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=s+OVqkfyvyT9tLRaTTTVeLMx7p1ihu2PyK06f3NH+m4=; b=BIvkS8qezw0NlcKYui5sHGIf2/H1G4QTGZubsj4YQ7Fg0/OWlqvoEQn5+OHiunjp35 g8Co0ORFVUpN1GCSfxI9KfEniIsQWkCCyR0k/C0qaW4+0FxTlYIYBIyW5r1AJfpiIhTD aya/rCpr/ysivcqHOgJr4YcP1XzanDYsH5o9+0C9k8nnrdYEZZuExDAc35Digcr0/iiB 1KRdKCFh8gCsWH3QIggJTN/0794X/u90ChNzUEUrZ8UQZAFR7yljwH94NCTRRxCAV3q4 gNg6c3IvUIA5i+zrcq4PLjLFnqwamxVxTngiE8rwdY1hsEryaW/jM5UjQEv7usctgg9X vqFQ== X-Gm-Message-State: AAQBX9cKk+Ccvfha8AGXEAAOjRsNGTMIQvME1m6KPdPBekLVNL7PEI2+ ieaIb6oW21ZlebZ9nlir7rziemoraq9AIk9wMcc= X-Google-Smtp-Source: AKy350ZbU0r0I/EfFW3YIvxct2GaWxziPDmRNWYLb0dmYuNj7cOPnbFSWn8Hszq0QOVVDQt4VGY4Vw== X-Received: by 2002:a05:6a00:1401:b0:636:e52f:631e with SMTP id l1-20020a056a00140100b00636e52f631emr22180035pfu.1.1682420735189; Tue, 25 Apr 2023 04:05:35 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([139.177.225.236]) by smtp.gmail.com with ESMTPSA id u3-20020a056a00158300b0063f3aac78b9sm4422169pfk.79.2023.04.25.04.05.32 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 25 Apr 2023 04:05:34 -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: [PATCH 3/9] maple_tree: Modify the allocation method of mtree_alloc_range/rrange() Date: Tue, 25 Apr 2023 19:05:05 +0800 Message-Id: <20230425110511.11680-4-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230425110511.11680-1-zhangpeng.00@bytedance.com> References: <20230425110511.11680-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: y5fcrg5bnczsm1jquo5c1deo53gkbuyp X-Rspamd-Queue-Id: 44BB2180010 X-HE-Tag: 1682420736-759736 X-HE-Meta: U2FsdGVkX19KxCD2CNRCIYUjD/fWbh+BqACIrqT4qPcE7AXLXqscU8sPUpwZDGckPM/Yih7CVH7bNWwoMnZj3WCggXTbEZZsECw4QYWHJeD8jPtq+5JOvV1b96T1dHuhGLYt//Qc1JzmexFPsTe9Bx8hipJk2oHCCYF/xqE0YoL8n67si4oLxDcsvFO/aPnr+WGvnSn0aRrwJZ0BrKAHPWfSOwNeY6/aE2KKJ3DNpddCPCackfAEXFfL2Y9Wjt1zXQ+/6Axioxr9YI1knk4Gfzx85mBzlbLc5F2bq8iPFAFmsuWwCoYy5EyVyzZD3V/xQH5RgsJzqPM5oFofqC91S8aJdImvA9gIdUuv/azkeZEnfx5mucurjpxyMmNYxd88164SSbClaVATkA8oa2hXJagm9YeG8ejpKHnZFoMrAZunvxN3voYtPmjCJKQB5UGKl4eyiL4cdSo/0hrfO+fM49xfzCjf9w3jAbVbAgy3LwVfZrk9d6Lrb3o46k54XBMIX/ES+AiNcLuubSKDiWybBA09u6Pr5bg0aBY8s9WrJc9bAh+jIRNTEIZyfLUAn9KJF/WQKVE3+zgKvvmHSDNdamWOaGMi+TJMjq4jX/CuNq2YCw4XUAtn65Eza4CsgQMrfKAsgKxmqQXTaSQII4THETCwfSkPW6bMRtYdoPpSKz51wuDm99SNuxzcfbnI4PJsEr6qBlz+PsNA0y3HvEuedYCy8HjPQEU1949CtwK5n+M7zzcafYXBD+Xfs5qUPT1egDc/KN2i2tRkGwdaR3G/zb8dAMH52+SuqV4co9Ol22RGEU8RYQipbXJZf2ersbyX83szhvMZZOHEBTc/nXcN9O1mWlxxb4Tmd042QIPNmboL79gLny77U1nWZI56r3ez0JCwYNIuMJ5S5IOfgGuWX0gXIg0gbUyd5JbqGH/yRIuv8x89vbJ1sKX1UBvdcXpu5IHxmgNXIndoMP0T7Ds 7gwURMVy dQyk8SBWUxMojYfEuOT2mYrO1Xg66GrblKJU6ae6vT+YKnxDvmCjfr4bad4HFCKs5Cqj4ns+okqA8hLnwptux+aOUKiW8G8esqZeQ4CmbgpDnyZG0expXyGkcFNWNx69ehcMcf2GcAlIHGIXTV/4ZghNb4ToX7yNHseUGynzXYkCeOaPCfyM7yKjVV5GUkiWuhwudN2DY81xaCp4HswlH+Nuz6paPpCHcG1SI+6uP68dpWD48LnHSZVfHGpPG9lnoCn18EF5kNlBcUPK8mt5wdM4HTJTGuqeSCWQlOOQshiWEskFb/5c/oPKkCypoSYMxbvmGAOUVOV91V69UtIyfbg9P4JgFW0o2kBZMDCSckdOHiGT0AJgUN+RBJcwGEWbHX/K2ybshYaRgkNmWIGTB/DYkAV5Xk5BdkSIPDnOC4BII7HcYywn6XswiOjoz2Lyvz5iBoLQcq6DFJXk= 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: Let mtree_alloc_range() and mtree_alloc_rrange() use mas_empty_area() and mas_empty_area_rev() respectively for allocation to reduce code redundancy. And after doing this, we don't need to maintain two logically identical codes to improve maintainability. In fact, mtree_alloc_range/rrange() has some bugs. For example, when dealing with min equals to max (mas_empty_area/area_rev() has been fixed), the allocation will fail. There are still some other bugs in it, I saw it with my naked eyes, but I didn't test it, for example: When mtree_alloc_range()->mas_alloc()->mas_awalk(), we set mas.index = min, mas.last = max - size. However, mas_awalk() requires mas.index = min, mas.last = max, which may lead to allocation failures. Right now no users are using these two functions so the bug won't trigger, but this might trigger in the future. Also use mas_store_gfp() instead of mas_fill_gap() as I don't see any difference between them. After doing this, we no longer need the three functions mas_fill_gap(), mas_alloc(), and mas_rev_alloc(). Fixes: 54a611b60590 ("Maple Tree: add new data structure") Signed-off-by: Peng Zhang --- lib/maple_tree.c | 45 ++++++++++++--------------------------------- 1 file changed, 12 insertions(+), 33 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index aa55c914818a0..294d4c8668323 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -6362,32 +6362,20 @@ int mtree_alloc_range(struct maple_tree *mt, unsigned long *startp, { int ret = 0; - MA_STATE(mas, mt, min, max - size); + MA_STATE(mas, mt, 0, 0); if (!mt_is_alloc(mt)) return -EINVAL; if (WARN_ON_ONCE(mt_is_reserved(entry))) return -EINVAL; - if (min > max) - return -EINVAL; - - if (max < size) - return -EINVAL; - - if (!size) - return -EINVAL; - mtree_lock(mt); -retry: - mas.offset = 0; - mas.index = min; - mas.last = max - size; - ret = mas_alloc(&mas, entry, size, startp); - if (mas_nomem(&mas, gfp)) - goto retry; - + ret = mas_empty_area(&mas, min, max, size); + if (!ret) + ret = mas_store_gfp(&mas, entry, gfp); mtree_unlock(mt); + if (!ret) + *startp = mas.index; return ret; } EXPORT_SYMBOL(mtree_alloc_range); @@ -6398,29 +6386,20 @@ int mtree_alloc_rrange(struct maple_tree *mt, unsigned long *startp, { int ret = 0; - MA_STATE(mas, mt, min, max - size); + MA_STATE(mas, mt, 0, 0); if (!mt_is_alloc(mt)) return -EINVAL; if (WARN_ON_ONCE(mt_is_reserved(entry))) return -EINVAL; - if (min >= max) - return -EINVAL; - - if (max < size - 1) - return -EINVAL; - - if (!size) - return -EINVAL; - mtree_lock(mt); -retry: - ret = mas_rev_alloc(&mas, min, max, entry, size, startp); - if (mas_nomem(&mas, gfp)) - goto retry; - + ret = mas_empty_area_rev(&mas, min, max, size); + if (!ret) + ret = mas_store_gfp(&mas, entry, gfp); mtree_unlock(mt); + if (!ret) + *startp = mas.index; return ret; } EXPORT_SYMBOL(mtree_alloc_rrange); From patchwork Tue Apr 25 11:05:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13223204 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 78E2BC6FD18 for ; Tue, 25 Apr 2023 11:05:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AB6F26B007B; Tue, 25 Apr 2023 07:05:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A66BF6B007D; Tue, 25 Apr 2023 07:05:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 92E9B6B007E; Tue, 25 Apr 2023 07:05:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 869D06B007B for ; Tue, 25 Apr 2023 07:05:41 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 43C5C1A0353 for ; Tue, 25 Apr 2023 11:05:41 +0000 (UTC) X-FDA: 80719632882.16.7BC9567 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by imf14.hostedemail.com (Postfix) with ESMTP id 528A310002D for ; Tue, 25 Apr 2023 11:05:39 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=fHIvqUmZ; spf=pass (imf14.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=1682420739; 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=I2GjseRaZiiYKMGFnELwsfMhZhXtBsHUr2pHKO1ngQg=; b=3DifLm0tDZs7NjhTuZ3vkh9KhgaPVw1urH2jyz1RJUq9RCBtUmxkCyEafAXb1SrmuNxvWk RJq91QxDn+xV0zf1/n7mHmx18REuIIcicb1X3nCEFpogcvlstGID2FTAhptrWBW+k6p+ai ku3hfZxQkDvW3EQtlSC6jLvZUuHr9dU= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=fHIvqUmZ; spf=pass (imf14.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=1682420739; a=rsa-sha256; cv=none; b=hZPcnZ5RXj1BdD+iXxG4wqI0IZEA50o5A04UkZHgMkRRSBWLSjj6gEpt17V7xhKIYvdyuM B+Qpgx5G5CLHo9hk1NkA8VydxUUTkxwMqW9i3fxqyHEquncFNROhGhJh9X6CgytYhVzrKv p4eDTWE0wCy7rJeN9TN424Xzvuk5NlQ= Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-63b60365f53so7046395b3a.0 for ; Tue, 25 Apr 2023 04:05:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1682420738; x=1685012738; 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=I2GjseRaZiiYKMGFnELwsfMhZhXtBsHUr2pHKO1ngQg=; b=fHIvqUmZ5phg4ETfqPuneR+uYrbeTFZNsqI5XZ3pc1dHVDhJLXx+0FexrM2XAJvjaz DMzNPe20gZ+NCvxomVoNk7+UR79+C4T1KVvfdllMBQIDgMY2UOCW0DZxkYp6oq2Foui9 Ad9oYzSTeGVri7alkJmHqYVcyUWCNAu61TGufp92Z8nGIMFj2zHiAVh9QMlyZMs8/X3n JaD5Z0SXR5QS9EAY/zo799iZxw/XCaMS5nZZFNEXsZ0uC8UWjlS5NmmnRb97ispvDyTB fJlLf2vgbq63ZL3bQSR/z4beNrVcaH7kTiLmle7C9I7G5kwKfFlFnPgkfKKqhnrV3Mw7 FUxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682420738; x=1685012738; 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=I2GjseRaZiiYKMGFnELwsfMhZhXtBsHUr2pHKO1ngQg=; b=EhhPnCs2fBoN8nnS7oI9oH+7uWSdxTgmQe4C2L8oKyXvzrqaFbwM8qMPGqEzK4Bnc7 YbO9r6pAFgZmI30wUmxk5/p/7L0Xis5OTzEcE15JsP0x7CdBhuDYcH2TyKOle4852kRA km7cTEdeD1zzLWCWhuprL8yMXMGM2QtxOMdIGixxQtCCN89lowjYlcMq04NMvut5zyJ+ fCNXnQLqRO5bHFa85uZeSzimfJXLTaxg4wb7mwRbSwkRqB58EpMJK8dYhh5z32PDsyAy mFMN0tl6r2tFlOHcwiRWHebK1j2mUcRyNCdhgXSKkroUwCJWLDKsxOTqyUXATo55WAK8 XhFg== X-Gm-Message-State: AAQBX9da8oPp96cWIn3glyeJMldg6pXZir8oZlZiPxIEhSPd23OQCED3 MvMJuYLzr6ZKZUgcK9vlhvTAUQ== X-Google-Smtp-Source: AKy350awbzXJx1QHpvFyg+xGDq1ex4M+sbcmkf9pb2UwPJHCYhwULi9AWE37QwzjYRLfzfHBJukZkw== X-Received: by 2002:a05:6a00:1581:b0:63b:8a91:e641 with SMTP id u1-20020a056a00158100b0063b8a91e641mr22828410pfk.11.1682420738337; Tue, 25 Apr 2023 04:05:38 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([139.177.225.236]) by smtp.gmail.com with ESMTPSA id u3-20020a056a00158300b0063f3aac78b9sm4422169pfk.79.2023.04.25.04.05.35 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 25 Apr 2023 04:05:38 -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: [PATCH 4/9] maple_tree: Update mtree_alloc_rrange() and mtree_alloc_range() testing Date: Tue, 25 Apr 2023 19:05:06 +0800 Message-Id: <20230425110511.11680-5-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230425110511.11680-1-zhangpeng.00@bytedance.com> References: <20230425110511.11680-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 528A310002D X-Rspam-User: X-Stat-Signature: zr46zufc3my7zp1w153kc1r6kxb6q987 X-HE-Tag: 1682420739-672855 X-HE-Meta: U2FsdGVkX19a+vz2bMCbHsp+u7U5L/RuwXloJwhxF6Om5uPwN+aS+Ucs3m54DTsLeRwQTQn4Sfo1vLc3HHsySyang06BY1wSjt1weY/zgQak85Y67lWBI/m9+apLc2drYqIg3s2dknSq5KkR16lmlv7KKK9FoCbC67ystT9OS+Jb7vL0s40LJIFvVXwPSoXwswmpJPma2L3vbPYRFGhULbojRHVso1mOLPMCRsR+uhdgfa3RY6b7I1ne1f8H5ee16bW3bLdcnjnxmOB7ujb454VUTG4SiqD5JhMaEpyoVAx2D7YpFARyN4joF4ynfcsZhEGB1PpeG5NcTOTiKcGrGiwBjDRkQTFFMCW5MvTK+7AklSrKIwHOFB80Qy/IK9xJD2GQeAybpg6UnpFva39XTlcczWpb+jMNL57mJ2kAChhLd1oKbHon5GFACARsJIkrBuUWN20CKgcRCWoG2P6HsZ0MSmFlmmBtiMNMC4VvOcjnZ03hlA0sMKMf13QfXTomgC2L/Vp6Lnp7CfBHRCSLs5lxJouwGdsatlDu3IoN8kB/LBKAqP0WLIKq7COB+0rHp52iSnSdPQJd0PCROCzYPIvaI3acVQurIxU5xntet1P5gxbHN3YI3tcI1BFsnhC80mT+IC0GtMGLDD+BkdLjnHDZxQbIdx5bDq60/ehdL477plQK+x7m8l003U1xbFNim3bnAWGzXMQG07iEj5MdYsyJYSLnXY98t/RzfOCCzrcytLrQJDRJ4OpHo2+/2PGmk5iY2nDM77ivBFkpKNFA0GCgEgfcPMuDsirr5NKOqyx0JvcZ5xOTcFBvWGV0bxNw/GH5LkyDcX7GvV+HrMtkj5ybNxxYyYaa4b/hjY6BGlLdBRfE8ne4pwuVb3rxZ6F6ewAKKZ0/d97uVc5iN+JTNYXRRn5NzMUrzDATyF2bLyWkjgikWeKi4B37iNLXq6vMZmmtgRABzL6fbLEHF9r ZALnkrGc S+O+W/6L5Z8sB83G3b6d2zS7Mxr7hMj96ReZanV6uVQDABJ8Xrq0XoPmNagu9wbkkX/Z3qH/8c9Cgql8xIwyuuq9saVAxrORc0gfln+a+0OblZ/WUP1YrOBxXH9V/KEHC8mizjQ1pIJP4FIAfR21YkhrFmYQ2YV1QjFibWJOdrf0vX5+A4de7dGzuGFBMHrs4T9M9xLcj4c8E3Nh65uxspDsdhTycrLqMwn41D3i2T2IzIPV0Vt6F7cW3iugnY4piF9N8je6DCkvKUytbudzia+DieNHo8WhNnbRnyHHBbn2Jj3rp07iQ4pb6IZK3HTu4/Ashk54xSaf/twJToo7X6/UsBYvjaqHYJ7sf0au9LdpYvPvE1LL2ctAJ5o4thmPo8pWDuoWmR0PMweIFDaClxhJtPINyOJhR0HfiYxq9uVctDlPL3CcBY+QUUNlnHc9WCAzBOyMzZ2yKtslxM18Zzjxf0C07MnHJWbxX2EnznPQ8cMI= 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: From: "Liam R. Howlett" The previous changes to the gap searching made this testing fail. Unfortunately, there was not a safe update order, so fix the testing now. Fixes: e15e06a83923 ("lib/test_maple_tree: add testing for maple tree") Signed-off-by: Liam R. Howlett Co-developed-by: Peng Zhang Signed-off-by: Peng Zhang --- lib/test_maple_tree.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/lib/test_maple_tree.c b/lib/test_maple_tree.c index f1db333270e9f..30f2ebff95d75 100644 --- a/lib/test_maple_tree.c +++ b/lib/test_maple_tree.c @@ -102,7 +102,7 @@ static noinline void check_mtree_alloc_rrange(struct maple_tree *mt, unsigned long result = expected + 1; int ret; - ret = mtree_alloc_rrange(mt, &result, ptr, size, start, end - 1, + ret = mtree_alloc_rrange(mt, &result, ptr, size, start, end, GFP_KERNEL); MT_BUG_ON(mt, ret != eret); if (ret) @@ -680,7 +680,7 @@ static noinline void check_alloc_rev_range(struct maple_tree *mt) 0, /* Return value success. */ 0x0, /* Min */ - 0x565234AF1 << 12, /* Max */ + 0x565234AF0 << 12, /* Max */ 0x3000, /* Size */ 0x565234AEE << 12, /* max - 3. */ 0, /* Return value success. */ @@ -692,14 +692,14 @@ static noinline void check_alloc_rev_range(struct maple_tree *mt) 0, /* Return value success. */ 0x0, /* Min */ - 0x7F36D510A << 12, /* Max */ + 0x7F36D5109 << 12, /* Max */ 0x4000, /* Size */ 0x7F36D5106 << 12, /* First rev hole of size 0x4000 */ 0, /* Return value success. */ /* Ascend test. */ 0x0, - 34148798629 << 12, + 34148798628 << 12, 19 << 12, 34148797418 << 12, 0x0, @@ -711,6 +711,12 @@ static noinline void check_alloc_rev_range(struct maple_tree *mt) 0x0, -EBUSY, + /* Single space test. */ + 34148798725 << 12, + 34148798725 << 12, + 1 << 12, + 34148798725 << 12, + 0, }; int i, range_count = ARRAY_SIZE(range); @@ -759,9 +765,9 @@ static noinline void check_alloc_rev_range(struct maple_tree *mt) mas_unlock(&mas); for (i = 0; i < req_range_count; i += 5) { #if DEBUG_REV_RANGE - pr_debug("\tReverse request between %lu-%lu size %lu, should get %lu\n", - req_range[i] >> 12, - (req_range[i + 1] >> 12) - 1, + pr_debug("\tReverse request %d between %lu-%lu size %lu, should get %lu\n", + i, req_range[i] >> 12, + (req_range[i + 1] >> 12), req_range[i+2] >> 12, req_range[i+3] >> 12); #endif @@ -777,6 +783,7 @@ static noinline void check_alloc_rev_range(struct maple_tree *mt) mt_set_non_kernel(1); mtree_erase(mt, 34148798727); /* create a deleted range. */ + mtree_erase(mt, 34148798725); check_mtree_alloc_rrange(mt, 0, 34359052173, 210253414, 34148798725, 0, mt); @@ -880,6 +887,13 @@ static noinline void check_alloc_range(struct maple_tree *mt) 4503599618982063UL << 12, /* Size */ 34359052178 << 12, /* Expected location */ -EBUSY, /* Return failure. */ + + /* Test a single entry */ + 34148798648 << 12, /* Min */ + 34148798648 << 12, /* Max */ + 4096, /* Size of 1 */ + 34148798648 << 12, /* Location is the same as min/max */ + 0, /* Success */ }; int i, range_count = ARRAY_SIZE(range); int req_range_count = ARRAY_SIZE(req_range); @@ -2660,7 +2674,7 @@ static noinline void check_empty_area_window(struct maple_tree *mt) MT_BUG_ON(mt, mas_empty_area(&mas, 5, 100, 6) != -EBUSY); mas_reset(&mas); - MT_BUG_ON(mt, mas_empty_area(&mas, 0, 8, 10) != -EBUSY); + MT_BUG_ON(mt, mas_empty_area(&mas, 0, 8, 10) != -EINVAL); mas_reset(&mas); mas_empty_area(&mas, 100, 165, 3); From patchwork Tue Apr 25 11:05:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13223205 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 3FCF4C77B71 for ; Tue, 25 Apr 2023 11:05:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id ADE886B007D; Tue, 25 Apr 2023 07:05:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A8F8B6B007E; Tue, 25 Apr 2023 07:05:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 92ED16B0080; Tue, 25 Apr 2023 07:05:44 -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 85CD46B007D for ; Tue, 25 Apr 2023 07:05:44 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 423ECA0374 for ; Tue, 25 Apr 2023 11:05:44 +0000 (UTC) X-FDA: 80719633008.02.6CE7FFA Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by imf02.hostedemail.com (Postfix) with ESMTP id 7388B80021 for ; Tue, 25 Apr 2023 11:05:42 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=Svev8byb; spf=pass (imf02.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.172 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=1682420742; 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=eeRfJQ/YCl9FjXRKTZNgTU7Yw5RZfHp0FYZQ2Hd7Tj4=; b=PJGHw2JLilGR93slXrDkwRWBtboDsddcqq5//uOa+5oulrwFM2xdd53dOM6KF/BpIc7du2 PrdQjvfnG16rcwLIMXtrECKRMOaL98Lr8g5v/WSIXaFgFdwIQHM+ACnUsuWF4XXDnZ6D4F vu1VUGQTTy75HoWClSp5CcQKpMHcNBk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1682420742; a=rsa-sha256; cv=none; b=nW/IXZlxlsB0JRkW/rq1StlOhRZFICnvLsLzJ/w9CKkE+ecNRj9ETqSkDlJ5s7iQlfsVqg FtIrlZDE1Injbh70fkJ4cHXLC9NAEvMxvJZfEb5LEm3kUUaIK4JndlZrT4XlchuHcAkt10 Y4QTdgWglyUYCRH3PXhziTKQ0K9sQjs= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=Svev8byb; spf=pass (imf02.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.172 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-63b4bf2d74aso4489744b3a.2 for ; Tue, 25 Apr 2023 04:05:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1682420741; x=1685012741; 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=eeRfJQ/YCl9FjXRKTZNgTU7Yw5RZfHp0FYZQ2Hd7Tj4=; b=Svev8byb/gTZnb0la5Wq4707w9wE4BQLB2oUjKyzCWd+gRkSVi8vfkItPYdxARqJ4q MbPTHUJfAQd0OtkvuRzZg/QTqPrBEBr9rwuyy0A/TIReFKimAy++ysDDQzOYAVSC58hO wXAfc8a4HYNGlD8F9FCsEvqUQe/eQVdcJe1K4sAYzQYoGX435meNMA1h35cA1gr5ge3D /auP7Lm9p3cXrA3H4B/b25cb1+45DqjELlJj996ww1QbQoCfhHQwB3ihcbibdbC3zOdm sVpm3ren90VMIxe337JJ7kwUre+g9lTypagafMBqfSY8eURnFRGQ2R91hUchRs38WWTT PbzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682420741; x=1685012741; 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=eeRfJQ/YCl9FjXRKTZNgTU7Yw5RZfHp0FYZQ2Hd7Tj4=; b=AFaxHGooLiC4QiXmP2/XO8YAzDU8lQ6+GVhtqmbIarWAINK2VZbwkzupzwlAovYXhZ 0N6DVM3+liXPpVsyd2lQxuKIL8jzC28+qYvb1WmZ7gni7VcTnst0GB1n1FkxzDS2wc9a uF8gmjSXsv7alQT8CCyIzFx1nF30cwttKjb8LKxWHAj6NHVfDMcv9jz3XBfkCDP9ilFw eF8v+RrXh7KSLWeSZueJpRAXlRkFWNayo6B3BkWoYAkZZ+zy8CrlXP986miFLAAnxfSB D8Nurw86VSNWK6mOWR1sKeiVWb/sJASihSPD19Or7C9R4x/K+XyIVWgzKbc+BZbvPPbc ASqw== X-Gm-Message-State: AAQBX9cL6avwXiN5WVgIYlh7F33b3oXRWl1uplbf908xNswMuMBpov9g 6M12OzwZdlcNSOPz0zf+OXi3jg== X-Google-Smtp-Source: AKy350bGAB2WnJrU0GQTFt8l6DwLDr9aIdRdmUvhZUORfrAE82ebBzlaAaNlw6D6ZqSo1FoOO6Oigg== X-Received: by 2002:a05:6a00:1a50:b0:627:e49a:871a with SMTP id h16-20020a056a001a5000b00627e49a871amr24354476pfv.23.1682420741370; Tue, 25 Apr 2023 04:05:41 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([139.177.225.236]) by smtp.gmail.com with ESMTPSA id u3-20020a056a00158300b0063f3aac78b9sm4422169pfk.79.2023.04.25.04.05.38 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 25 Apr 2023 04:05:41 -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: [PATCH 5/9] maple_tree: Remove an if statement that cannot be true Date: Tue, 25 Apr 2023 19:05:07 +0800 Message-Id: <20230425110511.11680-6-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230425110511.11680-1-zhangpeng.00@bytedance.com> References: <20230425110511.11680-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: 7388B80021 X-Rspamd-Server: rspam09 X-Stat-Signature: bnxyqs9iyd88yqqjeawm9yfn6wqdpyat X-HE-Tag: 1682420742-878941 X-HE-Meta: U2FsdGVkX1+smwUi+NNP5obVfJjsp7SNJzBg07FqdqtgW2Qs1Q02YigzB1f7y0ekFkIpDz38brDUTUp50nbs/qW2Waf/f4vRRi9uxP/XT1kqe0FbWLHO0q++CzleJkrz5vERwtfCmp7cAsMgSawpyis4Gqa08tF54+FOilc9D5LVWHZ5aeIDsNn1s4vkDrLIHp4e8iC+lQm80HzejSAOe+dPYKeeMTiV/3FwzBpXguJEJP/UPk+tHcpOSzK29e4pwkhsVUxCWNUDHk/IIv9uq1gBHFgZc9SW8hfX2VUD3oJlm+TsMG7xn87hdwq/QYENAYoTTiY2uBxRmH2oCX2o02Uz73hHMEbUGn2MX9HUPYhK3kzLqs+HHGhahXbH4tY2NRKnL15vsGGZ10gHtdRWcQzu7cv1w2PR7qGJ5XZ7yJd4QmnfML1I5IbYcgldbiW2yPPsd89vFbj85SGJriyG72q3wgoB0anYky0csrgRcpVLutgAHKKFeoPgYhg89AeLWxZQ68WZz/pqPV7jNc3Y4w8Y8gTY6CgyPpFEGieNWo7XaJMvmDJMCPzieX3mVeLleROnBq/G8bkbd1Dw4PLlkqJCnp/qdDT/vkCHtpCntB+FtADAr56Zc7FBgIDd1NEMSQxWxb0B62FFt23aj8Vez7GEav0D9RkOCEqgFcB+IgapWg4TXTnJ1eocu7Bj76CKBAN/kdhhaoY7Q9sSvvRUlru6MFdYv6f4BU3lBQCPGG+L3Wl+e2+UAHkftqFp+5mJRj5e1PVb61xvJ8U4hxnCgjTI1SNtMpgmhXh3H4avVXY/Orm74hGwysR0zkAeC1hgDxQRw/7/Jc/kO5lv1PCVLU/BYQnz57rc8liZi0F1ZpcYr/Ze/ZABXo1+SQXOUYN58z7Lx4pTkzsfD19IL8X4Kl9rvXH6T47xiu38WcrnoWfFo9jldNww5f8YVHhB32s0PEVG41LLY49e/RGYc9z 9oad3oaH b5GLSrp5AlEOyLGJzA6jXyeDy1R2QU+/amlLvcX94yP+T4Q0Zu+WRAWwAb0W36/ydgPd5PZP0uLycCppinqxDYd/SC+JhTGcwBmr5+dBfAgTdm/8z6XVUVSW3U/PP4WwZdDuEfh9PMtkv/8ATWZ7TsjncH6nG+dmpR5hlHrLQsh+xzcns1ftg+HW6A7Nwwnb2rGEpO8PWaGOjjGYxGjh0DvtHD17oXij6D3mKgbRkwr1McaK4iLbJqpMyXKaGeXOdIqgBSiJrv6qG+Mbv5rnDyTSw0zLf0eF23Gls1KDavBPgcqcUucaX2jPzGqU7NIi0ws2LJsVdrjLcM2zce2XSk/ZSdfaj4qQDCcG7LH7uJmGKvRFhGhpekDByJkIuXeky7a7/qdtBKMEd0jk7U0qxMTsTeimzz8VHfjYqs6nkrzVzkbrz9DtUhwv11IH6+spTGYwGRHkJJjq+LZo= 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: Because the commit 06e8fd999334b ("maple_tree: fix mas_empty_area() search") is merged, this if statement cannot be true, so delete it. Signed-off-by: Peng Zhang --- lib/maple_tree.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 294d4c8668323..7f4b2ce84ce61 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -5084,9 +5084,6 @@ static inline bool mas_anode_descend(struct ma_state *mas, unsigned long size) return true; } } - - if (mte_is_root(mas->node)) - found = true; done: mas->offset = offset; return found; From patchwork Tue Apr 25 11:05:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13223206 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 1D125C77B61 for ; Tue, 25 Apr 2023 11:05:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B052B6B007E; Tue, 25 Apr 2023 07:05:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AB5036B0080; Tue, 25 Apr 2023 07:05:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 97CFC6B0081; Tue, 25 Apr 2023 07:05:47 -0400 (EDT) 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 884646B007E for ; Tue, 25 Apr 2023 07:05:47 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 6594D40377 for ; Tue, 25 Apr 2023 11:05:47 +0000 (UTC) X-FDA: 80719633134.18.243B5AA Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by imf23.hostedemail.com (Postfix) with ESMTP id 862E414000E for ; Tue, 25 Apr 2023 11:05:45 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=kRDCATpM; spf=pass (imf23.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.172 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=1682420745; 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=Uhpet9rFKKSbNY/rO+kxNiiukorlrEmSdc9GCeX7BVQ=; b=e6KrgH/MT8sg4f1giN8OxOAfoYubCBci6wQ4IHqrsuWVwjRHAxGNXWi3ZCCPKtd1y2Rwk+ DhZVPmy4iaopMa/WEbcr+ltBoUpSOd/MBxISFRkav2mEu8aJ8PfkVLtW2I8vNOo2uugEL7 jq6glpm8WhBpVpR4dAouJnpZ7UJ/m3g= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=kRDCATpM; spf=pass (imf23.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.172 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=1682420745; a=rsa-sha256; cv=none; b=N0KdUBNfhebwzxRMkqvisNbo0SpSLlXksKDwAWHmoVFa3Q4OR/qDGfVh50Ym1PJ2b2JT3M S/ScJ5bhpqTkSZDCdpMk9phwn8h/NsSsOWfaut6+kT6ClsdJ+2Y9+dGudL6xJ8NHTsKmKe jiNEh9Sn5Bi0IUNtgRIvki9cZ6RZneA= Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-63b51fd2972so4490772b3a.3 for ; Tue, 25 Apr 2023 04:05:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1682420744; x=1685012744; 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=Uhpet9rFKKSbNY/rO+kxNiiukorlrEmSdc9GCeX7BVQ=; b=kRDCATpMOFuEPi6tXPsOXLZpTjhUGeNU5eTbsWS/STvZypZztv1c2WheEeS2ZqnMTC kpd1b3dOaUmTKyXaj+z9CyulDGeZtQwWDI4jrkMX22GZUDqIUkdI7glYxD+jmHZth1/E i0VsY7k71T7rtEZsPr0RtaW/qwJYwCCfnFrPYFo8E6rV4sJwqA/Wvf75YGIZtKQjP8gN tXmWXV7YanL+BeCwrwhNMS0CbG66ajylBFYygIuyhlINtNPvpz2OfsBg7buDGPs6x44o m5vs7IxRJ7cIHDTdtX9SfH9SC0bt7BMfYOLlFrjKRITZjTGinAox/LUHikSJzJkWe5Qz ySKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682420744; x=1685012744; 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=Uhpet9rFKKSbNY/rO+kxNiiukorlrEmSdc9GCeX7BVQ=; b=AOp5X20akF2xu0PJrOHcmIN/qW0pAOSlNq9FrfszKQ/kqOEqIYBadIBrNmL0VSm3B9 04GQGgfziwveRCDUQM9Sgoo2vLosqz+KB7igC1f4n9zYvCy9oh7JbimDdI58Or4SwZ/X PhjdizInk9fT3eJfui2pcvAo2zMwNgBM6QNMMOTRl4jj8XQVDY6hIAonCvxfkuyTpYgz VW8Hcd8gOydqjHMosER58LXVOqqsHzn9xRmOcNFz7vbbfWovHREAG+REeJugzRqBs/I9 0rLa8QtcbsJr+BuBNciT6aPPef4Nn3+vs467usDyXiqYzu0ilHZjhbqJU4mRPahHnyrq I/hw== X-Gm-Message-State: AAQBX9ecfr45oq3hO+B1JQxMqLzgV9yC0nMEIgI+xC3ZatxuMo/FFI3C kZ+L23wSWl5lps7hKmmXV2UUEw== X-Google-Smtp-Source: AKy350bb8ivezPwkMZceREpecMXYm1R01Tbms6afrN+M43oKICEeAjPUTaLy3P5Yg3AEbvNizSRdwA== X-Received: by 2002:a05:6a21:998d:b0:f1:ff77:4a32 with SMTP id ve13-20020a056a21998d00b000f1ff774a32mr23584687pzb.9.1682420744512; Tue, 25 Apr 2023 04:05:44 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([139.177.225.236]) by smtp.gmail.com with ESMTPSA id u3-20020a056a00158300b0063f3aac78b9sm4422169pfk.79.2023.04.25.04.05.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 25 Apr 2023 04:05:44 -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: [PATCH 6/9] maple_tree: Remove a confusing check Date: Tue, 25 Apr 2023 19:05:08 +0800 Message-Id: <20230425110511.11680-7-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230425110511.11680-1-zhangpeng.00@bytedance.com> References: <20230425110511.11680-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 862E414000E X-Stat-Signature: q7o1scibdupp7qro39bqa4jjyn154mqk X-HE-Tag: 1682420745-22925 X-HE-Meta: U2FsdGVkX19AUDqsVjktej3HJskILrcUrEUkCLsg1fQpEOkNPSCd/YqZ9J/4C1IbMY6bRBpatU4EWCSvTWhmU1HNWmGsqyFuSSbMeaZL93AlKjQL0+LjBAotNL18xWlSHCkPSqVth9uWYVbiTm92+Iy/1bVS/ndzacHavsSgjyavokrsPOqn0UZcyzzUxu3BIaQULXsIdQwpvvoQScgsK+emv3nJUcx4YA3dti2hOtiDDqpWeFJq4TTER9bOR1bomOo3MsV6sGrj08sLdLixGiVwcIONPSvFqokZIFLBGc+6i5hz5t+iJyZFC+8fJ6KWpSCzFk+xzj0eNrbj3bL7uVLsySB4AmNMUv4xAAKis9tevdaXgpUL7VecUi/qRM6GdEX5DrNwcEMiZzjpRteqPm4giSDKnLXynJW04q18lDt19tErKJBtzFOt1X01EVuniX5OD7Y07r6MCSxD+wnHPW1FCrUYfcFKsIUdEbPp1B69Zn/43BHGFLIRuX8eDYemPh1VeOSyaLxI/EoPmH99clLBFWVudM8S9piKRBR+xYWHNM1ZKnKUO73YrzUFrerRMpoy2JSWr9tCVb3WaeXrXaFEVVSNs4sMhkanGpTqmprOPYqUimO9v8Hpnk09Jx/ENEQpkn9XAl4VjdSK8w9s7E2mgTwv0xHx00ObLHIBtsLgS0IijoYDqgBjOv1VnW2QNk3VEhvgNrXuyY1QrPGFUyyJ10nIBGB7JWw6e9puXW2g+UPdNj0FTr0QqH5IsdnnDkjTT8VfFmHWzL6m17gm0AuLaxl8lyqUYw5zrPHF6prB4PS6Yr0JJmdxkcn3BmrOVSsSjv7BuhOZm+iNikId1R8ZDsTM/JwvuIJvw7Iv91oU6oXCrq4Ewb/yBC+u9oFWJV/Up3CyZGKXHfYg9Dt6pkba8LfZ+gpiMYbXxomLvDInJNP3z9l/KAwmKdETg3vC8mY6ztjKTrS+K0Xx0yj /2lc3PXq xGnzo4Z5XKTqifJSZNiD45sqwOWTsJ/Fk8nmIKND/KfHbfJYgN0ld1XbipLbE545X1WcS2E4vM0O4wTBTrYn+k9Wk9V13ZWRKo1gEOXr9Llr84ZeS+9Pt/L8GHi1WUkaDpYKbLkHMRGqpXVHV3v6jHsao7No5jK0kzgmx2zQlTUbnGiVJHSIWW/4HrGR375FQO9RQKuMBO78eXVbgXuip9b1AbMwnWWv/HvzuXaEZ8fNwW2u8jYkUt9aA6LJgpkKlYhnmWGreopk4DGgs3RrQN/ytqyfyzdC0Sury/4/ZyhAbUQEqNuLbx59E/lInKd+o5UIGNERk8F+GjoBvM8gMw3mk6w8QywOHYA+NYqQ2LefGpMqMiZpEHQA8k9OmXl9md4UEzPcvhIud4jfaP/J0lr5NMErhmdos8QqjYaOL/eUo4b7hgErKjr+CCzJ3ux15zTdGUVl2MxwHRf0= 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: After this loop, we are at the last slot of a node. Our purpose is to find an entry that is not NULL, but the pivot is checked here, delete it, and change to mas_logical_pivot() to get the pivot. Finally, only check whether the entry is NULL. Why is this confusing? If the pivot is equal to 0, but if the entry is not NULL at this time, it will return NULL because of the pivot, but it should not do this, the entry is valid. Signed-off-by: Peng Zhang --- lib/maple_tree.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 7f4b2ce84ce61..83441ef2e1f57 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4742,17 +4742,13 @@ static inline void *mas_next_nentry(struct ma_state *mas, return NULL; } - pivot = mas_safe_pivot(mas, pivots, mas->offset, type); + pivot = mas_logical_pivot(mas, pivots, mas->offset, type); entry = mas_slot(mas, slots, mas->offset); if (ma_dead_node(node)) return NULL; - if (!pivot) - return NULL; - if (!entry) return NULL; - found: mas->last = pivot; return entry; From patchwork Tue Apr 25 11:05:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13223207 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 7FCD9C77B61 for ; Tue, 25 Apr 2023 11:05:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 168306B0080; Tue, 25 Apr 2023 07:05:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0F1D16B0081; Tue, 25 Apr 2023 07:05:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id ED4166B0082; Tue, 25 Apr 2023 07:05:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id DE5896B0080 for ; Tue, 25 Apr 2023 07:05:50 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id A1C6CACD04 for ; Tue, 25 Apr 2023 11:05:50 +0000 (UTC) X-FDA: 80719633260.14.0B34A25 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by imf28.hostedemail.com (Postfix) with ESMTP id C5FCDC0004 for ; Tue, 25 Apr 2023 11:05:48 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=jipQmnHi; spf=pass (imf28.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.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=1682420748; 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=3wyOOQxSifE+UQ7Biie0VeiE7Xg3ne8+bvtiq6zNGpc=; b=6i85kzCL44gh+fgcx2LPXo6tUr82m2G5xf50MjHdsuUXw8IxlEYSHFWjggRFdvh1nAuYdJ mbP56tNsTa+MMjG6XSVpGSv30WsajsQ5lrq1MhcZRnwCvUjnzqIM0zCcelMcxcEHlhkeA5 LrtaABgXDqQwmlAmFXT3fsn40OjB+H4= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=jipQmnHi; spf=pass (imf28.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.171 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=1682420748; a=rsa-sha256; cv=none; b=ayw1oCBBQT4Q2kC3z+5YjGCvifdTPO7FE/iZLB1cQIoWE/EiRGs78F00/VZDwWULd2ZEGV QnuN8Iq3By/ULvO+a36uFT59BkQiIlJw94Oj1Vr6BpddWMqSAzeUL7YANB6xKG6beGtnIq 4NI1Iez+2OSHdhNlJQnXkvLMJJDHlS4= Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-63b5c4c76aaso4109417b3a.2 for ; Tue, 25 Apr 2023 04:05:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1682420748; x=1685012748; 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=3wyOOQxSifE+UQ7Biie0VeiE7Xg3ne8+bvtiq6zNGpc=; b=jipQmnHiGZqHhFj+pjse8A990ppkL1/uxO9HRdscpit7rhuWxH1VtL8WteZPa//UVl d+QYWMUc3Pd0xNIJ5KCnsF9R2zsXUbxhe79MilPyoF5EbgQWgrgD5Yx/Z643QyvsML8e Y/jlWVM3tUMLV/IXawWDmC1VAS3dP/bzZfDjJDUx7QS7NhTg5FRO+N5DpeKFva0YH+ux jJWMrmPke8pBOQm1JHvFPXk9am07Mtp+Z4X0pBvH9tYeY/Ky6BThaNUVjVEk3qJFoxRR s2JD+th6vAVyzSwwRovJ2WxkiFVq+PiDC67vi7LzP0ZtSLmtotp3zsqbzMeCtXArnENH cbUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682420748; x=1685012748; 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=3wyOOQxSifE+UQ7Biie0VeiE7Xg3ne8+bvtiq6zNGpc=; b=OumedGtqkANakJIq7/GsoCNOdCrXShligFFeengagYcp/jU/UuLuEt/W6BzEwIq5M9 BAH353mc2+SaCeEwgCLB7eZaNPl5sA4/s72eqWv+JXPe0S6IgG0j0Nv2O0CGOP2kuldj E6pslhvDAttq9XOEjbcEkjAij/Qh5H+cegJMJUkPHfMRtEwkJyFf64Cft2pq2Dw+uCYD w95idQvvj3mmsmLVcTReZJ90D8ELMH5wNchcZNL4jTHlrGnj4Iqe9Eubow1Xj3TnZyBj L1oQcdB8/oJZE533FsUsIPWoaoycf99ojfmyi6eoI2djJEgoL528vmSBesNYvXl4t19n NuIg== X-Gm-Message-State: AAQBX9fndFv7hDLoYyYFgvIDeEqPa/ckYHXGf/neV9I+n0VAY2A/m6aL XEXeSVfttqO3MezCBvb8kiZLeg== X-Google-Smtp-Source: AKy350al2UoM9RccPs0Hhp+BNacNU4gYAWUgaT33yzGBelCRbw3DAB4I5OBYUs9vNRoOZdmxnTocxQ== X-Received: by 2002:a05:6a00:1887:b0:624:7c9a:c832 with SMTP id x7-20020a056a00188700b006247c9ac832mr22104593pfh.8.1682420747660; Tue, 25 Apr 2023 04:05:47 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([139.177.225.236]) by smtp.gmail.com with ESMTPSA id u3-20020a056a00158300b0063f3aac78b9sm4422169pfk.79.2023.04.25.04.05.44 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 25 Apr 2023 04:05:47 -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: [PATCH 7/9] maple_tree: Delete redundant code in mas_next_node() Date: Tue, 25 Apr 2023 19:05:09 +0800 Message-Id: <20230425110511.11680-8-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230425110511.11680-1-zhangpeng.00@bytedance.com> References: <20230425110511.11680-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: C5FCDC0004 X-Stat-Signature: u13edgwuo74fcah4iaoqn4mpmqo1wzuo X-HE-Tag: 1682420748-639506 X-HE-Meta: U2FsdGVkX1/TBRd+speNtxxvHh9hSpCzVuSVXWmN9sYn59MyZH8vKe59Qk+ouQnv8t3EpwXZLkk0WknPi5wDvjCv1uk7VPzd1hD08pfAqovhCBJn3v2qgzy0vDdL6LkogycjHgslqwpDN5UmnfwUqKt8D4/L/f80M2jI83qMgzjV57mmATC4VRTlwA2fHgQmTPqCfasCwcq/WxWiygUSy5cRmu+GvQfg7p71o9OLGlv1eqxQ7rcQI68f0bt0rJkden/3PNGU/dBs+7iSy+SbMNMrs1d5fGMjpIktLdOGMM8WxNtKuweq23SMXqRnZKv6UhUn3ioEGdretJxbo92RmKx6PztiY0emdVo16jPj9itXYwTyKZLrYrX+rUezYaY/xJoHT/yEz2jKNuq6FMhiFWYHnKPbbaFt424kqybKKTJUCu+kaSSCIeFv65FVM8sHhDBNXpuXfExyc7HbLbqc8Pj5i+9nB9TXNpPyI/74OZGNyh0mH7LSMkXzrnYn4w9l8Mrrlj95GyvbDu7R7p4oQvOlzBiKcOecJSovY7F9VR1GHj7zRP/iHPJNCcGmfHgFW78flImjPByOqdSozRDCGpj7zM0fipgclnhuqVnqyxMGMJPHfhOLzIb5SaVZN2sT+1SHkfJJJgDY8qIA7Jwv53woUpdxEjhsJMsnFP7U1MXqGpq+OCxXdXP6/xCLj0//zmTnNf3YqjiE9qAvGfSfgEsUXKsheRMi33JrLU0tBItW/TbqvZQlnDIE625IuKK4+SFpOIcPrJtYPVdbyD2QaNEgqoXgFLALUMRyrDBQB8WpY4LphYgSzrLDgTEq5zbul+YHm8ohuexTFOU1o01AlSfvFYNRYZWqbiSmiHQKXigXAQS2BH2y2silM7mrt/y4W+Lp0SYAatbyS+ChnqIGNQE510rEpF2x2fujxEPPvGIgSjrSPNt0vk9cGKZT18gQXNrCv5j6veZF3hBD8bh I5LSMoPu 5TF2eLcNzvgp10G80qHabE/mSOYsAFcfsJyS24s2QNNoZhkwc098L1bA+YCfhf19EXHC9kcpibhZAkfBMqY5vWTGlLc4UwXHkZg5v5uZTYmNI+aIJqEo2nWB7xfkbJ1Q5SD6gNJNfqt4lEjEdvN+CPoaniuRtY5+ND3+Gfhoe61+l27iMDvzeu0TWilX9C0Nd8gzDuKE2p2ARA6yfLy3J45yVHAZTsrXbgbHe4xrHFcfi0TmKbsniH+ao3Gqf3lcVZKLXGo/piZfuo9H//w1CUIzSC3voE/LCw5qf4k5Z83+N6is3DF0HUJ475CR1fPoN+Q/U5TQQaobiuo4jj/MKYIgOQygJnpkcujZa3QTbJHK+yex4nD5rd/5C3ApVsDFtM6C3jnqjCCDyf7XcyMoVQg4XcjORFXYyu8ocA1lKrXGMmiI9V2jNL4AWDr+Gs7U8DHmmOo2J1aole4g= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000001, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: When offset == node_end is satisfied, go to the parent node, mas->max will not change. So there is no need to update min on the move. Signed-off-by: Peng Zhang --- lib/maple_tree.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 83441ef2e1f57..8bfa837b7b752 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4616,7 +4616,8 @@ static inline int mas_next_node(struct ma_state *mas, struct maple_node *node, enum maple_type mt; void __rcu **slots; - if (mas->max >= max) + min = mas->max + 1; + if (min > max) goto no_entry; level = 0; @@ -4624,10 +4625,6 @@ static inline int mas_next_node(struct ma_state *mas, struct maple_node *node, if (ma_is_root(node)) goto no_entry; - min = mas->max + 1; - if (min > max) - goto no_entry; - if (unlikely(mas_ascend(mas))) return 1; From patchwork Tue Apr 25 11:05:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13223208 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 69543C6FD18 for ; Tue, 25 Apr 2023 11:05:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0A50F6B0081; Tue, 25 Apr 2023 07:05:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 054EA6B0082; Tue, 25 Apr 2023 07:05:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E5F266B0083; Tue, 25 Apr 2023 07:05:53 -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 DA2376B0081 for ; Tue, 25 Apr 2023 07:05:53 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id AC364A0361 for ; Tue, 25 Apr 2023 11:05:53 +0000 (UTC) X-FDA: 80719633386.01.6CC6FD4 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by imf13.hostedemail.com (Postfix) with ESMTP id CFC2520029 for ; Tue, 25 Apr 2023 11:05:51 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=Jmn8+k2S; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf13.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.182 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=1682420751; 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=/5HiaDQy1gV5OijIvJDqywUjC7+FvWItMLIDy/cp2lo=; b=671XT/QL19K9d6NlzxS3XmJsfECVjrCvsOOzfb5yrZd3loqTif68Bxo+AU70rhb+8h//A5 C1NfvcGojefoL/nyaxXPR+7u/QrNtlFLj5pv9QZ3lHdGSWWUzuxdwtbXPKNuTLsJoS4Jxp vksvZRijTtmZKHtco90nXcyxAjt7uyE= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=Jmn8+k2S; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf13.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.182 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1682420751; a=rsa-sha256; cv=none; b=5Ayo8M+pwmEuSc10e8G3Qw26+FMvTkxtsU3LOO5Q7fM6BLQsf190AOPUADTxLfIZO/df6n 7mbVQh9JzJu8evyym3Q+TP0yjM2dJ9UalUkaV95cJ4p37+Poyqp5RH82Ckia+o0DNn/CZj hukSjXu68Rz7MLEedIwx4lRylr4C/EE= Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-63b5465fb99so4702391b3a.1 for ; Tue, 25 Apr 2023 04:05:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1682420751; x=1685012751; 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=/5HiaDQy1gV5OijIvJDqywUjC7+FvWItMLIDy/cp2lo=; b=Jmn8+k2SfFfgMhLQds+Cr0nlYahkoptl1RwDbzAx8AZV4daLWkUna/d9KpjCx2Rfy9 rmCt9o71sj3yTlbe6K2B/hk/W22x/AoY5gUneeoO2WZBUgG67nocT5AJKOv91QCs4JN+ DZCnL7fxyHriXlCninrD3Zk7URi4nUfnyi5EmbP/3Gha1H6bcYRPYa70gVOJDs6+9d0S qnpA6xJhk/rQJkofq1EEOa8tqw8D0zjeLVXFud06M0NuAFQZVoamUgVTSmw9Qqf/CECK aW9WKvh1ndvQxmuIyREMN2Zd+vYx5GuyPdQSabCRBc2itdPqh0hvHYca5F8MEElf7xn+ 3LeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682420751; x=1685012751; 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=/5HiaDQy1gV5OijIvJDqywUjC7+FvWItMLIDy/cp2lo=; b=TonvJrj7DPpyvGwNL27sqZk4pbrS4GOdvc22X1RzzyLN96DW2m8DkeaZWZ8LHifxBn SXXEyvHeS9Ri8gVz+UIfP/7mN+G9TkUkwNc4TiCoLgSs1p36If4N3/6GCSXwAQVx+gMs 30tB/DTK55LeJoFFMSS5nHGW6lYBTUMVaTFkZeHIGl4xaP9Ran7ATTD1iwCcOQiqsvMJ 0SYCjqSqMC36a2ab7R26oNyzjpTqpWiHf22fDcJh5z64gh0Tx96YrnEPrOaNPERIbTx6 YsVBGMBiRezQGtbkxcMYEs4IF+vBl9uIJMK3D7dnBx2SCeDEkjpuLgi8DXdtHyph8WyL KmMA== X-Gm-Message-State: AAQBX9f0rwJzUYzwvwBV2RS521amkrD7J4hASBi1PJKdbXOu5LvaJ/BB An1ffwAqRBbUo+EYN4q/rkU32A== X-Google-Smtp-Source: AKy350ZfhQmTsVjWSSkNdrmfeWoP+w6CU2sdxSf+zlZBnBd3DIyE6NNnISJz8v358g87ZS2LcR27eQ== X-Received: by 2002:a05:6a00:2d20:b0:634:7ba3:d142 with SMTP id fa32-20020a056a002d2000b006347ba3d142mr24767709pfb.10.1682420750817; Tue, 25 Apr 2023 04:05:50 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([139.177.225.236]) by smtp.gmail.com with ESMTPSA id u3-20020a056a00158300b0063f3aac78b9sm4422169pfk.79.2023.04.25.04.05.48 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 25 Apr 2023 04:05:50 -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: [PATCH 8/9] maple_tree: Remove the redundant check of mas->offset in mas_empty_area/area_rev() Date: Tue, 25 Apr 2023 19:05:10 +0800 Message-Id: <20230425110511.11680-9-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230425110511.11680-1-zhangpeng.00@bytedance.com> References: <20230425110511.11680-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: CFC2520029 X-Stat-Signature: 8wew6378bc36ssfs7mc3cf3pco4hdry4 X-HE-Tag: 1682420751-726862 X-HE-Meta: U2FsdGVkX1+s5hQTgkHx4sYg968bYsqN7rn+ilxEt07/0DQnNKLq8669Qh9jxOEE1ufuB0M+IxS8tihIhXjRzj6xikVAOuueYuzMLbAO/btjnnq0TO+KsUYe1HTLD4fIy6InOJNSrAQN6+3O5k1O98CPCW/5m9Mz6MYpUuKsuu3+YSpWl49tpMBaDu94NNplnIVSdwt1acTrlCptgmOJvio5rLSwwOaK7uimwYe+AxLQBFVFkOoTKNLhT9KyBdfMt3Z7M2wMYgviIKS/mX/y7Fv8V5QkjkInBjEMGy17EcujdCP3NWYbryFkGj1y/UiabvaUMw25AIZ1aNhW+DD9/57QZSMtg54CVAKIkqNMKo+I6BTuNYR1hj8uVOikL/+E//euBmmSQng81RbrzSQ3TLDekBxGMQ8MAppNrkKunp6to/AXmIOI70Vp/akQh+E6ebnXeHYJIxIp32mNPFaK9P/hSusk+z0wLjk6n7FWhF/SgaaUBwIoyhzctJ8sO8hbieq4/G3EiOSyuDA4ikMZ3CTBBJnXSJb3VAMzHE/7LjZGYKipVV56AL2C8VO/Gveq21yVOZjxibKL8Po5W1KvCfIdyi8jgH0DdBgfFQNKlhbgpRHOXuIrkA0/19DGWZuyozp5dWHpDIlSCcERQCvzXCgZLqUzKD++HFMpaA1b4zJWvJfCq/94o7J8ZFXwbdcqXISo122bHXZ9LrL/4GZsBxo25yW2QZiEbw6FXHYYsRf7q1KJnCBMsKNRG/AkWLqYDKmJUFsldB/lUqlRWoqxCpFZIcNcz2LJ5WrrPiPwMYJAWJkvrQ7O3zEcwHFtq/8ftMN4RzM5k/a094DVfAWddwTdMhvDKUFk96RZvc+cWDnqxQcqPb9qwXpAW4zBDxWvWWcyu9reEO5VYW+mQM23hor24Cq1eqaTlKZWc2jiy+wOzDvwxO5iFBtOMV9qV7bXwYBu0bUvtpYMuG7mk2m qH1aEDN2 181K/sMlk4VFo1TkLqfqxfFesraVBTT1XptwzusrnyJ+nvZm3a00qKvxBj0sdBfc6TOkAuQVI8yTn+UVKFyYv3b12owUpdRTvYw7TfGDo53TXDI5EiB30HXiSq2T83ZokhTyNVFsu+Vhqrzj/2qTnALzrKTHbKUDINepY2gap29r6+nXGhZSYmVuqB/PTWpBZtT02ur1CK87G6xokhl3xo2W53A7K7As23h8oc8k4G1ykY/cdUUu2hmUtaCfc831JvFKnOfeITqm2vlGCptKqQHmTs0UNmBGDrueVazrbSuHzfnbkTi6VYJAoJ4TMA/2V3/6w2KKvRA/OE+FYR7j87Kw0ibQ+wj/zr3+Ot93v0gVAsmvILsVp6D5YeqElTkbT2KZEAOKstR08j2AwbovBZa1SqTOouqxQPfi1meKDjzaOn9XZHFdzoYy8gK4z40ZNg8h460dD4qD7wEU= 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: In mas_empty_area(), after mas_awalk() returns, if EBUSY is not set, then mas->offset must be valid, no need to check. Same in mas_empty_area_rev(), so delete it. Signed-off-by: Peng Zhang --- lib/maple_tree.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 8bfa837b7b752..964214de2ed18 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -5305,13 +5305,9 @@ int mas_empty_area(struct ma_state *mas, unsigned long min, return xa_err(mas->node); offset = mas->offset; - if (unlikely(offset == MAPLE_NODE_SLOTS)) - return -EBUSY; - mt = mte_node_type(mas->node); pivots = ma_pivots(mas_mn(mas), mt); mas->index = max(mas->index, mas_safe_min(mas, pivots, offset)); - mas->last = mas->index + size - 1; return 0; } @@ -5365,9 +5361,6 @@ int mas_empty_area_rev(struct ma_state *mas, unsigned long min, if (mas_is_err(mas)) return xa_err(mas->node); - if (unlikely(mas->offset == MAPLE_NODE_SLOTS)) - return -EBUSY; - /* Trim the upper limit to the max. */ if (max < mas->last) mas->last = max; From patchwork Tue Apr 25 11:05:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13223209 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 A4BECC6FD18 for ; Tue, 25 Apr 2023 11:05:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 400D96B0082; Tue, 25 Apr 2023 07:05:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3B06D6B0083; Tue, 25 Apr 2023 07:05:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 29FA26B0085; Tue, 25 Apr 2023 07:05:57 -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 1CB296B0082 for ; Tue, 25 Apr 2023 07:05:57 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id E10384035E for ; Tue, 25 Apr 2023 11:05:56 +0000 (UTC) X-FDA: 80719633512.19.F31C5DE Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by imf05.hostedemail.com (Postfix) with ESMTP id 0CCB3100012 for ; Tue, 25 Apr 2023 11:05:54 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=WZB2irIo; spf=pass (imf05.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.177 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=1682420755; 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=SdvAl/rsZlyn6jAT/y3p3/RJdLkd5U9SZ/gjDoLgWfw=; b=X9YgfgmRLsjHyNCYII2GMpTqM+GWDc2GkMbyXsyHglzRWz3pO+RNHMYi1HNeWUjAhwygNE yKRe0C0B5+y1lGFxODhE4qERLC+1LS/y94ctZPGAFP466u9E+mOH0sAc0UgxT1wQEopjxH etohNqem2HoQIZoxm7OKYixpo6HoYQk= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=WZB2irIo; spf=pass (imf05.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.177 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=1682420755; a=rsa-sha256; cv=none; b=CSPB20Ikgr5mcdyzBgtoyza3IjX5i26ra3IXqTtMpxid9GonVC/+QLFZFvRDL5AATJAa7v caGRMWvVfJiYEDVLq7tyxOneEjuvG/tOqHoOUKXhnp5f6sEjIXFKNIBv+r2vf4JlzQv9+5 s6JZtQ7zWSWaevY5ZQpDjmdiaI/XSto= Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-63b5fca48bcso4722089b3a.0 for ; Tue, 25 Apr 2023 04:05:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1682420754; x=1685012754; 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=SdvAl/rsZlyn6jAT/y3p3/RJdLkd5U9SZ/gjDoLgWfw=; b=WZB2irIoBxS6GfGWbmO853Yh/UPd4puaaWuwwy6+RSHHRD9B00WbRPCkiKPVrIbRII 1pcfPq9bubluGJJeyOkwLw/XxAmdroXH+PyguDhLNWvGNXvKzmSCKSKO6fYtvqXgbO04 iz99DVGSY1h2LtWFUVD+x7fZ0tz+TLSL781orthWvsF2rwarXtXFcU4IV/V5a7zQRQq8 wuPrNWCDq6Ow9r9Vn27Ha/PmX//TkDUedK1Mow/rbV9iqKf015dWHpqGcO+uuA500v// WqsfSrj40q7HE8zDHZhcIzZCKsjjFNTglOGyr4KegnKNRbr3XDs9pNjqWtA0TXgPVef1 xngQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682420754; x=1685012754; 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=SdvAl/rsZlyn6jAT/y3p3/RJdLkd5U9SZ/gjDoLgWfw=; b=CN4dJY6jhmFwuKnzQcRc/1iok7xj87VWNRfZ/Yvpo7ljUpBvTlEcuQV7es9ov1lsTs 3f3dfiAghbsXpYmcY9V3s4atK+LGkscyhSDabrnCTnhiWG3Qh7XcsR/GW5X74SgELJz4 Yz99vjpidIg0rH1rlFGq1J7PfpyOWIcVr4QRXCkY7erjJkN4iUAE4YLVOuRx0k9nPl0f SEEZ2RQQ7tsVJLAa/JVdgakjZe1oQwrqnMZ9Q7/bsoeZWgNyIJsBn+gjJ5hSZuPLb+Hp /d7Ea4taMS5RbXPPuYzvpymd3sZKJ5sjoANaPXFL3P7dbps2D74OcSjFfqYuWj3p/a/D SciA== X-Gm-Message-State: AAQBX9cK86GBDgpmgQGc6MvwOWSMlldIwFV0y5t4hPcafbV/2DOvDybl pW+lxB74gT6dGcttLmp/4+vVJQ== X-Google-Smtp-Source: AKy350YosWlGcJzLz6lD6ztODg+LACdFQKhZ99bcfSueMS7rUjCsz9/sQVqQTb0SfTKSFkZeLRnrXg== X-Received: by 2002:a05:6a21:1014:b0:ec:86a7:4fa5 with SMTP id nk20-20020a056a21101400b000ec86a74fa5mr19512176pzb.30.1682420753957; Tue, 25 Apr 2023 04:05:53 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([139.177.225.236]) by smtp.gmail.com with ESMTPSA id u3-20020a056a00158300b0063f3aac78b9sm4422169pfk.79.2023.04.25.04.05.51 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 25 Apr 2023 04:05:53 -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: [PATCH 9/9] maple_tree: Move declaration of mas_empty_area_rev() to a better place Date: Tue, 25 Apr 2023 19:05:11 +0800 Message-Id: <20230425110511.11680-10-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230425110511.11680-1-zhangpeng.00@bytedance.com> References: <20230425110511.11680-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 0CCB3100012 X-Stat-Signature: xh1q4z11ebgi89d36ytmcypyjw86h1u7 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1682420754-60270 X-HE-Meta: U2FsdGVkX18Xa3OKLIYQX6uJn5dw2pz2JUk99L6ZIsu4y+ju3OwvSCLX7AEx+P5waam5gypbhEiq0zRlbgxmv4pND9gUOFKOMH/bkpXEVwXw+dOx9PpWUCu9O3UVeXX3kngdXRKB2Kx/a1wBjp2XZOR5Eu3tr/9mihCrf9S0Dv+RjoKG4LW18D2fd1gN0YuooVNM32UolzIx/QxvDX18tv9KHvFESZ5h6X6xdjXFd0c1ftQrRceB8FXeDtZvVGHRBlF41nc19013w6h6tEdlIlxQklP9rV3hNp2+0zMTDM/LQnfj3EoapP9BkysWWl20lojnE787MVTRTNkVWj4k3/mcEpYMxcIAnk0j18I6YSLbgR+I22PQKV29ULAqCXHZy8OmMSWBBgAt4sPt8yyCGywSlJHmKCCsdY+fEv2Z4FHXjpBfcrK9PjI5kV3sII1xTwwor3ap+7wSNyF5DrVO7MAAS26NSNq6aC1pZnZg4t7VSJp+WtB1Fa5rSjDe0BPQyPO3te3Hp1OKelFdC3YMJfohvDte3K+cTyIvag4x4hR2jR53vM9FpWc+3thCJXV7GgPGFOc1UxYd4dgiz3JA/HkN8KrGggXDdBIKSSCnrw0BQC60MpHuViVRvywxCuW7sPFpyKxCgpbpSTrX/X+dAQqlHH4qCQbzbV3zqQq9FiXbawpOESlSQ1nPINVQUWLLZHWXFwSLq2gM9WiQLTCig9iNnAiXYR9sGpncSlMNHAfKHHWNCnavemQ5kZ5BDmZBq70tUSYPFBI+EF8/HvTDfiOnYfy6BP1bnUnQ2U4Ds2seMyMP5eyvBRyoZENu7QdU6xFdMIgVwCkVZYKSKLrQL/3WpOexJNz2ooLH1Ny/5b6rGudqjlN7uM61FpSNXJdb5bVVHREw1VVNgRViuirwYo7ItXgRpXAgGH2QqYi5g8qK9ftmAavoHlZW8x1/YNUQ77acVehlrkn2j5Li8sv 2bDGduAu RxoqLddAOnYJuZRDtXchwsl8j6KNXHk6LpWKriaSaUHejnlnAcGJft3U2PleWtuCAF0573b9R6pZxd6rvzzDoDDioEHw03Fy3Be5MaDGzM2+0XrQb4oDVpoETjm/uH54lYIWtl0h1UOFb9+5gzLbm+RlkLdOPhQcapA/TBjmNygaQaUJnwAincsqGJHxeAzuCl4nI5CkhmvmYj7zZvRjyyx7RjqmVZLb8KzJMq7J4GdtbvNhZLLjCt91H4Zhq3oJahRFmDKBpoK5tRjXzECiuCLNgHTxiEG4x9p01xQjv0h0K2ExAZj9tmwoh14wUNY1qH7gibQXnz+DUxaKoB3womDQtZeAJmJ2cqATIZuPnUAscqPyKPUFcefFMQcm9k9k3KijUvd3cP1z0Aj/J6RwNiRxhJyJtpXa8agcCbCh9xucwwZKhiC6dn40sofDihhyjuGd8X7JkdW4t/dE= 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: mas_empty_area() and mas_empty_area_rev() are a pair, move mas_empty_area_rev() so that their declarations are together. Signed-off-by: Peng Zhang --- include/linux/maple_tree.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/linux/maple_tree.h b/include/linux/maple_tree.h index 1fadb5f5978b6..3130c1f822ddf 100644 --- a/include/linux/maple_tree.h +++ b/include/linux/maple_tree.h @@ -470,6 +470,12 @@ void *mas_next(struct ma_state *mas, unsigned long max); int mas_empty_area(struct ma_state *mas, unsigned long min, unsigned long max, unsigned long size); +/* + * This finds an empty area from the highest address to the lowest. + * AKA "Topdown" version, + */ +int mas_empty_area_rev(struct ma_state *mas, unsigned long min, + unsigned long max, unsigned long size); static inline void mas_init(struct ma_state *mas, struct maple_tree *tree, unsigned long addr) @@ -493,12 +499,6 @@ static inline bool mas_is_paused(struct ma_state *mas) return mas->node == MAS_PAUSE; } -/* - * This finds an empty area from the highest address to the lowest. - * AKA "Topdown" version, - */ -int mas_empty_area_rev(struct ma_state *mas, unsigned long min, - unsigned long max, unsigned long size); /** * mas_reset() - Reset a Maple Tree operation state. * @mas: Maple Tree operation state.