From patchwork Tue Mar 28 09:26:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Zijlstra X-Patchwork-Id: 76000 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2134573vqo; Tue, 28 Mar 2023 04:20:38 -0700 (PDT) X-Google-Smtp-Source: AKy350Yn+R+4L5M3omQnlrB8PQQ4aMvqC6sfACtLPZC/dhOQYaPzsuN6dPDMx5kBccg5/Opinwzb X-Received: by 2002:aa7:cd8b:0:b0:502:3ea4:7f95 with SMTP id x11-20020aa7cd8b000000b005023ea47f95mr8084515edv.35.1680002438171; Tue, 28 Mar 2023 04:20:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680002438; cv=none; d=google.com; s=arc-20160816; b=P0cp+o/xV5GXEQOM2vPm5oBnoljSuVdmXkz7bT6kgbcYFR9naqkisNFnvn5KTf1Aqt Lh0riw9wO5EZ/aSUMia3W40uvEUYf3HtcvSC7mS4CVfdsj/3DjG5B9ZlXuO7p1HftQrQ Q2m3zRpg/3khNCFrP2GA82/fipzU27eirhfk1+gCcwXzUqCHtHGyqgLJN4/FvInh6xZD ko8DFeyz0zcF1wjn9eaTWckkxwzFCXGyYN0p7hKBV62l6riTKCc8KLrP1PerTLOugqez 7Qw4jJip3AvkwdZJ+N8jd5GCTBe6MjFGvcAVINWJwtOUKjIi77fO13xVXcsXRMd+KlWy pOTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id:dkim-signature; bh=2nCdUjbTqHSXIpP/as6UIFPlbvoMHockVe8OM3H17xE=; b=FMiI1rlHd0qU5iDp0VJl6R3ZLcrft7d1X/OptVK6dZv5MHNgrwdVHVF+njADde0/Az k0wyO8JlXtznAZoQpzq2TDuyNjJhOYhyxKMnb0XHBWoIBZAzUjM7zZq1sUnbkJzp5leR sJCJjfwwr6CQXN/QmwzvGx2gxU3ehHceO6v/bcT+HJOi4dOU/chhFGo/PP4jSKyK4TlO XyImabDFQ+HlMvtjgHK782CGBrOL7SaKTGhfQyiydynwh/AZn8GEulSebRHNrsOh1aJL OnplouycPTe5VoYNtdENEe8Q0jHtbjB93MceaoVz8B3pG0NxLtKDG1aQ3cziQoIaQ/9r kfqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=desiato.20200630 header.b=LpRrNGlo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d19-20020a50fb13000000b004fd2b13b203si11798841edq.550.2023.03.28.04.20.14; Tue, 28 Mar 2023 04:20:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=desiato.20200630 header.b=LpRrNGlo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232060AbjC1LHI (ORCPT + 99 others); Tue, 28 Mar 2023 07:07:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39350 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229646AbjC1LHG (ORCPT ); Tue, 28 Mar 2023 07:07:06 -0400 Received: from desiato.infradead.org (desiato.infradead.org [IPv6:2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 395942101 for ; Tue, 28 Mar 2023 04:07:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:MIME-Version:References: Subject:Cc:To:From:Date:Message-ID:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:In-Reply-To; bh=2nCdUjbTqHSXIpP/as6UIFPlbvoMHockVe8OM3H17xE=; b=LpRrNGloDFUqUOQM8Sulplk7O9 aI0SZovwuFICcYdhbwj4mNMp/Ys6dgEdR0ixbfdzpq/AjBQarXz4AVIyj24nDXD3SLdd+6IGaMgrM ME1k4Uoeln4hoDLmS8ItPI8hqR6jt/zcwg65HAOR9jWrfY55tFnP1jUxCoanWrfx9lvFS3kpcQOtP 9l213m7Z0VPaefvg6vPH0nBjAwv8dhqt/J76WLnm3NEuzMR6kYDNhj4yKQoPSpIIQTRYeAmBNC4uW vdTVccJmcEj2PUN7yVSbmjzVhggTkOtaxmp6b3d0NNfjfLkFaf7WxuseJaytfZWc48SsOPv+vScps UB2yyRog==; Received: from j130084.upc-j.chello.nl ([24.132.130.84] helo=noisy.programming.kicks-ass.net) by desiato.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1ph79l-006XUv-1c; Tue, 28 Mar 2023 11:06:34 +0000 Received: from hirez.programming.kicks-ass.net (hirez.programming.kicks-ass.net [192.168.1.225]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) by noisy.programming.kicks-ass.net (Postfix) with ESMTPS id 513C8302E27; Tue, 28 Mar 2023 13:06:23 +0200 (CEST) Received: by hirez.programming.kicks-ass.net (Postfix, from userid 0) id C42892CB8CEC2; Tue, 28 Mar 2023 13:06:20 +0200 (CEST) Message-ID: <20230328110354.061987722@infradead.org> User-Agent: quilt/0.66 Date: Tue, 28 Mar 2023 11:26:29 +0200 From: Peter Zijlstra To: mingo@kernel.org, vincent.guittot@linaro.org Cc: linux-kernel@vger.kernel.org, peterz@infradead.org, juri.lelli@redhat.com, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, mgorman@suse.de, bristot@redhat.com, corbet@lwn.net, qyousef@layalina.io, chris.hyser@oracle.com, patrick.bellasi@matbug.net, pjt@google.com, pavel@ucw.cz, qperret@google.com, tim.c.chen@linux.intel.com, joshdon@google.com, timj@gnu.org, kprateek.nayak@amd.com, yu.c.chen@intel.com, youssefesmat@chromium.org, joel@joelfernandes.org, efault@gmx.de Subject: [PATCH 07/17] rbtree: Add rb_add_augmented_cached() helper References: <20230328092622.062917921@infradead.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.5 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761610237055138024?= X-GMAIL-MSGID: =?utf-8?q?1761610237055138024?= While slightly sub-optimal, updating the augmented data while going down the tree during lookup would be faster -- alas the augment interface does not currently allow for that, provide a generic helper to add a node to an augmented cached tree. Signed-off-by: Peter Zijlstra (Intel) --- include/linux/rbtree_augmented.h | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) --- a/include/linux/rbtree_augmented.h +++ b/include/linux/rbtree_augmented.h @@ -60,6 +60,32 @@ rb_insert_augmented_cached(struct rb_nod rb_insert_augmented(node, &root->rb_root, augment); } +static __always_inline struct rb_node * +rb_add_augmented_cached(struct rb_node *node, struct rb_root_cached *tree, + bool (*less)(struct rb_node *, const struct rb_node *), + const struct rb_augment_callbacks *augment) +{ + struct rb_node **link = &tree->rb_root.rb_node; + struct rb_node *parent = NULL; + bool leftmost = true; + + while (*link) { + parent = *link; + if (less(node, parent)) { + link = &parent->rb_left; + } else { + link = &parent->rb_right; + leftmost = false; + } + } + + rb_link_node(node, parent, link); + augment->propagate(parent, NULL); /* suboptimal */ + rb_insert_augmented_cached(node, tree, leftmost, augment); + + return leftmost ? node : NULL; +} + /* * Template for declaring augmented rbtree callbacks (generic case) *