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=-9.1 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_GIT 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 175B0C31E4D for ; Fri, 14 Jun 2019 01:57:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DE36F21744 for ; Fri, 14 Jun 2019 01:57:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560477440; bh=ll0sG+y9CyXkueP4WJSOxqIbvzi/0ANjUgalCZjIyVY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Sm/Nl5m2+xbixYygiiG5TIhNK3y+o3WP/ywenQDqnUlXC3IQVFFfbOvDA2GJESCvE xidUFUgx7EBtneRmapw7X203Hq8thgCoe6866p/G9WGwa3M2VkAOG6AXhtpTIMqEQs hW1V5pxm+3pamQyPlG9GkznzzBnaijrrqqP2xbT0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727107AbfFNB4v (ORCPT ); Thu, 13 Jun 2019 21:56:51 -0400 Received: from mail-pl1-f193.google.com ([209.85.214.193]:44452 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727082AbfFNB4u (ORCPT ); Thu, 13 Jun 2019 21:56:50 -0400 Received: by mail-pl1-f193.google.com with SMTP id t7so294053plr.11; Thu, 13 Jun 2019 18:56:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=gqosCdj9OpU/EXk2GpDgDRqe9bikXWYuASzuXE6aksc=; b=LZRBEftl8pHb3JlVw9EXTNiKB32j5ZIGY5yrb5L3XZS8fYdZOYMA9L1fa6fKtN7CVD /OPdNZ54hpy/FZhAvt7lAOwiHP6WW+0zKCN4HrpwW/+L9Bi83LwphSV91l0nYM/5JGeT iaE4giJW5buF1sDUCez1A1nGTmW0O7XLQH0yHmq+oKa+MgHS8yf1Uypncw3vl7RDPDxT d3TQjac2zPh3jHYjbasqQoc8FXZ8+rtvpEuvMfDMubSCwKurO/1VXrR3GtHmZXmsXhc6 SX7k5nOA5Vpsl60FqlXqDeE5J9wO+vcpoNkEenDQSvz/5MKuN/osaOTCo2JEhd5suq4P 17Ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=gqosCdj9OpU/EXk2GpDgDRqe9bikXWYuASzuXE6aksc=; b=cRUdFS9AGOyUd1uk5TpfLFBD23FF5ysWOCC44RepQP+w9xXqzma5gKllFx253GSvSj +oejmiVPLl0qhob/5w51+r0pgnX5UVHoKk08ZzPBdcDr7mXJGjndtK3jyRFoHn6wahYg sPglGB/08pPXxxxK3bm0nFRV2DibSPVe+gD3NZPOcLeU/OKCxyJpuQOV7ezi+zKi3Oo4 jO4mPys47vZVizwoUwaEFp5Ra0vYaFVWpm7BSnz2nNZkXv0isL2sYafOG0nVQZPUSo+M rSPqqF7VyRFO8fQQ18L1Dm9i+xphABNROl5UdDbfmmlwK4sn7xfHbMNabswHsgooomoG vZhA== X-Gm-Message-State: APjAAAV5gCCB+9bqs+LdSf42n7EzcEz8Iq96n6HmHHxzU83LBbtwP2JE 5nfWsFtPtAxUrocRppGSGE2IlFF6 X-Google-Smtp-Source: APXvYqy6vtdTSyddQoCMEwb+44JT+fMq1+X/sUS5AKcqdBHjD1n6xxD13smG9KatJMHGroyxClffMQ== X-Received: by 2002:a17:902:76c6:: with SMTP id j6mr65836349plt.263.1560477409705; Thu, 13 Jun 2019 18:56:49 -0700 (PDT) Received: from localhost ([2620:10d:c091:500::2:9d14]) by smtp.gmail.com with ESMTPSA id 14sm1023541pgp.37.2019.06.13.18.56.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jun 2019 18:56:48 -0700 (PDT) From: Tejun Heo To: axboe@kernel.dk, newella@fb.com, clm@fb.com, josef@toxicpanda.com, dennisz@fb.com, lizefan@huawei.com, hannes@cmpxchg.org Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, kernel-team@fb.com, cgroups@vger.kernel.org, ast@kernel.org, daniel@iogearbox.net, kafai@fb.com, songliubraving@fb.com, yhs@fb.com, bpf@vger.kernel.org, Tejun Heo Subject: [PATCH 06/10] blkcg: s/RQ_QOS_CGROUP/RQ_QOS_LATENCY/ Date: Thu, 13 Jun 2019 18:56:16 -0700 Message-Id: <20190614015620.1587672-7-tj@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190614015620.1587672-1-tj@kernel.org> References: <20190614015620.1587672-1-tj@kernel.org> Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org io.weight is gonna be another rq_qos cgroup mechanism. Let's rename RQ_QOS_CGROUP which is being used by io.latency to RQ_QOS_LATENCY in preparation. Signed-off-by: Tejun Heo --- block/blk-iolatency.c | 2 +- block/blk-rq-qos.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/block/blk-iolatency.c b/block/blk-iolatency.c index fa47a6485725..7d1dbe757063 100644 --- a/block/blk-iolatency.c +++ b/block/blk-iolatency.c @@ -744,7 +744,7 @@ int blk_iolatency_init(struct request_queue *q) return -ENOMEM; rqos = &blkiolat->rqos; - rqos->id = RQ_QOS_CGROUP; + rqos->id = RQ_QOS_LATENCY; rqos->ops = &blkcg_iolatency_ops; rqos->q = q; diff --git a/block/blk-rq-qos.h b/block/blk-rq-qos.h index e15b6907b76d..5f8b75826a98 100644 --- a/block/blk-rq-qos.h +++ b/block/blk-rq-qos.h @@ -14,7 +14,7 @@ struct blk_mq_debugfs_attr; enum rq_qos_id { RQ_QOS_WBT, - RQ_QOS_CGROUP, + RQ_QOS_LATENCY, }; struct rq_wait { @@ -74,7 +74,7 @@ static inline struct rq_qos *wbt_rq_qos(struct request_queue *q) static inline struct rq_qos *blkcg_rq_qos(struct request_queue *q) { - return rq_qos_id(q, RQ_QOS_CGROUP); + return rq_qos_id(q, RQ_QOS_LATENCY); } static inline const char *rq_qos_id_to_name(enum rq_qos_id id) @@ -82,8 +82,8 @@ static inline const char *rq_qos_id_to_name(enum rq_qos_id id) switch (id) { case RQ_QOS_WBT: return "wbt"; - case RQ_QOS_CGROUP: - return "cgroup"; + case RQ_QOS_LATENCY: + return "latency"; } return "unknown"; } -- 2.17.1