From patchwork Mon Feb 22 05:29:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaitanya Kulkarni X-Patchwork-Id: 12097909 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 EE766C43381 for ; Mon, 22 Feb 2021 05:31:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C25DE64E61 for ; Mon, 22 Feb 2021 05:31:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229947AbhBVFbS (ORCPT ); Mon, 22 Feb 2021 00:31:18 -0500 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:1875 "EHLO esa1.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229549AbhBVFbQ (ORCPT ); Mon, 22 Feb 2021 00:31:16 -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=1613971875; x=1645507875; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=CoCeSBqxrvjFEAnqMxwpePjEOv1siGwSFbQArqybpNE=; b=hdEAUR3OpyBA+uxBjvG2eNIFpa8Av03SjhCZ+I7FMSyRuuRn3N/5iIJ6 Gm7HECxpcFCBNjkAOGJT5mSDLLETM9F6Mj3bKE0uzK562Eh34Iz3jvOPZ xFyvzSvvMKAehMG/2xMsMNPLRC61/hFZ8DuQLhP9WkYU0BgPLWiW0k0wp R8VxmnirEY5DeVSLO8uhmojlEycqKtUgkNThgSYfh1NimXerfbqzls6Je KWfge81iYaIh/qatYWsTBkeEVLuCNbgxVuqUpPP3hHmh8mJN/01UmrSL2 Z5931nzuE3EKxmrQQ/PdI/TcIKWiHKGXKe9K4QLAQtoI5H/2swU3u4cdD Q==; IronPort-SDR: B0sIkdbCypWLbvRC8nN0A0rOHvNNNDdEp/toFmicJp4rAdGCGT/8elsGR2qKopn1Jz9Av9ra02 4R0hPcmRaO/xNItS6N1WJ3O6yrH16UgleYh1GeNT44+k3dvAsLGAjaNC/2L1vSjj5u8+91YduF 5/vHgQYoZUfq5u1SQdGhH2jPv6QEofwWaEqCvYdscvXHECfp7I8XcXsvl68ZUYO0W42JNz14nG BTJJzBmtHR49/510ijYnly62foDR8kdKIS+zxhudT+/uoXwLoHDLqzKyzX7z3F8nVgG4VPDhsa 3A4= X-IronPort-AV: E=Sophos;i="5.81,196,1610380800"; d="scan'208";a="271015605" Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 22 Feb 2021 13:30:10 +0800 IronPort-SDR: Dimv7Ey8G4ED9Ta8Kw8nr4OlCLXc2ULO/2E4S3f4Mra5Qn1GEtAJaY6QWLpOl5a5T+kpioAB9y Xp4np/aoLb4//BT9FOcVbIgsGe7ngfuaf9cJN0B2TMqbtniOQsZwk1CY8PDLjZK2k3wpx2PV10 SA76QmkICrCpDJHowNq92gBQltl10OCo9GnEi5rNko0NEeJjxrITMFmMbViOaHwTPeTjPPx6GC CI6Q+4VWiPFOns68zDI8OSrIMruEpEh8swO4MwryY3gJMPDZsoi6pIy55XnU5/OydGOl+gDwlD 3Phg6qarF933eJP+EqfZgA3v Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Feb 2021 21:11:42 -0800 IronPort-SDR: 3sjLOTpyhVbK2TJa/phZLNlpxSpvwqoc++8PVTVBhaGUN0XgwKQpKfwN8yODRzflbDadmft6FX 51tIp5JE0En5ox42yRazdJ/9X6PwU12GoTJGNA4hvkUxMhUvxPwRqqI0wRo8S22Uw/jyZ7tbwe lTubMsHh7bJyl0tsiQRwOjWQjxXbLeeg0k94WQCZavOUqTY1Y4PCuCzZ7epdA1FS4o3ceHFH/h Xhrb0D05fG9nA+penGvXwcFF9rJM26f5GWVTDZIZ1t2RWOG+1OkmUg6Hi7Qz8RVtMmKcFzACaq WnM= WDCIronportException: Internal Received: from vm.labspan.wdc.com (HELO vm.sc.wdc.com) ([10.6.137.102]) by uls-op-cesaip01.wdc.com with ESMTP; 21 Feb 2021 21:30:10 -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, hare@suse.de, colyli@suse.de, tj@kernel.org, rdunlap@infradead.org, jack@suse.cz, hch@lst.de Subject: [PATCH V3 1/5] block: remove superfluous param in blk_fill_rwbs() Date: Sun, 21 Feb 2021 21:29:55 -0800 Message-Id: <20210222052959.23155-2-chaitanya.kulkarni@wdc.com> X-Mailer: git-send-email 2.22.1.dirty In-Reply-To: <20210222052959.23155-1-chaitanya.kulkarni@wdc.com> References: <20210222052959.23155-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 Mon Feb 22 05:29:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaitanya Kulkarni X-Patchwork-Id: 12097913 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 B3BE5C433E0 for ; Mon, 22 Feb 2021 05:31:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 789BD64E61 for ; Mon, 22 Feb 2021 05:31:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229949AbhBVFb3 (ORCPT ); Mon, 22 Feb 2021 00:31:29 -0500 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:31328 "EHLO esa4.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229549AbhBVFb2 (ORCPT ); Mon, 22 Feb 2021 00:31:28 -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=1613971887; x=1645507887; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=4d2sXcIVAfHu+kk27+0p4rEb0sVQNT6B5jFqgSBoXBo=; b=bOdAMv9z47SN+xcYawcCcaO1ae4fXEtzRWOPIH/PTk2d5BkP6fWQhdHj yE3mAfdsJAsPfVH9nV1yH8VdxnmAZkfXz5sH7moikPu4eTijn1+Dgo0H+ a2sPOYqYTy2uV0ocEybPi5NxkBa8J8R6xa7olBQhsgFeFbqkTAVgkz551 CBgKkYja6w5jU4kJsamtePEsBvPeKR/mRzLJpOuEzy8uHK+o8XUDljgqk 5KGL8SdMioM3obvIXVurucuL/f2ot0m2oknr91t2ltXX5GWiZ0z7kB0cS AmbozAGLeJMnam4q6Re1iFFVBIeZxr8AMzhzNwasfllTJyxVFgaLfT/j8 Q==; IronPort-SDR: R0pMjUTLCb6TKHAuFi1YLSIc5iZLNBoabzxj9Wkm2wN9sOH/2Y1aAymnGuhuJpkbiPtzbN5gmX /cNWuiJq/s1J0t86jH9f5pbajExFU8Sms7nshsBdIiuL88pOxWbk09+gWNIy42yGfw/RMr1Yjm nJc/hl7+LaoFEXkND2w6hVL47xjHCDiadd24xppeQGE0e7hld5XdL5vr9z9msZwks3NuRyG+j8 p0KyOjug/NPmj7Gn7a5sfi+iHu5bW9TNdBg/gZp9krpb41Q3jb/8IDzYOKG6vdd9AtOqs6kLJJ gLU= X-IronPort-AV: E=Sophos;i="5.81,196,1610380800"; d="scan'208";a="160464884" 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; 22 Feb 2021 13:30:18 +0800 IronPort-SDR: jxC+l4ShtPO034WA6xr/k6/8fG6MLYNiUr/ua13cCG+GeV9ep8T1x7Mumolyts5JIZwyY95ose osLZTRf2pAi+vP+1yTEH2GXLh062cGOjQfNzn4HC2LsxsTE12rFP9UP7d1COGutfGyUbIZmaq1 KriRd/WX9zQ4frn6TG7VmzNmKlhCC2vULXNcFC14fvOdYLFt+0VWwwjVx2J42KwidmSSIWBeYe jEz9LpObDYU4I0KKObKQcx+cVc1YCCGzUWLEEyLIJjqW1Uue1lOEAMhq7dwXBSNgsbl8Ud57Hn 3Po7NG3q57FYmAFZqQFcsK8V Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Feb 2021 21:11:50 -0800 IronPort-SDR: Yz/3JUS1ZdZ13bIrJ2xj+nrbeVHBPUcXECiFHZbmtePAqrHbAkMESXFFskBXjst3BrQTPxqeR9 WZkYqlw8C4L1FDtVimiCT3QnkrpYXbHOHgld6L7fiwxSXcTZ9EKYF8IYGtusmIkbRNM5cfJrfY tjptvt2oUUN08uUoNFvCUuid4ebcNZRP0lZ3ICZwqSM6Y2mGpw8/4nMDGJ/IOAW/VUxb72KAu3 GQh8DjCqMMMC8F8RFB2i8TpCc3BrqfQmqbWLQRcaLp29wP8ecxP2AjJ/XSmUQh6EDxHJIoZ7RL dGI= WDCIronportException: Internal Received: from vm.labspan.wdc.com (HELO vm.sc.wdc.com) ([10.6.137.102]) by uls-op-cesaip01.wdc.com with ESMTP; 21 Feb 2021 21:30:19 -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, hare@suse.de, colyli@suse.de, tj@kernel.org, rdunlap@infradead.org, jack@suse.cz, hch@lst.de Subject: [PATCH V3 2/5] blktrace: add blk_fill_rwbs documentation comment Date: Sun, 21 Feb 2021 21:29:56 -0800 Message-Id: <20210222052959.23155-3-chaitanya.kulkarni@wdc.com> X-Mailer: git-send-email 2.22.1.dirty In-Reply-To: <20210222052959.23155-1-chaitanya.kulkarni@wdc.com> References: <20210222052959.23155-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 Mon Feb 22 05:29:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaitanya Kulkarni X-Patchwork-Id: 12097915 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 98848C433E0 for ; Mon, 22 Feb 2021 05:31:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 631D664E61 for ; Mon, 22 Feb 2021 05:31:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229952AbhBVFbn (ORCPT ); Mon, 22 Feb 2021 00:31:43 -0500 Received: from esa3.hgst.iphmx.com ([216.71.153.141]:29611 "EHLO esa3.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229549AbhBVFbm (ORCPT ); Mon, 22 Feb 2021 00:31:42 -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=1613971901; x=1645507901; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=NwgzSfysxAnsV/PwmEDbkBo+3nnTrLiXXNuavPj2YT4=; b=LkajCSm+SfRN+zzERDmIDgc7tQoxJa6AHAmh4Sa8lfp5M2eCrOwETVE/ GOS+gEAwQOo/8f5uDI1C+EX7wDH7S75iGUifvV1JFphmdGSMVo/X/r1U0 Hqhi9QnQVvDFE66Zaf4fYDKo7Y1ApoK5X1+OnD+YSrTjs+fjljA7AL3Yw up54fCHtyKISjUAqBPlwyVLnjyN59GBCyNiLUX7VMnUoT/77FmHy/MKxD 4S1460UT2LXUcG/AKQpVIFE9xhifDnAVuLSzoRNNrmU8X1fzXS0VjSE1S SXGy33A+d+cLsQsW2N4yEsF8Gu5DKCoyExFNjfIqt0ljB95dLpjTZFIIw w==; IronPort-SDR: RAN5KZBkIIR/xSi/EqpUgG/GNMdOLnPE/t6INqYyAuQf4aJApSFRM/dwENsweu7DFdfq9yZmsx /0NaHJGPheJo7SH65orphD+hHwU7QqVjGCMNeWoKL687dc3kTYS8TLDHs+hAta+/r449OwrL2W oHdMkOp74C0siLV59uYxNm4+W/9dbwuML9mpWnngBDGEzGoJL5qq7zVSpBSNW4pAm4PBV/WMvN A/W5TLg86ni5F+uSZbHrdtJPdhtSj67wMvw34dCEPQaGFPYRhKkF4dG66nupGV6J5FUwWijOd9 sac= X-IronPort-AV: E=Sophos;i="5.81,196,1610380800"; d="scan'208";a="164956417" Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 22 Feb 2021 13:30:26 +0800 IronPort-SDR: L+whU/pFMbFaB1SlOF1e70c7HME410K7tvY7u/iqiK/oU5JAHZQM1pC2Ow6foolYORtdeFYwgY pDxa3wsaHNw+1VeOb3BWcO8JYb6lReqJwfG4UJ+GTsXmxNRTVOy9u4KLyqLidLaD3MEWQfVxzO +pgEdTsj4Z1Dc8QX+EaQYMJP1ECTTPQtqkiKqrTj+lAZtdOeWYSGmCTMGA4rNE35HfL9w7xPOD RCDfde7d4I+qUEsIUKCForubwIKDseZEU+sb/RrNlP0FqQqs9bFn2ifygpbRziCPzYB+J8vehe acal9wRoaA0a+KNk2UzLrX8f Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Feb 2021 21:11:59 -0800 IronPort-SDR: 0wG0KxYggb6QzcYn9PRFlluAdCcTHTdazO7bHKOp/VSl96P9rVzxheiQrz4mEf/C7MLWc+wlAZ gdJPv7f7i/bBFtLqQZ4wsz9g50kPZ8xMJoxzlOAjxh+CnGFOsx2NNJtcMbSPWxJ6LlVpZiedWY gFMJCJ2AO1uWnIIEaC/FffDU1F0Uqt2kJ+ahpTeF9xx+eCN8xVPk+1xhX0Kf6SPsksei/8N9oj pzUFNnO3YyOfPgL3iVAS3vSGhp+UYQrPRuvRT+9nHxSqtRe56J5CMFVeCFQWzavN+Zvl1JT2a+ SzE= WDCIronportException: Internal Received: from vm.labspan.wdc.com (HELO vm.sc.wdc.com) ([10.6.137.102]) by uls-op-cesaip01.wdc.com with ESMTP; 21 Feb 2021 21:30:27 -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, hare@suse.de, colyli@suse.de, tj@kernel.org, rdunlap@infradead.org, jack@suse.cz, hch@lst.de Subject: [PATCH V3 3/5] blktrace: fix blk_rq_issue documentation Date: Sun, 21 Feb 2021 21:29:57 -0800 Message-Id: <20210222052959.23155-4-chaitanya.kulkarni@wdc.com> X-Mailer: git-send-email 2.22.1.dirty In-Reply-To: <20210222052959.23155-1-chaitanya.kulkarni@wdc.com> References: <20210222052959.23155-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 Mon Feb 22 05:29:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaitanya Kulkarni X-Patchwork-Id: 12097917 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 5F6F1C433DB for ; Mon, 22 Feb 2021 05:31:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 182D364E61 for ; Mon, 22 Feb 2021 05:31:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229953AbhBVFbu (ORCPT ); Mon, 22 Feb 2021 00:31:50 -0500 Received: from esa3.hgst.iphmx.com ([216.71.153.141]:29572 "EHLO esa3.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229549AbhBVFbs (ORCPT ); Mon, 22 Feb 2021 00:31:48 -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=1613971908; x=1645507908; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=RwSG67ACNLCwVXwgmCiXvQu1KQSR5+t16hNQS7JHeOY=; b=OQFWCJBeeSVgqOkgW/7jv20WWDz+W4BBxx4DZhPeYRaAFxk8Y9h98/f+ b13rUhYaQGDjy2HYfCTk0bgBg2twi3j0vhkTu5jH4wJdOgf3B92GWtJP0 GI03eww+OUQ95AIsXvdPBrYVymXp/y4pnDpEPiAW+1hAK2bR/KBnEnVRR LMIeDu6WI+O/+7dgmPzmYpyVJIwF+bBvW7KuPxo0Hcn2uRwu7kaSgusXQ rW6nDBom01h9pY+MbQMXfDkZjMGzrmY06DiHnPWg5gfwlwehaLXi7V6nR ReRGcubbjEZqCNNSSmEz2V9WdpnqScJ07ev5SHZSgxfYeYJ4zOb+zRGCr A==; IronPort-SDR: s3VzK1i7nVHUOhTTC0PTuqvFSZae+z6tZ4GSnXF5e0xL+H9jpVkCKh6TxXgV3G7PERGGZ/dyLo dSjZr/QSaZ2e30agTKJ3dHI4Ck3gT1p+cONFHI2TXptZeC93++Qb3SCaYl6CooaDd8uDGbUu/e 4R+Tw8N//snFxh7uoiDtJfuMX3DyOxEKeDTxB76I9W/mkaOMLun3wFWvYzojcyMAv4UUCOzWOS aGXz+KfMPxK7BoA136U61ThskSDVb64ZA8/XJVC5SvzPshB3CbCpn/FRhebppFG1WOmqScBEwU pso= X-IronPort-AV: E=Sophos;i="5.81,196,1610380800"; d="scan'208";a="164956436" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 22 Feb 2021 13:30:36 +0800 IronPort-SDR: zGnwzcr49NlCQyMmjQRECyNSRSmGgpYGnxJAJJE0Bp584vRB3qQkbxuYKCAKHeCo8Z7dKCZ28U u2s8Ul+IZwRERPi2qy96RqYMXJh1LjDWltxLcvIu2JSOReINw8gPYLjHJmBIbyNveBAQ3oLrbZ WUWpCt6PbioSCUImOlZt1BQZiwH77hYJsDwJ8/2UsLom6Oyl0r3HUJ1ZmMGZXOVBIlV8L+mEyP Vt5/E79KBE0gUpa3/Ic7S730Ap1PkEDRPZ4j+UN2G3GQ9soGwe7+7DYJ2pXDnzGXEibw9Fmg2g Y47i2hk1xY00/BYd+6FbQQ4q Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Feb 2021 21:13:56 -0800 IronPort-SDR: IHgh0m4ktUrZnjO/ITULBV7MqgfxfPxlbXRnSQsErkiuMscu4Zn7BdpC8/XKI2PsOsgCAkp8+Y 6n6K8riMPpkEh5q0cEBOW0AW0OQIcvr5xjvtj8W6B1fpe2z2LkpSrMMx2fVxx2GHylvhUS/0N8 gkfFTvhgsdxDfTdmo8twGW/ttIhzd1QNvRqxBZz7zHGEl5Nm85+KqteBlnjTO+wF/V5dDmA2A2 UDrLtVRxEPEaIq4766YInonX1Ya+goDvyrPdAFt6m0iJyju7zB//8ing7mAX8huhhfZbcl5rRt vi4= WDCIronportException: Internal Received: from vm.labspan.wdc.com (HELO vm.sc.wdc.com) ([10.6.137.102]) by uls-op-cesaip01.wdc.com with ESMTP; 21 Feb 2021 21:30:37 -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, hare@suse.de, colyli@suse.de, tj@kernel.org, rdunlap@infradead.org, jack@suse.cz, hch@lst.de Subject: [PATCH V3 4/5] blktrace: fix blk_rq_merge documentation Date: Sun, 21 Feb 2021 21:29:58 -0800 Message-Id: <20210222052959.23155-5-chaitanya.kulkarni@wdc.com> X-Mailer: git-send-email 2.22.1.dirty In-Reply-To: <20210222052959.23155-1-chaitanya.kulkarni@wdc.com> References: <20210222052959.23155-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 Mon Feb 22 05:29:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaitanya Kulkarni X-Patchwork-Id: 12097919 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 0755AC433DB for ; Mon, 22 Feb 2021 05:31:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D28B464DAF for ; Mon, 22 Feb 2021 05:31:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229959AbhBVFbw (ORCPT ); Mon, 22 Feb 2021 00:31:52 -0500 Received: from esa3.hgst.iphmx.com ([216.71.153.141]:29632 "EHLO esa3.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229549AbhBVFbv (ORCPT ); Mon, 22 Feb 2021 00:31:51 -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=1613971910; x=1645507910; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=X4RV9jRF76XZsdN/jdiib9/lI789l3/ugU7F/hAYw2g=; b=mr/a/CwSwosyWxTBClcKvamrO5QN4ySX981gfvokp/nCVQDX55haNmwL FwJfisL+spKV/DsnPopNFSkp5Vxx1J8KzaLRW0LWWJW6U34FSZQDX3vXB koNQCKyuVmzRH55u33KEp7b4Fmv45qfF32VD4bvaiE3UcmnHoJCymDLn8 kA1ZQiR6jlOL1kU0kzIgsurz8mmorw09f1rhQN/Rq0sv4hRpOGeSNxspx N5uLo44s957xHAJicwyDiH+6IFUN74AvxW8tsynW+KGWacStM2INY6Djd l0AIGJSeSaB24srUJyM7t8drsZ8stHvHParllYJ3mzpoyevyCgTPqQ49h A==; IronPort-SDR: 9SXO38M2Q8DQQa9BexSYlqXCr8Dw91wCUm7zJgl5tegIrrCQif1DufVxTaH/8UlkXVLD930xP9 1AlcErKJTZRlmyGpJIbCMlwtPOkg0CwexxjZbRp+29fg0JiabH4+8ahr42YLtV7h5MEGuk0/Eh s0bux+bF9LZFenArjr66YdWmkJjmbq6VSrR1qNcQCmG39krqIOdA4kUcUR8CvbQihbpd0kgHBS D22aEfV8TFyVBcuFMFb9y7JOjye4J6V4J4S5vJR6mdp3nlGgf3xyTHwNGDIUyQw8pLJx44nMv5 9o0= X-IronPort-AV: E=Sophos;i="5.81,196,1610380800"; d="scan'208";a="164956456" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 22 Feb 2021 13:30:45 +0800 IronPort-SDR: OjBMut9v/Up+6nYt7At615UJDZuWsgrbvd6h3byifiu88wTWrz8Yz/9DlEpH7S1rP3KEOLgfe3 ZpaQi54XotO1I5EHvntL/BdMcnReLLsDRBWvIhHeeFWOoqUD8m61lkU52cwcYh8gz7fhXYFHjb rRio/KsCnMus8FydlYy5bcxht+UIdeStS+wnDKg598vz18jTF1GVI4bJ1bGG8+mIKbktfzNjVx ZIpnq2/792gLx3PHdy2nYVAdBofh+biq2WLZS2y9UuNct+OqU4r2tLSx6eOsbdRDsjJo7V/QDD iWBNDR8wfMW8SQ8iGE+y+DcA Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Feb 2021 21:14:05 -0800 IronPort-SDR: g2ONloCcWDi46zc3uzvUM+1hy0YtzGTDT3DW9X2UumKOcAk8wL36viExpNEEpy1Vt/JuWbr8og +j4qOr1P3UopNLsBlAlfCcuBujeulxrtImvEJn55gUWORF/z+QbPTwo71DuyPAMO3ZtDnIb2q6 b2+ZgoCUCxWrafLLWgjK+GK5theeqyWEJr7rD5KQB6pgT+seWHgCwcz3QqdJt+XdL9ATBksQf8 sJKETc+UYSgjDl1YFkG9e8ctE0AAKhJPhxMNvja80+YPn0ZywUnKzesvd3tGrm95Fxa9zpvUE0 3W8= WDCIronportException: Internal Received: from vm.labspan.wdc.com (HELO vm.sc.wdc.com) ([10.6.137.102]) by uls-op-cesaip01.wdc.com with ESMTP; 21 Feb 2021 21:30:45 -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, hare@suse.de, colyli@suse.de, tj@kernel.org, rdunlap@infradead.org, jack@suse.cz, hch@lst.de Subject: [PATCH V3 5/5] block: get rid of the trace rq insert wrapper Date: Sun, 21 Feb 2021 21:29:59 -0800 Message-Id: <20210222052959.23155-6-chaitanya.kulkarni@wdc.com> X-Mailer: git-send-email 2.22.1.dirty In-Reply-To: <20210222052959.23155-1-chaitanya.kulkarni@wdc.com> References: <20210222052959.23155-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 b398dde53af9..ec482e6641ff 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)