From nobody Mon Feb 9 01:20:49 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1605552623; cv=none; d=zohomail.com; s=zohoarc; b=UL5QXZlvdQMUSDNIcFPbt4SyIYFCGkBbOONeFt3tuLrSkfFjF/+6A6PKTxGzTpjD7SvC0ezHsab6FgARXPSGxXnEfm4+K5ek/bXxdlh001Ei1ZGGppRUwsTSkzgSm9LYX7MJ6eI+RlhjQTGGG1xEJ6E6C2/BivAuYm/1gjlQ+cA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605552623; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=UoQ+fCC4BRbUGZsPTAxrdSyDJoL9MZeZDvijtjlnmX4=; b=WHwPyjsR9Ixc3XSB3OpwWWBALpvDTJF0nV5UL4Y5+5NgItyE65f7dJZrJZFapEM1g3IjHFacZ3/3OloT4vRwLPHGwV+jTlK6GCtYs41IABN0WUFcvE36IZbIu5MMzWT6Mqi37hNAkpHj+gOL/op5At7JRRF6yyOLCyfCdZPdTWQ= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605552622979243.23406895009703; Mon, 16 Nov 2020 10:50:22 -0800 (PST) Received: from localhost ([::1]:60932 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1keja1-0004NW-PK for importer@patchew.org; Mon, 16 Nov 2020 13:50:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37534) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kejHd-0003Sy-33 for qemu-devel@nongnu.org; Mon, 16 Nov 2020 13:31:22 -0500 Received: from mx2.suse.de ([195.135.220.15]:34664) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kejHa-0006BJ-H0 for qemu-devel@nongnu.org; Mon, 16 Nov 2020 13:31:20 -0500 Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id DC276B06A; Mon, 16 Nov 2020 18:31:15 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Hannes Reinecke To: Paolo Bonzini Subject: [PATCH 3/3] scsi: add tracing for SG_IO commands Date: Mon, 16 Nov 2020 19:31:14 +0100 Message-Id: <20201116183114.55703-4-hare@suse.de> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20201116183114.55703-1-hare@suse.de> References: <20201116183114.55703-1-hare@suse.de> Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=195.135.220.15; envelope-from=hare@suse.de; helo=mx2.suse.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/16 12:53:11 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x (no timestamps) [generic] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org, Hannes Reinecke Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add tracepoints for SG_IO commands to allow for debugging of SG_IO commands. Signed-off-by: Hannes Reinecke --- hw/scsi/scsi-disk.c | 3 ++- hw/scsi/scsi-generic.c | 8 +++++++- hw/scsi/trace-events | 4 ++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index 2959526b52..dd23a38d6a 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -2768,7 +2768,8 @@ static BlockAIOCB *scsi_block_do_sgio(SCSIBlockReq *r= eq, io_header->timeout =3D s->qdev.io_timeout * 1000; io_header->usr_ptr =3D r; io_header->flags |=3D SG_FLAG_DIRECT_IO; - + trace_scsi_disk_aio_sgio_command(r->req.tag, req->cdb[0], lba, + nb_logical_blocks, io_header->timeout= ); aiocb =3D blk_aio_ioctl(s->qdev.conf.blk, SG_IO, io_header, cb, opaque= ); assert(aiocb !=3D NULL); return aiocb; diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c index e07924b3d7..8687336438 100644 --- a/hw/scsi/scsi-generic.c +++ b/hw/scsi/scsi-generic.c @@ -128,6 +128,8 @@ static int execute_command(BlockBackend *blk, r->io_header.usr_ptr =3D r; r->io_header.flags |=3D SG_FLAG_DIRECT_IO; =20 + trace_scsi_generic_aio_sgio_command(r->req.tag, r->req.cmd.buf[0], + r->io_header.timeout); r->req.aiocb =3D blk_aio_ioctl(blk, SG_IO, &r->io_header, complete, r); if (r->req.aiocb =3D=3D NULL) { return -EIO; @@ -524,8 +526,12 @@ int scsi_SG_IO_FROM_DEV(BlockBackend *blk, uint8_t *cm= d, uint8_t cmd_size, io_header.sbp =3D sensebuf; io_header.timeout =3D timeout * 1000; =20 + trace_scsi_generic_ioctl_sgio_command(cmd[0], io_header.timeout); ret =3D blk_ioctl(blk, SG_IO, &io_header); - if (ret < 0 || io_header.driver_status || io_header.host_status) { + if (ret < 0 || io_header.status || + io_header.driver_status || io_header.host_status) { + trace_scsi_generic_ioctl_sgio_done(cmd[0], ret, io_header.status, + io_header.host_status); return -1; } return 0; diff --git a/hw/scsi/trace-events b/hw/scsi/trace-events index 0e0aa9847d..9788661bfd 100644 --- a/hw/scsi/trace-events +++ b/hw/scsi/trace-events @@ -331,6 +331,7 @@ scsi_disk_emulate_command_UNKNOWN(int cmd, const char *= name) "Unknown SCSI comma scsi_disk_dma_command_READ(uint64_t lba, uint32_t len) "Read (sector %" PR= Id64 ", count %u)" scsi_disk_dma_command_WRITE(const char *cmd, uint64_t lba, int len) "Write= %s(sector %" PRId64 ", count %u)" scsi_disk_new_request(uint32_t lun, uint32_t tag, const char *line) "Comma= nd: lun=3D%d tag=3D0x%x data=3D%s" +scsi_disk_aio_sgio_command(uint32_t tag, uint8_t cmd, uint64_t lba, int le= n, uint32_t timeout) "disk aio sgio: tag=3D0x%x cmd=3D0x%x (sector %" PRId6= 4 ", count %d) timeout=3D%u" =20 # scsi-generic.c scsi_generic_command_complete_noio(void *req, uint32_t tag, int statuc) "C= ommand complete %p tag=3D0x%x status=3D%d" @@ -342,3 +343,6 @@ scsi_generic_write_data(uint32_t tag) "scsi_write_data = tag=3D0x%x" scsi_generic_send_command(const char *line) "Command: data=3D%s" scsi_generic_realize_type(int type) "device type %d" scsi_generic_realize_blocksize(int blocksize) "block size %d" +scsi_generic_aio_sgio_command(uint32_t tag, uint8_t cmd, uint32_t timeout)= "generic aio sgio: tag=3D0x%x cmd=3D0x%x timeout=3D%u" +scsi_generic_ioctl_sgio_command(uint8_t cmd, uint32_t timeout) "generic io= ctl sgio: cmd=3D0x%x timeout=3D%u" +scsi_generic_ioctl_sgio_done(uint8_t cmd, int ret, uint8_t status, uint8_t= host_status) "generic ioctl sgio: cmd=3D0x%x ret=3D%d status=3D0x%x host_s= tatus=3D0x%x" --=20 2.16.4