From patchwork Mon May 11 11:14:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Straub X-Patchwork-Id: 11540467 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C5A35159A for ; Mon, 11 May 2020 11:32:05 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9BF2A20708 for ; Mon, 11 May 2020 11:32:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=web.de header.i=@web.de header.b="KLqskJKV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9BF2A20708 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=web.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:50140 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jY6fE-0005FV-Kj for patchwork-qemu-devel@patchwork.kernel.org; Mon, 11 May 2020 07:32:04 -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 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 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 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 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 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?q?Marc-Andr=C3=A9?= Lureau Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" 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 = block/ crypto-obj-y = crypto/ io-obj-y = io/ +io-obj-y += yank.o endif # CONFIG_SOFTMMU or CONFIG_TOOLS 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; }; 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); +/** + * 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" #define SOCKET_MAX_FDS 16 @@ -55,6 +56,7 @@ qio_channel_socket_new(void) sioc = QIO_CHANNEL_SOCKET(object_new(TYPE_QIO_CHANNEL_SOCKET)); sioc->fd = -1; + sioc->yank = 0; ioc = QIO_CHANNEL(sioc); qio_channel_set_feature(ioc, QIO_CHANNEL_FEATURE_SHUTDOWN); @@ -395,10 +397,19 @@ qio_channel_socket_accept(QIOChannelSocket *ioc, return NULL; } +static void qio_channel_socket_yank(void *opaque) +{ + QIOChannel *ioc = opaque; + QIOChannelSocket *sioc = QIO_CHANNEL_SOCKET(ioc); + + shutdown(sioc->fd, SHUT_RDWR); +} + static void qio_channel_socket_init(Object *obj) { QIOChannelSocket *ioc = QIO_CHANNEL_SOCKET(obj); ioc->fd = -1; + ioc->yank = 0; } 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 = -1; } + if (ioc->yank) { + yank_unregister_function(qio_channel_socket_yank, ioc); + } } @@ -686,6 +700,20 @@ qio_channel_socket_set_delay(QIOChannel *ioc, &v, sizeof(v)); } +static void +qio_channel_socket_set_yank(QIOChannel *ioc, + bool enabled) +{ + QIOChannelSocket *sioc = QIO_CHANNEL_SOCKET(ioc); + + if (sioc->yank) { + yank_unregister_function(qio_channel_socket_yank, ioc); + } + sioc->yank = enabled; + if (sioc->yank) { + yank_register_function(qio_channel_socket_yank, ioc); + } +} 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 = qio_channel_socket_shutdown; ioc_klass->io_set_cork = qio_channel_socket_set_cork; ioc_klass->io_set_delay = qio_channel_socket_set_delay; + ioc_klass->io_set_yank = qio_channel_socket_set_yank; ioc_klass->io_create_watch = qio_channel_socket_create_watch; ioc_klass->io_set_aio_fd_handler = qio_channel_socket_set_aio_fd_handler; } 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, } } +void qio_channel_set_yank(QIOChannel *ioc, + bool enabled) +{ + QIOChannelClass *klass = QIO_CHANNEL_GET_CLASS(ioc); + + if (klass->io_set_yank) { + klass->io_set_yank(ioc, enabled); + } +} void qio_channel_set_cork(QIOChannel *ioc, bool enabled)