From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50775) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W7m1F-0003It-Rc for qemu-devel@nongnu.org; Mon, 27 Jan 2014 08:14:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W7m1A-0002kp-PT for qemu-devel@nongnu.org; Mon, 27 Jan 2014 08:14:29 -0500 Received: from mx1.redhat.com ([209.132.183.28]:14360) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W7m1A-0002kg-H7 for qemu-devel@nongnu.org; Mon, 27 Jan 2014 08:14:24 -0500 Message-ID: <52E65BA4.50408@redhat.com> Date: Mon, 27 Jan 2014 14:14:12 +0100 From: Paolo Bonzini MIME-Version: 1.0 References: <1390546944-9687-1-git-send-email-famz@redhat.com> <20140126061101.GD2958@irqsave.net> In-Reply-To: <20140126061101.GD2958@irqsave.net> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] scsi: Change scsi sense buf size to 252 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?ISO-8859-1?Q?Beno=EEt_Canet?= , Fam Zheng Cc: qemu-devel@nongnu.org Il 26/01/2014 07:11, Beno=EEt Canet ha scritto: > Le Friday 24 Jan 2014 =E0 15:02:24 (+0800), Fam Zheng a =E9crit : >> Current buffer size fails the assersion check in like >> >> hw/scsi/scsi-bus.c:1655: assert(req->sense_len <=3D sizeof(req-= >sense)); >> >> when backend (block/iscsi.c) returns more data then 96. >> >> Exercise the core dump path by booting an Gentoo ISO with scsi-generic >> device backed with iscsi (built with libiscsi 1.7.0): >> >> x86_64-softmmu/qemu-system-x86_64 \ >> -drive file=3Discsi://localhost:3260/iqn.foobar/0,if=3Dnone,id=3Dd= rive-disk \ >> -device virtio-scsi-pci,id=3Dscsi1,bus=3Dpci.0,addr=3D0x6 \ >> -device scsi-generic,drive=3Ddrive-disk,bus=3Dscsi1.0,id=3Discsi-d= isk \ >> -boot d \ >> -cdrom gentoo.iso >> >> qemu-system-x86_64: hw/scsi/scsi-bus.c:1655: scsi_req_complete: >> Assertion `req->sense_len <=3D sizeof(req->sense)' failed. >> >> According to SPC-4, section 4.5.2.1, 252 is the limit of sense data. S= o >> increase the value to fix it. >> >> Also remove duplicated define for the macro. >> >> Signed-off-by: Fam Zheng Applied to scsi-next, thanks! Paolo >> --- >> hw/scsi/scsi-generic.c | 2 -- >> hw/scsi/spapr_vscsi.c | 1 - >> include/hw/scsi/scsi.h | 2 +- >> 3 files changed, 1 insertion(+), 4 deletions(-) >> >> diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c >> index 8f195be..4967e47 100644 >> --- a/hw/scsi/scsi-generic.c >> +++ b/hw/scsi/scsi-generic.c >> @@ -37,8 +37,6 @@ do { fprintf(stderr, "scsi-generic: " fmt , ## __VA_= ARGS__); } while (0) >> #include >> #include "block/scsi.h" >> >> -#define SCSI_SENSE_BUF_SIZE 96 >> - >> #define SG_ERR_DRIVER_TIMEOUT 0x06 >> #define SG_ERR_DRIVER_SENSE 0x08 >> >> diff --git a/hw/scsi/spapr_vscsi.c b/hw/scsi/spapr_vscsi.c >> index c0c46d7..e8bca39 100644 >> --- a/hw/scsi/spapr_vscsi.c >> +++ b/hw/scsi/spapr_vscsi.c >> @@ -60,7 +60,6 @@ >> #define VSCSI_MAX_SECTORS 4096 >> #define VSCSI_REQ_LIMIT 24 >> >> -#define SCSI_SENSE_BUF_SIZE 96 >> #define SRP_RSP_SENSE_DATA_LEN 18 >> >> typedef union vscsi_crq { >> diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h >> index bf6da3d..ca66454 100644 >> --- a/include/hw/scsi/scsi.h >> +++ b/include/hw/scsi/scsi.h >> @@ -31,7 +31,7 @@ typedef struct SCSISense { >> uint8_t ascq; >> } SCSISense; >> >> -#define SCSI_SENSE_BUF_SIZE 96 >> +#define SCSI_SENSE_BUF_SIZE 252 >> >> struct SCSICommand { >> uint8_t buf[SCSI_CMD_BUF_SIZE]; >> -- >> 1.8.5.3 >> >> > Reviewed-by: Benoit Canet >