From nobody Sun May 19 19:40:29 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1589195973; cv=none; d=zohomail.com; s=zohoarc; b=gdcxFhFXPloaAqG0FSe0Xu1+N7E2rhMWLJ3wK6mj9rstaC5BhIT1xB1RZ9Qu0WB0W90qi/5nOCKAfSMJXbDrFBFjzpqsm13EE0ZY36P4jtcRgncyA6++27XORfb5k+ZqQUlKi9U18ZSeKQ6hR1Y5t1kNTCkniNoRs3GqMMq8RWM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589195973; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tXg7fZ6yE0Ek54lzVR+URbDTOS8itrBr35m4m8l7xN0=; b=Vbpsx0yxGLUOkM3h1DBO9qHDr/XWfFD3fgrdmTjPzBUaMYjbj7r1b7//2LhalOw+qfuwbq1SYbpUzDZVYN65pU1YzrV4VTlR+U36s2qowtdrQEXkELO0XNJU2JXcVcUaB3GnwNxEbSmycXYsqdg7IReltGKpC5vojTWQ4OjpkpI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1589195973638112.99824245623256; Mon, 11 May 2020 04:19:33 -0700 (PDT) Received: from localhost ([::1]:59688 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jY6T5-0002yu-Us for importer@patchew.org; Mon, 11 May 2020 07:19:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55796) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jY6OT-0000Nb-FK; Mon, 11 May 2020 07:14:45 -0400 Received: from mout.web.de ([212.227.17.11]:45173) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jY6OS-0006pG-Er; Mon, 11 May 2020 07:14:45 -0400 Received: from luklap ([89.247.255.192]) by smtp.web.de (mrweb105 [213.165.67.124]) with ESMTPSA (Nemesis) id 1N7gXQ-1j40SL0KZe-014gPR; Mon, 11 May 2020 13:14:39 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1589195679; bh=69isl/oloXKqCgT1lMh7Rv9glCgzyS4DtmEifV3kP2Y=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=Ls5hh1hNeY5R9PSRPcu0l8xb9iP8cgvDfwuYZvKhzmNCphsc7EhdeNzPh+ZWkJdPq dCSB3itY0opts2furo1sGH4TKfZcTZ5FKyqe3sf8UNJePEkPDXIJErsD5+Y5ajV6GS 9JCYXCkygiweynZ0ncWoGRc+3+1JFqEdPwGiOCNg= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Date: Mon, 11 May 2020 13:14:37 +0200 From: Lukas Straub To: qemu-devel Subject: [PATCH 1/5] Introduce yank feature Message-ID: <99931d0c9ab23eb641bd612e154f007348afa690.1589193717.git.lukasstraub2@web.de> In-Reply-To: References: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/I_Kx/CpVvM=iQB0A2ZZVo8K"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Provags-ID: V03:K1:MJUelbv6jUA0wE0LZky0xBVwVS9C3aZj3VVV3jOfm7HZnRG5Mm0 QY4q73Ow6G9i6DBZaNmccKdFCL1AX30vLnN6xSvjqoz+5KKVGTaW3EnBk7InpRL+7DXpsV7 vkK3cI+w8qTBbaAiavTEpyhT0IIx7R2OAA2LPBtZxfh4qS+gBnZ4Cq3BvXLi/R8KyHKOM1q tBB6JTCxGYekgDGRQnAFg== X-UI-Out-Filterresults: notjunk:1;V03:K0:zVbW5lOgWBg=:0lyFw7JO3+DbF/yjYHeZDj SVyQQI0VVcepf5xP72yT5xqOJoKSQUtL0KbNIEaVgm5LqI2Srzhit0q/Fg5RA0dV0T/GTK4Dc ds1ePzZWf1lcXlCkY1R+Fgi7KpZksphPoLvDIGK1Dkng6JGlxyBSkYMpS7PF7iBZgyLi2phw+ DVOr6PfmZql8DqngKZBpWM/dBEQPOtjZqL/PLCbT8G/W7xZpOfNVvrtqtnyacdkfFpLxsJqLo q2DoscYECFfTKTn/9AcxXTe4hCSaATlNS7DpXqdzNn52biLFnp66MLxYUm4SjQk2A3nubrqGM K2wNZmNhuzd6Z35PFjjbmAAwtFzUCYe+NLiZWB9vc04GSEb/UwKl198EzxJPNa5RF7QBg2eyJ h57vbpxxq8i8tg4fxVbN6/wg/mUCWAYEN2szjgWoCH+F5gCQl6RfWGC4RiFUvrJgNZjVy8o5V hgVn59NMcxmSpON+eAIKB/1RYSPtfvBBNCnEXWv9tKkSY+aIOEtKmeMlFYhpeP4a/O3I9gBUj BjjkFa/IayvG3nVk1BvedH7tesB737XQeSB8upt0NT3hk+4qH8RVwpksK3SGM7u5plqicheBj C3gH9lvouwvIUBJDySL0GBBuWWhIaIkAwqmjCqhIf89xtG6XpW8CMqKQ8dtMGIrXuePOrewCJ /6G6J/aS0VXZHTKsTYb+Ppikrkj+7K3Mch0nvxXgoPuNszVecxQSUxkQV0mvb9EznFHMN6qxM 6XbXepKGN9j9cm5KM2K69c0y3Z8IC9Qt4Exz4/d0v8p4O+nDP7yah4DrHJteDgjRk1hHH7R5F VGRSw5sWw88o9qxrf8pux4OS7/wQzKS0erLq8bYCxMxtI1mialhe905T3HBvS8Q22T2N6HYNz kxy5L11dVDULmwMqAv6pKkKhCk2NjYMlPtjJE+MEikJXlrz7jve7Zza41dwBIM/k/AUwM87jD zxUuYakuLWW5sQlkwyekoRM93ilMuCZeEzyqxNBmqwMxLBQ2x9LFGVdgj1GJYSp1WyZ45JTam Msp4RH3dQZrvtip2k9ZesHrjF14aRaqH04oy483U3X9ZH+P8xDALsU+d8+IPMen/QSxlHDZjn Tbg5E7YBe5oBVHo2gv/PjcpPc5UgRrCd8gHL4hkfVntJv3gGn4UXksMoxJQ2JShJyiuuMUGB5 xbzYq78TNh5rHtxLr1w+6ls8Q4kWKBACunWNJ+SHfLJMagl/b4vvxAAINL+iuSiHfj51RykbK LlednjxGt74IvNYRA Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=212.227.17.11; envelope-from=lukasstraub2@web.de; helo=mout.web.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/11 07:14:43 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , "Daniel P. =?UTF-8?B?QmVycmFuZ8Op?=" , qemu-block , Juan Quintela , "Dr. David Alan Gilbert" , Max Reitz , Paolo Bonzini , =?UTF-8?B?TWFyYy1BbmRy?= =?UTF-8?B?w6k=?= Lureau Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-Zoho-Virus-Status: 1 X-ZohoMail-DKIM: fail (Header signature does not verify) --Sig_/I_Kx/CpVvM=iQB0A2ZZVo8K Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The yank feature allows to recover from hanging qemu by "yanking" at various parts. Other qemu systems can register yank functions which will be called by the 'yank' out-of-band qmp command. Signed-off-by: Lukas Straub --- qapi/misc.json | 15 ++++++++++ softmmu/vl.c | 2 ++ yank.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++ yank.h | 12 ++++++++ 4 files changed, 104 insertions(+) create mode 100644 yank.c create mode 100644 yank.h diff --git a/qapi/misc.json b/qapi/misc.json index 99b90ac80b..de1ee494ae 100644 --- a/qapi/misc.json +++ b/qapi/misc.json @@ -1550,3 +1550,18 @@ ## { 'command': 'query-vm-generation-id', 'returns': 'GuidInfo' } =20 +## +# @yank: +# +# Recover from hanging qemu by calling yank functions. +# +# Returns: nothing. +# +# Example: +# +# -> { "execute": "yank" } +# <- { "return": {} } +# +# Since: 5.1 +## +{ 'command': 'yank', 'allow-oob': true } diff --git a/softmmu/vl.c b/softmmu/vl.c index 32c0047889..5d99749d29 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -112,6 +112,7 @@ #include "qapi/qmp/qerror.h" #include "sysemu/iothread.h" #include "qemu/guest-random.h" +#include "yank.h" =20 #define MAX_VIRTIO_CONSOLES 1 =20 @@ -2906,6 +2907,7 @@ void qemu_init(int argc, char **argv, char **envp) precopy_infrastructure_init(); postcopy_infrastructure_init(); monitor_init_globals(); + yank_init(); =20 if (qcrypto_init(&err) < 0) { error_reportf_err(err, "cannot initialize crypto: "); diff --git a/yank.c b/yank.c new file mode 100644 index 0000000000..cefbfd8ab5 --- /dev/null +++ b/yank.c @@ -0,0 +1,75 @@ +/* + * QEMU yank feature + * + * Copyright (c) Lukas Straub + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qemu/thread.h" +#include "qemu/queue.h" +#include "yank.h" + +struct YankFuncAndParam { + YankFn *func; + void *opaque; + QLIST_ENTRY(YankFuncAndParam) next; +}; + +static QemuMutex lock; +static QLIST_HEAD(qlisthead, YankFuncAndParam) head + =3D QLIST_HEAD_INITIALIZER(head); + +void yank_register_function(YankFn *func, void *opaque) +{ + struct YankFuncAndParam *tmp =3D g_malloc(sizeof(struct YankFuncAndPar= am)); + tmp->func =3D func; + tmp->opaque =3D opaque; + + qemu_mutex_lock(&lock); + QLIST_INSERT_HEAD(&head, tmp, next); + qemu_mutex_unlock(&lock); +} + +void yank_unregister_function(YankFn *func, void *opaque) +{ + qemu_mutex_lock(&lock); + + struct YankFuncAndParam *tmp; + QLIST_FOREACH(tmp, &head, next) { + if (tmp->func =3D=3D func && tmp->opaque =3D=3D opaque) { + QLIST_REMOVE(tmp, next); + g_free(tmp); + qemu_mutex_unlock(&lock); + return; + } + } + + abort(); +} + +void yank_call_functions(void) +{ + qemu_mutex_lock(&lock); + + struct YankFuncAndParam *tmp; + QLIST_FOREACH(tmp, &head, next) { + tmp->func(tmp->opaque); + } + + qemu_mutex_unlock(&lock); +} + +void qmp_yank(Error **errp) +{ + yank_call_functions(); +} + +void yank_init(void) +{ + qemu_mutex_init(&lock); + QLIST_INIT(&head); +} diff --git a/yank.h b/yank.h new file mode 100644 index 0000000000..7376224219 --- /dev/null +++ b/yank.h @@ -0,0 +1,12 @@ + +#ifndef YANK_H +#define YANK_H + +typedef void (YankFn) (void *opaque); + +void yank_register_function(YankFn *func, void *opaque); +void yank_unregister_function(YankFn *func, void *opaque); +void yank_call_functions(void); +void yank_init(void); +void qmp_yank(Error **errp); +#endif --=20 2.20.1 --Sig_/I_Kx/CpVvM=iQB0A2ZZVo8K Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEg/qxWKDZuPtyYo+kNasLKJxdslgFAl65M50ACgkQNasLKJxd sljF3g//Us2qiNZcJZKouFsTTshtllfrT2KsgQ9R8+mhMUFYR1xg8R2762Q3cdr9 /5MPThQ0OSAkDVeYlodoTwHJu8v1MXgmXhwEvGSRlo13ITybpoWZD//eOp7yE6mZ 4wXjMRygQKq1SVZ82tW9lRFCpwUcg7xTR28sKMAYkaY0NiXN/Y/71u/mVmruanIB PtN4T+flpH41IXDwwD+mK7lANIjU2BrBJRAXjtENuiKDIuwC9XwFRepr0N/065uY /T/nVAR4x4yvDOnu/sJbeOME0Wqm08BBo/sQ86J9vyyI/7machOmXEKLE+RtALjM Xbuy36o5bC51JyR/VrOxd3TBdk0jgBsk+J+wUSISvBIh+WuFiYfqNtYkuyqZh7Hr xKuI+R0dcCU0t9FZd4LszNN29C9f2P8VR/lfoWw27vUwAfLtD9EF3mVflxzEfrqO fHnasQwFXT77SPvBwj/heThaLChu0XuWrBPrLddT+2VNUS/OOC2eiD/KC8P+96+v N5RChkGkoq/RrK6NYBWLNgGZfkAaJU5OBbpE/aNerSikUVAW+q43b+qLoaGeGXVE Y3UGSlA9roVCiPteWS6JaUKFgAmefZnTASpm610cejMfgG0KK0BizPCpben9vzsu vLjIt0utqAU/gbCk7rOzIHpRdgMCqwDeKrxOyZKVDrW41I+0lNI= =Qx+H -----END PGP SIGNATURE----- --Sig_/I_Kx/CpVvM=iQB0A2ZZVo8K-- From nobody Sun May 19 19:40:29 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1589196794; cv=none; d=zohomail.com; s=zohoarc; b=SdxKnXkTHCtKJ2f1Hp7NesTCH4e19W1jSPvRjov/SQArH2yEMEI1vDjPbpGEABf4K0nyJoBmKhMTnOKUqQtscI/zFlCQz3QmVq6/CTlOli8YRaCjgA/SakxVYh8pvDacXcmgLbVu1S6k3kGNStgaDc+v7ezTgbvfAGmniNhgRa8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589196794; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TB8in1eBPIYJQxf5CzVaLFA540j+oDtsyleQb77ka88=; b=gH/ZY0esI3mZPBNN2f132C7Lo6hCLAEKTgWL3GNGjo79HyTd+QT5NBKx24gp0nSaUxY8cTL40xrFSVfsYb1T/UFV3nxDV01AI+twZC/fn6+su4xOeBA/jCBnSLPTJQ1w9fmiUIaWnn+uAbUg7jS2O/O4CUn8nsUQzZqjoW/QbaU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1589196794802769.8197526863618; Mon, 11 May 2020 04:33:14 -0700 (PDT) Received: from localhost ([::1]:50140 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jY6gL-0005FV-AQ for importer@patchew.org; Mon, 11 May 2020 07:33:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55822) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jY6OW-0000Uv-NI; Mon, 11 May 2020 07:14:48 -0400 Received: from mout.web.de ([212.227.15.3]:35957) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jY6OV-0006rr-LE; Mon, 11 May 2020 07:14:48 -0400 Received: from luklap ([89.247.255.192]) by smtp.web.de (mrweb002 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MFcPd-1jLgBz1pIL-00Eht0; Mon, 11 May 2020 13:14:42 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1589195682; bh=KUWMlVMntn3U1nUaS+EoCscEK7fr6wH8WZeZRn/C7XE=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=KLqskJKV6otItMdDFp3CRHcgzVnGX62cdARHWDWp9Wqb33VEFMm43Q9hC0F34zKBy owXoUCQ00wcmP0CCk1VOyM6P65xpbpRWle+h34xux6c1OxEWF3nj1NomPqv3gepkok xBlNTXkc4ego5pmZsdKLjF7v27tcZY5TE17ySYLo= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Date: Mon, 11 May 2020 13:14:41 +0200 From: Lukas Straub To: qemu-devel Subject: [PATCH 2/5] io/channel.c,io/channel-socket.c: Add yank feature Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/+Z.y1BF4DD61=sLH0F31ie5"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Provags-ID: V03:K1:7Czdz+grKSXvHO3K5q013O5YYv+f/v+3lPiUpo3O1Z6jfnVFweG jkEvCFjB+M17hCupvgf3oMcvI3jTg1B1upcBEvPUhWivjxR371rsOdnMH2Gx66h44LIAMlD u50BxUBlufpE5XtVcTCSQaYnAUnyScRjRkAHsvdjwEP6CqHhrcMdE9zj41zZ0lZNmnDSt6R uEpnhIxBzyJZX39S4mXjQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:e6NH5ealTW4=:uAgmTrfDC88JrPoaVp7i8T lMmM2BA35dIHHF0kciOSvmPmgODxNE4ILjvk9ktLC8WNxopUyoBYOgUe24sN5aCyNxcbcPKWB LNBqbep5i/oZewtH6NUDxDQtoiXItmPV/71c7f8UTRhCRY0rrlVgRYeM2LUJuG+JOkJUuZKmv fQv8C5qItxRZXGRVqiTHaU9raK0wQhwC4f6MAzztpgG+7N/wYQfXHEaFBS7g3jC/VF2F28Ddg el5yqeMnYFkzr4+dr5v53cpho7DZqE+9N4T8nMLkl4srQX/vY4Mmufii0UY7Lr8CI9EVx5X4n HAJsnM91aSEe8jU3Yrlmvr6qBLp6L4PMt5Oo/V0qzJCucsziPIB1tFtnLXeThKmyyUjEaVAJy tKIOvK/7I7urkJ8qd/HlxgcF4jxfb3r6U/dCKEIOuASmqFg8Eys9FAghiqejYuz14q60F9V68 w7Rw1HM//4QrKNf3SrGJwDxgZECbWEFRtFWmTS7YoSwrof0Po8TZTImiWk8kNziDmOX4KpjHM XhDiXYxUWgoYEvn4YOWIZOckr2QKBCzBjKFMxLeik2ad6MZu8kGZ6NLBNbaMACLpQedmXQejT KvpIsk+dRixCefEMGCTTlbOJOSp1YXaT/7E1LK9vK1lriFZbogtueOxDPRtBn04FWvg1e0C1/ 7NYITPg5JauQy6lBvE3CSdb57rLuqzpe11z6A7mvzMGZvnlgnbw5Bo4eb8aA0oNjZjo0Pt7Eg 2P3OEHTsz/atcMXtW+tUfZbv04r9LCTW9oulVTF5supLZG0F6+SwqgsFGpqv8ohItkk3g8wu9 /HyD8eoatkxKzFXQqQdJcVU3ULm5MApZZADX6DMbp7VplWycAOBRPEJ4DKbkkMVJcorVweUuX 6Hg12tOnVVnZtbUS2sS3NPEdY7HqF5LBFCbhvmmOwrGs+8DSlVbExnxJLkiv5Q+E8KwVekN2R ffBdn1DBCUOKqhZ7X/+BBdb5fjg1F5ffIu2O604iwmOBWBmTS0DzJTlDO7fCce16M9xXisQ23 YAxxZRKD78yFWT/7MEBn8DRPiZS9aqClARzUJ0QHYd8M6LjAd8DbSUdtTkFmuvL3+Brda99wO 2+pmBFy7Z7qx+GvQq8uMMPhIAybmfAs7fm9T1JsVkBeSbnAS0mnVPR0+IbDIEfWSk3rNDNcE7 lu25fibwMtVg4z2/jR4cJr1nFbcNU0atMUQ6jlL97PKiC1k50Qyz1/3ZZqK1h4jbVnl8Pg9HY YayNkdCDNWOlV63Hd Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=212.227.15.3; envelope-from=lukasstraub2@web.de; helo=mout.web.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/11 07:11:00 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , "Daniel P. =?UTF-8?B?QmVycmFuZ8Op?=" , qemu-block , Juan Quintela , "Dr. David Alan Gilbert" , Max Reitz , Paolo Bonzini , =?UTF-8?B?TWFyYy1BbmRy?= =?UTF-8?B?w6k=?= Lureau Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-Zoho-Virus-Status: 1 X-ZohoMail-DKIM: fail (Header signature does not verify) --Sig_/+Z.y1BF4DD61=sLH0F31ie5 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add qio_channel_set_yank function to channel and to channel-socket, which will register a yank function. The yank function calls shutdown() on the socket. Signed-off-by: Lukas Straub --- Makefile.objs | 1 + include/io/channel-socket.h | 1 + include/io/channel.h | 12 ++++++++++++ io/channel-socket.c | 29 +++++++++++++++++++++++++++++ io/channel.c | 9 +++++++++ 5 files changed, 52 insertions(+) diff --git a/Makefile.objs b/Makefile.objs index a7c967633a..889115775c 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -24,6 +24,7 @@ block-obj-m =3D block/ crypto-obj-y =3D crypto/ =20 io-obj-y =3D io/ +io-obj-y +=3D yank.o =20 endif # CONFIG_SOFTMMU or CONFIG_TOOLS =20 diff --git a/include/io/channel-socket.h b/include/io/channel-socket.h index 777ff5954e..0fa7a364f3 100644 --- a/include/io/channel-socket.h +++ b/include/io/channel-socket.h @@ -48,6 +48,7 @@ struct QIOChannelSocket { socklen_t localAddrLen; struct sockaddr_storage remoteAddr; socklen_t remoteAddrLen; + bool yank; }; =20 =20 diff --git a/include/io/channel.h b/include/io/channel.h index d4557f0930..782b618694 100644 --- a/include/io/channel.h +++ b/include/io/channel.h @@ -132,6 +132,8 @@ struct QIOChannelClass { bool enabled); void (*io_set_delay)(QIOChannel *ioc, bool enabled); + void (*io_set_yank)(QIOChannel *ioc, + bool enabled); off_t (*io_seek)(QIOChannel *ioc, off_t offset, int whence, @@ -550,6 +552,16 @@ int qio_channel_shutdown(QIOChannel *ioc, void qio_channel_set_delay(QIOChannel *ioc, bool enabled); =20 +/** + * qio_channel_set_yank: + * @ioc: the channel object + * @enabled: the new flag state + * + * Controls wether this channel participates in yanking. + */ +void qio_channel_set_yank(QIOChannel *ioc, + bool enabled); + /** * qio_channel_set_cork: * @ioc: the channel object diff --git a/io/channel-socket.c b/io/channel-socket.c index b74f5b92a0..be03946d29 100644 --- a/io/channel-socket.c +++ b/io/channel-socket.c @@ -26,6 +26,7 @@ #include "io/channel-watch.h" #include "trace.h" #include "qapi/clone-visitor.h" +#include "yank.h" =20 #define SOCKET_MAX_FDS 16 =20 @@ -55,6 +56,7 @@ qio_channel_socket_new(void) =20 sioc =3D QIO_CHANNEL_SOCKET(object_new(TYPE_QIO_CHANNEL_SOCKET)); sioc->fd =3D -1; + sioc->yank =3D 0; =20 ioc =3D QIO_CHANNEL(sioc); qio_channel_set_feature(ioc, QIO_CHANNEL_FEATURE_SHUTDOWN); @@ -395,10 +397,19 @@ qio_channel_socket_accept(QIOChannelSocket *ioc, return NULL; } =20 +static void qio_channel_socket_yank(void *opaque) +{ + QIOChannel *ioc =3D opaque; + QIOChannelSocket *sioc =3D QIO_CHANNEL_SOCKET(ioc); + + shutdown(sioc->fd, SHUT_RDWR); +} + static void qio_channel_socket_init(Object *obj) { QIOChannelSocket *ioc =3D QIO_CHANNEL_SOCKET(obj); ioc->fd =3D -1; + ioc->yank =3D 0; } =20 static void qio_channel_socket_finalize(Object *obj) @@ -422,6 +433,9 @@ static void qio_channel_socket_finalize(Object *obj) closesocket(ioc->fd); ioc->fd =3D -1; } + if (ioc->yank) { + yank_unregister_function(qio_channel_socket_yank, ioc); + } } =20 =20 @@ -686,6 +700,20 @@ qio_channel_socket_set_delay(QIOChannel *ioc, &v, sizeof(v)); } =20 +static void +qio_channel_socket_set_yank(QIOChannel *ioc, + bool enabled) +{ + QIOChannelSocket *sioc =3D QIO_CHANNEL_SOCKET(ioc); + + if (sioc->yank) { + yank_unregister_function(qio_channel_socket_yank, ioc); + } + sioc->yank =3D enabled; + if (sioc->yank) { + yank_register_function(qio_channel_socket_yank, ioc); + } +} =20 static void qio_channel_socket_set_cork(QIOChannel *ioc, @@ -784,6 +812,7 @@ static void qio_channel_socket_class_init(ObjectClass *= klass, ioc_klass->io_shutdown =3D qio_channel_socket_shutdown; ioc_klass->io_set_cork =3D qio_channel_socket_set_cork; ioc_klass->io_set_delay =3D qio_channel_socket_set_delay; + ioc_klass->io_set_yank =3D qio_channel_socket_set_yank; ioc_klass->io_create_watch =3D qio_channel_socket_create_watch; ioc_klass->io_set_aio_fd_handler =3D qio_channel_socket_set_aio_fd_han= dler; } diff --git a/io/channel.c b/io/channel.c index e4376eb0bc..0c4095e0e0 100644 --- a/io/channel.c +++ b/io/channel.c @@ -373,6 +373,15 @@ void qio_channel_set_delay(QIOChannel *ioc, } } =20 +void qio_channel_set_yank(QIOChannel *ioc, + bool enabled) +{ + QIOChannelClass *klass =3D QIO_CHANNEL_GET_CLASS(ioc); + + if (klass->io_set_yank) { + klass->io_set_yank(ioc, enabled); + } +} =20 void qio_channel_set_cork(QIOChannel *ioc, bool enabled) --=20 2.20.1 --Sig_/+Z.y1BF4DD61=sLH0F31ie5 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEg/qxWKDZuPtyYo+kNasLKJxdslgFAl65M6EACgkQNasLKJxd sljo9g//W+2343YJ+TbDPBooBeKFlJqOVcz1lAaJNefEdIQ1g8XfdTmp1IC3G3B1 snWrRVXb8ShCeW3fEHyiZoMkrkZ4m9wPvJi8jbcvxjurc8KKQWC1lnxTK2Vl9wqJ FgrljFaeh6soK9o4qVvAWa5oltmAJsEo/9xItWPVBBii+ct2yF3rmlAgS/gAYhoo vsPgyNyUL9Ioc7mdTqWGPLgn1o+MZ0ZhsImyVKWQeJCrJDkkJW6aVqDTX5+DhD6+ alRRdU9kChfCF08/TZtthlnnLTsNJh4sn8jk0CDcszIatq469OKNI/HLKdQDCBlL rLNTIaLX63yDfKHrTV5OBXU5dHSl7oU0TMyKTuYF4MgMaBND6KRZYzqru80wsJ4k BXH6qq9gP/4SjiW7pghzYUBjd8a9mIK4gvHJhEQqRJjvEZXkTjRSMO9Kq3nex70G NboLA4ey2bHVVXG+UWH2VdrmVNxJE5uuyKKw7Cgc4+j6MWGfDswnHUpi4VCCJLoj b0DQmqDTdRMYOo7ALO4vXCkxMdPTkb5wdhF51x73jWgj+i8CgwfyivtrdKVRo/sC vmoRj58MQ8DKmzdueOINNn9WvAI46F+p4cNuJRsjmM771s6kklAfzUOAlrCWy5oi O3ZxDXVWW64xLRGUgvOzCdy7jNNqcbXrZb8PeQi4ip+UPNyqKus= =jpRL -----END PGP SIGNATURE----- --Sig_/+Z.y1BF4DD61=sLH0F31ie5-- From nobody Sun May 19 19:40:29 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1589197216; cv=none; d=zohomail.com; s=zohoarc; b=R0RXJdXT5Ksta6VcX6jelTxxgq3/YIvqDx8MNjbrZWUVYOAuvntj1llmrb8ILHHGTIOYH0ull9ClD/WCE5qi4CswMLQUPKhE8w3sLNdwMkQE8rRLtpfOVbYn+6OnDwOzlHpZxWH4IcSu3npxt6yczRQOX4ecaD9HR1iLNGQ1dPw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589197216; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=PoJ9Nafr4LYL9pHl3HcrZXyhClWlp0sHhq15/C5gza0=; b=dzkCEwkbBwnVqG+10pmr1njXYGuL1KAuQyxJoHKrYxkYBkPuU9ZAakv6q5IALoqGyLIP6gVfz9cIBOK1dz6LPMzzyHT3EKtmHKW291QdTSqJPX4wNMqg1X2xF1p9BF4KLQL6I/ICFf2SORiVdVcHTBe+A734YSsbOGeuRp03j6w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1589197216830973.3301263295476; Mon, 11 May 2020 04:40:16 -0700 (PDT) Received: from localhost ([::1]:37314 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jY6n9-0004di-9C for importer@patchew.org; Mon, 11 May 2020 07:40:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55832) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jY6Oa-0000cO-2m; Mon, 11 May 2020 07:14:52 -0400 Received: from mout.web.de ([212.227.17.12]:57943) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jY6OY-0006tK-Mn; Mon, 11 May 2020 07:14:51 -0400 Received: from luklap ([89.247.255.192]) by smtp.web.de (mrweb106 [213.165.67.124]) with ESMTPSA (Nemesis) id 1MNOV6-1jji4F25xC-00P0bh; Mon, 11 May 2020 13:14:45 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1589195685; bh=9nGypIWIejpA7HfrS60ch3u2aL2qpDcRe5ObfV39NrQ=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=stMMxOC5X4CrTiHK3jDxNNEGFqU/lPuzj0ycUvh7PA662QigR4LTAwtsgwO0tIJ/S sBSiMk64+D1fnvhAR5Zo0WciHh41HZcF7OF4bMYXmoIp2RmTrbdlOSBItxzkKPQtbi XiPNsp3qImpGFg1+FUYnzKxX0FsSab7vh4Ve1etU= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Date: Mon, 11 May 2020 13:14:44 +0200 From: Lukas Straub To: qemu-devel Subject: [PATCH 3/5] block/nbd.c: Add yank feature Message-ID: <1e712fa7f08e4772c2a68197a851161bee51610f.1589193717.git.lukasstraub2@web.de> In-Reply-To: References: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/=EWYk1vF1y85GQW7SBrQC38"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Provags-ID: V03:K1:CbWoCUPLZCMVgZAYdVQ9OIB5fjgRkbvXEKmDdD06kATq24YYNYn YEBaIRzw5Oxk9mEGbRwjS6as8ZZzf1qcwOdzAYxnY7nYiOd8sgXpeslloWCCEnoNzzegdIh l46wn8QduDAWAfnYyDladi2xx6nNpgM0zdLTrSNndS9WvW3Uj7Z6RTSIv2Z91302IJZ+PSg vNVrKjVwtunKVonOQ9xuA== X-UI-Out-Filterresults: notjunk:1;V03:K0:INt/hoZG3E8=:WDYkHSwaBul5QedSSoBVCn wLFGoPwPXzT/9CjK5+W5ibkZ7wF/gte5AwrgDwEqciklrzwIfYVkGSpx2XptX4NPxfdUnZqNC Lh26/WuXP6K8ZrxArRdAcjE1jZY211hK0B8IDgTYWAq6sNsxDjWrgIVF3C68YXNytvaXiwQmE sadW11eYrHpA5VpNB63NippXm29tZdQi/DmhldEFEUKr9nj0nav/FY0f8UQaXpGmyHw/Gjr9u nY+sAql88li+qt69T09HEO8GRo0ujIjsgDeQ618508EACbZ7bfbpghcUxa5pC3cIRt0sUMaRf n4Q7CftrStOIJUUlGpBkwYP1M+PjzYRa/6SyeU1kppxsO82iARHTc+QcKy1D04mpO0R5U6+S0 cunLJizIs9p2b0PPrxU9Wc5FSy9atwPYgJ3uDKxo9WoEmW432bJDM/sP27PjuMWco3EjzwwGN +tkKPJFT0TtLl6kVo9lSSqg62iXWvVa6GitAZ6r1ocY3gU25/ZyC5OP9QeuOuggpnObkdyM2e uiyvfFQsADojwt2l8EYcuSsHanj+Pt1BxUM4vrolpIod4V0DpAIlhZnI0ypcIthkWofOiILMC LNhhrzrX5vHHOqBLgEmpG1YQYxfDq7htuvCd7INwaR7clfWEVaklQ9OvIxPuDALYBfO0k8cZY H1Bb1rd86nb5lG17N6FbGxq6rJiiDyZSyI0aeaBsiUY6Hiib8es76ysHMb8SKVX8VP02MX0Kc FGkUpJyLbvDr7lGAo+oTEKixni4FamsyzWkhHD7SrMf1Dlw/2tIOmlzino+jDMkwmsTpl91iB soCrtUYXppTh7WaO69sY+y3pqgBlQ67jHWAytkSh36MHSJWccUsOnbsN0bbJMCiG9j519r8Bx oGdIvSnwMtTRLPVpyUz4KfNsddMh+kLbtQIRhYMyVXt1IHGnGVbQ5xebJK8x+SuXUV9kuCBrw Iaq35JalCiccmCiEHWJiDgrvPt35ZqeaqIaAvLK8dC6749DE+7ZLF03a3jgKrXMrbjryfUszk SUttqZBQVz9rEk+83r/HcY+xwK+RELXIyQF1U8/L0S4ACMzV96n/fYr5JxRH79D3lGMvCCbBa 2pbaBckwVvVlG3viLk4ZkZEpw9zL7Cviyn7ksh9vpoemxf8WXA/mvDO+Wt7rXTAlDlFcOLoJ7 MTXPwbJHdWC52o1oikECmDZUyy1sSqL7V18AVfVsW1woGejwgefUK1G7xPThzbGL6pQT3npI2 bjldkT8UxxHJj5DQq Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=212.227.17.12; envelope-from=lukasstraub2@web.de; helo=mout.web.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/11 07:10:54 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , "Daniel P. =?UTF-8?B?QmVycmFuZ8Op?=" , qemu-block , Juan Quintela , "Dr. David Alan Gilbert" , Max Reitz , Paolo Bonzini , =?UTF-8?B?TWFyYy1BbmRy?= =?UTF-8?B?w6k=?= Lureau Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-Zoho-Virus-Status: 1 X-ZohoMail-DKIM: fail (Header signature does not verify) --Sig_/=EWYk1vF1y85GQW7SBrQC38 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add yank option, pass it to the socket-channel and register a yank function which sets s->state =3D NBD_CLIENT_QUIT. This is the same behaviour as if an error occured. Signed-off-by: Lukas Straub --- Makefile.objs | 1 + block/nbd.c | 68 +++++++++++++++++++++++++++++++++----------- qapi/block-core.json | 5 +++- 3 files changed, 56 insertions(+), 18 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 889115775c..4b213b3e78 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -18,6 +18,7 @@ block-obj-y +=3D block.o blockjob.o job.o block-obj-y +=3D block/ scsi/ block-obj-y +=3D qemu-io-cmds.o block-obj-$(CONFIG_REPLICATION) +=3D replication.o +block-obj-y +=3D yank.o =20 block-obj-m =3D block/ =20 diff --git a/block/nbd.c b/block/nbd.c index 2160859f64..3c0fd3abb8 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -35,6 +35,7 @@ #include "qemu/option.h" #include "qemu/cutils.h" #include "qemu/main-loop.h" +#include "qemu/atomic.h" =20 #include "qapi/qapi-visit-sockets.h" #include "qapi/qmp/qstring.h" @@ -43,6 +44,8 @@ #include "block/nbd.h" #include "block/block_int.h" =20 +#include "yank.h" + #define EN_OPTSTR ":exportname=3D" #define MAX_NBD_REQUESTS 16 =20 @@ -91,6 +94,7 @@ typedef struct BDRVNBDState { QCryptoTLSCreds *tlscreds; const char *hostname; char *x_dirty_bitmap; + bool yank; } BDRVNBDState; =20 static int nbd_client_connect(BlockDriverState *bs, Error **errp); @@ -111,12 +115,12 @@ static void nbd_clear_bdrvstate(BDRVNBDState *s) static void nbd_channel_error(BDRVNBDState *s, int ret) { if (ret =3D=3D -EIO) { - if (s->state =3D=3D NBD_CLIENT_CONNECTED) { + if (atomic_read(&s->state) =3D=3D NBD_CLIENT_CONNECTED) { s->state =3D s->reconnect_delay ? NBD_CLIENT_CONNECTING_WAIT : NBD_CLIENT_CONNECTING_NOWAIT; } } else { - if (s->state =3D=3D NBD_CLIENT_CONNECTED) { + if (atomic_read(&s->state) =3D=3D NBD_CLIENT_CONNECTED) { qio_channel_shutdown(s->ioc, QIO_CHANNEL_SHUTDOWN_BOTH, NULL); } s->state =3D NBD_CLIENT_QUIT; @@ -167,7 +171,7 @@ static void nbd_client_attach_aio_context(BlockDriverSt= ate *bs, * s->connection_co is either yielded from nbd_receive_reply or from * nbd_co_reconnect_loop() */ - if (s->state =3D=3D NBD_CLIENT_CONNECTED) { + if (atomic_read(&s->state) =3D=3D NBD_CLIENT_CONNECTED) { qio_channel_attach_aio_context(QIO_CHANNEL(s->ioc), new_context); } =20 @@ -206,7 +210,7 @@ static void nbd_teardown_connection(BlockDriverState *b= s) { BDRVNBDState *s =3D (BDRVNBDState *)bs->opaque; =20 - if (s->state =3D=3D NBD_CLIENT_CONNECTED) { + if (atomic_read(&s->state) =3D=3D NBD_CLIENT_CONNECTED) { /* finish any pending coroutines */ assert(s->ioc); qio_channel_shutdown(s->ioc, QIO_CHANNEL_SHUTDOWN_BOTH, NULL); @@ -230,13 +234,14 @@ static void nbd_teardown_connection(BlockDriverState = *bs) =20 static bool nbd_client_connecting(BDRVNBDState *s) { - return s->state =3D=3D NBD_CLIENT_CONNECTING_WAIT || - s->state =3D=3D NBD_CLIENT_CONNECTING_NOWAIT; + NBDClientState state =3D atomic_read(&s->state); + return state =3D=3D NBD_CLIENT_CONNECTING_WAIT || + state =3D=3D NBD_CLIENT_CONNECTING_NOWAIT; } =20 static bool nbd_client_connecting_wait(BDRVNBDState *s) { - return s->state =3D=3D NBD_CLIENT_CONNECTING_WAIT; + return atomic_read(&s->state) =3D=3D NBD_CLIENT_CONNECTING_WAIT; } =20 static coroutine_fn void nbd_reconnect_attempt(BDRVNBDState *s) @@ -305,7 +310,7 @@ static coroutine_fn void nbd_co_reconnect_loop(BDRVNBDS= tate *s) nbd_reconnect_attempt(s); =20 while (nbd_client_connecting(s)) { - if (s->state =3D=3D NBD_CLIENT_CONNECTING_WAIT && + if (atomic_read(&s->state) =3D=3D NBD_CLIENT_CONNECTING_WAIT && qemu_clock_get_ns(QEMU_CLOCK_REALTIME) - start_time_ns > delay= _ns) { s->state =3D NBD_CLIENT_CONNECTING_NOWAIT; @@ -341,7 +346,7 @@ static coroutine_fn void nbd_connection_entry(void *opa= que) int ret =3D 0; Error *local_err =3D NULL; =20 - while (s->state !=3D NBD_CLIENT_QUIT) { + while (atomic_read(&s->state) !=3D NBD_CLIENT_QUIT) { /* * The NBD client can only really be considered idle when it has * yielded from qio_channel_readv_all_eof(), waiting for data. Thi= s is @@ -356,7 +361,7 @@ static coroutine_fn void nbd_connection_entry(void *opa= que) nbd_co_reconnect_loop(s); } =20 - if (s->state !=3D NBD_CLIENT_CONNECTED) { + if (atomic_read(&s->state) !=3D NBD_CLIENT_CONNECTED) { continue; } =20 @@ -435,7 +440,7 @@ static int nbd_co_send_request(BlockDriverState *bs, qemu_co_queue_wait(&s->free_sema, &s->send_mutex); } =20 - if (s->state !=3D NBD_CLIENT_CONNECTED) { + if (atomic_read(&s->state) !=3D NBD_CLIENT_CONNECTED) { rc =3D -EIO; goto err; } @@ -462,7 +467,7 @@ static int nbd_co_send_request(BlockDriverState *bs, if (qiov) { qio_channel_set_cork(s->ioc, true); rc =3D nbd_send_request(s->ioc, request); - if (rc >=3D 0 && s->state =3D=3D NBD_CLIENT_CONNECTED) { + if (rc >=3D 0 && atomic_read(&s->state) =3D=3D NBD_CLIENT_CONNECTE= D) { if (qio_channel_writev_all(s->ioc, qiov->iov, qiov->niov, NULL) < 0) { rc =3D -EIO; @@ -777,7 +782,7 @@ static coroutine_fn int nbd_co_do_receive_one_chunk( s->requests[i].receiving =3D true; qemu_coroutine_yield(); s->requests[i].receiving =3D false; - if (s->state !=3D NBD_CLIENT_CONNECTED) { + if (atomic_read(&s->state) !=3D NBD_CLIENT_CONNECTED) { error_setg(errp, "Connection closed"); return -EIO; } @@ -936,7 +941,7 @@ static bool nbd_reply_chunk_iter_receive(BDRVNBDState *= s, NBDReply local_reply; NBDStructuredReplyChunk *chunk; Error *local_err =3D NULL; - if (s->state !=3D NBD_CLIENT_CONNECTED) { + if (atomic_read(&s->state) !=3D NBD_CLIENT_CONNECTED) { error_setg(&local_err, "Connection closed"); nbd_iter_channel_error(iter, -EIO, &local_err); goto break_loop; @@ -961,7 +966,8 @@ static bool nbd_reply_chunk_iter_receive(BDRVNBDState *= s, } =20 /* Do not execute the body of NBD_FOREACH_REPLY_CHUNK for simple reply= . */ - if (nbd_reply_is_simple(reply) || s->state !=3D NBD_CLIENT_CONNECTED) { + if (nbd_reply_is_simple(reply) || + atomic_read(&s->state) !=3D NBD_CLIENT_CONNECTED) { goto break_loop; } =20 @@ -1395,6 +1401,14 @@ static int nbd_client_reopen_prepare(BDRVReopenState= *state, return 0; } =20 +static void nbd_yank(void *opaque) +{ + BlockDriverState *bs =3D opaque; + BDRVNBDState *s =3D (BDRVNBDState *)bs->opaque; + + atomic_set(&s->state, NBD_CLIENT_QUIT); +} + static void nbd_client_close(BlockDriverState *bs) { BDRVNBDState *s =3D (BDRVNBDState *)bs->opaque; @@ -1407,14 +1421,17 @@ static void nbd_client_close(BlockDriverState *bs) nbd_teardown_connection(bs); } =20 -static QIOChannelSocket *nbd_establish_connection(SocketAddress *saddr, +static QIOChannelSocket *nbd_establish_connection(BlockDriverState *bs, + SocketAddress *saddr, Error **errp) { + BDRVNBDState *s =3D (BDRVNBDState *)bs->opaque; QIOChannelSocket *sioc; Error *local_err =3D NULL; =20 sioc =3D qio_channel_socket_new(); qio_channel_set_name(QIO_CHANNEL(sioc), "nbd-client"); + qio_channel_set_yank(QIO_CHANNEL(sioc), s->yank); =20 qio_channel_socket_connect_sync(sioc, saddr, &local_err); if (local_err) { @@ -1438,7 +1455,7 @@ static int nbd_client_connect(BlockDriverState *bs, E= rror **errp) * establish TCP connection, return error if it fails * TODO: Configurable retry-until-timeout behaviour. */ - QIOChannelSocket *sioc =3D nbd_establish_connection(s->saddr, errp); + QIOChannelSocket *sioc =3D nbd_establish_connection(bs, s->saddr, errp= ); =20 if (!sioc) { return -ECONNREFUSED; @@ -1829,6 +1846,12 @@ static QemuOptsList nbd_runtime_opts =3D { "future requests before a successful reconnect will " "immediately fail. Default 0", }, + { + .name =3D "yank", + .type =3D QEMU_OPT_BOOL, + .help =3D "Forcibly close the connection and don't attempt to " + "reconnect when the 'yank' qmp command is executed.", + }, { /* end of list */ } }, }; @@ -1888,6 +1911,8 @@ static int nbd_process_options(BlockDriverState *bs, = QDict *options, =20 s->reconnect_delay =3D qemu_opt_get_number(opts, "reconnect-delay", 0); =20 + s->yank =3D qemu_opt_get_bool(opts, "yank", false); + ret =3D 0; =20 error: @@ -1921,6 +1946,10 @@ static int nbd_open(BlockDriverState *bs, QDict *opt= ions, int flags, /* successfully connected */ s->state =3D NBD_CLIENT_CONNECTED; =20 + if (s->yank) { + yank_register_function(nbd_yank, bs); + } + s->connection_co =3D qemu_coroutine_create(nbd_connection_entry, s); bdrv_inc_in_flight(bs); aio_co_schedule(bdrv_get_aio_context(bs), s->connection_co); @@ -1972,6 +2001,11 @@ static void nbd_close(BlockDriverState *bs) BDRVNBDState *s =3D bs->opaque; =20 nbd_client_close(bs); + + if (s->yank) { + yank_unregister_function(nbd_yank, bs); + } + nbd_clear_bdrvstate(s); } =20 diff --git a/qapi/block-core.json b/qapi/block-core.json index 943df1926a..1c1578160e 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -3862,6 +3862,8 @@ # reconnect. After that time, any delayed requests and a= ll # future requests before a successful reconnect will # immediately fail. Default 0 (Since 4.2) +# @yank: Forcibly close the connection and don't attempt to reconnect when +# the 'yank' qmp command is executed. (Since: 5.1) # # Since: 2.9 ## @@ -3870,7 +3872,8 @@ '*export': 'str', '*tls-creds': 'str', '*x-dirty-bitmap': 'str', - '*reconnect-delay': 'uint32' } } + '*reconnect-delay': 'uint32', + 'yank': 'bool' } } =20 ## # @BlockdevOptionsRaw: --=20 2.20.1 --Sig_/=EWYk1vF1y85GQW7SBrQC38 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEg/qxWKDZuPtyYo+kNasLKJxdslgFAl65M6QACgkQNasLKJxd slgqZRAAkEvBgPb7R+vNzYLW/UVNHb2ZS0T3q/lfgEP9AgcCt+fqLNfoyvgoD6Hk BJ7rGmr2sEZTF73/NnyoU/SgK3iqNP3upHftWFAS0Q0/HC424e38zHjLRekDFPlY XbXd/SwxbBfvYJbVwi9g6g0V3d3P52BmmcGQgtu+IY2cQIUT291nn3yAQLs/z4Ta vnDV8mVa4Mf4BffH03Wc+nnQHpEwXhcDg57T8z7Ec9nGnw829IPRYjOXbWqHi4BN jN/KRvdp7I0uwtppBX7faSLC9IetxW6+cA7Y8315JpMnt/7Ds1sP7aj6YHL4tIza Rq2HrbMrQUGfYcVOd2XGhMV8gSmdSToVmHSeOsRB2q0MxrK12qsUwEPZVHVmue5V 4AmT+4NDjIa/XHng115Doygk90u1ARU6eQadPA44l3cCJRBJh2YJvJ3LHilFE1RY AtImhDStaFr860qw93Euz1q8ojq8jFILToSXOT0IEW2DEj2hXE0zXEz8myK15vod 4jpxtVKU1/5RsX+U/i9tr+6pHR+cvkMG+FNvqxIOuhSP2Rn6gCwIGzu46Ki+m3fM sw1SGcd51uLdpeq1xNeN87Qs7dY+VsOaEPkCCNK7AVg5qfN+W8JZmlplL1PCnQEC C+J70hrwa6jcRW7thkpr1I9RdFRpwLoqvD3Jre3cN+N+T9iDYHI= =iKRm -----END PGP SIGNATURE----- --Sig_/=EWYk1vF1y85GQW7SBrQC38-- From nobody Sun May 19 19:40:29 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1589196343; cv=none; d=zohomail.com; s=zohoarc; b=nCX91rS9aVKZ486Xwad+qmjjBGZoVlGNGVzWn5qMXV6SsU3gZEjC8lNDcNUGRsfq7kX+W5nkGnzkLF7O7u4YZJvXV74VaakQxR56g/obSmi/sJJENGwYlt8f7yD9xEzd/zbTO+KTSxqdP2GrZLt5eW4fxEaOuVQmwKRUr6kASTk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589196343; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=sW1XLe96n7aZNUTG3SvTEpEJr5dRpCyCfVltAD1Yksc=; b=jmT/cvHlGtQV65v+d2vni+24LnAR8K4RoLV4rUZFtVIkz6Oh9HW3phAfjcVhjl7mtfWikMbk30jV1QO2FzZt0UAT4P6V4/b6+nLUznJeMrIHq5QFa8YasriZs1yB6CSF6eJdwLOfRrtB965wfK8/IkaRzxpBPLC4OZ2TSV3KPU8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1589196342989240.30257832334132; Mon, 11 May 2020 04:25:42 -0700 (PDT) Received: from localhost ([::1]:40804 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jY6Z3-0008E1-6R for importer@patchew.org; Mon, 11 May 2020 07:25:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55850) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jY6Od-0000i3-G9; Mon, 11 May 2020 07:14:55 -0400 Received: from mout.web.de ([212.227.15.14]:37697) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jY6Oc-0006ti-Hw; Mon, 11 May 2020 07:14:55 -0400 Received: from luklap ([89.247.255.192]) by smtp.web.de (mrweb002 [213.165.67.108]) with ESMTPSA (Nemesis) id 0LfzcB-1ijs4B3Adv-00pgGC; Mon, 11 May 2020 13:14:48 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1589195688; bh=ox7FrQlIDpodo9cR+t+IPZpwtzB7Qs5pOwi+y4G35M0=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=OnZ4+5ZqLtFFJ9bQcOkXe6xYdkNM80rywQvGir9YO9Loqjn4fjAxKzlX+IEPs/O3j mt9kflmw8Bjwd6J2IXAdrdh7jIQQgiVkKswvdtDzlyZHTTMpvZ5XECcM5//a6FN+Iu 1UhJklww41YGWfyadW7u851Jczij1bqbWYOhqo7E= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Date: Mon, 11 May 2020 13:14:47 +0200 From: Lukas Straub To: qemu-devel Subject: [PATCH 4/5] chardev/char-socket.c: Add yank feature Message-ID: <7f87fcd9be3cedfe0410c151de2bf4e5d907b1e2.1589193717.git.lukasstraub2@web.de> In-Reply-To: References: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/oQzx6d5Nk2.gRvD_d/mV1E."; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Provags-ID: V03:K1:0wT0tdxCVau8z0N6eYdSpqwC5zAcYrOZroPKp2QhXq3kpCeF8cG oGhyLcx4nw0trtcn43p7I5gR8QvRsspNvDE264Y2USE8upIFEvOpyP7u+wXw7x5J9q/7Okc Oqc+jMRUYoKc/pYBAZhW1rpH1lh5LfpBthTy4M+cg9soqaD3bTjjg0tmSqWn4bIOw6L+5nS j3JAMN+2Tks7+aeXoC+0w== X-UI-Out-Filterresults: notjunk:1;V03:K0:u/mYSBWGa1A=:V866AMqLzcEYkIHs2en4Yj UIEiw7bxXvUgPvL4Tzl9n7T7elfb30P9gs2GVxPJllz9UxalZIsqmc5pFkp5N9iMqORiwBInF FTrYLyfWqLm1RHBNQsjMGDRW9Rku9lDkAnqdTeth7TyyypL/XoEsV5OdSM0Mn6lmZPP+QI1pT TRoSwiKjKJvT6DO7M9TpM57P7EuMWF6r5AxFLpqNNCAryGwqyn2hFb0oUjBvaJyypu9mr8f37 T1Q6wRPmzJmUMF1f+rTb8rLHt3BcwPDsYLyk2JS8v5cxub0dw96kUA66Av9q5+RaYFa+88wB8 owayfvWWVWAOfAYTWVNyD5R18nJ9YMgDkEwpHAk592qBoZ/zE0oIHgIsHFJRqqFF0MwQR8a1k /2hjj/DS305a+5yaznSs0Ax/hk4950fcHhgGGIWw2ywZyt21R40IPewfAOFRiUC1DwQXx9oV6 Dyzj5+5Vl4KWX6ax9OOiquDokANX7CO8K7EKpK/7ZqEHQAJLEEhaufBhPJEFFOin2xrCkKtAl ynx27C3jjTRf9ZcTxAyUAJQ626SH4H7YnMVNn+o25Zrl7HiH04zda1aaAL+OUWb/+rOSY9i+g RvDmLgbMZNOSX4fpy2v9Z8ljPDGng57vNFFhNZodNeDhfJSwZjaXQdCgI780xbaDzPAMO4c2i iqo17owBX27wAKu82AwqRBvuV9I8JhSwekr7gctRYrac/F/Lpy9N0v/I8kOV36vcbWPxObl4Q r5trFmBlOAc7yz5dGS5q3PDWMQlxhvvyuMAv8FpNEUmesdyVq7DTn8srASkbs5ybTJ1l25/jU yswgr/QufQV2ESAySpzLiE5A5CtCO9xxxwlxQyk7H/dpFqMTEQq9ulIlnDBAABHSWVFrw9X1o N06NSs39GRCeP6MlpSlLyJgxVYYxD2SSnEndK1SFDJuNbjJc+JuqgN7DRBx3XQYOZqgCtphjw VRus+skV9DzZrY2hz4Im7KLCTtLW8OVe5MVGpdCTrDr2+Ogs25a5Rr65jp9gd1MV4ATkhXalm brgnVZVFgfGzHX3WNQ/bXvL/XQO4z3GFiWBwoCcKe5JV9vXFR7yi/t8d/8s8Ios6zAKNkY5vU 0sD4xR4ef6TFP1OQCLwGSUQbmABYVKfab8LC5ZVeLH5ZDpr5aXTCNpvJEBYnHjtyrOQznvBug rfa7CB+5o1UoCwIHsthELyPKYnvnOBg+pLeNcs+095uKEVmj8sHomHuZudei3X2rx5zROW/ZY gCgelDymDVQprt+ry Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=212.227.15.14; envelope-from=lukasstraub2@web.de; helo=mout.web.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/11 07:10:54 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , "Daniel P. =?UTF-8?B?QmVycmFuZ8Op?=" , qemu-block , Juan Quintela , "Dr. David Alan Gilbert" , Max Reitz , Paolo Bonzini , =?UTF-8?B?TWFyYy1BbmRy?= =?UTF-8?B?w6k=?= Lureau Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-Zoho-Virus-Status: 1 X-ZohoMail-DKIM: fail (Header signature does not verify) --Sig_/oQzx6d5Nk2.gRvD_d/mV1E. Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add yank option which is passed to the socket-channel. Signed-off-by: Lukas Straub --- chardev/char-socket.c | 8 ++++++++ chardev/char.c | 3 +++ qapi/char.json | 5 ++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/chardev/char-socket.c b/chardev/char-socket.c index 185fe38dda..e476358941 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -65,6 +65,7 @@ typedef struct { int max_size; int do_telnetopt; int do_nodelay; + int do_yank; int *read_msgfds; size_t read_msgfds_num; int *write_msgfds; @@ -877,6 +878,9 @@ static int tcp_chr_new_client(Chardev *chr, QIOChannelS= ocket *sioc) if (s->do_nodelay) { qio_channel_set_delay(s->ioc, false); } + if (s->do_yank) { + qio_channel_set_yank(s->ioc, true); + } if (s->listener) { qio_net_listener_set_client_func_full(s->listener, NULL, NULL, NULL, chr->gcontext); @@ -1297,6 +1301,7 @@ static void qmp_chardev_open_socket(Chardev *chr, SocketChardev *s =3D SOCKET_CHARDEV(chr); ChardevSocket *sock =3D backend->u.socket.data; bool do_nodelay =3D sock->has_nodelay ? sock->nodelay : false; + bool do_yank =3D sock->has_yank ? sock->yank : false; bool is_listen =3D sock->has_server ? sock->server : true; bool is_telnet =3D sock->has_telnet ? sock->telnet : false; bool is_tn3270 =3D sock->has_tn3270 ? sock->tn3270 : false; @@ -1310,6 +1315,7 @@ static void qmp_chardev_open_socket(Chardev *chr, s->is_tn3270 =3D is_tn3270; s->is_websock =3D is_websock; s->do_nodelay =3D do_nodelay; + s->do_yank =3D do_yank; if (sock->tls_creds) { Object *creds; creds =3D object_resolve_path_component( @@ -1400,6 +1406,8 @@ static void qemu_chr_parse_socket(QemuOpts *opts, Cha= rdevBackend *backend, =20 sock->has_nodelay =3D qemu_opt_get(opts, "delay"); sock->nodelay =3D !qemu_opt_get_bool(opts, "delay", true); + sock->has_yank =3D qemu_opt_get(opts, "yank"); + sock->yank =3D qemu_opt_get_bool(opts, "yank", false); /* * We have different default to QMP for 'server', hence * we can't just check for existence of 'server' diff --git a/chardev/char.c b/chardev/char.c index e77564060d..04075389bf 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -939,6 +939,9 @@ QemuOptsList qemu_chardev_opts =3D { },{ .name =3D "logappend", .type =3D QEMU_OPT_BOOL, + },{ + .name =3D "yank", + .type =3D QEMU_OPT_BOOL, }, { /* end of list */ } }, diff --git a/qapi/char.json b/qapi/char.json index daceb20f84..f9c04e720c 100644 --- a/qapi/char.json +++ b/qapi/char.json @@ -270,6 +270,8 @@ # then attempt a reconnect after the given number of seconds. # Setting this to zero disables this function. (default: 0) # (Since: 2.2) +# @yank: Shutdown the socket when the 'yank' qmp command is executed. +# (Since: 5.1) # # Since: 1.4 ## @@ -283,7 +285,8 @@ '*telnet': 'bool', '*tn3270': 'bool', '*websocket': 'bool', - '*reconnect': 'int' }, + '*reconnect': 'int', + '*yank': 'bool' }, 'base': 'ChardevCommon' } =20 ## --=20 2.20.1 --Sig_/oQzx6d5Nk2.gRvD_d/mV1E. Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEg/qxWKDZuPtyYo+kNasLKJxdslgFAl65M6cACgkQNasLKJxd sliFAg//YyalI54Fj8NyBm0Irs3WorpvvGdQ+OnevRLWD0hYvfia8b5uU4Az4u0O xy1wp8U/LO+Gop0SvbYseRs+xjYM9O1Qfc8hL0cvsSiJUYR5Qrr113nLP0YMMgTL g/qjKlRaBefhRLha5LfF5BEiI568ojmWt+s2mZzvWsQmH9J+hxkXxr8vQpSl95Nb 95+EXXPwgftwiWrme6zhC+SX/2nwNXeE11kZBhQTwaDpTwAtiqL99KK9pB2V9dxk 9cPkI4VxxO+BVvsAXVEofohHAWpkz9hFI5l//3yTNDVzdwbLaQRUJ4XmiXYux1wS uuWdm731p+cHD1bDk3OkA4dooNJOmUUVvXhQ/EDXWB02NotNyQldNcrkKKRf9L1d +FaH9uxloKxkyYqbCmGkkYFB+RHHWkkSHj9lrDGY3GwrgCDFxVG7YsklAtbbGils mRFutM3rAkhtEYMjPXbSWFyY4OTjCHih7rBYYCJ0LuzSb/5jk6vxTDwu7XJj7Ss0 mePOdd7CvrvV+7/dOrEmOkXHrVkK3FlZtsjGV55X2Hq7NUzNRyjov2eXeDP605OE +iZy1k4WjkD2kGhhW7Mr8MyN4+KkIshO2d+//w/cQ5hU2H4V82sjEKWfbDDIW6Do 3DWNSlN9W3lRYs0ao0/chwlaCNsTJ0LfUUfWgbsjdxQ76wuQHZY= =CdWq -----END PGP SIGNATURE----- --Sig_/oQzx6d5Nk2.gRvD_d/mV1E.-- From nobody Sun May 19 19:40:29 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1589196722; cv=none; d=zohomail.com; s=zohoarc; b=gzaf5wxlI2+xt1x9bqJzW+gmcjfmykaZp9cnDdkJAO2OxVY9iiDyVgw7ZRqXJbR4gCRcij0A7ld7VMK2J8L4Ke7HMWWX20YUYGwNm9mXu7rHntHEkZv9kXkhT+YOmJ2Erl6sPNUayVzwdNbAsNf5r9vsEWPvOwApq0RbLSRafR8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589196722; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2jaB+xQfP4AGSXHr1WSz4pH/V02Wpfmm6Ugv7AxT/tU=; b=LkRZZ496kF2v26F6povy2kyDiEWNTirgPDFSwKjZSf19UU/WPRtSJr2KhWuMMbVx+BCvSgPkgLM+hW9wWr9rjWBZkW4cYNaKlECY23tbqoKv5Il+JD2J9J1rpyelllZSEmz8X1AlD1WnrsuZ9h9URbtMXvV/d9A1hV4p34LFDvQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1589196722019900.4755337946214; Mon, 11 May 2020 04:32:02 -0700 (PDT) Received: from localhost ([::1]:48420 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jY6fA-0004HH-9W for importer@patchew.org; Mon, 11 May 2020 07:32:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55866) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jY6Og-0000m5-EX; Mon, 11 May 2020 07:14:58 -0400 Received: from mout.web.de ([212.227.17.12]:60721) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jY6Of-0006u7-9d; Mon, 11 May 2020 07:14:58 -0400 Received: from luklap ([89.247.255.192]) by smtp.web.de (mrweb105 [213.165.67.124]) with ESMTPSA (Nemesis) id 1M7usy-1jUEW13kIM-0053Tb; Mon, 11 May 2020 13:14:51 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1589195692; bh=u51BuTx1QED54eOkdNUZ6No9sGilpZkM0a/cyn0RLZM=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=PM+Mi41XqyRf0Mps1tW2ppBNGDsAgGX92BhYf2Js1Kc4aIRxmSgxqkNIJmZJYAU4X OjI53QGkgiLFOJy7x2VJfXrWyQdrM1jsdtHibOwbXKRjAHFbrSmal46uBiiyIOcGqj /7/jOSBjdYTcGGQwMojHgRgJAg6tNrHqLg1EvAxQ= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Date: Mon, 11 May 2020 13:14:50 +0200 From: Lukas Straub To: qemu-devel Subject: [PATCH 5/5] migration: Add yank feature Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/3_s4nB_LcOHq/=piffqMOyR"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Provags-ID: V03:K1:sIDB7egPqlktd6cyGQsLqIj8ClOqxAx17eEkKE3zjei82usYfD1 +WBv4ULQs3DpmxPGRZQQkf/cLHA7AUkkpWeWOzxTwfM6nkWOekIA5LiHXyjo8LofVwUgpDK Hxamufb+8yhkqMDcCJJIX1KPWBAAHXKsEzXt8vzFJDrydb4bh59WRgCF5UQoMyqGK8NfPHc eWG2QoTenQBMjn40TGc7Q== X-UI-Out-Filterresults: notjunk:1;V03:K0:EGNflHftLwg=:i9EhMFoTqqy4jctjVzPTlI 3oBgTPfyTSuDSs1Jt1RL0R2/5ZJUmSmNOjgRFHia07FNE2Wpo1+GwaRvza0wnbp8oeChSlkUV RIPJI3mWzL3G4jwdm0DROY4KbG8lNDxecqeWvQcRPhPRLecXUriwsQsqYw/CgipqMmUHMVl19 8O/yO/Qy7OH+LJftVIAqd8jfwAmfs5q9U2Ot7eSdV9GBf6jbMzsaOwfM+woHu5sK7FpzQk3ax HFdUjFKk9vas47DYUhAXiBX0aFG41e45aCPE/BA8aCNqcku6CBp534zgtdn2A+RYVgFwz3eNU RODIZrKgPU+msNxjU7IV4E9VhgJWP3hwAOcHs4xWOsDjMkTq9Npkly27y6lR3d/O3hD81Pt0e K0RlH3K7/obh8BTcXC/p74cBnH0O/DA+QZVoCJI5sn6U4i101d5Oa5k7/VnLEUmsN26jN9QYr mgH/xDAAWhGaUSZ73qmB/ZBxuo6sngW6Lf/cSjraU9K9nKwueS/fQ66Xu5fYdPiBnyi0yYuRm mSKvAhOZCGnS1NsJxHNwjjWq2Gbmhh5bWH75UKiRv9cgKbUkhOiV3VUJ80NpNGPAnK1vrUIWm /9HiZZLn+L8fsZ2Pck1zY3Aa9UKVO88Aipaq/aq/3tksjmPUSs6pGZshpiAKWFlDLCrdRMHkF Sm/1n7Yjp9x39KiGEYxOsWKTbkZw7IgSqlPXIG1Ecyo7764BOChZQkiOyA4iH4bNwKV51jVur E2kyAW8v+wgWvp8kj4Nl0Ll2OeoAUqZCf5k/WzOC+tqe3mWQmb9N83URu6epO7z1wMhsRY9oW +1UHuTzFspnttjWYjBfZbYjuz46s3RHpGx18U5t5W0c/ODakj94gI0EBKaIaqZdYP3FgQGmsx BhE1hCG+yaex90DhOeyIcwiKgRj6VKy3WD7A8DTbxiUM+Al/9YchAVA1WevhK8KK2SMSw79x6 kEe+0S/NqoMKOILXHinirJ2Koxfj3SPSIbImZCPBvYXmbClQ4IUomwywO7XE9Rd1lzHrr/eL/ qARAbrhcF5kBjSE9wNH2nSJttNtHOoDJ1eZcgJwaBsT/bG3IMlNvBgVDA5QtvoimfVVYIqjIl gyFEND1tmtDEA7nYr6S/ES0FWm0m+T3TbDWpy5pQCTNw66YxEV6i+Z/Qz71xjIn2ltZvtmmia q8yvznPMm1W/Ln/uwW4+qJttsV5RXKRMCq2j/hN/otg0i6QDQJZOy924e43iJyqASlsNWwCaK ONtxUX5iqQnmads6W Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=212.227.17.12; envelope-from=lukasstraub2@web.de; helo=mout.web.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/11 07:10:54 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , "Daniel P. =?UTF-8?B?QmVycmFuZ8Op?=" , qemu-block , Juan Quintela , "Dr. David Alan Gilbert" , Max Reitz , Paolo Bonzini , =?UTF-8?B?TWFyYy1BbmRy?= =?UTF-8?B?w6k=?= Lureau Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-Zoho-Virus-Status: 1 X-ZohoMail-DKIM: fail (Header signature does not verify) --Sig_/3_s4nB_LcOHq/=piffqMOyR Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add yank option which is passed to the socket-channel. Signed-off-by: Lukas Straub --- migration/channel.c | 2 ++ migration/migration.c | 11 +++++++++++ qapi/migration.json | 17 ++++++++++++++--- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/migration/channel.c b/migration/channel.c index 20e4c8e2dc..498af99104 100644 --- a/migration/channel.c +++ b/migration/channel.c @@ -35,6 +35,7 @@ void migration_channel_process_incoming(QIOChannel *ioc) trace_migration_set_incoming_channel( ioc, object_get_typename(OBJECT(ioc))); =20 + qio_channel_set_yank(ioc, s->parameters.yank); if (s->parameters.tls_creds && *s->parameters.tls_creds && !object_dynamic_cast(OBJECT(ioc), @@ -67,6 +68,7 @@ void migration_channel_connect(MigrationState *s, ioc, object_get_typename(OBJECT(ioc)), hostname, error); =20 if (!error) { + qio_channel_set_yank(ioc, s->parameters.yank); if (s->parameters.tls_creds && *s->parameters.tls_creds && !object_dynamic_cast(OBJECT(ioc), diff --git a/migration/migration.c b/migration/migration.c index 187ac0410c..b6f2f82dfb 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -814,6 +814,8 @@ MigrationParameters *qmp_query_migrate_parameters(Error= **errp) params->max_postcopy_bandwidth =3D s->parameters.max_postcopy_bandwidt= h; params->has_max_cpu_throttle =3D true; params->max_cpu_throttle =3D s->parameters.max_cpu_throttle; + params->has_yank =3D true; + params->yank =3D s->parameters.yank; params->has_announce_initial =3D true; params->announce_initial =3D s->parameters.announce_initial; params->has_announce_max =3D true; @@ -1364,6 +1366,9 @@ static void migrate_params_test_apply(MigrateSetParam= eters *params, if (params->has_max_cpu_throttle) { dest->max_cpu_throttle =3D params->max_cpu_throttle; } + if (params->has_yank) { + dest->yank =3D params->yank; + } if (params->has_announce_initial) { dest->announce_initial =3D params->announce_initial; } @@ -1472,6 +1477,9 @@ static void migrate_params_apply(MigrateSetParameters= *params, Error **errp) if (params->has_max_cpu_throttle) { s->parameters.max_cpu_throttle =3D params->max_cpu_throttle; } + if (params->has_yank) { + s->parameters.yank =3D params->yank; + } if (params->has_announce_initial) { s->parameters.announce_initial =3D params->announce_initial; } @@ -3623,6 +3631,8 @@ static Property migration_properties[] =3D { DEFINE_PROP_UINT8("max-cpu-throttle", MigrationState, parameters.max_cpu_throttle, DEFAULT_MIGRATE_MAX_CPU_THROTTLE), + DEFINE_PROP_BOOL("yank", MigrationState, + parameters.yank, false), DEFINE_PROP_SIZE("announce-initial", MigrationState, parameters.announce_initial, DEFAULT_MIGRATE_ANNOUNCE_INITIAL), @@ -3711,6 +3721,7 @@ static void migration_instance_init(Object *obj) params->has_xbzrle_cache_size =3D true; params->has_max_postcopy_bandwidth =3D true; params->has_max_cpu_throttle =3D true; + params->has_yank =3D true; params->has_announce_initial =3D true; params->has_announce_max =3D true; params->has_announce_rounds =3D true; diff --git a/qapi/migration.json b/qapi/migration.json index eca2981d0a..ad9e431a8f 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -623,6 +623,9 @@ # will consume more CPU. # Defaults to 1. (Since 5.0) # +# @yank: Shutdown the migration socket when the 'yank' qmp command is +# executed. (Since: 5.1) +# # Since: 2.4 ## { 'enum': 'MigrationParameter', @@ -636,7 +639,7 @@ 'multifd-channels', 'xbzrle-cache-size', 'max-postcopy-bandwidth', 'max-cpu-throttle', 'multifd-compression', - 'multifd-zlib-level' ,'multifd-zstd-level' ] } + 'multifd-zlib-level' ,'multifd-zstd-level', 'yank' ] } =20 ## # @MigrateSetParameters: @@ -747,6 +750,9 @@ # will consume more CPU. # Defaults to 1. (Since 5.0) # +# @yank: Shutdown the migration socket when the 'yank' qmp command is +# executed. (Since: 5.1) +# # Since: 2.4 ## # TODO either fuse back into MigrationParameters, or make @@ -776,7 +782,8 @@ '*max-cpu-throttle': 'int', '*multifd-compression': 'MultiFDCompression', '*multifd-zlib-level': 'int', - '*multifd-zstd-level': 'int' } } + '*multifd-zstd-level': 'int', + '*yank': 'bool'} } =20 ## # @migrate-set-parameters: @@ -907,6 +914,9 @@ # will consume more CPU. # Defaults to 1. (Since 5.0) # +# @yank: Shutdown the migration socket when the 'yank' qmp command is +# executed. (Since: 5.1) +# # Since: 2.4 ## { 'struct': 'MigrationParameters', @@ -934,7 +944,8 @@ '*max-cpu-throttle': 'uint8', '*multifd-compression': 'MultiFDCompression', '*multifd-zlib-level': 'uint8', - '*multifd-zstd-level': 'uint8' } } + '*multifd-zstd-level': 'uint8', + '*yank': 'bool'} } =20 ## # @query-migrate-parameters: --=20 2.20.1 --Sig_/3_s4nB_LcOHq/=piffqMOyR Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEg/qxWKDZuPtyYo+kNasLKJxdslgFAl65M6oACgkQNasLKJxd sljUmQ//eM1QHLxHZzIriLeuwaXssLezo72VskdClbhHEiCi0lelZVAuHxsp6XMg IX/qth5RBx2lsmQD3KBdxGUAwg8eLTDFtchhLt5Cm404Bs7Iwhngob5ZSGRXt1aS 5+W/77+j24f4sp8Kyzt229EqZKkJKHfpzrDlQbnZ39STVDpfkgb4qZJASxihtbdC s2aMrhkku+wVJgkmLTJsij1Iv0mmHlR5qm+PUOpKhhtxRdJE/SZ3huGlLk2BT85u viQ2xoTF3ra6hhgIbnUDNllfNMtdbnz1wi4jkvEHBbsTlbgnQCQ6FWu9kefoE7Bo TTA5laFmE8Tz8Pzq7hUN/+wCtuGbAM38UTCwdygqYFl7sFw2qt9kgiRLiJflsbtt L+wpdgRx62lNz6EhMgp+GxzrSPEZqdmYoE9ACLIVmS6YMiI1PysjGhrsqIrTwjte b9trW+lAFWSCU5fPLYswyLo8bBFhkDMmbWDHCNyavazm3tP0iDxeOYVQc05MrHan 0pFQqakGUhxn9ushRH3ZIzn7RZ5ht9tBJtaPppr/92E0Was8ibvnbiND9tdvXQQy WuDqG3eDwYJVs1UDkz7t0QT1jsVVDh8GQT5Ae1EiuVehXdd94dmQsA62qSNcL/z6 gn9m8ZJYey/0DJoDJrsirDh0M4GWhaZncSQjEa9TBVtU6v1bXvc= =rzxV -----END PGP SIGNATURE----- --Sig_/3_s4nB_LcOHq/=piffqMOyR--