From patchwork Mon Sep 9 07:31:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Valente X-Patchwork-Id: 173359 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp4007877ilq; Mon, 9 Sep 2019 00:32:14 -0700 (PDT) X-Google-Smtp-Source: APXvYqzS8q8MSsrVBFZs6pbfqwBSpP3RnuOugSU52Dhml6/3xX+GW4MsadIM0HTZvTGCyEkNGZtm X-Received: by 2002:a17:906:ce52:: with SMTP id se18mr18054955ejb.263.1568014333920; Mon, 09 Sep 2019 00:32:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568014333; cv=none; d=google.com; s=arc-20160816; b=LqeCCXMUsf5xycciRstBjALmAbxLU6VQRICc1N/PTz0h9a9Iiw8r3mu2qeX6htl4OW xVLCbqPTgwAupJkbSPkefELFhQrTmgOic0ISGiLfNG2RcFzki3Eius/hWXsk0yADQRhx SEvAHhL9oGGOz16yD6u+yk0v40GBeCnTEug+uwpYOS8F9dl3a4eqqNUhp/mAALwWS5he 2gQFgth2phaj4rQBYtRWzo3fF2OgWeO5o/vB1zYmmG92+qt4aMkUl2KD7+g2D6JaLkze qzgzHAQm1Sk7JeuWrJ2iDMbkHtBnNMhykxf3IPZxpR1bz0y7eGMLRxrHOBPRFX15NOGq uAlw== 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=Zyjk5LLEUpKt0UtgpDlm7KCNgviInbE7D7cMBgrLQBk=; b=FxG1w3RktccmiE3wnnl2V7z7Y0l0nZ1aGIYjlMMsbepBK6GXIov/wBsY5TxzccOoVu 57rsDbqP/Qpkz4X0KUsZZ7xrRkU18+RmV0jUzco8vnvggr8a2ghvoZk9UPHpMBEZKcDi Fi9nTz4f/9toZsQSKYI2cFBis05qiSuWzAu1dj0B7nN6yUzpWVTADwxDGdc0zSExrVeu Td1VkN5h0tydsvCqmjTHYhH5lDcI72ijBsxgjII8MpHHiRoW6qCIC/csGKF0c6sbEMwZ bFrkuoW+8jNm9ZfkPM1Ar8KeyCJnOCt+y4pYbDUSOOoqjdnuryzguRhNZWy9dWsV8c28 s34Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Nmp2Nta8; 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 z33si7499730edz.314.2019.09.09.00.32.13; Mon, 09 Sep 2019 00:32:13 -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=Nmp2Nta8; 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 S2388210AbfIIHcI (ORCPT + 28 others); Mon, 9 Sep 2019 03:32:08 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:53503 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732252AbfIIHcE (ORCPT ); Mon, 9 Sep 2019 03:32:04 -0400 Received: by mail-wm1-f65.google.com with SMTP id q19so12501347wmc.3 for ; Mon, 09 Sep 2019 00:32:02 -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=Zyjk5LLEUpKt0UtgpDlm7KCNgviInbE7D7cMBgrLQBk=; b=Nmp2Nta8RxHOTP0Ai3OSlk2CAwu/jWa+KWkMVPpAh2/xBK8uiovcqm4z1wSvte1jkt 6iUWhoDT5l2W164KcZuTpvo7o1yIZR3IBwSbqkeBHf1lLtqcY7woUt/JKqcVFHlia/bp dyGFf2tKxXFEoeNOvzrPNKs4KH22VpTPdZ3+x4mh3CvP5I5G0/N5SGkjK5ArFa2f4qgL 9VG45Dn9Lz8h/kVWzA7AIyUmgmp1aoFGJQG+vkT7xS+LkH6059pSXqilXqhlkyElhcUx U+5tRCgRHVXTi48ZdhKkhy0RG07bPT3w2oob2Fm8r5gBSnBd+ipMK4d1zi7GGWOmrzU+ YdTA== 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=Zyjk5LLEUpKt0UtgpDlm7KCNgviInbE7D7cMBgrLQBk=; b=pcd5JAsCx+1ObqtEm7wGIXWZSmozQNG9gILTG3ndO9ORhOFyoPeDm4bpR5xMWUkviV APSluTpIIX0Jip7Vh/YM5BN3DcuzhjzMMW1wUjRz66J0cOnVIAO9zzvF+McxTrpOdv0g UeJ9F1CGNDp+KWqmJWsAZ8ejObk7qefq5/ZrK7YsZ/msN/Cclf81F/3vk16W8AXmNZcL Jt6Q3vG0rcTbSqfl6fjRWgdQUmSnR1F0hHEmD7cc2C6lqLgALS12APH+RCmbdOkVt2+l H/i0J9BqU/dFdlcavih4Lfdd9s0D0cPPlipi4DVfjJbSCEjuwzQIhpcntOKg7RMPBQ8H PoUQ== X-Gm-Message-State: APjAAAUBO3VugdJFHJ7H0j6rcfJDO3A2QVYPTucbvwspbWHwqBWrgBH7 5PTMJLyEtRiMHIIcFZZuIYIjtg== X-Received: by 2002:a1c:f403:: with SMTP id z3mr12896108wma.74.1568014322015; Mon, 09 Sep 2019 00:32:02 -0700 (PDT) Received: from localhost.localdomain (146-241-7-242.dyn.eolo.it. [146.241.7.242]) by smtp.gmail.com with ESMTPSA id c8sm617012wrr.49.2019.09.09.00.32.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Sep 2019 00:32:01 -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, bfq-iosched@googlegroups.com, oleksandr@natalenko.name, Tejun Heo , cgroups@vger.kernel.org, Angelo Ruocco , Paolo Valente Subject: [PATCH 1/1] block, bfq: delete "bfq" prefix from cgroup filenames Date: Mon, 9 Sep 2019 09:31:17 +0200 Message-Id: <20190909073117.20625-2-paolo.valente@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190909073117.20625-1-paolo.valente@linaro.org> References: <20190909073117.20625-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 0f6cd688924f..14b7a1160664 100644 --- a/block/bfq-cgroup.c +++ b/block/bfq-cgroup.c @@ -1139,7 +1139,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, @@ -1147,42 +1147,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_BFQ_CGROUP_DEBUG { - .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, }, @@ -1190,66 +1190,66 @@ struct cftype bfq_blkcg_legacy_files[] = { /* the same statistics 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_BFQ_CGROUP_DEBUG { - .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, }, @@ -1259,7 +1259,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,