From patchwork Mon Apr 8 14:39:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Valente X-Patchwork-Id: 161938 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3765057jan; Mon, 8 Apr 2019 07:40:00 -0700 (PDT) X-Google-Smtp-Source: APXvYqxrdPRrf7Hdhx/JZoo+/nwcyvMeznTpV7OHftfDAwWK3vfqCyvVn+wgO4A1FGaJFfDjX4fV X-Received: by 2002:a65:5cc8:: with SMTP id b8mr28129034pgt.36.1554734400178; Mon, 08 Apr 2019 07:40:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554734400; cv=none; d=google.com; s=arc-20160816; b=PsMW0kAPYlawik+yk/mWkWRpf6ZEuNfPdNmydzmiFIsOJUgjjAIhfAR2PwBgDC1ocX eAYtK+jRxwExU7BwRLjrHUmgk+f8b/6BWaQIIB/BvH3dS/xPZKvLY0bLhXOvSYLtqN6n OzpLWZ8LztFLlJ358ThFKRB9MnDl87WcVTcKf2hKoWpqmUykDFA9TWzhWIv5UccVfiLX KnNS6PdDcnQzIFFZLhS+VZADfSy+nyCzZcxGuR1tiPzoIA1uY20X0ELSxm87k3CTnK7p wK23Y2gh63QVoUlAMIYBzZKgt0AHTpPHUsD0L+GTawGXyXJYh+c5sTkFu9r01qb32hYr 1clA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Gu8wtsCKXjWJ0bzgQFlSKbghceLWt6dpiC4QGxS8ako=; b=IRb41Lae+6D3K9YOplBdnbTP9xlHgcngyN8ErVekV+x8U3b/pRKbJW3Fk+CpEnLWRn dv7f/ATR3XKT8N/BJ2Omn83pkFDfdJY3wVVorbggP+nwQ7F6fCgJ0CI1g4qJ9r1pvaKS tea2q77uojUaceKH7x7MYWeVGw5fkG1zZVjT5rhelX0yE4c1dmXTcTSehrpkX4CPDjde 7hMCVipXmHCOppM9YmohbelLGOIeTWjWWyoKHhmYvyKHLaVVf/EXuifXS6f6urEYpHrw rf6vgTXoxctZh1NJSmg/uKF7POT65allmIV1XSliBt7SWxClJg2X5f553i4DxpRVt/SI eyOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NIwNxuFG; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f2si26138350pgi.61.2019.04.08.07.39.59; Mon, 08 Apr 2019 07:40:00 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NIwNxuFG; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727228AbfDHOj6 (ORCPT + 31 others); Mon, 8 Apr 2019 10:39:58 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:34842 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726850AbfDHOjy (ORCPT ); Mon, 8 Apr 2019 10:39:54 -0400 Received: by mail-wm1-f65.google.com with SMTP id y197so15038718wmd.0 for ; Mon, 08 Apr 2019 07:39:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Gu8wtsCKXjWJ0bzgQFlSKbghceLWt6dpiC4QGxS8ako=; b=NIwNxuFGq/nknNExEL/1gIJN4YJ3X1R1zSbTogJKbEg3wEz2GllIVKqPM10cYmFv6l IlPyHtdNPSJXWllpklWHB9iB2sq3PqntuaS/WV6dUdXleRVgXfq6augXSH8CzBoTidhD sdvfj/A0sWOdL8IeeAD5WACqL3REe+p1TUxoG6EdK6iYFNH2SvcHy4278IkLzVkwBMud P6F6qIIJEiYQKAQLPSN5Jm6o9mprhPqHTwuJxm79qX0ybDvwmqqHvxPRjL2YnI1peEqp kJVdi9hzGSH0U7D7VOG08sfcBIyNTMcEpiBxuiEtwbPPefRRpEpj3qbN9QXSUXj7EKCq xOAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Gu8wtsCKXjWJ0bzgQFlSKbghceLWt6dpiC4QGxS8ako=; b=ul+e0POyeNeigcmXyQXd7aIoY5X/YGxKDi+r+3EFKuj6aaWQ4M5p15ztZ/pfBtcWrQ nqtWYVeB1IjbzkaNOvk7UYes9gOIQio0rdxrm5drpaGUVTK2pFgzv9dmQUEzIGiIpiH6 WG/V1mXXSl4c4HyIwUJfm5yNo5VmSPDDn//I/78uQi6SDdvISsw5ktBj7/YUbNHPYyvr qV3C5NgVDSG+vqNsivBWgX5um1nAw/WtbGkelgXDeq7lDumw7+cdoKMd4v4QzXb2AmNp eRGQMFlVAKbt2VWCasXtE1A9jv7H+SucHRUxSyVHWwINZYEeamW6YWDb8Jthb7CTA6Xk jLLg== X-Gm-Message-State: APjAAAXmtjbSLVWjKPDQcnksyBbfaAeABULU0NEMwb5fE3AKTG2Do7JX oTSNQOndJKxBJZojHRP8MyhQFg== X-Received: by 2002:a1c:7512:: with SMTP id o18mr18603747wmc.68.1554734392971; Mon, 08 Apr 2019 07:39:52 -0700 (PDT) Received: from localhost.localdomain ([88.147.51.116]) by smtp.gmail.com with ESMTPSA id r196sm15113852wmf.22.2019.04.08.07.39.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Apr 2019 07:39:52 -0700 (PDT) From: Paolo Valente To: Jens Axboe Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, ulf.hansson@linaro.org, linus.walleij@linaro.org, broonie@kernel.org, bfq-iosched@googlegroups.com, oleksandr@natalenko.name, Angelo Ruocco , Paolo Valente Subject: [PATCH 1/1] block, bfq: delete "bfq" prefix from cgroup filenames Date: Mon, 8 Apr 2019 16:39:35 +0200 Message-Id: <20190408143935.9062-2-paolo.valente@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190408143935.9062-1-paolo.valente@linaro.org> References: <20190408143935.9062-1-paolo.valente@linaro.org> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Angelo Ruocco When bfq was merged into mainline, there were two I/O schedulers that implemented the proportional-share policy: bfq for blk-mq and cfq for legacy blk. bfq's interface files in the blkio/io controller have the same names as cfq. But the cgroups interface doesn't allow two entities to use the same name for their files, so for bfq we had to prepend the "bfq" prefix to each of its files. However no legacy code uses these modified file names. This naming also causes confusion, as, e.g., in [1]. Now cfq has gone with legacy blk, so there is no need any longer for these prefixes in (the never used) bfq names. In view of this fact, this commit removes these prefixes, thereby enabling legacy code to truly use the proportional share policy in blk-mq. [1] https://github.com/systemd/systemd/issues/7057 Signed-off-by: Angelo Ruocco Signed-off-by: Paolo Valente --- block/bfq-cgroup.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) -- 2.20.1 diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c index c6113af31960..319c2444dc71 100644 --- a/block/bfq-cgroup.c +++ b/block/bfq-cgroup.c @@ -1053,7 +1053,7 @@ struct blkcg_policy blkcg_policy_bfq = { struct cftype bfq_blkcg_legacy_files[] = { { - .name = "bfq.weight", + .name = "weight", .flags = CFTYPE_NOT_ON_ROOT, .seq_show = bfq_io_show_weight, .write_u64 = bfq_io_set_weight_legacy, @@ -1061,42 +1061,42 @@ struct cftype bfq_blkcg_legacy_files[] = { /* statistics, covers only the tasks in the bfqg */ { - .name = "bfq.io_service_bytes", + .name = "io_service_bytes", .private = (unsigned long)&blkcg_policy_bfq, .seq_show = blkg_print_stat_bytes, }, { - .name = "bfq.io_serviced", + .name = "io_serviced", .private = (unsigned long)&blkcg_policy_bfq, .seq_show = blkg_print_stat_ios, }, #ifdef CONFIG_DEBUG_BLK_CGROUP { - .name = "bfq.time", + .name = "time", .private = offsetof(struct bfq_group, stats.time), .seq_show = bfqg_print_stat, }, { - .name = "bfq.sectors", + .name = "sectors", .seq_show = bfqg_print_stat_sectors, }, { - .name = "bfq.io_service_time", + .name = "io_service_time", .private = offsetof(struct bfq_group, stats.service_time), .seq_show = bfqg_print_rwstat, }, { - .name = "bfq.io_wait_time", + .name = "io_wait_time", .private = offsetof(struct bfq_group, stats.wait_time), .seq_show = bfqg_print_rwstat, }, { - .name = "bfq.io_merged", + .name = "io_merged", .private = offsetof(struct bfq_group, stats.merged), .seq_show = bfqg_print_rwstat, }, { - .name = "bfq.io_queued", + .name = "io_queued", .private = offsetof(struct bfq_group, stats.queued), .seq_show = bfqg_print_rwstat, }, @@ -1104,66 +1104,66 @@ struct cftype bfq_blkcg_legacy_files[] = { /* the same statictics which cover the bfqg and its descendants */ { - .name = "bfq.io_service_bytes_recursive", + .name = "io_service_bytes_recursive", .private = (unsigned long)&blkcg_policy_bfq, .seq_show = blkg_print_stat_bytes_recursive, }, { - .name = "bfq.io_serviced_recursive", + .name = "io_serviced_recursive", .private = (unsigned long)&blkcg_policy_bfq, .seq_show = blkg_print_stat_ios_recursive, }, #ifdef CONFIG_DEBUG_BLK_CGROUP { - .name = "bfq.time_recursive", + .name = "time_recursive", .private = offsetof(struct bfq_group, stats.time), .seq_show = bfqg_print_stat_recursive, }, { - .name = "bfq.sectors_recursive", + .name = "sectors_recursive", .seq_show = bfqg_print_stat_sectors_recursive, }, { - .name = "bfq.io_service_time_recursive", + .name = "io_service_time_recursive", .private = offsetof(struct bfq_group, stats.service_time), .seq_show = bfqg_print_rwstat_recursive, }, { - .name = "bfq.io_wait_time_recursive", + .name = "io_wait_time_recursive", .private = offsetof(struct bfq_group, stats.wait_time), .seq_show = bfqg_print_rwstat_recursive, }, { - .name = "bfq.io_merged_recursive", + .name = "io_merged_recursive", .private = offsetof(struct bfq_group, stats.merged), .seq_show = bfqg_print_rwstat_recursive, }, { - .name = "bfq.io_queued_recursive", + .name = "io_queued_recursive", .private = offsetof(struct bfq_group, stats.queued), .seq_show = bfqg_print_rwstat_recursive, }, { - .name = "bfq.avg_queue_size", + .name = "avg_queue_size", .seq_show = bfqg_print_avg_queue_size, }, { - .name = "bfq.group_wait_time", + .name = "group_wait_time", .private = offsetof(struct bfq_group, stats.group_wait_time), .seq_show = bfqg_print_stat, }, { - .name = "bfq.idle_time", + .name = "idle_time", .private = offsetof(struct bfq_group, stats.idle_time), .seq_show = bfqg_print_stat, }, { - .name = "bfq.empty_time", + .name = "empty_time", .private = offsetof(struct bfq_group, stats.empty_time), .seq_show = bfqg_print_stat, }, { - .name = "bfq.dequeue", + .name = "dequeue", .private = offsetof(struct bfq_group, stats.dequeue), .seq_show = bfqg_print_stat, }, @@ -1173,7 +1173,7 @@ struct cftype bfq_blkcg_legacy_files[] = { struct cftype bfq_blkg_files[] = { { - .name = "bfq.weight", + .name = "weight", .flags = CFTYPE_NOT_ON_ROOT, .seq_show = bfq_io_show_weight, .write = bfq_io_set_weight,