Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp1273811pxb; Sun, 22 Aug 2021 11:19:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwHB4aWn8ePnfV/XB3nj6PoT8y6LMgPhm+akuFIvYbiBO8ytgf+mFUz+3Byla7v43yD7HtB X-Received: by 2002:a17:906:b48:: with SMTP id v8mr31717680ejg.258.1629656340417; Sun, 22 Aug 2021 11:19:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629656340; cv=none; d=google.com; s=arc-20160816; b=l8M4SlIf/hQukvtHlNPeLhRQoBbHmeGrEhiUcJL+xXIELdqFjv4H6NZq8vm7/a59cg YtUicaDIONdbxrUMrUVvL47O81lsgX6s1O6JZORExbVvtsEdaYSr+uei4aVec276gohl joeQmk/EwFxK/WvDgSYKxrdOTVolg7DTjC5B6UuAEMoIDizospGnuYStK/45uhUmrHF2 x31GXj1zdl7Q74chOhLdxlsI5cBc2gmGB8ZtU64FQZ87BgPbYI/wfT+UHhCvkZNukIS6 BE9Z4hmlkGIyG31l1Wp/YxY0OwjkzKBJ8G4l8X1XliXnHOrFrucAqKGbkIL0lkDSvCNN u7Ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from; bh=i4bH1i8Tw835kTS/R7D2DUg8y3hkI9HubKyOSa6DkIs=; b=CN2ozbKXLD6ZwaLwAHYVN1wgwkPWfGQSvAMd8QpNHqnyVRqDLEQ6yFmSWRgDAnIx1q r2E0nH27/Y3sCr3Zy0Uwdzb5ufC6gRk/6AjCWkjE590i8PccM18m6Gi15ICWI0NxR3PC /z2v3VCrX9jbjTi+SIIG/MIDfghfHeRdtaclaj0mM+f9FUQhG+jjt/lxk6TpcfLPS1tY 8aJlNFimM+6aTY7ZUYj0bfiaKcTWPPaBVM8wWuQRJTjYjzKP0Gn6L+cVH2s/djG0dMqE 1e4eAh7t+Rojk3D4BfmwiZ4CtT/XBYvCg7pKHhR91+ATEa8sLwdZ/7ubSNO6YC+f/NdG OJLQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h15si12627640edb.263.2021.08.22.11.18.37; Sun, 22 Aug 2021 11:19:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231984AbhHVSQV (ORCPT + 99 others); Sun, 22 Aug 2021 14:16:21 -0400 Received: from foss.arm.com ([217.140.110.172]:45830 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230245AbhHVSQT (ORCPT ); Sun, 22 Aug 2021 14:16:19 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C7C731042; Sun, 22 Aug 2021 11:15:37 -0700 (PDT) Received: from e113632-lin (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id CD3FF3F5A1; Sun, 22 Aug 2021 11:15:34 -0700 (PDT) From: Valentin Schneider To: Sebastian Andrzej Siewior Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, rcu@vger.kernel.org, linux-rt-users@vger.kernel.org, Catalin Marinas , Will Deacon , Ingo Molnar , Peter Zijlstra , Thomas Gleixner , Steven Rostedt , Daniel Bristot de Oliveira , "Paul E. McKenney" , Frederic Weisbecker , Josh Triplett , Mathieu Desnoyers , Davidlohr Bueso , Lai Jiangshan , Joel Fernandes , Anshuman Khandual , Vincenzo Frascino , Steven Price , Ard Biesheuvel , Boqun Feng , Mike Galbraith Subject: Re: [PATCH v3 3/4] rcu/nocb: Protect NOCB state via local_lock() under PREEMPT_RT In-Reply-To: <20210817153613.l5f66czar6pajexo@linutronix.de> References: <20210811201354.1976839-1-valentin.schneider@arm.com> <20210811201354.1976839-4-valentin.schneider@arm.com> <20210817153613.l5f66czar6pajexo@linutronix.de> Date: Sun, 22 Aug 2021 19:15:32 +0100 Message-ID: <87bl5p73cr.mognet@arm.com> MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 17/08/21 17:36, Sebastian Andrzej Siewior wrote: >> +static inline int rcu_lockdep_is_held_nocb_local(struct rcu_data *rdp) >> +{ >> + return lockdep_is_held( >> +#ifdef CONFIG_PREEMPT_RT >> + &rdp->nocb_local_lock.lock >> +#else >> + &rdp->nocb_local_lock >> +#endif >> + ); >> +} > > Now that I see it and Paul asked for it, please just use !RT version. > return lockdep_is_held(&rdp->nocb_local_lock); > > and RT will work, too. > The above was required due to the (previous) definition of local_lock_t: typedef struct { spinlock_t lock; } local_lock_t; On -rt11 I see this is now: typedef spinlock_t local_lock_t; which indeed means the iffdefery can (actually it *has* to) go. >> static inline bool rcu_current_is_nocb_kthread(struct rcu_data *rdp) >> { >> /* Race on early boot between thread creation and assignment */ >> @@ -1629,6 +1664,22 @@ static void rcu_nocb_unlock_irqrestore(struct rcu_data *rdp, >> } >> } >> >> +/* >> + * The invocation of rcu_core() within the RCU core kthreads remains preemptible >> + * under PREEMPT_RT, thus the offload state of a CPU could change while >> + * said kthreads are preempted. Prevent this from happening by protecting the >> + * offload state with a local_lock(). >> + */ >> +static void rcu_nocb_local_lock(struct rcu_data *rdp) >> +{ >> + local_lock(&rcu_data.nocb_local_lock); >> +} >> + >> +static void rcu_nocb_local_unlock(struct rcu_data *rdp) >> +{ >> + local_unlock(&rcu_data.nocb_local_lock); >> +} >> + > Do you need to pass rdp given that it is not used? > Not anymore, you're right. >> /* Lockdep check that ->cblist may be safely accessed. */ >> static void rcu_lockdep_assert_cblist_protected(struct rcu_data *rdp) >> { > > Sebastian