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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5BD2CC25B4E for ; Fri, 20 Jan 2023 09:11:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229590AbjATJLf (ORCPT ); Fri, 20 Jan 2023 04:11:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50056 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229509AbjATJLe (ORCPT ); Fri, 20 Jan 2023 04:11:34 -0500 Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A2388F6C7; Fri, 20 Jan 2023 01:10:55 -0800 (PST) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id EC0492291C; Fri, 20 Jan 2023 09:10:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1674205812; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gQvwlZMlLhRv3E/CFHmtorftMkqrnoEikLGHcn0eaZ8=; b=cwSe/024H0Ps9K0/fv9ijiamNZt38pVrrjCO3vm+bx7YWl0RFzqHkMiAY4x2FMHH9OXLXZ UFv1eTXrshzg1SIUSbTacalDXjuV5dpiCuLOgS5Au3MyNyJG8/tuG13CDV0nVDFc5NL6ju C8tdBGPnKl1vYLz1FfkPdftYvpA+U/s= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1674205812; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gQvwlZMlLhRv3E/CFHmtorftMkqrnoEikLGHcn0eaZ8=; b=kAZLPtlEMUw8KrJ79GcfE6CIQkExNnuQLOsWoVNpf/48FNBfI6Em5HZq1YVHMrnTv3Iz69 UWU/zhSAyHbiCzDg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 8CC7213251; Fri, 20 Jan 2023 09:10:12 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 0Wj9H3RaymNxKAAAMHmgww (envelope-from ); Fri, 20 Jan 2023 09:10:12 +0000 Date: Fri, 20 Jan 2023 10:10:10 +0100 From: Andreas Herrmann To: Christoph Hellwig Cc: Jens Axboe , Tejun Heo , Josef Bacik , linux-block@vger.kernel.org, cgroups@vger.kernel.org Subject: Re: [PATCH 06/15] blk-wbt: pass a gendisk to wbt_{enable,disable}_default Message-ID: References: <20230117081257.3089859-1-hch@lst.de> <20230117081257.3089859-7-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20230117081257.3089859-7-hch@lst.de> Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org On Tue, Jan 17, 2023 at 09:12:48AM +0100, Christoph Hellwig wrote: > Pass a gendisk to wbt_enable_default and wbt_disable_default to > prepare for phasing out usage of the request_queue in the blk-cgroup > code. > > Signed-off-by: Christoph Hellwig > --- > block/bfq-iosched.c | 4 ++-- > block/blk-iocost.c | 4 ++-- > block/blk-sysfs.c | 2 +- > block/blk-wbt.c | 7 ++++--- > block/blk-wbt.h | 8 ++++---- > 5 files changed, 13 insertions(+), 12 deletions(-) Looks good to me. Feel free to add Reviewed-by: Andreas Herrmann > diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c > index 815b884d6c5acf..68062243f2c142 100644 > --- a/block/bfq-iosched.c > +++ b/block/bfq-iosched.c > @@ -7165,7 +7165,7 @@ static void bfq_exit_queue(struct elevator_queue *e) > > blk_stat_disable_accounting(bfqd->queue); > clear_bit(ELEVATOR_FLAG_DISABLE_WBT, &e->flags); > - wbt_enable_default(bfqd->queue); > + wbt_enable_default(bfqd->queue->disk); > > kfree(bfqd); > } > @@ -7354,7 +7354,7 @@ static int bfq_init_queue(struct request_queue *q, struct elevator_type *e) > blk_queue_flag_set(QUEUE_FLAG_SQ_SCHED, q); > > set_bit(ELEVATOR_FLAG_DISABLE_WBT, &eq->flags); > - wbt_disable_default(q); > + wbt_disable_default(q->disk); > blk_stat_enable_accounting(q); > > return 0; > diff --git a/block/blk-iocost.c b/block/blk-iocost.c > index 3b965d6b037970..6f39ca99e9d76f 100644 > --- a/block/blk-iocost.c > +++ b/block/blk-iocost.c > @@ -3270,11 +3270,11 @@ static ssize_t ioc_qos_write(struct kernfs_open_file *of, char *input, > blk_stat_enable_accounting(disk->queue); > blk_queue_flag_set(QUEUE_FLAG_RQ_ALLOC_TIME, disk->queue); > ioc->enabled = true; > - wbt_disable_default(disk->queue); > + wbt_disable_default(disk); > } else { > blk_queue_flag_clear(QUEUE_FLAG_RQ_ALLOC_TIME, disk->queue); > ioc->enabled = false; > - wbt_enable_default(disk->queue); > + wbt_enable_default(disk); > } > > if (user) { > diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c > index 5486b6c57f6b8a..2074103865f45b 100644 > --- a/block/blk-sysfs.c > +++ b/block/blk-sysfs.c > @@ -826,7 +826,7 @@ int blk_register_queue(struct gendisk *disk) > goto out_elv_unregister; > > blk_queue_flag_set(QUEUE_FLAG_REGISTERED, q); > - wbt_enable_default(q); > + wbt_enable_default(disk); > blk_throtl_register(disk); > > /* Now everything is ready and send out KOBJ_ADD uevent */ > diff --git a/block/blk-wbt.c b/block/blk-wbt.c > index 68a774d7a7c9c0..8f9302134339c5 100644 > --- a/block/blk-wbt.c > +++ b/block/blk-wbt.c > @@ -650,8 +650,9 @@ void wbt_set_write_cache(struct request_queue *q, bool write_cache_on) > /* > * Enable wbt if defaults are configured that way > */ > -void wbt_enable_default(struct request_queue *q) > +void wbt_enable_default(struct gendisk *disk) > { > + struct request_queue *q = disk->queue; > struct rq_qos *rqos; > bool disable_flag = q->elevator && > test_bit(ELEVATOR_FLAG_DISABLE_WBT, &q->elevator->flags); > @@ -718,9 +719,9 @@ static void wbt_exit(struct rq_qos *rqos) > /* > * Disable wbt, if enabled by default. > */ > -void wbt_disable_default(struct request_queue *q) > +void wbt_disable_default(struct gendisk *disk) > { > - struct rq_qos *rqos = wbt_rq_qos(q); > + struct rq_qos *rqos = wbt_rq_qos(disk->queue); > struct rq_wb *rwb; > if (!rqos) > return; > diff --git a/block/blk-wbt.h b/block/blk-wbt.h > index e3ea6e7e290076..7ab1cba55c25f7 100644 > --- a/block/blk-wbt.h > +++ b/block/blk-wbt.h > @@ -91,8 +91,8 @@ static inline unsigned int wbt_inflight(struct rq_wb *rwb) > #ifdef CONFIG_BLK_WBT > > int wbt_init(struct request_queue *); > -void wbt_disable_default(struct request_queue *); > -void wbt_enable_default(struct request_queue *); > +void wbt_disable_default(struct gendisk *disk); > +void wbt_enable_default(struct gendisk *disk); > > u64 wbt_get_min_lat(struct request_queue *q); > void wbt_set_min_lat(struct request_queue *q, u64 val); > @@ -108,10 +108,10 @@ static inline int wbt_init(struct request_queue *q) > { > return -EINVAL; > } > -static inline void wbt_disable_default(struct request_queue *q) > +static inline void wbt_disable_default(struct gendisk *disk) > { > } > -static inline void wbt_enable_default(struct request_queue *q) > +static inline void wbt_enable_default(struct gendisk *disk) > { > } > static inline void wbt_set_write_cache(struct request_queue *q, bool wc) > -- > 2.39.0 > -- Regards, Andreas SUSE Software Solutions Germany GmbH Frankenstrasse 146, 90461 Nürnberg, Germany GF: Ivo Totev, Andrew Myers, Andrew McDonald, Martje Boudien Moerman (HRB 36809, AG Nürnberg)