From nobody Mon Feb 9 20:34:56 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1513791148464347.59325441252065; Wed, 20 Dec 2017 09:32:28 -0800 (PST) Received: from localhost ([::1]:60424 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eRiE4-0001fU-Px for importer@patchew.org; Wed, 20 Dec 2017 12:32:16 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56479) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eRhyR-0004k9-6b for qemu-devel@nongnu.org; Wed, 20 Dec 2017 12:16:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eRhyP-0007Hm-Sy for qemu-devel@nongnu.org; Wed, 20 Dec 2017 12:16:07 -0500 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:39562) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eRhyP-0007HP-In for qemu-devel@nongnu.org; Wed, 20 Dec 2017 12:16:05 -0500 Received: by mail-wr0-x243.google.com with SMTP id a41so22872028wra.6 for ; Wed, 20 Dec 2017 09:16:05 -0800 (PST) Received: from 640k.lan (dynamic-adsl-78-12-251-125.clienti.tiscali.it. [78.12.251.125]) by smtp.gmail.com with ESMTPSA id f125sm2751101wme.45.2017.12.20.09.16.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Dec 2017 09:16:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Wl8kr8vLFKQ5lbit/DElXKfp6cMKMo3EL+UZ0o+IkHE=; b=NknbJyG+ki8GOWc7Gwk1gw5lk2kAagmYdbGbvFuv7wumiHOzVQylvhwVKK2sP2kXcc QjVTpO5Qgj821S3N4UY2Ue3qFjwzAvfytUUcO7e1fbIqIn1VgzZSYlWudlEINrNg8i3n fSoC8NmoRLxAUwpMHclpIKHOmXP44Bf5qI+doVTeG196uXaWnytI7MF/eK5UjQPyL4jF Iu9WUA97yoAVKv7bzCeetC815zGtR5MrgD86hAHHlO7woTiGotTaeETArTVZJG1SjJ5+ npt5F4Z86aYDlXMvw5CODmGB1VZHmywYQKDkau552AGNFm2HkUd2vtvJvp8PBEoRjzL2 5etQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=Wl8kr8vLFKQ5lbit/DElXKfp6cMKMo3EL+UZ0o+IkHE=; b=o7o0ImhesMIORLX7Fu9M7BfvXSE09z4KEhsWP86UUGvdgFz5OPetY8UKfCf6oK2Bry qiSOf3fdCvZGG1hxcGA0iEd1KdEldkuEAuitiLLlvWYOKsJ+RnwA60snr+d2AR1j/U8W u2nEgIrmuWz/cav9vdFVxSCtds/wNsTqgoI+6k0hxNMMOhAjNQmlVz1T21jTEQJ1W579 S26MadPPWNbpLI5nTzfX+1eVgssAtgtqLbnOJdKuecvmn1q7wmaMcSNfgb30eq+jKNEl tfyOztHTtsDH08aQTh/Ggyh4+yexoCzNukL8aNH5X+1yXAYOpR/H/D7kr3A9yICjnmP5 jPUw== X-Gm-Message-State: AKGB3mJTQBNkwlaIuYg656KXVc3py5E93uvpcKcCXLF5+av8HfkcC7Ar KcoIeCIEWhkSYmQTfPiIoKAIWROr X-Google-Smtp-Source: ACJfBosjK422wnaZcsWqYTtrcxb4QSGd7rQqap91wchodpK/OXKdjoi73n5XDOlyifbbVMtuprbvQA== X-Received: by 10.223.139.152 with SMTP id o24mr9956946wra.243.1513790164221; Wed, 20 Dec 2017 09:16:04 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 20 Dec 2017 18:14:40 +0100 Message-Id: <1513790098-9815-29-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1513790098-9815-1-git-send-email-pbonzini@redhat.com> References: <1513790098-9815-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::243 Subject: [Qemu-devel] [PULL 28/46] block/iscsi: only report an iSCSI Failure if we don't handle it gracefully X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Lieven Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Peter Lieven we currently report an "iSCSI Failure" in iscsi_co_generic_cb if the task hasn't completed with SCSI_STATUS_GOOD. However, we expect a failure in some cases and handle it gracefully. This is the case for misaligned UNMAPs and WRITESAME10/16 calls without UNMAP. In this case a failure in the logs can be quite misleading. While we are at it improve the logging to reveal which operation failed at what LBA. Signed-off-by: Peter Lieven Message-Id: <1512733868-9009-3-git-send-email-pl@kamp.de> Signed-off-by: Paolo Bonzini --- block/iscsi.c | 43 ++++++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/block/iscsi.c b/block/iscsi.c index c532ec7..5c0a9e5 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -104,6 +104,7 @@ typedef struct IscsiTask { IscsiLun *iscsilun; QEMUTimer retry_timer; int err_code; + char *err_str; } IscsiTask; =20 typedef struct IscsiAIOCB { @@ -265,7 +266,7 @@ iscsi_co_generic_cb(struct iscsi_context *iscsi, int st= atus, } } iTask->err_code =3D iscsi_translate_sense(&task->sense); - error_report("iSCSI Failure: %s", iscsi_get_error(iscsi)); + iTask->err_str =3D g_strdup(iscsi_get_error(iscsi)); } =20 out: @@ -629,6 +630,8 @@ retry: =20 if (iTask.status !=3D SCSI_STATUS_GOOD) { iscsi_allocmap_set_invalid(iscsilun, sector_num, nb_sectors); + error_report("iSCSI WRITE10/16 failed at lba %" PRIu64 ": %s", lba, + iTask.err_str); r =3D iTask.err_code; goto out_unlock; } @@ -637,6 +640,7 @@ retry: =20 out_unlock: qemu_mutex_unlock(&iscsilun->mutex); + g_free(iTask.err_str); return r; } =20 @@ -651,10 +655,9 @@ static int64_t coroutine_fn iscsi_co_get_block_status(= BlockDriverState *bs, struct scsi_get_lba_status *lbas =3D NULL; struct scsi_lba_status_descriptor *lbasd =3D NULL; struct IscsiTask iTask; + uint64_t lba; int64_t ret; =20 - iscsi_co_init_iscsitask(iscsilun, &iTask); - if (!is_sector_request_lun_aligned(sector_num, nb_sectors, iscsilun)) { ret =3D -EINVAL; goto out; @@ -670,11 +673,13 @@ static int64_t coroutine_fn iscsi_co_get_block_status= (BlockDriverState *bs, goto out; } =20 + lba =3D sector_qemu2lun(sector_num, iscsilun); + + iscsi_co_init_iscsitask(iscsilun, &iTask); qemu_mutex_lock(&iscsilun->mutex); retry: if (iscsi_get_lba_status_task(iscsilun->iscsi, iscsilun->lun, - sector_qemu2lun(sector_num, iscsilun), - 8 + 16, iscsi_co_generic_cb, + lba, 8 + 16, iscsi_co_generic_cb, &iTask) =3D=3D NULL) { ret =3D -ENOMEM; goto out_unlock; @@ -701,6 +706,8 @@ retry: * because the device is busy or the cmd is not * supported) we pretend all blocks are allocated * for backwards compatibility */ + error_report("iSCSI GET_LBA_STATUS failed at lba %" PRIu64 ": %s", + lba, iTask.err_str); goto out_unlock; } =20 @@ -738,6 +745,7 @@ retry: } out_unlock: qemu_mutex_unlock(&iscsilun->mutex); + g_free(iTask.err_str); out: if (iTask.task !=3D NULL) { scsi_free_scsi_task(iTask.task); @@ -756,6 +764,7 @@ static int coroutine_fn iscsi_co_readv(BlockDriverState= *bs, struct IscsiTask iTask; uint64_t lba; uint32_t num_sectors; + int r =3D 0; =20 if (!is_sector_request_lun_aligned(sector_num, nb_sectors, iscsilun)) { return -EINVAL; @@ -853,19 +862,23 @@ retry: iTask.complete =3D 0; goto retry; } - qemu_mutex_unlock(&iscsilun->mutex); =20 if (iTask.status !=3D SCSI_STATUS_GOOD) { - return iTask.err_code; + error_report("iSCSI READ10/16 failed at lba %" PRIu64 ": %s", + lba, iTask.err_str); + r =3D iTask.err_code; } =20 - return 0; + qemu_mutex_unlock(&iscsilun->mutex); + g_free(iTask.err_str); + return r; } =20 static int coroutine_fn iscsi_co_flush(BlockDriverState *bs) { IscsiLun *iscsilun =3D bs->opaque; struct IscsiTask iTask; + int r =3D 0; =20 iscsi_co_init_iscsitask(iscsilun, &iTask); qemu_mutex_lock(&iscsilun->mutex); @@ -892,13 +905,15 @@ retry: iTask.complete =3D 0; goto retry; } - qemu_mutex_unlock(&iscsilun->mutex); =20 if (iTask.status !=3D SCSI_STATUS_GOOD) { - return iTask.err_code; + error_report("iSCSI SYNCHRONIZECACHE10 failed: %s", iTask.err_str); + r =3D iTask.err_code; } =20 - return 0; + qemu_mutex_unlock(&iscsilun->mutex); + g_free(iTask.err_str); + return r; } =20 #ifdef __linux__ @@ -1139,12 +1154,15 @@ retry: } =20 if (iTask.status !=3D SCSI_STATUS_GOOD) { + error_report("iSCSI UNMAP failed at lba %" PRIu64 ": %s", + list.lba, iTask.err_str); r =3D iTask.err_code; goto out_unlock; } =20 out_unlock: qemu_mutex_unlock(&iscsilun->mutex); + g_free(iTask.err_str); return r; } =20 @@ -1241,6 +1259,8 @@ retry: if (iTask.status !=3D SCSI_STATUS_GOOD) { iscsi_allocmap_set_invalid(iscsilun, offset >> BDRV_SECTOR_BITS, bytes >> BDRV_SECTOR_BITS); + error_report("iSCSI WRITESAME10/16 failed at lba %" PRIu64 ": %s", + lba, iTask.err_str); r =3D iTask.err_code; goto out_unlock; } @@ -1255,6 +1275,7 @@ retry: =20 out_unlock: qemu_mutex_unlock(&iscsilun->mutex); + g_free(iTask.err_str); return r; } =20 --=20 1.8.3.1