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=-18.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,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 18C33C636C9 for ; Mon, 19 Jul 2021 16:45:31 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C677C6108B for ; Mon, 19 Jul 2021 16:45:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C677C6108B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=U6QxCJe/WyudL1kHOjZ8vY3v+PhiNLrkvmZaR1/Coqw=; b=YMvdwJfFcpBpol ni5r0lvypv03bgViBokS+9WqLjQg8Q1Fb/TNKXyqNENt55U4BANiFos6AmyU20Mu+QrTFCJc4ckba KnnACEsrQyKu2Y7fWJ1+qOFRQ1gQnx+Gbuq2u21dbH0auVrVvpfDtBXWUVy/0mQHp1mGdQJbHKYaf WPmiePyV1yUyuYSEXXp/baNdpnszm2bbV2RBWxnhQe582vqHCEXjy+md/I1bbhRtBlUhVj5lA9rrP un+bb0i29UZTJsIG8nQL5+P+f2qT83Wyr2t95Kr+2Nr1GFYj9GaJhcAwmBEQJoL7RJm1kAwzjpUAW EeVrEW952Lt3DCuFarlg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m5WOE-00Ac2Q-NR; Mon, 19 Jul 2021 16:45:10 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m5WNm-00Ac14-WB for linux-nvme@lists.infradead.org; Mon, 19 Jul 2021 16:44:46 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4656E60C40; Mon, 19 Jul 2021 16:44:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626713082; bh=gCarchxrwxzRh+UkXAi+byh+2IIFmWII0I/QQkJr/jk=; h=From:To:Cc:Subject:Date:From; b=En4WGFKNEGVuELdNF/Q/WeABG64xKBSXe1+naIK1b3LSiwl3nusy/IUS9i4j9+GRZ 2WH7OdJqDQ1gGsCHdqlPbKk1prZR3ELibsnp9YJJeUIW3h28Vhd9HOHTzWlPGW3zpz 5+13GQ2ChhxhLE38HdcXttbjDs+FnBbzZtJebl+GKOMv7iQt2CJsAOEdpNxaUWQ6Y8 IQnb+0vDJWeThh71rYs3J0Bx0J6Zz1BwHLVBMV7+dSoMDzZ65s/FZg2JLPaqBxi6EY 8INyZ9B3Gp4u8R1NAUpWEU/rtqGBgArWW4lyf4t6M0wxKnLgM11fMI9nqxKlUHnsWn V0oTAN4MHyrTQ== From: Keith Busch To: linux-nvme@lists.infradead.org, sagi@grimberg.me, hch@lst.de Cc: Keith Busch Subject: [PATCH] nvme: fix nvme_setup_command metadata trace event Date: Mon, 19 Jul 2021 09:44:39 -0700 Message-Id: <20210719164439.2002887-1-kbusch@kernel.org> X-Mailer: git-send-email 2.25.4 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210719_094443_123932_9C8717BA X-CRM114-Status: GOOD ( 10.16 ) X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org The metadata address is set after the trace event, so the trace is not capturing anything useful. Rather than logging the memory address, it's useful to know if the command carries a metadata payload, so change the trace event to log that true/false state instead. Signed-off-by: Keith Busch --- drivers/nvme/host/trace.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/nvme/host/trace.h b/drivers/nvme/host/trace.h index daaf700eae79..35bac7a25422 100644 --- a/drivers/nvme/host/trace.h +++ b/drivers/nvme/host/trace.h @@ -56,7 +56,7 @@ TRACE_EVENT(nvme_setup_cmd, __field(u8, fctype) __field(u16, cid) __field(u32, nsid) - __field(u64, metadata) + __field(bool, metadata) __array(u8, cdw10, 24) ), TP_fast_assign( @@ -66,13 +66,13 @@ TRACE_EVENT(nvme_setup_cmd, __entry->flags = cmd->common.flags; __entry->cid = cmd->common.command_id; __entry->nsid = le32_to_cpu(cmd->common.nsid); - __entry->metadata = le64_to_cpu(cmd->common.metadata); + __entry->metadata = !!blk_integrity_rq(req); __entry->fctype = cmd->fabrics.fctype; __assign_disk_name(__entry->disk, req->rq_disk); memcpy(__entry->cdw10, &cmd->common.cdw10, sizeof(__entry->cdw10)); ), - TP_printk("nvme%d: %sqid=%d, cmdid=%u, nsid=%u, flags=0x%x, meta=0x%llx, cmd=(%s %s)", + TP_printk("nvme%d: %sqid=%d, cmdid=%u, nsid=%u, flags=0x%x, meta=0x%x, cmd=(%s %s)", __entry->ctrl_id, __print_disk_name(__entry->disk), __entry->qid, __entry->cid, __entry->nsid, __entry->flags, __entry->metadata, -- 2.25.4 _______________________________________________ Linux-nvme mailing list Linux-nvme@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-nvme