From nobody Mon Nov 17 11:47:04 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1603806991; cv=none; d=zohomail.com; s=zohoarc; b=YndDefNKwFXlklMJCCUVKc5l0YaqRQAIW9Cj8ClmEH/fNAi6tey+QHqPRACK/kRyFkzPqRYWyrv9HFBA5ydIAvU/rxIBR1o0pn1T5ElLLNvq4gwUi3gln+qthUb3jFqp1NhGVSZj4rOzOHW/qHQDx7bQaZiycdFTXS9je/IcJhE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603806991; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=WBWP7KBMIQI6YRPnFGQwZbxBBXEh8CIfDLyp5hJxrI0=; b=SP65HweVlhzA3+8x6kLnef3E6AeHdUYBKqB/XDuea3LjLQOUgBGCqXqU7iTbJzGFdOKRVIJizSNdU/Ez8dGji+uiC5Y9tcJHa9DW8mH1zMRY0fJ4bwspyewGncIUYYYnq8NR7hUbFfF1FpWaZkbxnLcxIhF47cb2j1Xx1q3Fmhk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1603806991343543.4110170298093; Tue, 27 Oct 2020 06:56:31 -0700 (PDT) Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-406-akznsdyeNQCSHRniJYwXgg-1; Tue, 27 Oct 2020 09:56:23 -0400 Received: by mail-ej1-f70.google.com with SMTP id z8so940399ejw.3 for ; Tue, 27 Oct 2020 06:56:23 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (237.red-88-18-140.staticip.rima-tde.net. [88.18.140.237]) by smtp.gmail.com with ESMTPSA id h15sm1088318ejf.50.2020.10.27.06.56.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Oct 2020 06:56:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603806989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WBWP7KBMIQI6YRPnFGQwZbxBBXEh8CIfDLyp5hJxrI0=; b=apUdwp9v+1cItCBXebBrkownNvrnlmmVYzh8+voO9452zYm33+D3MjWAAkM3tE5xokPKSc jxL6Uz/0jJt8tq0qe/DQeJxvYWy4FjgChyTKoSZz3M3PALPzYXPsqM3bYy1Dyd1yzDlnkR sMFVhPJ2dv9nuuuLOCVu7/fpCd9Vfs8= X-MC-Unique: akznsdyeNQCSHRniJYwXgg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WBWP7KBMIQI6YRPnFGQwZbxBBXEh8CIfDLyp5hJxrI0=; b=WPz3IMiB9chw2DnRIQcoUpABDhpJpAKjJQLiLu5hFZ8RGalWOApwD5y5EPnitUDj65 +0ZeWvQXH5iyUEb2b48DxPEmOwV8XHLQDdlXdTiatk1urQgnw4KufOobdZkudmghn6hc 7nVQ6NROFhqzTvKUnZ9XtaQ1jix+xtCtCQFrDFb7EK3fwYAWJngKDkH0elHumUqSmEWn TMz9LhTSbW23XVAd8tQ6s+a3wtBsulaIFc9roIcv/fytWQkcPbUqHQF5S/UKGUbK/dt1 v+KOofZrm2zqTiJGt3sm28XePYkSAT3kmRmETNMeZOE7FGAjJjB681WaaQTQq8/KRwDH o/KA== X-Gm-Message-State: AOAM532yAu1nISk1uWp+7lOn1rrutsNJg2lob757qdvJC05kghr3U5MK 3y0On1iZ3dpgUkzBdq+JejKERruVebxY9x2Dk+y9GPfMkOy0PIv1f4S4itOwRwnRiyAD9pQghgL pFLJDz5PYnYRVpQ== X-Received: by 2002:a17:906:5594:: with SMTP id y20mr2650657ejp.196.1603806982306; Tue, 27 Oct 2020 06:56:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwQSZcVQU+o3Hk7rvmzMGq3IlquhDlUEgCoHtlKGQdLsCnzA4YKsJOo+FZo8KxtT0R5NaJ0lA== X-Received: by 2002:a17:906:5594:: with SMTP id y20mr2650638ejp.196.1603806982089; Tue, 27 Oct 2020 06:56:22 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Klaus Jensen , qemu-block@nongnu.org, Fam Zheng , Keith Busch , Eric Auger , Stefan Hajnoczi , Kevin Wolf , Max Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 06/25] block/nvme: Improve nvme_free_req_queue_wait() trace information Date: Tue, 27 Oct 2020 14:55:28 +0100 Message-Id: <20201027135547.374946-7-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201027135547.374946-1-philmd@redhat.com> References: <20201027135547.374946-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) What we want to trace is the block driver state and the queue index. Suggested-by: Stefan Hajnoczi Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Eric Auger Reviewed-by: Stefan Hajnoczi --- block/nvme.c | 2 +- block/trace-events | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/block/nvme.c b/block/nvme.c index 8d74401ae7a..29d2541b911 100644 --- a/block/nvme.c +++ b/block/nvme.c @@ -292,7 +292,7 @@ static NVMeRequest *nvme_get_free_req(NVMeQueuePair *q) =20 while (q->free_req_head =3D=3D -1) { if (qemu_in_coroutine()) { - trace_nvme_free_req_queue_wait(q); + trace_nvme_free_req_queue_wait(q->s, q->index); qemu_co_queue_wait(&q->free_req_queue, &q->lock); } else { qemu_mutex_unlock(&q->lock); diff --git a/block/trace-events b/block/trace-events index 86292f3312b..cc5e2b55cb5 100644 --- a/block/trace-events +++ b/block/trace-events @@ -154,7 +154,7 @@ nvme_rw_done(void *s, int is_write, uint64_t offset, ui= nt64_t bytes, int ret) "s nvme_dsm(void *s, uint64_t offset, uint64_t bytes) "s %p offset 0x%"PRIx64= " bytes %"PRId64"" nvme_dsm_done(void *s, uint64_t offset, uint64_t bytes, int ret) "s %p off= set 0x%"PRIx64" bytes %"PRId64" ret %d" nvme_dma_map_flush(void *s) "s %p" -nvme_free_req_queue_wait(void *q) "q %p" +nvme_free_req_queue_wait(void *s, unsigned q_index) "s %p q #%u" nvme_cmd_map_qiov(void *s, void *cmd, void *req, void *qiov, int entries) = "s %p cmd %p req %p qiov %p entries %d" nvme_cmd_map_qiov_pages(void *s, int i, uint64_t page) "s %p page[%d] 0x%"= PRIx64 nvme_cmd_map_qiov_iov(void *s, int i, void *page, int pages) "s %p iov[%d]= %p pages %d" --=20 2.26.2