From patchwork Mon May 15 13:17:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13241441 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 C90E5C77B7D for ; Mon, 15 May 2023 13:18:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5B98F280006; Mon, 15 May 2023 09:18:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 569CF280001; Mon, 15 May 2023 09:18:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4596D280006; Mon, 15 May 2023 09:18:45 -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 2C2C1280001 for ; Mon, 15 May 2023 09:18:45 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id EDC161A0542 for ; Mon, 15 May 2023 13:18:44 +0000 (UTC) X-FDA: 80792544168.01.B61ECF6 Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by imf18.hostedemail.com (Postfix) with ESMTP id 1B7E61C0005 for ; Mon, 15 May 2023 13:18:42 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=iRq9sScO; spf=pass (imf18.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.216.49 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684156723; 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=lo1IIZfKjDP5LNi0dc+D12owX90CR8s5tkIi0vNkd7U=; b=helZeUbTODxNMiLHMu7qZXkur5z3ZcLSZv6kXErV8P9ErIsRhcFM5E5hyrNxfXSwLQZ1KV RDUUNnnkgUiQY70PQfryKejGKd3nPQyaqPy9wqrtCoTxzqpuyMApDr5ff9YoTqtRxYuzoC q9rbY01KWhGfaOPoiYrVUM7nkZPUtEM= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=iRq9sScO; spf=pass (imf18.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.216.49 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684156723; a=rsa-sha256; cv=none; b=0lWuPKLkXJyHI3siVZhMLtA0I4KF7TeomlIXreMSRxrP9DAqAyadkLwSdu2vpxDEwbTvi7 PO2RizxlwC686urleWkT4DAvbIQhlBOSfUrkWSULX5alKAnNQpnLPejKxCtUqTQ8Q96mb3 1PfOSvwY5kFHeaZEEP5ZGiVR1rr3fJw= Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-24df161f84bso8727179a91.3 for ; Mon, 15 May 2023 06:18:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1684156722; x=1686748722; 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=lo1IIZfKjDP5LNi0dc+D12owX90CR8s5tkIi0vNkd7U=; b=iRq9sScOWZTCRfloTGbziN9cAC64a11zOsNkjp+5c1soI+3pRGWoucKuYa0+afBrM9 KP8InFDQgvCjKmHotLh2wYIyXRzWHtTPq+Eu/2q4uz7EHQaV09LS/cg0LBz50XCOSenv 5TIATnqEPFgNUuV8mtQuISYyzUH0xhNubca3DObs4XwCQmcEhgMKj6lZoQBSaPM42/p3 ZPnakXFKNosi63bdx6zJYoyHGjOpg2rxmoG3YBjH17UsScQn6r/yNgXEZSpXMSaiPPvO sVodHaxkosK0wFyiC0Hn2X0gh8Q5Iww84zRZZ4k5Aa2XQix6BKn1naSGI7OW3PhFCTqn VtCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684156722; x=1686748722; 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=lo1IIZfKjDP5LNi0dc+D12owX90CR8s5tkIi0vNkd7U=; b=YpNX6d3tqqDpWzPurmlVWisDafxLYpVK0NBkln87vVW7f2g36/+s0nVHeG6nsfUzbu t6o0G+qDKCrkcERX1vnMf44fRJazIJJdsTzVBOZGz7efUWpQU1oACT/v9jcrr5WO7spF 5egxy1KEzXmeWfju/eeofKIN/vPoHubY5OV6QLJfUzDeDOJ81P4kZIZBkduVc065YV3k 2axkUDXXPSVEr7Hxu1TNgD/Ah3/IcYfGtJQW5xbZPvA6qZD91R1+wi5ixDLXLlZxf81N QSoiWAr9W602Grel50KJvhtiIkf6eg0xBQksjrz0P6OaD7ZOb7FUkWc66esUx7YIkkCe jvjA== X-Gm-Message-State: AC+VfDwB7c2H3RgRHgUWtBBnA9P0jl+SfDLjoFamm16d0ZB1Zjjmm76f L+e8/ey0bXOC8I6xybvxpsGRdg== X-Google-Smtp-Source: ACHHUZ6sqdEAVKXCZZzGT9Z6sL0SWer+AhnOXHqqOFRcuvjaqR338puxAj51isP5NagP+6F7tjxgTA== X-Received: by 2002:a17:90b:46cd:b0:250:6119:6c1f with SMTP id jx13-20020a17090b46cd00b0025061196c1fmr27787639pjb.19.1684156721988; Mon, 15 May 2023 06:18:41 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([139.177.225.239]) by smtp.gmail.com with ESMTPSA id gl20-20020a17090b121400b0024749e7321bsm14190014pjb.6.2023.05.15.06.18.39 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 15 May 2023 06:18: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 06/10] maple_tree: Wrap the replace operation with an inline function. Date: Mon, 15 May 2023 21:17:53 +0800 Message-Id: <20230515131757.60035-7-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230515131757.60035-1-zhangpeng.00@bytedance.com> References: <20230515131757.60035-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 X-Stat-Signature: hmjnxgi5j6ob44drmh3dmhc9uqt5qc6k X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 1B7E61C0005 X-Rspam-User: X-HE-Tag: 1684156722-573590 X-HE-Meta: U2FsdGVkX19rY61hqcFsgo4tuhCTT1PpibhuN9IVU5Z9lu59c6PFYYGsCWxQyIt15tjVWw4UCncM+nTH37pJG9QJLnWeb3EQ/xKCKL4cgkPKsp124ubFPw+g/7wKTtTmenWiBE6g2lrEczDREoJwPY8adpnpadD9geZGV/cVboJcKi8DqPjXd9NnG/3/51WrqEHStql7RZv860dGxdcj3oNeDblUS4xZ1ksq8rWcr5XAQe5j7YGviomkTBwpvx15DptXQMuD9q0Td1WS2GG1qWN0ZE9wyyvtahdVCS3OFZpRSGoijy5zdkou/RFN3+3xyxJ992V7Pu2JKzeUL4eAG1Xuba29bJShto/Gp94tqE6pd+LGcxtPjUhRnSL2bVC34rWr3EMCY9r9r+UJopY94tLdlblvgiHS4qO/luuTgQe4gbyhxQAT3SblPMtPwfjEx7gQxYQesWiaKThS6/i5IX/p/N1eBvDmEa3NqyQ/TF/zUoeQVkdcT/jlRRCafP0Bc/HWIqfUD/HeF+WvqyBaWwYwMJKuHIV515dlkPjVvBGrPhQIYjr3vNxoaoNaI3XTsVNRmPTlq15PNUM/0DAoElVh1qnnU1mzY43ugIKp/voYUPM0VZTfLbXQ7bggeq0QPYTPenDcM7dPmGJ+byhVPdVkwSuofXRyu50isW1nZKWT/BhcBuvM0Lz8X/8KSG/WaMpeadG9Ycy576wbmwNrCa6QKc6W/4aDgfcOU8m42uxBJSPyuh3ePBhy/QAgtTdrXZQqm9nKcynVuXVLwN2ZCeeLpVlbSX9wXYhx2OBpoE4J3l63ubsQdXdsvp4hw1RRW+UtIO7ZvQy3aW8qNt28g2/ptTB7Y87MoWzPh8QNP/cLtjQDNlVlgx3OpZsInbIn9LuAE63IrbErq8Vf+9EL2MtwnEiInufKxviql+iqSH05F2NnIsFnbjSCvsQJc5tenj+yN7rj35v8fzrZS2e IJvyfazQ 7RZ5iP4UL7VWPS4s23Ov8HotLniEhTLr1pBo8Jro85aJG31W5G6NSYttzq8wmhm7c7Ufr/NOnmcyuz/SSrZB0jMhHCZJx27hBw6zKficCpOzrPDTApddG6IuGNACo7o+uzIABYz9N0UBVwtxvtbxzPa0CxAAP4gqsbWUbFvn/JsLD2kjffJo5fn5dwHfibykgXKWz3vHWmnfe/SN2XJAXD4ZeEZUfP9TmxrnKBEoVK7j4ulyk2BCjNSOZ++BAFex/Mw1i980euL/9cM/tH9twWhEHRxsPhifE3QVRyNJsIVCbVkjNdhj9DYncLDqb2FLFGWUNkKu2P2SZg+GM+MKOsT2YvxyEoqqdYLkIr14UvhtWFxkMfo4qqI0EblAO7sJgWXjTo6FD8uZklmY7seSU9WL7Hxw+QNGkQL1+PYN0A9eOQO8+FgRKRbOLbd1OeOxZzw1eKqvJKLVDkMM= 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: To make mas_wr_modify() cleaner, wrap the replace operation with an inline function. Signed-off-by: Peng Zhang --- lib/maple_tree.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 4c649d75a4923..ce695adc670ec 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4288,6 +4288,19 @@ static inline void mas_wr_extend_null(struct ma_wr_state *wr_mas) } } +static inline bool mas_wr_replace(struct ma_wr_state *wr_mas) +{ + struct ma_state *mas = wr_mas->mas; + + if (wr_mas->r_min == mas->index && wr_mas->r_max == mas->last) { + rcu_assign_pointer(wr_mas->slots[mas->offset], wr_mas->entry); + if (!!wr_mas->entry ^ !!wr_mas->content) + mas_update_gap(mas); + return true; + } + return false; +} + static inline bool mas_wr_append(struct ma_wr_state *wr_mas) { unsigned char end = wr_mas->node_end; @@ -4347,13 +4360,9 @@ static inline void mas_wr_modify(struct ma_wr_state *wr_mas) unsigned char node_size; struct ma_state *mas = wr_mas->mas; - /* Direct replacement */ - if (wr_mas->r_min == mas->index && wr_mas->r_max == mas->last) { - rcu_assign_pointer(wr_mas->slots[mas->offset], wr_mas->entry); - if (!!wr_mas->entry ^ !!wr_mas->content) - mas_update_gap(mas); + /* Attempt to direct replace */ + if (mas_wr_replace(wr_mas)) return; - } /* Attempt to append */ node_slots = mt_slots[wr_mas->type];