From patchwork Wed May 17 08:58: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: 13244472 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 52D99C77B75 for ; Wed, 17 May 2023 08:59:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D7CB5280004; Wed, 17 May 2023 04:59:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D2D35280001; Wed, 17 May 2023 04:59:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BF563280004; Wed, 17 May 2023 04:59:14 -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 B1B3C280001 for ; Wed, 17 May 2023 04:59:14 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 7A024ADDD4 for ; Wed, 17 May 2023 08:59:14 +0000 (UTC) X-FDA: 80799147828.12.A16B6D4 Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by imf24.hostedemail.com (Postfix) with ESMTP id 7F4A1180007 for ; Wed, 17 May 2023 08:59:12 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=PVkHjKmN; spf=pass (imf24.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.216.42 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=1684313952; a=rsa-sha256; cv=none; b=cJp/y5ib1QPB3u6DvB0hGOFpXSVXHXujlWLQzCy7Nl8Of19QJczj3uxhzcjIaKon1ISOgD cPdPs6+vwlZ3DyHrhjgH4hBBooX7LqtA04hOwM2Dpk74TQS8BRs7DoovDglcDjBPTa61Sh wwOxZnts6mfIYNCdRke2cJZYX+n5nc4= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=PVkHjKmN; spf=pass (imf24.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.216.42 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=1684313952; 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=L9aNGrqQBPjiuab0lkbsDijWS2guYts9Wyl3byUG0bc=; b=e7QicgAevoXSxF2yfN73af8l22obMMpHV7So4mhJf1bQi3CXw29VCZc0yGquSV282OwT/L 6qqTFXRJk5FgThUFf1YYv4H+tjxjgOfK9N3N2Mvh1VhdkKuEUJHuUCP3MEKBCMtDmKWWKe 9h9HMgw1Znw44tmfFyBfsfAytAs/VUI= Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-2502346bea0so447925a91.2 for ; Wed, 17 May 2023 01:59:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1684313951; x=1686905951; 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=L9aNGrqQBPjiuab0lkbsDijWS2guYts9Wyl3byUG0bc=; b=PVkHjKmNBRNoPUuywfzQSWpLOEe9y6Le98hPE+07bPGymbDIGtwrSk4xVyi3eR0k2S bX5kBB0H3NlzJfQEoP7sfHuEmEbDGUEcp9HPEsMVuzE+ptHbpQXZPJ7+zrXdwQNJ83ce 8ENSur0Opp8Zbg8MGsz+sUNE0qhL2bVj2HGCLmTOb1inynR0m+UBjc0msDu/7sxqJM2p Aa3bFJ7LFReAOst5AYiFDvfGMDZHcviGgITrQh9bibrxAdKMbOIHjjI+iqCOknwkkP79 K3v1Zx+QjZw5pAMKf58p3Ra2EZ8oyz7Ha+OckwnkN0YlwvSvcwbx3v1bsdc5IkIx16By FVNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684313951; x=1686905951; 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=L9aNGrqQBPjiuab0lkbsDijWS2guYts9Wyl3byUG0bc=; b=Jopa8c28FG5t1+R1yrr7QVEsfJfh+QQcs9c+LX43+amaqkB6qYYBLysenUHJMxJUse s9c9RPUbiFqidDY8fwRauyTXV1XwbuRLsafrTwnj04M9qJi70dFwOPKCPd1YWJF6Tdix DU/qvW93CDcl97SW2wziK2jAc5gFipxX9gzN4PkcBOSeoT0nis/TG7iN7VEdjztim4fI RmhAsHoI0LTmlLmBLDXbq2yzFJVLgN3lq3l0g392ltZilMbHbWfMkdWhrY97rHCE7hGZ wkfLm7MNiE92owhJgn+uAt0xKp4HrpvGSr8sNcB7Vrv4tOuPw2r5WEHqgGzzK2g44xAW CSHA== X-Gm-Message-State: AC+VfDzg9FvJkb6kMNqBOCODFCaqQmfU/b0uQ0qGDiCo9vWFweQr3W4S 0T5fHXxdMXidTtettGM3usXX5A== X-Google-Smtp-Source: ACHHUZ5DxkbsJqpwqqa/RF6nfH0fg2jWd8EQ2nzER6XH1u8bbzG2vqw0bz1d1ax/FUaCfeRQQtr7dw== X-Received: by 2002:a17:90a:af86:b0:250:5194:b135 with SMTP id w6-20020a17090aaf8600b002505194b135mr35679211pjq.34.1684313951480; Wed, 17 May 2023 01:59:11 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([139.177.225.255]) by smtp.gmail.com with ESMTPSA id m18-20020a63ed52000000b0052c9d1533b6sm15056765pgk.56.2023.05.17.01.59.09 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 17 May 2023 01:59:11 -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 v2 09/10] maple_tree: Simplify and clean up mas_wr_node_store() Date: Wed, 17 May 2023 16:58:08 +0800 Message-Id: <20230517085809.86522-10-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230517085809.86522-1-zhangpeng.00@bytedance.com> References: <20230517085809.86522-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: om71u6zq8hjrihkaawd3dfccsr1xgwkf X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 7F4A1180007 X-HE-Tag: 1684313952-744178 X-HE-Meta: U2FsdGVkX19V0S0zBhnsQxTiyDil0hl4GdozkEYVvNQTy8QE2u5bLwutNo+ewSVe/Lkw7rnz+k7f51cJwEG6OzOjfcRlChRMNWFHjdX7zawIBqwSvt/pfsWL0eM7GclKOqQz2pFjzh4B9MUXKbyMQYOKjDJhgHj7KN7zu2gB3HvVFF8z9WDZW6kkqLJys3XQGrh5u999EZziuIWZCeHgwjU/fKH/07pYP3rjmRG6tfN1SBvNe4DOhw95AXper0XBCyrCUd7MZLmSPJ08y5Uf+keN/zxi8rEcw460hV8x+tDZhgOHNsFOfgdhuUZdYwqucrCILTFq2ZfmaixxkB61DxAa4bCz5mxciKrArmkHJLzmE0Ujn8HIKeFIi8H6WkncL9q0ydjh2glBiJaI22gzGHTwYUWwNSd8ifhfP+XKS+/cI30Y/cRpTUsPdXIR83N0S0xCINKqeXxGHhV0jhfbo5jxmfZE4RnhD3mqyYzVb/N2fSvmEuvO+9wQPoBBaPnghzZndpgv+d2hdDeQKiDPEttsfyVFxDSAsMyVHDA0FJYRXmZ/N6PHlu+T0/j/Y+GyYJjADO/lAHQTBdjGEloB5X+xmXS/l3umbFZKiRdZ3e1F1SdmZncodK+un0DUCdzDfQCggxzZXir8+Egmcl2gUjRlm2VllMrIzSZ8mbD4l07mnosM64mALBTjNQBjvfieu6vlmVsd2JdhC+EBsD+iL7I5ZYSUX4CofctWlyTLnPe5r0/og8kD3UQh9L3L/aHGwC0EUn57OuRFzNhuCR9vyPasC4ePI4Cu3bpIPA+qkrNgzCv09r9aEi2k9efeRD8O8k0FRzHEXsEHKEmisOwUdbM7WKJTxEGomSDeVZvYphLDn2j9fxsBFabPDLjcvj2fcFx8OwbHzn4J6bizkeDvr5G04CjEXuOOnpox4eCC/nkPsbjo7KcC0Tx0vBbw7vUbrDj0ecJbWP2gWo9Z48f YUZjCokK j+B7LshwrwO7z5jX212/wiFwVvNMIcoR1GQNONiKdeLKlPgcx0I7hiOlBSfk4L6ekFlxvNn/L57CErwkBAWJt7uBx7tkGWZE6O+4lxkF5NZ3kc4sj7O5/pVP7pEhEmqy39nND1EYOV2ZeiHw5hMMUDPnXS9yehs4wenWJCjmSIiy6OzLXu4oXTPErt0p1+uYlYvv4rtxT2JWKZX/jILM3QF4mdxY5mQmqi7dEnNOtSThw7kNonbNhn7UbNNHvY6btfeyKRU5FIcyp5MqXKjIV01+6mLyudd2JnXFD0nfPtth6HPQBhe44skz3tSgqTeMpat1MuUY2GYQ2SD6G/8wEMAsknkpp3EAmtlOfAL29QN48Rl/Jk0J1Ad9Yrf81DHEE4hbrWO32UgS1EaQCCYDURpxENDvJ5vGFIHRDkD1kTKpsEmYKZobe+TfF/3NijcAGMic4kvmJmZZuCWo= 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: Simplify and clean up mas_wr_node_store(), remove unnecessary code. Signed-off-by: Peng Zhang --- lib/maple_tree.c | 87 +++++++++++++++--------------------------------- 1 file changed, 26 insertions(+), 61 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 25a8b7d5d598..b86001ad4632 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4072,52 +4072,27 @@ static inline int mas_wr_spanning_store(struct ma_wr_state *wr_mas) * * Return: True if stored, false otherwise */ -static inline bool mas_wr_node_store(struct ma_wr_state *wr_mas) +static inline bool mas_wr_node_store(struct ma_wr_state *wr_mas, + unsigned char new_end) { struct ma_state *mas = wr_mas->mas; void __rcu **dst_slots; unsigned long *dst_pivots; - unsigned char dst_offset; - unsigned char new_end = wr_mas->node_end; - unsigned char offset; - unsigned char node_slots = mt_slots[wr_mas->type]; + unsigned char dst_offset, offset_end = wr_mas->offset_end; struct maple_node reuse, *newnode; - unsigned char copy_size, max_piv = mt_pivots[wr_mas->type]; + unsigned char copy_size, node_pivots = mt_pivots[wr_mas->type]; bool in_rcu = mt_in_rcu(mas->tree); - offset = mas->offset; - if (mas->last == wr_mas->r_max) { - /* runs right to the end of the node */ - if (mas->last == mas->max) - new_end = offset; - /* don't copy this offset */ - wr_mas->offset_end++; - } else if (mas->last < wr_mas->r_max) { - /* new range ends in this range */ - if (unlikely(wr_mas->r_max == ULONG_MAX)) - mas_bulk_rebalance(mas, wr_mas->node_end, wr_mas->type); - - new_end++; - } else { - if (wr_mas->end_piv == mas->last) - wr_mas->offset_end++; - - new_end -= wr_mas->offset_end - offset - 1; - } - - /* new range starts within a range */ - if (wr_mas->r_min < mas->index) - new_end++; - - /* Not enough room */ - if (new_end >= node_slots) - return false; - - /* Not enough data. */ + /* Check if there is enough data. The room is enough. */ if (!mte_is_root(mas->node) && (new_end <= mt_min_slots[wr_mas->type]) && !(mas->mas_flags & MA_STATE_BULK)) return false; + if (mas->last == wr_mas->end_piv) + offset_end++; /* don't copy this offset */ + else if (unlikely(wr_mas->r_max == ULONG_MAX)) + mas_bulk_rebalance(mas, wr_mas->node_end, wr_mas->type); + /* set up node. */ if (in_rcu) { mas_node_count(mas, 1); @@ -4134,47 +4109,36 @@ static inline bool mas_wr_node_store(struct ma_wr_state *wr_mas) dst_pivots = ma_pivots(newnode, wr_mas->type); dst_slots = ma_slots(newnode, wr_mas->type); /* Copy from start to insert point */ - memcpy(dst_pivots, wr_mas->pivots, sizeof(unsigned long) * (offset + 1)); - memcpy(dst_slots, wr_mas->slots, sizeof(void *) * (offset + 1)); - dst_offset = offset; + memcpy(dst_pivots, wr_mas->pivots, sizeof(unsigned long) * mas->offset); + memcpy(dst_slots, wr_mas->slots, sizeof(void *) * mas->offset); /* Handle insert of new range starting after old range */ if (wr_mas->r_min < mas->index) { - mas->offset++; - rcu_assign_pointer(dst_slots[dst_offset], wr_mas->content); - dst_pivots[dst_offset++] = mas->index - 1; + rcu_assign_pointer(dst_slots[mas->offset], wr_mas->content); + dst_pivots[mas->offset++] = mas->index - 1; } /* Store the new entry and range end. */ - if (dst_offset < max_piv) - dst_pivots[dst_offset] = mas->last; - mas->offset = dst_offset; - rcu_assign_pointer(dst_slots[dst_offset], wr_mas->entry); + if (mas->offset < node_pivots) + dst_pivots[mas->offset] = mas->last; + rcu_assign_pointer(dst_slots[mas->offset], wr_mas->entry); /* * this range wrote to the end of the node or it overwrote the rest of * the data */ - if (wr_mas->offset_end > wr_mas->node_end || mas->last >= mas->max) { - new_end = dst_offset; + if (offset_end > wr_mas->node_end) goto done; - } - dst_offset++; + dst_offset = mas->offset + 1; /* Copy to the end of node if necessary. */ - copy_size = wr_mas->node_end - wr_mas->offset_end + 1; - memcpy(dst_slots + dst_offset, wr_mas->slots + wr_mas->offset_end, + copy_size = wr_mas->node_end - offset_end + 1; + memcpy(dst_slots + dst_offset, wr_mas->slots + offset_end, sizeof(void *) * copy_size); - if (dst_offset < max_piv) { - if (copy_size > max_piv - dst_offset) - copy_size = max_piv - dst_offset; - - memcpy(dst_pivots + dst_offset, - wr_mas->pivots + wr_mas->offset_end, - sizeof(unsigned long) * copy_size); - } + memcpy(dst_pivots + dst_offset, wr_mas->pivots + offset_end, + sizeof(unsigned long) * (copy_size - 1)); - if ((wr_mas->node_end == node_slots - 1) && (new_end < node_slots - 1)) + if (new_end < node_pivots) dst_pivots[new_end] = mas->max; done: @@ -4387,7 +4351,8 @@ static inline void mas_wr_modify(struct ma_wr_state *wr_mas) if (new_end == wr_mas->node_end && mas_wr_slot_store(wr_mas)) return; - else if (mas_wr_node_store(wr_mas)) + + if (mas_wr_node_store(wr_mas, new_end)) return; if (mas_is_err(mas))