From nobody Tue Apr 30 15:29:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1559729546; cv=none; d=zoho.com; s=zohoarc; b=nfwqMUNDeAUMuI93Y/tkJgnH/uSa/JOYouZrRpLi2CeiQyVH8WwPxYlD2RnVHeYikzgeZjB9ur/RI/n3X6GnjK+azzB1+u32gEAoxgyG/U8l0n52x6ls1rsd3s/ICvSFC2DBAC+eJSfqZ4RJ7NGGKsyowLTtd7Z4qi+fH8mUzhU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559729546; 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:ARC-Authentication-Results; bh=0LYJBJFgPJQy6JBIKUnCQn2Rxhf3uQ6OKcKGG86aIkE=; b=Y9+zKAlgG0V8N+/l4S82gW5oJH7MobyNx3ZIV1z/0Sd8BSn1Tyj4yRaA/YI2kkUPtzXjDv03Q34Ln9Jd6WHijdtghd9kaVC6U1sHbDl5fJcDNtpulLDMRhsoc0b95AvcLcwMEj3Ra19Iz6KID8/ChgUqztpTGNQaalOUMdA8GGQ= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559729546415209.4052582650553; Wed, 5 Jun 2019 03:12:26 -0700 (PDT) Received: from localhost ([127.0.0.1]:38587 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYSu3-0001u7-Fj for importer@patchew.org; Wed, 05 Jun 2019 06:12:19 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40501) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYSr9-0008HM-Hc for qemu-devel@nongnu.org; Wed, 05 Jun 2019 06:09:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYSr8-0007as-HQ for qemu-devel@nongnu.org; Wed, 05 Jun 2019 06:09:19 -0400 Received: from relay.sw.ru ([185.231.240.75]:47172) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hYSr8-0007Ys-9Q; Wed, 05 Jun 2019 06:09:18 -0400 Received: from [10.94.3.0] (helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.91) (envelope-from ) id 1hYSr4-0000xT-1J; Wed, 05 Jun 2019 13:09:14 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Wed, 5 Jun 2019 13:09:12 +0300 Message-Id: <20190605100913.34972-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20190605100913.34972-1-vsementsov@virtuozzo.com> References: <20190605100913.34972-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH 1/2] io/channel: add qio_channel_set_keepalive 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: kwolf@redhat.com, vsementsov@virtuozzo.com, berrange@redhat.com, mreitz@redhat.com, den@openvz.org 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" Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake fd, SOL_SOCKET, SO_KEEPALIVE, + &val, sizeof(val)); + + if (ret < 0) { + error_setg_errno(errp, errno, "Unable to set KEEPALIVE"); + } + + return ret; +} + + static void qio_channel_socket_set_delay(QIOChannel *ioc, bool enabled) @@ -762,6 +780,7 @@ static void qio_channel_socket_class_init(ObjectClass *= klass, ioc_klass->io_writev =3D qio_channel_socket_writev; ioc_klass->io_readv =3D qio_channel_socket_readv; ioc_klass->io_set_blocking =3D qio_channel_socket_set_blocking; + ioc_klass->io_set_keepalive =3D qio_channel_socket_set_keepalive; ioc_klass->io_close =3D qio_channel_socket_close; ioc_klass->io_shutdown =3D qio_channel_socket_shutdown; ioc_klass->io_set_cork =3D qio_channel_socket_set_cork; diff --git a/io/channel.c b/io/channel.c index 2a26c2a2c0..0f0b2b7b65 100644 --- a/io/channel.c +++ b/io/channel.c @@ -265,6 +265,20 @@ int qio_channel_set_blocking(QIOChannel *ioc, return klass->io_set_blocking(ioc, enabled, errp); } =20 +int qio_channel_set_keepalive(QIOChannel *ioc, + bool enabled, + Error **errp) +{ + QIOChannelClass *klass =3D QIO_CHANNEL_GET_CLASS(ioc); + + if (!klass->io_set_keepalive) { + error_setg(errp, "KEEPALIVE is not supported by IO channel"); + return -ENOTSUP; + } + + return klass->io_set_keepalive(ioc, enabled, errp); +} + =20 int qio_channel_close(QIOChannel *ioc, Error **errp) --=20 2.18.0 From nobody Tue Apr 30 15:29:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1559729462; cv=none; d=zoho.com; s=zohoarc; b=iB+AwukP/STQnixk7b/x4Qz3gusk2bWgUUpOC4CHggPpaFxT5ZctH2w0KaFm8wmfTN0p3EafVVQCXXkF1uQoDcr1/2+yVvWEpOnGGNcFXJ3H/0VP8XYQwQTHADgQxFnyaaSCYFTIzmoAESvK/Gn2Mhfa1wG20G9tzXwdLKRYy1o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559729462; 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:ARC-Authentication-Results; bh=8jBJC0Hpeay0LvfXvVi7DyzYGxr5MncQUev2z5LGr6g=; b=PiwLigKoE+D1zjzUMJm3vrwZzLy+0QggkE754tY2qyjG82HfjmUFWST13m+jm6xlMkh+1ThZM6XR0L+HaXf3xRwCTINvEwo8VFrg8M5h1q+o8mSWrFzhUiWKDC6XveEXg1TEHY4XbquHgbrHA8PrmU5fQi63ZKnafsQyItT/lUc= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559729462339886.9539111924321; Wed, 5 Jun 2019 03:11:02 -0700 (PDT) Received: from localhost ([127.0.0.1]:38574 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYSsZ-0000jA-HE for importer@patchew.org; Wed, 05 Jun 2019 06:10:47 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40497) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYSr9-0008HL-En for qemu-devel@nongnu.org; Wed, 05 Jun 2019 06:09:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYSr8-0007ay-Hh for qemu-devel@nongnu.org; Wed, 05 Jun 2019 06:09:19 -0400 Received: from relay.sw.ru ([185.231.240.75]:47168) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hYSr8-0007Yu-9T; Wed, 05 Jun 2019 06:09:18 -0400 Received: from [10.94.3.0] (helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.91) (envelope-from ) id 1hYSr4-0000xT-6Y; Wed, 05 Jun 2019 13:09:14 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Wed, 5 Jun 2019 13:09:13 +0300 Message-Id: <20190605100913.34972-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20190605100913.34972-1-vsementsov@virtuozzo.com> References: <20190605100913.34972-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH 2/2] nbd-client: enable TCP keepalive 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: kwolf@redhat.com, vsementsov@virtuozzo.com, berrange@redhat.com, mreitz@redhat.com, den@openvz.org 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" Enable keepalive option to track server availablity. Requested-by: Denis V. Lunev Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/nbd-client.c | 1 + 1 file changed, 1 insertion(+) diff --git a/block/nbd-client.c b/block/nbd-client.c index 790ecc1ee1..b57cea8482 100644 --- a/block/nbd-client.c +++ b/block/nbd-client.c @@ -1137,6 +1137,7 @@ static int nbd_client_connect(BlockDriverState *bs, =20 /* NBD handshake */ logout("session init %s\n", export); + qio_channel_set_keepalive(QIO_CHANNEL(sioc), true, NULL); qio_channel_set_blocking(QIO_CHANNEL(sioc), true, NULL); =20 client->info.request_sizes =3D true; --=20 2.18.0