From patchwork Fri Mar 25 08:19:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "(Exiting) Baolin Wang" X-Patchwork-Id: 8669071 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B8D7AC0553 for ; Fri, 25 Mar 2016 08:20:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 51E3B20373 for ; Fri, 25 Mar 2016 08:20:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EA8C220268 for ; Fri, 25 Mar 2016 08:20:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752514AbcCYIUV (ORCPT ); Fri, 25 Mar 2016 04:20:21 -0400 Received: from mail-pf0-f173.google.com ([209.85.192.173]:35050 "EHLO mail-pf0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752146AbcCYIUS (ORCPT ); Fri, 25 Mar 2016 04:20:18 -0400 Received: by mail-pf0-f173.google.com with SMTP id n5so77885801pfn.2 for ; Fri, 25 Mar 2016 01:20:17 -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; bh=sXFTUBH7W1OR48gQBjRN62yhHvik5XswokENCNR8edo=; b=BAvwiIdT0xKHotdL7b72FsP7IPSsMwhrkteOrWOd6l8nr546doe5iTB2j5pYht9Y8w zNps4TaSTWI6Xka28hNyeliiqw4vSpj9tCXX0PDuHCpoW+EuGU/rmigUpVzuxg6y3P29 cUjAN2WaL8VxMVK8JSpX8pZqK40otD7sAJASQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=sXFTUBH7W1OR48gQBjRN62yhHvik5XswokENCNR8edo=; b=HIOkhBob645dJaoWbXfd1nFZChLopMdreaIPWoK6mCZFiOVGycZBMq7wE0elXkAiVV RCrLABt1OZfifKG3JFYNfmMkVsS+F6vPAwRO0RXTLqepGhaa0xnCHek5ZAQOTIbBID+U JH3aYPpfRTvLJfhF8EEDqyrsVrNRT1ydhucBnRU3bYi6vRSch5QB+DhtUf/SfrGQeRVg DaJFtghFPN6yluck11zdNfAZdil66La6vgu+bSTDdbzbpwQHlr+1sJ+nE4A59FppcrNq VjK5RJ2zo+AJro19p6TV9ytF8M/RwTDy5JLRxp2HOnYsDm6SgiT2jIB1OMaL8kVxbEJr CKZw== X-Gm-Message-State: AD7BkJJNbUB5jzh46PC5xsZhQErbq4vkgTjPZUOguz0U9xqwG+XPQEBDizcUirX3p2IkTrFg X-Received: by 10.98.66.155 with SMTP id h27mr19182813pfd.91.1458894017136; Fri, 25 Mar 2016 01:20:17 -0700 (PDT) Received: from baolinwangubtpc.spreadtrum.com ([175.111.195.49]) by smtp.gmail.com with ESMTPSA id e6sm14732180pfj.71.2016.03.25.01.20.11 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 25 Mar 2016 01:20:16 -0700 (PDT) From: Baolin Wang To: ulf.hansson@linaro.org, rostedt@goodmis.org, mingo@redhat.com Cc: adrian.hunter@intel.com, yangbo.lu@freescale.com, akpm@linux-foundation.org, JBottomley@Odin.com, lporzio@micron.com, jonathanh@nvidia.com, grundler@chromium.org, axboe@fb.com, fabf@skynet.be, yunpeng.gao@intel.com, dan.j.williams@intel.com, rabin.vincent@axis.com, chuanxiao.dong@intel.com, shawn.lin@rock-chips.com, heiko@sntech.de, dianders@chromium.org, david@protonic.nl, broonie@kernel.org, linus.walleij@linaro.org, takahiro.akashi@linaro.org, baolin.wang@linaro.org, linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org Subject: [PATCH v2] mmc: Provide tracepoints for request processing Date: Fri, 25 Mar 2016 16:19:35 +0800 Message-Id: <7dff940d08f26e9994557d94652f581ad84899e0.1458893798.git.baolin.wang@linaro.org> X-Mailer: git-send-email 1.7.9.5 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch provides some tracepoints for the lifecycle of a request from fetching to completion to help with performance analysis of MMC subsystem. Changes since v1: - Remove the redundant typecasts. - Fix the bug that could cause a system crash. Signed-off-by: Baolin Wang --- drivers/mmc/card/block.c | 6 ++ drivers/mmc/card/queue.c | 4 + drivers/mmc/core/core.c | 5 ++ include/trace/events/mmc.h | 178 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 193 insertions(+) create mode 100644 include/trace/events/mmc.h diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index fe207e5..d372a2d 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -46,6 +46,9 @@ #include "queue.h" +#define CREATE_TRACE_POINTS +#include + MODULE_ALIAS("mmc:block"); #ifdef MODULE_PARAM_PREFIX #undef MODULE_PARAM_PREFIX @@ -1709,6 +1712,7 @@ static u8 mmc_blk_prep_packed_list(struct mmc_queue *mq, struct request *req) if (phys_segments > max_phys_segs) break; + trace_mmc_block_packed_req(next); list_add_tail(&next->queuelist, &mqrq->packed->list); cur = next; reqs++; @@ -1870,6 +1874,7 @@ static int mmc_blk_end_packed_req(struct mmc_queue_req *mq_rq) } list_del_init(&prq->queuelist); blk_end_request(prq, 0, blk_rq_bytes(prq)); + trace_mmc_block_req_done(prq); i++; } @@ -1985,6 +1990,7 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *rqc) } else { ret = blk_end_request(req, 0, brq->data.bytes_xfered); + trace_mmc_block_req_done(req); } /* diff --git a/drivers/mmc/card/queue.c b/drivers/mmc/card/queue.c index 6f4323c..d0388cf 100644 --- a/drivers/mmc/card/queue.c +++ b/drivers/mmc/card/queue.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include @@ -64,6 +65,9 @@ static int mmc_queue_thread(void *d) mq->mqrq_cur->req = req; spin_unlock_irq(q->queue_lock); + if (req) + trace_mmc_queue_fetch(req); + if (req || mq->mqrq_prev->req) { set_current_state(TASK_RUNNING); cmd_flags = req ? req->cmd_flags : 0; diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index f95d41f..cb575ca 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include @@ -152,6 +153,8 @@ void mmc_request_done(struct mmc_host *host, struct mmc_request *mrq) led_trigger_event(host->led, LED_OFF); + trace_mmc_request_done(host, mrq); + if (mrq->sbc) { pr_debug("%s: req done : %d: %08x %08x %08x %08x\n", mmc_hostname(host), mrq->sbc->opcode, @@ -229,6 +232,8 @@ static int mmc_start_request(struct mmc_host *host, struct mmc_request *mrq) if (mmc_card_removed(host->card)) return -ENOMEDIUM; + trace_mmc_request_start(host, mrq); + if (mrq->sbc) { pr_debug("<%s: starting CMD%u arg %08x flags %08x>\n", mmc_hostname(host), mrq->sbc->opcode, diff --git a/include/trace/events/mmc.h b/include/trace/events/mmc.h new file mode 100644 index 0000000..e165ce7 --- /dev/null +++ b/include/trace/events/mmc.h @@ -0,0 +1,178 @@ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM mmc + +#if !defined(_TRACE_MMC_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_MMC_H + +#include +#include +#include +#include + +DECLARE_EVENT_CLASS(mmc_request, + + TP_PROTO(struct request *rq), + + TP_ARGS(rq), + + TP_STRUCT__entry( + __field(sector_t, sector) + __field(unsigned int, data_len) + __field(int, cmd_dir) + __field(struct request *, rq) + ), + + TP_fast_assign( + __entry->sector = blk_rq_pos(rq); + __entry->data_len = blk_rq_bytes(rq); + __entry->cmd_dir = rq_data_dir(rq); + __entry->rq = rq; + ), + + TP_printk("struct request[%p]:sector=%lu rw=%d len=%u", + __entry->rq, (unsigned long)__entry->sector, + __entry->cmd_dir, __entry->data_len) +); + +DEFINE_EVENT(mmc_request, mmc_queue_fetch, + + TP_PROTO(struct request *rq), + + TP_ARGS(rq) + +); + +DEFINE_EVENT(mmc_request, mmc_block_packed_req, + + TP_PROTO(struct request *rq), + + TP_ARGS(rq) + +); + +DEFINE_EVENT(mmc_request, mmc_block_req_done, + + TP_PROTO(struct request *rq), + + TP_ARGS(rq) + +); + +TRACE_EVENT(mmc_request_start, + + TP_PROTO(struct mmc_host *host, struct mmc_request *mrq), + + TP_ARGS(host, mrq), + + TP_STRUCT__entry( + __field(u32, cmd_opcode) + __field(u32, cmd_arg) + __field(unsigned int, cmd_flags) + __field(u32, stop_opcode) + __field(u32, stop_arg) + __field(unsigned int, stop_flags) + __field(u32, sbc_opcode) + __field(u32, sbc_arg) + __field(unsigned int, sbc_flags) + __field(unsigned int, blocks) + __field(unsigned int, blksz) + __field(unsigned int, data_flags) + __field(struct mmc_request *, mrq) + __string(name, mmc_hostname(host)) + ), + + TP_fast_assign( + __entry->cmd_opcode = mrq->cmd->opcode; + __entry->cmd_arg = mrq->cmd->arg; + __entry->cmd_flags = mrq->cmd->flags; + __entry->stop_opcode = mrq->stop ? mrq->stop->opcode : 0; + __entry->stop_arg = mrq->stop ? mrq->stop->arg : 0; + __entry->stop_flags = mrq->stop ? mrq->stop->flags : 0; + __entry->sbc_opcode = mrq->sbc ? mrq->sbc->opcode : 0; + __entry->sbc_arg = mrq->sbc ? mrq->sbc->arg : 0; + __entry->sbc_flags = mrq->sbc ? mrq->sbc->flags : 0; + __entry->blksz = mrq->data ? mrq->data->blksz : 0; + __entry->blocks = mrq->data ? mrq->data->blocks : 0; + __entry->data_flags = mrq->data ? mrq->data->flags : 0; + __assign_str(name, mmc_hostname(host)); + __entry->mrq = mrq; + ), + + TP_printk("%s: start struct mmc_request[%p]: " + "cmd_opcode=%u cmd_arg=0x%x cmd_flags=0x%x " + "stop_opcode=%u stop_arg=0x%x stop_flags=0x%x " + "sbc_opcode=%u sbc_arg=0x%x sbc_flags=0x%x " + "blocks=%u blksz=%u data_flags=0x%x", + __get_str(name), __entry->mrq, + __entry->cmd_opcode, __entry->cmd_arg, __entry->cmd_flags, + __entry->stop_opcode, __entry->stop_arg, __entry->stop_flags, + __entry->sbc_opcode, __entry->sbc_arg, __entry->sbc_flags, + __entry->blocks, __entry->blksz, __entry->data_flags) +); + +TRACE_EVENT(mmc_request_done, + + TP_PROTO(struct mmc_host *host, struct mmc_request *mrq), + + TP_ARGS(host, mrq), + + TP_STRUCT__entry( + __field(u32, cmd_opcode) + __field(int, cmd_err) + __array(u32, cmd_resp, 4) + __field(u32, stop_opcode) + __field(int, stop_err) + __array(u32, stop_resp, 4) + __field(u32, sbc_opcode) + __field(int, sbc_err) + __array(u32, sbc_resp, 4) + __field(unsigned int, bytes_xfered) + __field(int, data_err) + __field(struct mmc_request *, mrq) + __string(name, mmc_hostname(host)) + ), + + TP_fast_assign( + __entry->cmd_opcode = mrq->cmd->opcode; + __entry->cmd_err = mrq->cmd->error; + memcpy(__entry->cmd_resp, mrq->cmd->resp, 4); + __entry->stop_opcode = mrq->stop ? mrq->stop->opcode : 0; + __entry->stop_err = mrq->stop ? mrq->stop->error : 0; + __entry->stop_resp[0] = mrq->stop ? mrq->stop->resp[0] : 0; + __entry->stop_resp[1] = mrq->stop ? mrq->stop->resp[1] : 0; + __entry->stop_resp[2] = mrq->stop ? mrq->stop->resp[2] : 0; + __entry->stop_resp[3] = mrq->stop ? mrq->stop->resp[3] : 0; + __entry->sbc_opcode = mrq->sbc ? mrq->sbc->opcode : 0; + __entry->sbc_err = mrq->sbc ? mrq->sbc->error : 0; + __entry->sbc_resp[0] = mrq->sbc ? mrq->sbc->resp[0] : 0; + __entry->sbc_resp[1] = mrq->sbc ? mrq->sbc->resp[1] : 0; + __entry->sbc_resp[2] = mrq->sbc ? mrq->sbc->resp[2] : 0; + __entry->sbc_resp[3] = mrq->sbc ? mrq->sbc->resp[3] : 0; + __entry->bytes_xfered = mrq->data ? mrq->data->bytes_xfered : 0; + __entry->data_err = mrq->data ? mrq->data->error : 0; + __assign_str(name, mmc_hostname(host)); + __entry->mrq = mrq; + ), + + TP_printk("%s: end struct mmc_request[%p]: " + "cmd_opcode=%u cmd_err=%d cmd_resp=0x%x 0x%x 0x%x 0x%x " + "stop_opcode=%u stop_err=%d stop_resp=0x%x 0x%x 0x%x 0x%x " + "sbc_opcode=%u sbc_err=%d sbc_resp=0x%x 0x%x 0x%x 0x%x " + "bytes_xfered=%u data_err=%d", + __get_str(name), __entry->mrq, + __entry->cmd_opcode, __entry->cmd_err, + __entry->cmd_resp[0], __entry->cmd_resp[1], + __entry->cmd_resp[2], __entry->cmd_resp[3], + __entry->stop_opcode, __entry->stop_err, + __entry->stop_resp[0], __entry->stop_resp[1], + __entry->stop_resp[2], __entry->stop_resp[3], + __entry->sbc_opcode, __entry->sbc_err, + __entry->sbc_resp[0], __entry->sbc_resp[1], + __entry->sbc_resp[2], __entry->sbc_resp[3], + __entry->bytes_xfered, __entry->data_err) +); + +#endif /* _TRACE_MMC_H */ + +/* This part must be outside protection */ +#include