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=-5.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham 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 D01E3C433DF for ; Thu, 28 May 2020 18:55:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B6DBB205CB for ; Thu, 28 May 2020 18:55:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405951AbgE1Szm (ORCPT ); Thu, 28 May 2020 14:55:42 -0400 Received: from mx2.suse.de ([195.135.220.15]:59878 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405977AbgE1Szm (ORCPT ); Thu, 28 May 2020 14:55:42 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id B45D1AB5C; Thu, 28 May 2020 18:55:39 +0000 (UTC) Received: by quack2.suse.cz (Postfix, from userid 1000) id E05D71E1289; Thu, 28 May 2020 20:55:39 +0200 (CEST) Date: Thu, 28 May 2020 20:55:39 +0200 From: Jan Kara To: Luis Chamberlain Cc: Jan Kara , Bart Van Assche , Jens Axboe , linux-block@vger.kernel.org Subject: Re: [PATCH] blktrace: Avoid sparse warnings when assigning q->blk_trace Message-ID: <20200528185539.GJ14550@quack2.suse.cz> References: <20200528092910.11118-1-jack@suse.cz> <298af02a-3b58-932a-8769-72dcc52750ad@acm.org> <20200528183152.GH14550@quack2.suse.cz> <20200528184333.GU11244@42.do-not-panic.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200528184333.GU11244@42.do-not-panic.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org On Thu 28-05-20 18:43:33, Luis Chamberlain wrote: > On Thu, May 28, 2020 at 08:31:52PM +0200, Jan Kara wrote: > > On Thu 28-05-20 07:44:38, Bart Van Assche wrote: > > > (+Luis) > > > > > > On 2020-05-28 02:29, Jan Kara wrote: > > > > Mostly for historical reasons, q->blk_trace is assigned through xchg() > > > > and cmpxchg() atomic operations. Although this is correct, sparse > > > > complains about this because it violates rcu annotations. Furthermore > > > > there's no real need for atomic operations anymore since all changes to > > > > q->blk_trace happen under q->blk_trace_mutex. So let's just replace > > > > xchg() with rcu_replace_pointer() and cmpxchg() with explicit check and > > > > rcu_assign_pointer(). This makes the code more efficient and sparse > > > > happy. > > > > > > > > Reported-by: kbuild test robot > > > > Signed-off-by: Jan Kara > > > > > > How about adding a reference to commit c780e86dd48e ("blktrace: Protect > > > q->blk_trace with RCU") in the description of this patch? > > > > Yes, that's probably a good idea. > > > > > > @@ -1669,10 +1672,7 @@ static int blk_trace_setup_queue(struct request_queue *q, > > > > > > > > blk_trace_setup_lba(bt, bdev); > > > > > > > > - ret = -EBUSY; > > > > - if (cmpxchg(&q->blk_trace, NULL, bt)) > > > > - goto free_bt; > > > > - > > > > + rcu_assign_pointer(q->blk_trace, bt); > > > > get_probe_ref(); > > > > return 0; > > > > > > This changes a conditional assignment of q->blk_trace into an > > > unconditional assignment. Shouldn't q->blk_trace only be assigned if > > > q->blk_trace == NULL? > > > > Yes but both callers of blk_trace_setup_queue() actually check that > > q->blk_trace is NULL before calling blk_trace_setup_queue() and since we > > hold blk_trace_mutex all the time, the value of q->blk_trace cannot change. > > So the conditional assignment was just bogus. > > If you run a blktrace against a different partition the check does have > an effect today. This is because the request_queue is shared between > partitions implicitly, even though they end up using a different struct > dentry. So the check is actually still needed, however my change adds > this check early as well so we don't do a memory allocation just to > throw it away. I'm not sure we are speaking about the same check but I might be missing something. blk_trace_setup_queue() is only called from sysfs_blk_trace_attr_store(). That does: mutex_lock(&q->blk_trace_mutex); bt = rcu_dereference_protected(q->blk_trace, lockdep_is_held(&q->blk_trace_mutex)); if (attr == &dev_attr_enable) { if (!!value == !!bt) { ret = 0; goto out_unlock_bdev; } ^^^ So if 'bt' is non-NULL, and we are enabling, we bail instead of calling blk_trace_setup_queue(). Similarly later: if (bt == NULL) { ret = blk_trace_setup_queue(q, bdev); ... so we again call blk_trace_setup_queue() only if bt is NULL. So IMO the cmpxchg() in blk_trace_setup_queue() could never fail to set the value. Am I missing something? Honza -- Jan Kara SUSE Labs, CR