From nobody Mon Feb 9 19:52:25 2026 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=1603964026; cv=none; d=zohomail.com; s=zohoarc; b=SjzLZUlz9D5AtY4xi02UJyIGa2pk7zIKWpawehfxmkeayeMmDnsWIlj1NJXTBaua/IZHh+r7ADprA0t2ZBH+MPArvYKIUfEdLMfevWwFOTClCeD0ku5Zsb5DY8LlrpU450xO93DtyRgKmdn2kAfd9M50OZZwO0pXiaTn/NhVvSM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603964026; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=/V2bopfrgs5z9fXdSqKgAQr3mfETDBQSgYOoqY9Jixw=; b=mp6/zSBNvGa8oHPHd7qed6EFjvoZtisJWMb2kOU3IuOPWYdSJp6GIZilS5u4omZ8S++ZnyN2rrEMFuJGt/cM/j2QL12lwHZ3apiPF+9Devx/hfDUtA7Js/1G/6HPTsEZGH4YSRLSuu7KYZYvbrTw8E6sgrYGg308sl8RnbgNDvE= 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 1603964026723488.41990246476564; Thu, 29 Oct 2020 02:33:46 -0700 (PDT) Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-592-gfMvf3CKMsuKGSFMQFa7hw-1; Thu, 29 Oct 2020 05:33:43 -0400 Received: by mail-ej1-f72.google.com with SMTP id x12so918613eju.22 for ; Thu, 29 Oct 2020 02:33:42 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id x2sm1176316edr.65.2020.10.29.02.33.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Oct 2020 02:33:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603964025; 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=/V2bopfrgs5z9fXdSqKgAQr3mfETDBQSgYOoqY9Jixw=; b=HMJwztie6yqZ2oBGfIcEZbwyQyVq8RjijRhiet9pLHhLnDb/5fxdFTP8NhBFTB7ZNXcfWO LmnZxUBcnX2CFfo9Dhq01xXIupKB401DrB/yadVX24aqgLk45WTVkDeQm2EIW60Jwyn4sY +LW+ExVOi65vm1VofLpBGf8Kgecuw5g= X-MC-Unique: gfMvf3CKMsuKGSFMQFa7hw-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=/V2bopfrgs5z9fXdSqKgAQr3mfETDBQSgYOoqY9Jixw=; b=V/lM647rWn66t244Pce71B4PQLDuDL0/vQ2UcrhvcTHlMFjI7y2oU2Qb4Q+rxxOk3I ePr8AlKhjRWUoJyR2ox6PBhyuXSvg0BfGHj3GlO21pWOXZ+dyh/l3mcSyumCKxbtcAXq 2m2/XxR2dnBbLzl5iRS1+wNfK6OKDE4f/b7BGK2HvUjbg41pZ6rKni+AB3xcuTcBZ7Z3 T28dh25JNnTttlwdUxASbKPO3QLzlU6jkLuWQpeTqYhLr4OJDCvZDEzUkRQAoQmgejyT PTdUnxNrRFikZb4mFWcTup/l7YZRADUGtBj4iEizmE8+RoaHA7GmgiIiVdPl1DgUlsQt QeVg== X-Gm-Message-State: AOAM532tcf/CayN3tzzNsSfHIJ5FfWGJHgebtEaoW6aoPFI9gxW3SuqR Qj6+qDtKYX/yizGLpAGqY5PMDwM3+SUPp/0uv9EvPvb+eYNG5tsfs1cjFZjHk3VuVWgQpmbx/4B nrSbZIiqADLr4JA== X-Received: by 2002:aa7:c792:: with SMTP id n18mr2975746eds.209.1603964021762; Thu, 29 Oct 2020 02:33:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxYpESBUBbOB5lW/BGGS4fuMQ3uYbb/gclHdzF0P/kIYuQNRO6rAfDaJcaq0s9OfNJKAYveQQ== X-Received: by 2002:aa7:c792:: with SMTP id n18mr2975728eds.209.1603964021606; Thu, 29 Oct 2020 02:33:41 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Stefan Hajnoczi , Kevin Wolf , Klaus Jensen , Eric Auger , Max Reitz , Fam Zheng , Keith Busch , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-5.2 v2 06/25] block/nvme: Improve nvme_free_req_queue_wait() trace information Date: Thu, 29 Oct 2020 10:32:47 +0100 Message-Id: <20201029093306.1063879-7-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201029093306.1063879-1-philmd@redhat.com> References: <20201029093306.1063879-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 Reviewed-by: Eric Auger Reviewed-by: Stefan Hajnoczi Tested-by: Eric Auger Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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