From patchwork Fri Oct 13 11:58:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frederic Weisbecker X-Patchwork-Id: 152552 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp1835654vqb; Fri, 13 Oct 2023 05:01:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEpH4t8W5gR9EB4KKOUzJp0qnV7d/wKUQr9UHSq7VA4MeEfh4FnSBTDsFcDDK6pINjcU90I X-Received: by 2002:a17:90b:1d87:b0:27d:2261:73e4 with SMTP id pf7-20020a17090b1d8700b0027d226173e4mr3935048pjb.2.1697198480587; Fri, 13 Oct 2023 05:01:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697198480; cv=none; d=google.com; s=arc-20160816; b=xnf+3fgc3WlW4ZYD3jkXUzAbWTZXN+qYV60GtS+Q7WKRmRCxMXNHwp4Cf72ZZJgGad z3upwNJFFqbP8DYWtn1SZ+wON6k211+majmTpo/xixYox6FQI1d9U5GggLGkKmcUUYlf qelgA2bWt9haKVydbAqjSlBCrvO14/pnDeOZIENNxFyQfgl1MaZNAvMAIl8T7wajbBR/ zNhW7b/gDRv3S7W1VxgKMAXe6op3OQKbgO/+NdF8+Lf/vn86t8xtcsEmtcpFlmp1Vl0N GoBMKDSp4u7A2mQkvHaQ8C2IZEp1B1ky0RQ+WNenu9dQiNA9EYC21elCvkKQBSkYhbH1 Kawg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=qkiyQcL0Juz4c3OmLP36cb82z+rkMu9s2wCCT95yb6g=; fh=EnTBLYqW3ZqGVDhG+3QSxSPwUQwq5qMu5oTnNM8+B2k=; b=ojqdtTiRXrNOAT2x6wkF/ubbCHn9kPML6miZlCE0PN0zcxrK4xTBTUI5DdxMSpoZle oVDpsL7A8UcGW0XAC8VnIxVcCW0vS0MhnsAJ+k41Wmc5SevQB8ENg5GRlCwCmkxB0lbB Vbu8uRjuak62AsPKVwvnsYhcJcIBVUsl5S2wWQOn8nEDJDYREJDqjqvPp3e0hqPUWYB/ Ns0BGJigYQ5Ij2Ae1z7doBi3le0SbySgU8h066mB/WByu5CbtP4rsyylG4miWCytTrv5 v6UQoAXdYlzCbBtN5TYVmbMAoJVE0UoyTbSxotvke3jvJeAYZgfRZP7C/8BA0g1BIazL x2MQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Lc6G8raI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id nn13-20020a17090b38cd00b00276b87c8b8esi3225423pjb.59.2023.10.13.05.01.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 05:01:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Lc6G8raI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id C068782CEFFA; Fri, 13 Oct 2023 05:01:08 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231807AbjJMMAV (ORCPT + 19 others); Fri, 13 Oct 2023 08:00:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46058 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231808AbjJML7w (ORCPT ); Fri, 13 Oct 2023 07:59:52 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8E28010F5; Fri, 13 Oct 2023 04:59:41 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6F9AAC433C7; Fri, 13 Oct 2023 11:59:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1697198380; bh=9eKXMVkzj30bJjMYB0HS6GlgZmQ+aae2FrSYU4LFmqA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Lc6G8raIpvm9yT+YjPvUXfqlCcBSGvsvCO41iqsHlWYs4HoQlQBrbHeBxldNK5ZS3 pONJYQJQN8KuhB5BjprBpq9wf/9T9SvMRBG39QxxHXQ1rPgL1L80QL2KM2Hrx+aklz VKsa6uz21SOzhNNhM6Hq/Rb5xNiB08jMy8WbNKBCHz6AL97J0u12oBp63SDRdoOUq1 oRWY9+04XjJdF+ONPBtdBPLScLHxAB26DrcYD0AxeKLVNuuYdMOuxkOcszopNNoTeT hVSoEl1CZ5KCLZpPXkhjcr8tS+BpK++87WcEIiVWxi/QTe9H8Uj42fxnsq8L+LRdC9 osyzbuL8PBVqQ== From: Frederic Weisbecker To: LKML Cc: Frederic Weisbecker , Boqun Feng , Joel Fernandes , Josh Triplett , Mathieu Desnoyers , Neeraj Upadhyay , "Paul E . McKenney" , Steven Rostedt , Uladzislau Rezki , rcu , Qiuxu Zhuo Subject: [PATCH 11/18] rcu: Use rcu_segcblist_segempty() instead of open coding it Date: Fri, 13 Oct 2023 13:58:55 +0200 Message-Id: <20231013115902.1059735-12-frederic@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231013115902.1059735-1-frederic@kernel.org> References: <20231013115902.1059735-1-frederic@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Fri, 13 Oct 2023 05:01:08 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779641593921693890 X-GMAIL-MSGID: 1779641593921693890 This makes the code more readable. Reviewed-by: Qiuxu Zhuo Reviewed-by: Joel Fernandes (Google) Reviewed-by: Paul E. McKenney Signed-off-by: Frederic Weisbecker --- kernel/rcu/rcu_segcblist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/rcu/rcu_segcblist.c b/kernel/rcu/rcu_segcblist.c index f71fac422c8f..1693ea22ef1b 100644 --- a/kernel/rcu/rcu_segcblist.c +++ b/kernel/rcu/rcu_segcblist.c @@ -368,7 +368,7 @@ bool rcu_segcblist_entrain(struct rcu_segcblist *rsclp, smp_mb(); /* Ensure counts are updated before callback is entrained. */ rhp->next = NULL; for (i = RCU_NEXT_TAIL; i > RCU_DONE_TAIL; i--) - if (rsclp->tails[i] != rsclp->tails[i - 1]) + if (!rcu_segcblist_segempty(rsclp, i)) break; rcu_segcblist_inc_seglen(rsclp, i); WRITE_ONCE(*rsclp->tails[i], rhp); @@ -551,7 +551,7 @@ bool rcu_segcblist_accelerate(struct rcu_segcblist *rsclp, unsigned long seq) * as their ->gp_seq[] grace-period completion sequence number. */ for (i = RCU_NEXT_READY_TAIL; i > RCU_DONE_TAIL; i--) - if (rsclp->tails[i] != rsclp->tails[i - 1] && + if (!rcu_segcblist_segempty(rsclp, i) && ULONG_CMP_LT(rsclp->gp_seq[i], seq)) break;