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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DFA46C433EF for ; Fri, 15 Jul 2022 21:33:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231651AbiGOVdw (ORCPT ); Fri, 15 Jul 2022 17:33:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39700 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230236AbiGOVdp (ORCPT ); Fri, 15 Jul 2022 17:33:45 -0400 X-Greylist: delayed 179 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Fri, 15 Jul 2022 14:33:43 PDT Received: from mo4-p01-ob.smtp.rzone.de (mo4-p01-ob.smtp.rzone.de [85.215.255.53]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4BF6C6439 for ; Fri, 15 Jul 2022 14:33:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1657920455; s=strato-dkim-0002; d=iokpp.de; h=Message-Id:Date:Subject:Cc:To:From:Cc:Date:From:Subject:Sender; bh=ftOZyHjc9fR4P7242V8ktD8hYYx3sxdAtQDS71sPEmA=; b=DO/MC0H/eiSQcg5H6jggad38h188504b5uxud6U4v9MEVXubNLQJHjIzjvXSbOgQvW YPGjOa0baJjnuBsQBFA/c6SiEJhmZeX1Pnp3xqELJBcwB/FvnZPDPVdZV71HkpIFPFT2 XjPbfnWdoKXV9daWmuiMZ3wS5jYwt2C/aG72m+FKWpUSLIu1nETLlVMs3lwmk1p3P8QG nM7vyh+DM0hW5BXm3xIYlUUbnyJ0Dw4NC03UBE3yC3eoRAkMZasFTL5bEzIK5HF/jjvR hzKRrxixJw00SLF8ZHksFJp5PoSq/RE+OO8VS/AJqQv5W7BbgRWnRLdrGbiWmwrPnyll llgw== Authentication-Results: strato.com; dkim=none X-RZG-AUTH: ":LmkFe0i9dN8c2t4QQyGBB/NDXvjDB6pBSedrgBzPc9DUyubU4DD1QLj68UeUr1+U1UzWvoOJrrSACWlJOqXdPodE67SDBKlmD1RX4Q==" X-RZG-CLASS-ID: mo00 Received: from linux.speedport.ip by smtp.strato.de (RZmta 47.47.0 AUTH) with ESMTPSA id z88edfy6FLRYECh (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Fri, 15 Jul 2022 23:27:34 +0200 (CEST) From: Bean Huo To: kbusch@kernel.org, axboe@fb.com, hch@lst.de, sagi@grimberg.me, linux-nvme@lists.infradead.org Cc: linux-kernel@vger.kernel.org, beanhuo@micron.com Subject: [PATCH v2] nvme: Use command_id instead of req->tag in trace_nvme_complete_rq() Date: Fri, 15 Jul 2022 23:27:21 +0200 Message-Id: <20220715212721.332857-1-beanhuo@iokpp.de> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bean Huo Use command_id instead of req->tag in trace_nvme_complete_rq(), because of commit e7006de6c238 ("nvme: code command_id with a genctr for use authentication after release"), cmd->common.command_id is set to ((genctl & 0xf)< 12 | req->tag), no longer req->tag, which makes cid in trace_nvme_complete_rq and trace_nvme_setup_cmd are not the same. Fixes: e7006de6c238 ("nvme: code command_id with a genctr for use authentication after release") Signed-off-by: Bean Huo --- V1 -- V2: Add fixes tag. --- drivers/nvme/host/trace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/nvme/host/trace.h b/drivers/nvme/host/trace.h index b5f85259461a..fe8c90080731 100644 --- a/drivers/nvme/host/trace.h +++ b/drivers/nvme/host/trace.h @@ -98,7 +98,7 @@ TRACE_EVENT(nvme_complete_rq, TP_fast_assign( __entry->ctrl_id = nvme_req(req)->ctrl->instance; __entry->qid = nvme_req_qid(req); - __entry->cid = req->tag; + __entry->cid = nvme_req(req)->cmd->common.command_id; __entry->result = le64_to_cpu(nvme_req(req)->result.u64); __entry->retries = nvme_req(req)->retries; __entry->flags = nvme_req(req)->flags; -- 2.34.1