From patchwork Wed Nov 28 18:07:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 202519 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 100252C0086 for ; Thu, 29 Nov 2012 05:08:04 +1100 (EST) Received: from localhost ([::1]:34589 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tdm3F-0000vZ-Q8 for incoming@patchwork.ozlabs.org; Wed, 28 Nov 2012 13:08:01 -0500 Received: from eggs.gnu.org ([208.118.235.92]:54829) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tdm37-0000un-R7 for qemu-devel@nongnu.org; Wed, 28 Nov 2012 13:07:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tdm2x-00085A-RI for qemu-devel@nongnu.org; Wed, 28 Nov 2012 13:07:53 -0500 Received: from ssl.dlhnet.de ([91.198.192.8]:36184 helo=ssl.dlh.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tdm2x-00081D-GO for qemu-devel@nongnu.org; Wed, 28 Nov 2012 13:07:43 -0500 Received: from localhost (localhost [127.0.0.1]) by ssl.dlh.net (Postfix) with ESMTP id 3660814CDCC; Wed, 28 Nov 2012 19:07:41 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at ssl.dlh.net Received: from ssl.dlh.net ([127.0.0.1]) by localhost (ssl.dlh.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id o8amb2bA-GCJ; Wed, 28 Nov 2012 19:07:40 +0100 (CET) Received: from [82.141.7.8] (unknown [82.141.7.8]) by ssl.dlh.net (Postfix) with ESMTPSA id 8386F14CDC3; Wed, 28 Nov 2012 19:07:40 +0100 (CET) Message-ID: <50B652ED.10808@dlhnet.de> Date: Wed, 28 Nov 2012 19:07:41 +0100 From: Peter Lieven User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:15.0) Gecko/20120827 Thunderbird/15.0 MIME-Version: 1.0 To: "qemu-devel@nongnu.org" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 91.198.192.8 Cc: kwolf@redhat.com, Paolo Bonzini , ronnie sahlberg Subject: [Qemu-devel] [PATCH] iscsi: add support for iSCSI NOPs 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 This patch will send NOP-Out PDUs every 5 seconds to the iSCSI target. If a consecutive number of NOP-In replies fail a reconnect is initiated. iSCSI NOPs help to ensure that the connection to the target is still operational. This should not, but in reality may be the case even if the TCP connection is still alive if there are bugs in either the target or the initiator implementation. Reported-by: Ronnie Sahlberg Signed-off-by: Peter Lieven --- block/iscsi.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/block/iscsi.c b/block/iscsi.c index d0b1a10..fab4c8b 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -47,6 +47,9 @@ typedef struct IscsiLun { int block_size; uint64_t num_blocks; int events; + + QEMUTimer *nop_timer; + int nops_in_flight; } IscsiLun; typedef struct IscsiAIOCB { @@ -72,6 +75,9 @@ struct IscsiTask { int complete; }; +#define NOP_INTERVAL 5000 +#define MAX_NOP_FAILURES 3 + static void iscsi_bh_cb(void *p) { @@ -925,6 +931,35 @@ static char *parse_initiator_name(const char *target) } } +static void iscsi_nop_cb(struct iscsi_context *iscsi, int status, void *command_data, void *private_data) +{ + IscsiLun *iscsilun = private_data; + + if (iscsilun) { + iscsilun->nops_in_flight = 0; + } +} + +static void iscsi_nop_timed_event(void *opaque) +{ + IscsiLun *iscsilun = opaque; + + if (iscsilun->nops_in_flight > MAX_NOP_FAILURES) { + error_report("iSCSI: NOP timeout. Reconnecting..."); + iscsi_reconnect(iscsilun->iscsi); + iscsilun->nops_in_flight = 0; + } + + if (iscsi_nop_out_async(iscsilun->iscsi, iscsi_nop_cb, NULL, 0, iscsilun) != 0) { + error_report("iSCSI: failed to sent NOP-Out. Disabling NOP messages."); + return; + } + + qemu_mod_timer(iscsilun->nop_timer, qemu_get_clock_ms(rt_clock) + NOP_INTERVAL); + iscsi_set_events(iscsilun); + iscsilun->nops_in_flight++; +} + /* * We support iscsi url's on the form * iscsi://[%@][:]// @@ -1036,6 +1071,10 @@ static int iscsi_open(BlockDriverState *bs, const char *filename, int flags) ret = 0; + /* Set up a timer for sending out iSCSI NOPs */ + iscsilun->nop_timer = qemu_new_timer_ms(rt_clock, iscsi_nop_timed_event, iscsilun); + qemu_mod_timer(iscsilun->nop_timer, qemu_get_clock_ms(rt_clock) + NOP_INTERVAL); + out: if (initiator_name != NULL) { g_free(initiator_name); @@ -1058,6 +1097,10 @@ static void iscsi_close(BlockDriverState *bs) IscsiLun *iscsilun = bs->opaque; struct iscsi_context *iscsi = iscsilun->iscsi; + if (iscsilun->nop_timer) { + qemu_del_timer(iscsilun->nop_timer); + qemu_free_timer(iscsilun->nop_timer); + } qemu_aio_set_fd_handler(iscsi_get_fd(iscsi), NULL, NULL, NULL, NULL); iscsi_destroy_context(iscsi); memset(iscsilun, 0, sizeof(IscsiLun));