From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 056AEC3F68F for ; Thu, 12 Dec 2019 04:07:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CF0B921655 for ; Thu, 12 Dec 2019 04:07:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576123659; bh=XO3UIsiT7lgIlluvra0obFaodZI0dYDEZe6IgMN6kDk=; h=Date:From:To:Cc:Subject:Reply-To:References:In-Reply-To:List-ID: From; b=amZo1cng4C4SeKJSS6SeEloKEUVkknVK+RojI1XvKsOzROxviLM7H9K8PL0B7kIGN QVCjm0N/AwJ2pnX8alKXLcLfD8Bdl8uPSHJE8HmpT24cupOl2NbASLST6Vcvt66m15 SE+hDeieahg3kkDYnbIiCt8zSg3nG3ofDDvyPifk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727811AbfLLEHj (ORCPT ); Wed, 11 Dec 2019 23:07:39 -0500 Received: from mail.kernel.org ([198.145.29.99]:37378 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726769AbfLLEHi (ORCPT ); Wed, 11 Dec 2019 23:07:38 -0500 Received: from paulmck-ThinkPad-P72.home (199-192-87-166.static.wiline.com [199.192.87.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 01891206C3; Thu, 12 Dec 2019 04:07:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576123658; bh=XO3UIsiT7lgIlluvra0obFaodZI0dYDEZe6IgMN6kDk=; h=Date:From:To:Cc:Subject:Reply-To:References:In-Reply-To:From; b=VzBdb8s1umvM/sS6v3VE4M7OqiQoQK7ASMD13a6MQuyrjr2NopDf/v9Y9Em+lryyQ NCr9rB7g2vBvzLQzh0vQg+AxvrRvMZ4r2uT0jjoWO7rp4xvTi4kcZ6o1+bHm8gho9y 4c1g+1UTOBtgbE69oK0C9GiyU/a1MO6bzNFK0qP4= Received: by paulmck-ThinkPad-P72.home (Postfix, from userid 1000) id A592A352035F; Wed, 11 Dec 2019 20:07:37 -0800 (PST) Date: Wed, 11 Dec 2019 20:07:37 -0800 From: "Paul E. McKenney" To: Stephen Rothwell Cc: David Howells , Linux Next Mailing List , Linux Kernel Mailing List Subject: Re: linux-next: build failure after merge of the rcu tree Message-ID: <20191212040737.GR2889@paulmck-ThinkPad-P72> Reply-To: paulmck@kernel.org References: <20191212134516.3b5f4a4e@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191212134516.3b5f4a4e@canb.auug.org.au> User-Agent: Mutt/1.9.4 (2018-02-28) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Dec 12, 2019 at 01:45:16PM +1100, Stephen Rothwell wrote: > Hi all, > > After merging the rcu tree, today's linux-next build (x86_64 allmodconfig) > failed like this: > > drivers/misc/watch_queue.c: In function 'watch_queue_set_filter': > drivers/misc/watch_queue.c:526:2: error: implicit declaration of function 'rcu_swap_protected' [-Werror=implicit-function-declaration] > 526 | rcu_swap_protected(wqueue->filter, wfilter, > | ^~~~~~~~~~~~~~~~~~ > > Caused by commit > > af8c9224182e ("rcu: Remove rcu_swap_protected()") > > interacting with commit > > fe78d401ca6b ("General notification queue with user mmap()'able ring buffer") > > from the keys tree. > > I have added the following merge fix patch for today: > > From: Stephen Rothwell > Date: Thu, 12 Dec 2019 13:37:52 +1100 > Subject: [PATCH] rcu: fix up for "Remove rcu_swap_protected()" > > Signed-off-by: Stephen Rothwell Reviewed-by: Paul E. McKenney I would be happy to take this if desired, but it would probably be better for this to be applied directly to the keys tree. Either way, please let me know. Thanx, Paul > --- > drivers/misc/watch_queue.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/misc/watch_queue.c b/drivers/misc/watch_queue.c > index b3fc59b4ef6c..a4a77ec977ac 100644 > --- a/drivers/misc/watch_queue.c > +++ b/drivers/misc/watch_queue.c > @@ -523,8 +523,8 @@ static long watch_queue_set_filter(struct inode *inode, > kfree(tf); > set: > inode_lock(inode); > - rcu_swap_protected(wqueue->filter, wfilter, > - lockdep_is_held(&inode->i_rwsem)); > + wfilter = rcu_replace_pointer(wqueue->filter, wfilter, > + lockdep_is_held(&inode->i_rwsem)); > inode_unlock(inode); > if (wfilter) > kfree_rcu(wfilter, rcu); > -- > 2.24.0 > > -- > Cheers, > Stephen Rothwell