From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755376AbeDZUZX (ORCPT ); Thu, 26 Apr 2018 16:25:23 -0400 Received: from mx2.suse.de ([195.135.220.15]:47721 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754357AbeDZUZW (ORCPT ); Thu, 26 Apr 2018 16:25:22 -0400 From: Johannes Thumshirn To: Keith Busch Cc: Linux NVMe Mailinglist , Linux Kernel Mailinglist , Christoph Hellwig , Sagi Grimberg , Johannes Thumshirn Subject: [PATCH v2] nvme: change order of qid and cmdid in completion trace Date: Thu, 26 Apr 2018 14:25:15 -0600 Message-Id: <20180426202515.20206-1-jthumshirn@suse.de> X-Mailer: git-send-email 2.16.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Keith reported that command submission and command completion tracepoints have the order of the cmdid and qid fields swapped. While it isn't easily possible to change the command submission tracepoint, as there is a regression test parsing it in blktests we can swap the command completion tracepoint to have the fields aligned. Signed-off-by: Johannes Thumshirn Reported-by: Keith Busch Reviewed-by: Jens Axboe --- * Changes to v1: - Changed two typos Jens spotted - Add Jens' R-b --- drivers/nvme/host/trace.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/nvme/host/trace.h b/drivers/nvme/host/trace.h index ea91fccd1bc0..01390f0e1671 100644 --- a/drivers/nvme/host/trace.h +++ b/drivers/nvme/host/trace.h @@ -148,8 +148,8 @@ TRACE_EVENT(nvme_complete_rq, __entry->flags = nvme_req(req)->flags; __entry->status = nvme_req(req)->status; ), - TP_printk("cmdid=%u, qid=%d, res=%llu, retries=%u, flags=0x%x, status=%u", - __entry->cid, __entry->qid, __entry->result, + TP_printk("qid=%d, cmdid=%u, res=%llu, retries=%u, flags=0x%x, status=%u", + __entry->qid, __entry->cid, __entry->result, __entry->retries, __entry->flags, __entry->status) ); -- 2.16.3