From patchwork Fri Apr 15 13:24:00 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 91373 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C806BB6F7E for ; Fri, 15 Apr 2011 23:24:46 +1000 (EST) Received: from localhost ([::1]:41816 helo=lists2.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QAj0t-0007z4-V2 for incoming@patchwork.ozlabs.org; Fri, 15 Apr 2011 09:24:43 -0400 Received: from eggs.gnu.org ([140.186.70.92]:44852) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QAj0W-0007vP-5a for qemu-devel@nongnu.org; Fri, 15 Apr 2011 09:24:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QAj0V-0001cz-9a for qemu-devel@nongnu.org; Fri, 15 Apr 2011 09:24:20 -0400 Received: from mail-px0-f174.google.com ([209.85.212.174]:60920) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QAj0V-0001ci-52 for qemu-devel@nongnu.org; Fri, 15 Apr 2011 09:24:19 -0400 Received: by mail-px0-f174.google.com with SMTP id 15so3004423pxi.33 for ; Fri, 15 Apr 2011 06:24:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=83NDjUaVCtEJUQw8Y+l5UeNaHfM3vFOurHyeXldS53k=; b=AqRJgViapBZ0mdNxY+eTka8ZsOc9F1c2LlwahsmbXlzlk+nfVy6L96AAA5t9SSqkSV 3dOMHo8JuylMVG28QTcFo3K7fH6gaitxKdSYpy2+5/ofwtor9fiG9OLNZGCNxkO5Bqft NKwZ71DHNIdSCzJxeeU/ig9WaihA9WSc/1I+c= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; b=KfwFSgI/1ya4QLxShCkoHrhIKdKosprNc3lW/HBFJ6eh+R6kcGYp4xVt/YT9L8F2Ty re80Mvh15c5nLXewdzdVJbv55hky6ojizIA52aMRmiQ/4I5QszpH06Y8sELjIT5LwSYh DFS+92Q/YTcoh3Z9S9xJwDnzeDSdk192DqH8Y= Received: by 10.68.54.1 with SMTP id f1mr2043810pbp.302.1302873858783; Fri, 15 Apr 2011 06:24:18 -0700 (PDT) Received: from localhost.localdomain (93-34-184-88.ip51.fastwebnet.it [93.34.184.88]) by mx.google.com with ESMTPS id n7sm439878pbi.2.2011.04.15.06.24.16 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 15 Apr 2011 06:24:17 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 15 Apr 2011 15:24:00 +0200 Message-Id: <1302873840-17161-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.4 In-Reply-To: <1302873840-17161-1-git-send-email-pbonzini@redhat.com> References: <1302873840-17161-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.212.174 Subject: [Qemu-devel] [PATCH 2/2] add tracing of scsi requests X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini --- hw/scsi-bus.c | 45 ++++++++++++++++++++++++++------------------- trace-events | 6 ++++++ 2 files changed, 32 insertions(+), 19 deletions(-) diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index ceeb4ec..6b306a7 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -4,6 +4,7 @@ #include "scsi-defs.h" #include "qdev.h" #include "blockdev.h" +#include "trace.h" static char *scsibus_get_fw_dev_path(DeviceState *dev); @@ -141,6 +142,7 @@ SCSIRequest *scsi_req_alloc(size_t size, SCSIDevice *d, uint32_t tag, uint32_t l req->lun = lun; req->status = -1; req->enqueued = true; + trace_scsi_req_alloc(req->dev->id, req->lun, req->tag); QTAILQ_INSERT_TAIL(&d->requests, req, next); return req; } @@ -159,6 +161,7 @@ SCSIRequest *scsi_req_find(SCSIDevice *d, uint32_t tag) static void scsi_req_dequeue(SCSIRequest *req) { + trace_scsi_req_dequeue(req->dev->id, req->lun, req->tag); if (req->enqueued) { QTAILQ_REMOVE(&req->dev->requests, req, next); req->enqueued = false; @@ -195,6 +198,7 @@ static int scsi_req_length(SCSIRequest *req, uint8_t *cmd) req->cmd.len = 12; break; default: + trace_scsi_req_parse_bad(req->dev->id, req->lun, req->tag, cmd[0]); return -1; } @@ -377,25 +381,7 @@ static uint64_t scsi_req_lba(SCSIRequest *req) return lba; } -int scsi_req_parse(SCSIRequest *req, uint8_t *buf) -{ - int rc; - - if (req->dev->type == TYPE_TAPE) { - rc = scsi_req_stream_length(req, buf); - } else { - rc = scsi_req_length(req, buf); - } - if (rc != 0) - return rc; - - memcpy(req->cmd.buf, buf, req->cmd.len); - scsi_req_xfer_mode(req); - req->cmd.lba = scsi_req_lba(req); - return 0; -} - -static const char *scsi_command_name(uint8_t cmd) +static const char *__attribute__((const)) scsi_command_name(uint8_t cmd) { static const char *names[] = { [ TEST_UNIT_READY ] = "TEST_UNIT_READY", @@ -489,6 +475,28 @@ static const char *scsi_command_name(uint8_t cmd) return names[cmd]; } +int scsi_req_parse(SCSIRequest *req, uint8_t *buf) +{ + int rc; + + if (req->dev->type == TYPE_TAPE) { + rc = scsi_req_stream_length(req, buf); + } else { + rc = scsi_req_length(req, buf); + } + if (rc != 0) { + return rc; + } + + memcpy(req->cmd.buf, buf, req->cmd.len); + scsi_req_xfer_mode(req); + req->cmd.lba = scsi_req_lba(req); + trace_scsi_req_parsed(req->dev->id, req->lun, req->tag, + buf[0], scsi_command_name(buf[0]), req->cmd.mode, + req->cmd.xfer, req->cmd.lba); + return 0; +} + void scsi_req_print(SCSIRequest *req) { FILE *fp = stderr; diff --git a/trace-events b/trace-events index 703b745..51e2497 100644 --- a/trace-events +++ b/trace-events @@ -205,6 +205,12 @@ disable usb_set_config(int addr, int config, int ret) "dev %d, config %d, ret %d disable usb_clear_device_feature(int addr, int feature, int ret) "dev %d, feature %d, ret %d" disable usb_set_device_feature(int addr, int feature, int ret) "dev %d, feature %d, ret %d" +# hw/scsi-bus.c +disable scsi_req_alloc(int target, int lun, int tag) "target %d lun %d tag %d" +disable scsi_req_dequeue(int target, int lun, int tag) "target %d lun %d tag %d" +disable scsi_req_parsed(int target, int lun, int tag, int cmd, const char *cmdname, int mode, int xfer, uint64_t lba) "target %d lun %d tag %d command %d (%s) dir %d length %d lba %"PRIu64"" +disable scsi_req_parse_bad(int target, int lun, int tag, int cmd) "target %d lun %d tag %d command %d" + # vl.c disable vm_state_notify(int running, int reason) "running %d reason %d"