From patchwork Fri Feb 5 03:50:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaitanya Kulkarni X-Patchwork-Id: 12069257 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=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 1F12BC433E0 for ; Fri, 5 Feb 2021 03:52:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C952E64FBF for ; Fri, 5 Feb 2021 03:52:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229879AbhBEDwC (ORCPT ); Thu, 4 Feb 2021 22:52:02 -0500 Received: from esa5.hgst.iphmx.com ([216.71.153.144]:21792 "EHLO esa5.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229692AbhBEDwB (ORCPT ); Thu, 4 Feb 2021 22:52:01 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1612497121; x=1644033121; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=CoCeSBqxrvjFEAnqMxwpePjEOv1siGwSFbQArqybpNE=; b=nSq7NDWt/8WxZRsbJPvqdfHRrL7jVZJCSfq/8CHBta8WxskSL3FFwj1j Ia+jBgH0+D7tN2jC7EAAUgEnk6CVzndNVF7uUE4lDdDf0d8B8+JSj1Pnu FR+2w1ZgHUVckN8v1//BFTO33vXAs2s0FOu60EQxMrqpdF2yEjadn5TDv FiDnR+ayIk5xiy4jzawcUNBdwleW64KgulvP8EyY2WLguBoroquLMlh10 Jxr86x7NiCFvC+3/N0XHVv5+i8VkPpUUiZyGVMJQX5RpA1J2djYxYQlBl kwSJeQnjhank9rGYICawNAyWtJkH7K9B6EGzfKk3ZfgsHvLPeXtXQEt9G g==; IronPort-SDR: SCB7z/E0IeUGaCABUOJ/hYzn3nncZyO36JPQRFuVPtuCYZwyA1KMoP63GldHh086bbpdFRqdzE 2FqkYNTPgu0owOfn4Y65mfvrOyn5ytmjn8eGvHv+mcWz7Cl0f18xBDFcswCLXIZcnFZq3qPKpg 2l5dlKttFP6D9ZuC1wkZDxOKhsbK4gTSIGKHwjEs16W4tHnDP0Orf+ThDIQOpUOyfrgK0Ia6o+ t1wNgNMGBV6QkwJpjxwhNTJrriNXD06TnpI/1mf2caQApWAVbHV1xxlQzkN+Zyburq0zFpl1er 8xg= X-IronPort-AV: E=Sophos;i="5.81,154,1610380800"; d="scan'208";a="159196405" Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 05 Feb 2021 11:50:56 +0800 IronPort-SDR: zehKQ2LWmMg5/mMYnJTjERQ4SGGBNF6+gKVAGsNxDfKqdevdEuYVXRz9SfY2NTltGu6hNJiz03 hLIc4aT9GqxxlfNnW+pk+PkD60ov2BhJT+jWsOh8+axF4eSNB43p9SDNdtXaofTq90ZmwUHLO+ utUFPnapFvaDQWmLntqt58Yd6UWUHuCJWzN90CBE6wO7rO12sCOL9dtf6UhKaqAFIpgnvPSgcG 5qXMSc7wBgWZC/dvAkVeLWfidfE1y6NjXJ1pRAfOqYjQN+CyxI8jQabyt3mjQxbBUaH6YVkeb3 lhnWodamcexfl+Kw39WFLsKY Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Feb 2021 19:32:58 -0800 IronPort-SDR: dOxLBjd2oIiT1au4dhVXcxFvzjsa3ifvpCnqaH4LiYnS1ik/9cCMxtuR0nrWHCjh/82lO4VxY2 XtNseoFZ8Un+MgpWo7+WbRWoS5ao11VyAyvcuxncDwyImcTabwNGk8G78aTH5L/oDszzlVWY9g jc2szKDdzmm+l4Q6oRpf7StPplfgIZHjwJRnq80eQjT2/TStzQNNB4HPwEiYk3uU+ENXJAPuGl 8BPUIy2Lzj5hTDBcPOrHBjGgZX0lLRlOlYlZ7viYyuZ3hLTUxeFPGHQEwlE+Z3wWHhj2r7GrKG 7fo= WDCIronportException: Internal Received: from vm.labspan.wdc.com (HELO vm.sc.wdc.com) ([10.6.137.102]) by uls-op-cesaip02.wdc.com with ESMTP; 04 Feb 2021 19:50:56 -0800 From: Chaitanya Kulkarni To: linux-block@vger.kernel.org Cc: paolo.valente@linaro.org, axboe@kernel.dk, rostedt@goodmis.org, mingo@redhat.com, chaitanya.kulkarni@wdc.com, johannes.thumshirn@wdc.com, damien.lemoal@wdc.com, bvanassche@acm.org, dongli.zhang@oracle.com, akpm@linux-foundation.org, aravind.ramesh@wdc.com, joshi.k@samsung.com, niklas.cassel@wdc.com, hare@suse.de, colyli@suse.de, tj@kernel.org, rdunlap@infradead.org, jack@suse.cz, hch@lst.de Subject: [PATCH V2 1/5] block: remove superfluous param in blk_fill_rwbs() Date: Thu, 4 Feb 2021 19:50:40 -0800 Message-Id: <20210205035044.5645-2-chaitanya.kulkarni@wdc.com> X-Mailer: git-send-email 2.22.1 In-Reply-To: <20210205035044.5645-1-chaitanya.kulkarni@wdc.com> References: <20210205035044.5645-1-chaitanya.kulkarni@wdc.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org The last parameter for the function blk_fill_rwbs() was added in 5782138e47 ("tracing/events: convert block trace points to TRACE_EVENT()") in order to signal read request and use of that parameter was replaced with using switch case REQ_OP_READ with 1b9a9ab78b0 ("blktrace: use op accessors"), but the parameter was never removed. Remove the unused parameter and adjust the respective call sites. Fixes: 1b9a9ab78b0 ("blktrace: use op accessors") Signed-off-by: Chaitanya Kulkarni Reviewed-by: Johannes Thumshirn Reviewed-by: Damien Le Moal Reviewed-by: Christoph Hellwig --- include/linux/blktrace_api.h | 2 +- include/trace/events/bcache.h | 10 +++++----- include/trace/events/block.h | 16 ++++++++-------- kernel/trace/blktrace.c | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h index 05556573b896..11484f1d19a1 100644 --- a/include/linux/blktrace_api.h +++ b/include/linux/blktrace_api.h @@ -119,7 +119,7 @@ struct compat_blk_user_trace_setup { #endif -extern void blk_fill_rwbs(char *rwbs, unsigned int op, int bytes); +extern void blk_fill_rwbs(char *rwbs, unsigned int op); static inline sector_t blk_rq_trace_sector(struct request *rq) { diff --git a/include/trace/events/bcache.h b/include/trace/events/bcache.h index e41c611d6d3b..899fdacf57b9 100644 --- a/include/trace/events/bcache.h +++ b/include/trace/events/bcache.h @@ -28,7 +28,7 @@ DECLARE_EVENT_CLASS(bcache_request, __entry->sector = bio->bi_iter.bi_sector; __entry->orig_sector = bio->bi_iter.bi_sector - 16; __entry->nr_sector = bio->bi_iter.bi_size >> 9; - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size); + blk_fill_rwbs(__entry->rwbs, bio->bi_opf); ), TP_printk("%d,%d %s %llu + %u (from %d,%d @ %llu)", @@ -102,7 +102,7 @@ DECLARE_EVENT_CLASS(bcache_bio, __entry->dev = bio_dev(bio); __entry->sector = bio->bi_iter.bi_sector; __entry->nr_sector = bio->bi_iter.bi_size >> 9; - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size); + blk_fill_rwbs(__entry->rwbs, bio->bi_opf); ), TP_printk("%d,%d %s %llu + %u", @@ -137,7 +137,7 @@ TRACE_EVENT(bcache_read, __entry->dev = bio_dev(bio); __entry->sector = bio->bi_iter.bi_sector; __entry->nr_sector = bio->bi_iter.bi_size >> 9; - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size); + blk_fill_rwbs(__entry->rwbs, bio->bi_opf); __entry->cache_hit = hit; __entry->bypass = bypass; ), @@ -168,7 +168,7 @@ TRACE_EVENT(bcache_write, __entry->inode = inode; __entry->sector = bio->bi_iter.bi_sector; __entry->nr_sector = bio->bi_iter.bi_size >> 9; - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size); + blk_fill_rwbs(__entry->rwbs, bio->bi_opf); __entry->writeback = writeback; __entry->bypass = bypass; ), @@ -238,7 +238,7 @@ TRACE_EVENT(bcache_journal_write, __entry->sector = bio->bi_iter.bi_sector; __entry->nr_sector = bio->bi_iter.bi_size >> 9; __entry->nr_keys = keys; - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size); + blk_fill_rwbs(__entry->rwbs, bio->bi_opf); ), TP_printk("%d,%d %s %llu + %u keys %u", diff --git a/include/trace/events/block.h b/include/trace/events/block.h index 0d782663a005..879cba8bdfca 100644 --- a/include/trace/events/block.h +++ b/include/trace/events/block.h @@ -89,7 +89,7 @@ TRACE_EVENT(block_rq_requeue, __entry->sector = blk_rq_trace_sector(rq); __entry->nr_sector = blk_rq_trace_nr_sectors(rq); - blk_fill_rwbs(__entry->rwbs, rq->cmd_flags, blk_rq_bytes(rq)); + blk_fill_rwbs(__entry->rwbs, rq->cmd_flags); __get_str(cmd)[0] = '\0'; ), @@ -133,7 +133,7 @@ TRACE_EVENT(block_rq_complete, __entry->nr_sector = nr_bytes >> 9; __entry->error = error; - blk_fill_rwbs(__entry->rwbs, rq->cmd_flags, nr_bytes); + blk_fill_rwbs(__entry->rwbs, rq->cmd_flags); __get_str(cmd)[0] = '\0'; ), @@ -166,7 +166,7 @@ DECLARE_EVENT_CLASS(block_rq, __entry->nr_sector = blk_rq_trace_nr_sectors(rq); __entry->bytes = blk_rq_bytes(rq); - blk_fill_rwbs(__entry->rwbs, rq->cmd_flags, blk_rq_bytes(rq)); + blk_fill_rwbs(__entry->rwbs, rq->cmd_flags); __get_str(cmd)[0] = '\0'; memcpy(__entry->comm, current->comm, TASK_COMM_LEN); ), @@ -249,7 +249,7 @@ TRACE_EVENT(block_bio_complete, __entry->sector = bio->bi_iter.bi_sector; __entry->nr_sector = bio_sectors(bio); __entry->error = blk_status_to_errno(bio->bi_status); - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size); + blk_fill_rwbs(__entry->rwbs, bio->bi_opf); ), TP_printk("%d,%d %s %llu + %u [%d]", @@ -276,7 +276,7 @@ DECLARE_EVENT_CLASS(block_bio, __entry->dev = bio_dev(bio); __entry->sector = bio->bi_iter.bi_sector; __entry->nr_sector = bio_sectors(bio); - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size); + blk_fill_rwbs(__entry->rwbs, bio->bi_opf); memcpy(__entry->comm, current->comm, TASK_COMM_LEN); ), @@ -433,7 +433,7 @@ TRACE_EVENT(block_split, __entry->dev = bio_dev(bio); __entry->sector = bio->bi_iter.bi_sector; __entry->new_sector = new_sector; - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size); + blk_fill_rwbs(__entry->rwbs, bio->bi_opf); memcpy(__entry->comm, current->comm, TASK_COMM_LEN); ), @@ -474,7 +474,7 @@ TRACE_EVENT(block_bio_remap, __entry->nr_sector = bio_sectors(bio); __entry->old_dev = dev; __entry->old_sector = from; - blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size); + blk_fill_rwbs(__entry->rwbs, bio->bi_opf); ), TP_printk("%d,%d %s %llu + %u <- (%d,%d) %llu", @@ -518,7 +518,7 @@ TRACE_EVENT(block_rq_remap, __entry->old_dev = dev; __entry->old_sector = from; __entry->nr_bios = blk_rq_count_bios(rq); - blk_fill_rwbs(__entry->rwbs, rq->cmd_flags, blk_rq_bytes(rq)); + blk_fill_rwbs(__entry->rwbs, rq->cmd_flags); ), TP_printk("%d,%d %s %llu + %u <- (%d,%d) %llu %u", diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c index 9e9ee4945043..8a2591c7aa41 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c @@ -1867,7 +1867,7 @@ void blk_trace_remove_sysfs(struct device *dev) #ifdef CONFIG_EVENT_TRACING -void blk_fill_rwbs(char *rwbs, unsigned int op, int bytes) +void blk_fill_rwbs(char *rwbs, unsigned int op) { int i = 0; From patchwork Fri Feb 5 03:50:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaitanya Kulkarni X-Patchwork-Id: 12069259 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=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 2A4FBC433E0 for ; Fri, 5 Feb 2021 03:52:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E634164FA3 for ; Fri, 5 Feb 2021 03:52:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229979AbhBEDwK (ORCPT ); Thu, 4 Feb 2021 22:52:10 -0500 Received: from esa5.hgst.iphmx.com ([216.71.153.144]:21807 "EHLO esa5.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229692AbhBEDwJ (ORCPT ); Thu, 4 Feb 2021 22:52:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1612497129; x=1644033129; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=4d2sXcIVAfHu+kk27+0p4rEb0sVQNT6B5jFqgSBoXBo=; b=HGPB9sKoeggwXx4jep5YIhbr/0Gl7q5SJTTktGikRfId/EeS3Q0/4Kts jvlA4VGWIRRz2Os/LeSYz1iCL3JgikezKQRdVJxrKe0p/d72u/+mycAQi MbHCwXgxXLfP3ndfxmpvHX4ZSqiN9qzjoucmgOA1xC2EaRuQgSQhITx4/ nunvIwVRK2LtJC/DzKCGiyGTkjePk++7U2TMcv27xmlj6YyaD+LpPRYOe NdIqdfGGTq+mH51LdrtCrWn/0H+a3wBI3EqbCsiAx4bhUZXgwe9zv9i87 gV1Ey8vl17ldxm14U7+wILyq0VXoLvqdRHvrJ6t8zowLbVoAHzvHoRoJk Q==; IronPort-SDR: wlS+2+aUQDIZBLPJ1Fz5flVPScM1FeA84pNRf6ccopsBxQVHASOBprgX4AhlV/QUNgzg8iXWQ3 N4itxASRWfeRlUqGPNcHMtREyJ1NvBx2dxOzlUs7PaeRDuOiL1+9uZWCn6ISvo9AoyYqSF5N+I fwfXjNEVMhwi7WYxM7P9RxumxHpGGz6lC3Ra5q+ESArZBZxj3VRkKMOxRGMV+SyaFBJsLW6SAA Z0paQbMK4bxl5kg4oh474BBtG75ZUQHZ5z31ZFA0towYSvu06khuhE8HRa3tQF5EHvaomw+3PH Pe0= X-IronPort-AV: E=Sophos;i="5.81,154,1610380800"; d="scan'208";a="159196415" Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 05 Feb 2021 11:51:03 +0800 IronPort-SDR: MjKnLI2FsBBkm4YlS2dOuBEoeqMLrokoxZsUkifM7yKInBWAD0jgDfPkrPCYiuvrQl6b4SbnDI pK3txFkxJ8qyDtoBpWlGFfl9LXj+J0rjjKRVfTUYCc/m7+jljXhrFk0Fn0VbAs9MPonvLTH6U9 +q6lkYy8MDo5NVit9I2fe4jBMGz+8y7ObgzAvqaEF5VYtnHX8HtwZsa7ZNKpzKm/4eHLmLg3dG Wfn8YyH5bh6akPUbvYJHRP5pXB3EvsF+Vd5tRON65/oLcWHSFlAjzR963Al/whJMj6hpBPZUE/ ssZmXyQzJql30jn4NnZT9thQ Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Feb 2021 19:33:06 -0800 IronPort-SDR: gHmJyxL8vUOF34wEAfoLtW2cAfR99OY/evbJISIXVF8nxObZu3McLCoztkzWaRUs69CTtKotNO eXarYWW3UV1qwk6JiAtGDRVgoKj+nQQtycgnYi6SjgBw7flJYzmX/Kk3KxH6m4G917HWS1mR85 zNaklBih0RUbvfG+TMUuWobjVoj3Np5bteDzwgNcN28TlzV6dXCeQUPAGyMOkB/MH8oxuG/WsM neOfz/gfom5esBWVErY4BavkqfGslZ/q/4p3Wxf3FjfNd20sHzAQKQuHfH+85VW+upA4rY50EO n+A= WDCIronportException: Internal Received: from vm.labspan.wdc.com (HELO vm.sc.wdc.com) ([10.6.137.102]) by uls-op-cesaip02.wdc.com with ESMTP; 04 Feb 2021 19:51:04 -0800 From: Chaitanya Kulkarni To: linux-block@vger.kernel.org Cc: paolo.valente@linaro.org, axboe@kernel.dk, rostedt@goodmis.org, mingo@redhat.com, chaitanya.kulkarni@wdc.com, johannes.thumshirn@wdc.com, damien.lemoal@wdc.com, bvanassche@acm.org, dongli.zhang@oracle.com, akpm@linux-foundation.org, aravind.ramesh@wdc.com, joshi.k@samsung.com, niklas.cassel@wdc.com, hare@suse.de, colyli@suse.de, tj@kernel.org, rdunlap@infradead.org, jack@suse.cz, hch@lst.de Subject: [PATCH V2 2/5] blktrace: add blk_fill_rwbs documentation comment Date: Thu, 4 Feb 2021 19:50:41 -0800 Message-Id: <20210205035044.5645-3-chaitanya.kulkarni@wdc.com> X-Mailer: git-send-email 2.22.1 In-Reply-To: <20210205035044.5645-1-chaitanya.kulkarni@wdc.com> References: <20210205035044.5645-1-chaitanya.kulkarni@wdc.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org blk_fill_rwbs() is an expoted function, add kernel style documentation comment. Signed-off-by: Chaitanya Kulkarni Reviewed-by: Johannes Thumshirn Reviewed-by: Damien Le Moal Reviewed-by: Christoph Hellwig --- include/linux/blktrace_api.h | 2 +- kernel/trace/blktrace.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h index 11484f1d19a1..e17d04abf6a3 100644 --- a/include/linux/blktrace_api.h +++ b/include/linux/blktrace_api.h @@ -119,7 +119,7 @@ struct compat_blk_user_trace_setup { #endif -extern void blk_fill_rwbs(char *rwbs, unsigned int op); +void blk_fill_rwbs(char *rwbs, unsigned int op); static inline sector_t blk_rq_trace_sector(struct request *rq) { diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c index 8a2591c7aa41..d7ebef83771c 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c @@ -1867,6 +1867,16 @@ void blk_trace_remove_sysfs(struct device *dev) #ifdef CONFIG_EVENT_TRACING +/** + * blk_fill_rwbs - Fill the buffer rwbs by mapping op to character string. + * @rwbs buffer to be filled + * @op: REQ_OP_XXX for the tracepoint + * + * Description: + * Maps the REQ_OP_XXX to character and fills the buffer provided by the + * caller with resulting string. + * + **/ void blk_fill_rwbs(char *rwbs, unsigned int op) { int i = 0; From patchwork Fri Feb 5 03:50:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaitanya Kulkarni X-Patchwork-Id: 12069261 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=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 D5146C433DB for ; Fri, 5 Feb 2021 03:52:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8DED264FBC for ; Fri, 5 Feb 2021 03:52:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229989AbhBEDwR (ORCPT ); Thu, 4 Feb 2021 22:52:17 -0500 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:47376 "EHLO esa2.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229692AbhBEDwR (ORCPT ); Thu, 4 Feb 2021 22:52:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1612497356; x=1644033356; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=NwgzSfysxAnsV/PwmEDbkBo+3nnTrLiXXNuavPj2YT4=; b=FDGvGI5v8WgniGLzXofrs6b0RwOMWckBoV/HULoW/uHafXfw3XquIKUw xNyc2I5NvOg7gRTAum3Mq26OS+1ycY4JUx/1tE9S2zDYjapRn5TgLpaRU X+ItAB3fGpO4v3xj7tb7TIvMwPDT4xQqvhDpkcwPZwXZzQBfU5npjPuIP wfD7oDELJeeGQudIV/xouJZet8wnFidrYCQiNr3WpazUbtbpGRq8S5oZ8 Wpo5b9GgdiRMczDvwejH3PJmLyH28KMO5SzLKOs0XhbEGOu6igtXaHY44 7//y4yRgxcdjyb80xazsK24g4Lsh8NV0tIu1G5qN/0bZuU1QpkzI3K7eq g==; IronPort-SDR: xx87rwkN9reRyCu0GqsAJardMPl/7VuaNQevoRDaYH5lJ1xNmKSonq2wAnmbJcyotAQbPgHGZ6 GO6wWiR9JX5otYJDzs+q5YeWEL6ezGpSrCx3yovXyyd3XPNfpnDuIfG5B8vHeKQNFuwbeDEC1g 2fg0qXl7HXVQP6NDDeSHebDyl0T5xbtuwwWm0U76OhXvdZEbArS0xYHkS5JEHvArchEPLp5135 QZAOGha86ICzUMkDQD/hoAG/2qLFIpG5X312UOr0vFEZJwH5hCRBhCmjjBjyFU63zLZha6YiIy F0o= X-IronPort-AV: E=Sophos;i="5.81,154,1610380800"; d="scan'208";a="263300861" Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 05 Feb 2021 11:54:16 +0800 IronPort-SDR: J47+agh5kYZASikXTDfhdaDK96z0TdF5yk6tvqyfiuYgeVkelj4Mz+O/Eyi2IkeR+43Wkjp95Z mHAKV2J73hiW/FG8Y/M8s140HGHA5oyklsppEbtHZEH+DLVqy62LrXhEIAreQpnqO+zXhTbHnl 4VzdCrJ45/O7eX3nRyGn/AdOpf+Yqs9Xvnzc/fnETaDgAG0qhcR2j5BBhswkxrFT42Hl5alVgw ixcHf7VtYwxP5sfg2fPEJbdTqADywdcRpStEp2TTVHQZQ6guw7/e1nmLTjJxc5+i2it8QJb8Mz QX3By8t6UD7Sarr+wfhAhvcU Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Feb 2021 19:33:13 -0800 IronPort-SDR: y0orts6v3OSiNNsoJEURzGib9GzTrueBFFil8RGP0kbEG6h1dMa+ZY/6ULMrVPhWb1T12qFOfg vFftqs/wE/kMKNMwqtOmHP34vdrMlQ1LyafQijLBsHDz/L3wiC+VjXPmHWkTuoeRKP3CkxsTVo CNyQfvCl2SvfI/hdJibUG7zbh0jXs523W7RoGURwr1NDUjJ+YxKNaHvU7RsO51B4boEa8x9boG Y17KlJ64sUIAwvphtz/fmWTVxokgqJXOYhmN2aobLv/5rvZ/GjivRi4VbqPcc1YiF9O1m09949 Ct0= WDCIronportException: Internal Received: from vm.labspan.wdc.com (HELO vm.sc.wdc.com) ([10.6.137.102]) by uls-op-cesaip02.wdc.com with ESMTP; 04 Feb 2021 19:51:11 -0800 From: Chaitanya Kulkarni To: linux-block@vger.kernel.org Cc: paolo.valente@linaro.org, axboe@kernel.dk, rostedt@goodmis.org, mingo@redhat.com, chaitanya.kulkarni@wdc.com, johannes.thumshirn@wdc.com, damien.lemoal@wdc.com, bvanassche@acm.org, dongli.zhang@oracle.com, akpm@linux-foundation.org, aravind.ramesh@wdc.com, joshi.k@samsung.com, niklas.cassel@wdc.com, hare@suse.de, colyli@suse.de, tj@kernel.org, rdunlap@infradead.org, jack@suse.cz, hch@lst.de Subject: [PATCH V2 3/5] blktrace: fix blk_rq_issue documentation Date: Thu, 4 Feb 2021 19:50:42 -0800 Message-Id: <20210205035044.5645-4-chaitanya.kulkarni@wdc.com> X-Mailer: git-send-email 2.22.1 In-Reply-To: <20210205035044.5645-1-chaitanya.kulkarni@wdc.com> References: <20210205035044.5645-1-chaitanya.kulkarni@wdc.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org The commit 881245dcff29 ("Add DocBook documentation for the block tracepoints.") added the comment for blk_rq_issue() tracepoint. Remove the duplicate word from the tracepoint documentation. Fixes: 881245dcff29 ("Add DocBook documentation for the block tracepoints.") Signed-off-by: Chaitanya Kulkarni Reviewed-by: Johannes Thumshirn Reviewed-by: Damien Le Moal Reviewed-by: Christoph Hellwig --- include/trace/events/block.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/trace/events/block.h b/include/trace/events/block.h index 879cba8bdfca..004cfe34ef37 100644 --- a/include/trace/events/block.h +++ b/include/trace/events/block.h @@ -196,7 +196,7 @@ DEFINE_EVENT(block_rq, block_rq_insert, /** * block_rq_issue - issue pending block IO request operation to device driver - * @rq: block IO operation operation request + * @rq: block IO operation request * * Called when block operation request @rq from queue @q is sent to a * device driver for processing. From patchwork Fri Feb 5 03:50:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaitanya Kulkarni X-Patchwork-Id: 12069263 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=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 0957EC433DB for ; Fri, 5 Feb 2021 03:52:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B91CD64FBC for ; Fri, 5 Feb 2021 03:52:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230134AbhBEDwZ (ORCPT ); Thu, 4 Feb 2021 22:52:25 -0500 Received: from esa3.hgst.iphmx.com ([216.71.153.141]:26691 "EHLO esa3.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229692AbhBEDwY (ORCPT ); Thu, 4 Feb 2021 22:52:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1612497143; x=1644033143; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=RwSG67ACNLCwVXwgmCiXvQu1KQSR5+t16hNQS7JHeOY=; b=kEAfFIO8+7a0qFic3dCBQN8Po2KeiazqcoBYLWV7eI42E04VICZVG04L 5ar2Q7wPFysUyl1dEXhtae8IRSyVgxig4tAGT5PrXm6BIsDlRmqjssXXy U0yy5ktudkToHz9vLPMkhAgNaWSQ8lt47baSahUmC809Ae0/pT5m/qFCc RWLmW3ewcdHqGOTpQd09o2ku/y7THi8R4M1fUlDQuMjYx0gwlWQbM5BB0 RY8jIB9ppB4nRg94C6TV/eZkeDU2mF9ww3Ak+zsmEtPzflETu+EkmoYya Grf/NMpIhUHf28xOpUTfU2Kh5a+R8azx5EA0L4reunFcXmP8vudDixC63 Q==; IronPort-SDR: DYlN++uRKBEmnkN8xmuvVpCTm/27JMZuVzjgB/BP8r60yQJ0b+JY0TDv5ej8glwhORRbGHWDBG vNlx1RwrySyGeS1KrE8kb85s9+GweM3weEo2WnV5cvumGYuBJdLSUkosZspbMayojxaEJD/Jqe ZWFOgHlMajeOuUnnfDHiKQhofAn+xcE4UeLJl27eOK9Xb8QzTCpe9UKtDPdEn+qeKRJviBt777 89eXhzsde672rDJFRRyPSpXkMV84HTVy+7i+DlsDFtiLlr5Vo0WEM0MRApX90Dj16XgZP+ZaIR zZs= X-IronPort-AV: E=Sophos;i="5.81,154,1610380800"; d="scan'208";a="163645290" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 05 Feb 2021 11:51:18 +0800 IronPort-SDR: TFD9gs+33eyAeoAjrwZKY4GBrZuG64F819fH3C4T92ZlTB+gdLhuvPIUE0AAxq+QJbCWKwcmpg 7GpMWhHp8NZp8OL+fdwQSTgmzYds+MfLA+qaM1j0hNqg6IKUtxfD0aSfC9YLkzXijSPvL0fhx2 qDjlkq9GFZxdTG1SvWTCv/FtoIkqLvVcIDExjZxFB5u1jLHbLR+/l2Y8GYR4hm+Ynd7YY3o/xj OwoDH94IwhK8D1nOKUCQoFb45jry3C+4lWFYNR3fBdlPTEVr3cJ33XxD/kVm5EhD5a2sYd0O5J R3yD9pBYTj/0zuVAy1wyGdps Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Feb 2021 19:35:16 -0800 IronPort-SDR: CO+PaLAyqHKpp6ParyOFGHUGgdkzGAiWghJ60jfD8gUbOhmXL+vs/poa1G4qCcqlWzUhR4A+pE HjrxfWXhlSEJT+mZO6iTFZAuM4VH9W6+/dndWJ1/PHraYEUla8s5lYhSE1QiiPXNfJJ+bjdk3s PKQblPpb/N3op2fmH1FLOGchiey2sRdo5xoOcG+NtZc78/XRec0JgAlRpe1HK+RryteIBrx5HG TPqU63FMGCmYwe+dZEXmJ5+t0Ei+glycLfLka9jAy1MyURGp5vs4yMXDI5ntQZbVtgPNKejA9U VM4= WDCIronportException: Internal Received: from vm.labspan.wdc.com (HELO vm.sc.wdc.com) ([10.6.137.102]) by uls-op-cesaip02.wdc.com with ESMTP; 04 Feb 2021 19:51:18 -0800 From: Chaitanya Kulkarni To: linux-block@vger.kernel.org Cc: paolo.valente@linaro.org, axboe@kernel.dk, rostedt@goodmis.org, mingo@redhat.com, chaitanya.kulkarni@wdc.com, johannes.thumshirn@wdc.com, damien.lemoal@wdc.com, bvanassche@acm.org, dongli.zhang@oracle.com, akpm@linux-foundation.org, aravind.ramesh@wdc.com, joshi.k@samsung.com, niklas.cassel@wdc.com, hare@suse.de, colyli@suse.de, tj@kernel.org, rdunlap@infradead.org, jack@suse.cz, hch@lst.de Subject: [PATCH V2 4/5] blktrace: fix blk_rq_merge documentation Date: Thu, 4 Feb 2021 19:50:43 -0800 Message-Id: <20210205035044.5645-5-chaitanya.kulkarni@wdc.com> X-Mailer: git-send-email 2.22.1 In-Reply-To: <20210205035044.5645-1-chaitanya.kulkarni@wdc.com> References: <20210205035044.5645-1-chaitanya.kulkarni@wdc.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org The commit f3bdc62fd82e ("blktrace: Provide event for request merging") added the comment for blk_rq_merge() tracepoint. Remove the duplicate word from the tracepoint documentation. Fixes: f3bdc62fd82e ("blktrace: Provide event for request merging") Signed-off-by: Chaitanya Kulkarni Reviewed-by: Johannes Thumshirn Reviewed-by: Damien Le Moal Reviewed-by: Christoph Hellwig --- include/trace/events/block.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/trace/events/block.h b/include/trace/events/block.h index 004cfe34ef37..cc5ab96a7471 100644 --- a/include/trace/events/block.h +++ b/include/trace/events/block.h @@ -210,7 +210,7 @@ DEFINE_EVENT(block_rq, block_rq_issue, /** * block_rq_merge - merge request with another one in the elevator - * @rq: block IO operation operation request + * @rq: block IO operation request * * Called when block operation request @rq from queue @q is merged to another * request queued in the elevator. From patchwork Fri Feb 5 03:50:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaitanya Kulkarni X-Patchwork-Id: 12069265 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=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 D37AAC433DB for ; Fri, 5 Feb 2021 03:52:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9F30E64FA3 for ; Fri, 5 Feb 2021 03:52:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230470AbhBEDwe (ORCPT ); Thu, 4 Feb 2021 22:52:34 -0500 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:59516 "EHLO esa6.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230184AbhBEDwc (ORCPT ); Thu, 4 Feb 2021 22:52:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1612497152; x=1644033152; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=sYaZwm67j1G5Z1/af70UAoZcllAxqQnu7anijwrmnBY=; b=Y5yuF/9u4Wt24xbBaycwd6Mn4eN8k52MggOxqqimdUoXXYVteHoV9aXT xmkuvqHX/JTHoYCUGFQwSdCMVC5b1MSSoxXB7e5YTJwAaUXn5yjSQEL6f uPm5neg1+/BagMe7Ux5MVIowoDicZpttee6UvUrKELwLOOBYUBChkrTYp TemZVyQvi6WSEzMc3XfV6e0FNm/fGKvsn4P6w+To4bWgxF5auBIhGh6A5 gHbU1inuNQLgJIXcp2u0KfHReX1oz261GpNC0uOCUcGxiCOpQezw0lrdF WEalWrt7ElrxR0YQ6IpPcCb5jALWLCtfYxGJZqBRKxPiY0kGpTVkBYE9v Q==; IronPort-SDR: eHRV2VMGYMFZPStG5yDQwRE3vcs+44tP2Y+JYDxPBrWDfkLmS3EVwReceDk+iu2t9i2hITkpt5 nrTP16ODH7vgjaCKSeBvj+sakWDdxQcPPe0jNi/koo2+tl8gFn/K7XdcRmK/uLwm0Tnrmhfw3T gd3yywekrih6P8KIBvB9SLkLQaxp7HoSkkaL0P7CWLqTI5C5s8cKs1WTV5Sx0URaEt/cyXOxAn +Y7mEMpBzNhjqdI88/jicU19ZOszPsfF9y69wpylqKAvsL7e8DSbBREpoo8tDzrh1CopxHUI46 pf8= X-IronPort-AV: E=Sophos;i="5.81,154,1610380800"; d="scan'208";a="160386852" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 05 Feb 2021 11:51:26 +0800 IronPort-SDR: Faiy03YVrFyIKWjaAxxHbRA1wgOL62rFjCCUr0ryKW4ffAaYZG8YvKX+6whAi0pxWEBLPNRapy BdzBIIga/WKuihWQ1+8DOjY+ZNwnebxVmX9xf96Lpo4P2QaiRESBusltbMJlQOBt/zkEJ9iP/X YuBWgr9oKvvaWTxG0GiRmj1wzJCkhUuBPc6z24+E/l2IwjujoPauhmE3dUqZULMF9q/0IiUD7h XU1smEcgO3eim5KRzCtf0FnKRXn0k4PnpFfTEmrvEKNatgHRr3h9iN+Z75U+yvEAVV+GzcNn+L q1ELejU4Zn8eWjW40jqc+y7H Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Feb 2021 19:35:24 -0800 IronPort-SDR: 4OCN2LYDjgEVxXIUlJwvyKMNng2kxL2bPSLivk53CMZp3ak/Vvb4w3xpk8Loo8fo3VNlyqZji6 i8fQp27Wi2iBH3d/kFzDOYdvuab76gxrIXDeXowCs4+hg7K6Al+ZFB7YpPwlZuj1LtvT2fvRt7 g/7bxXvDJJZyUWESXT0rNhjc0GGM2OMdhvlTo/yt9iWXz53uPJn+AIoP0s371u7gSTPpEOJMVH F4gQDezdWoO2G7U/uBJw1hNAH/wyW6pfaWf4Pwd5QKNTDST8RDCrs6YhYbnlRKYe8J31fvToz1 Jfw= WDCIronportException: Internal Received: from vm.labspan.wdc.com (HELO vm.sc.wdc.com) ([10.6.137.102]) by uls-op-cesaip02.wdc.com with ESMTP; 04 Feb 2021 19:51:26 -0800 From: Chaitanya Kulkarni To: linux-block@vger.kernel.org Cc: paolo.valente@linaro.org, axboe@kernel.dk, rostedt@goodmis.org, mingo@redhat.com, chaitanya.kulkarni@wdc.com, johannes.thumshirn@wdc.com, damien.lemoal@wdc.com, bvanassche@acm.org, dongli.zhang@oracle.com, akpm@linux-foundation.org, aravind.ramesh@wdc.com, joshi.k@samsung.com, niklas.cassel@wdc.com, hare@suse.de, colyli@suse.de, tj@kernel.org, rdunlap@infradead.org, jack@suse.cz, hch@lst.de Subject: [PATCH V2 5/5] block: get rid of the trace rq insert wrapper Date: Thu, 4 Feb 2021 19:50:44 -0800 Message-Id: <20210205035044.5645-6-chaitanya.kulkarni@wdc.com> X-Mailer: git-send-email 2.22.1 In-Reply-To: <20210205035044.5645-1-chaitanya.kulkarni@wdc.com> References: <20210205035044.5645-1-chaitanya.kulkarni@wdc.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org Get rid of the wrapper for trace_block_rq_insert() and call the function directly. Signed-off-by: Chaitanya Kulkarni Reviewed-by: Johannes Thumshirn Reviewed-by: Damien Le Moal Reviewed-by: Christoph Hellwig --- block/bfq-iosched.c | 4 +++- block/blk-core.c | 1 + block/blk-mq-sched.c | 6 ------ block/blk-mq-sched.h | 1 - block/kyber-iosched.c | 4 +++- block/mq-deadline.c | 4 +++- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index dfa87e360d71..da5e1f620625 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -125,6 +125,8 @@ #include #include +#include + #include "blk.h" #include "blk-mq.h" #include "blk-mq-tag.h" @@ -5621,7 +5623,7 @@ static void bfq_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq, spin_unlock_irq(&bfqd->lock); - blk_mq_sched_request_inserted(rq); + trace_block_rq_insert(rq); spin_lock_irq(&bfqd->lock); bfqq = bfq_init_rq(rq); diff --git a/block/blk-core.c b/block/blk-core.c index 5e752840b41a..fc60ff208497 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -59,6 +59,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(block_rq_remap); EXPORT_TRACEPOINT_SYMBOL_GPL(block_bio_complete); EXPORT_TRACEPOINT_SYMBOL_GPL(block_split); EXPORT_TRACEPOINT_SYMBOL_GPL(block_unplug); +EXPORT_TRACEPOINT_SYMBOL_GPL(block_rq_insert); DEFINE_IDA(blk_queue_ida); diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c index deff4e826e23..ddb65e9e6fd9 100644 --- a/block/blk-mq-sched.c +++ b/block/blk-mq-sched.c @@ -384,12 +384,6 @@ bool blk_mq_sched_try_insert_merge(struct request_queue *q, struct request *rq) } EXPORT_SYMBOL_GPL(blk_mq_sched_try_insert_merge); -void blk_mq_sched_request_inserted(struct request *rq) -{ - trace_block_rq_insert(rq); -} -EXPORT_SYMBOL_GPL(blk_mq_sched_request_inserted); - static bool blk_mq_sched_bypass_insert(struct blk_mq_hw_ctx *hctx, bool has_sched, struct request *rq) diff --git a/block/blk-mq-sched.h b/block/blk-mq-sched.h index 0476360f05f1..5b18ab915c65 100644 --- a/block/blk-mq-sched.h +++ b/block/blk-mq-sched.h @@ -7,7 +7,6 @@ void blk_mq_sched_assign_ioc(struct request *rq); -void blk_mq_sched_request_inserted(struct request *rq); bool blk_mq_sched_try_merge(struct request_queue *q, struct bio *bio, unsigned int nr_segs, struct request **merged_request); bool __blk_mq_sched_bio_merge(struct request_queue *q, struct bio *bio, diff --git a/block/kyber-iosched.c b/block/kyber-iosched.c index c25c41d0d061..f13da10953bf 100644 --- a/block/kyber-iosched.c +++ b/block/kyber-iosched.c @@ -13,6 +13,8 @@ #include #include +#include + #include "blk.h" #include "blk-mq.h" #include "blk-mq-debugfs.h" @@ -602,7 +604,7 @@ static void kyber_insert_requests(struct blk_mq_hw_ctx *hctx, list_move_tail(&rq->queuelist, head); sbitmap_set_bit(&khd->kcq_map[sched_domain], rq->mq_ctx->index_hw[hctx->type]); - blk_mq_sched_request_inserted(rq); + trace_block_rq_insert(rq); spin_unlock(&kcq->lock); } } diff --git a/block/mq-deadline.c b/block/mq-deadline.c index b57470e154c8..f3631a287466 100644 --- a/block/mq-deadline.c +++ b/block/mq-deadline.c @@ -18,6 +18,8 @@ #include #include +#include + #include "blk.h" #include "blk-mq.h" #include "blk-mq-debugfs.h" @@ -496,7 +498,7 @@ static void dd_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq, if (blk_mq_sched_try_insert_merge(q, rq)) return; - blk_mq_sched_request_inserted(rq); + trace_block_rq_insert(rq); if (at_head || blk_rq_is_passthrough(rq)) { if (at_head)