From nobody Tue Dec 16 07:06:24 2025 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520982131224519.4354285253146; Tue, 13 Mar 2018 16:02:11 -0700 (PDT) Received: from localhost ([::1]:43356 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evsvq-0000tA-Cm for importer@patchew.org; Tue, 13 Mar 2018 19:02:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57867) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evshm-0005Ss-FF for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:47:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evshl-0002vY-J8 for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:47:38 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:54931) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evshl-0002uV-CP for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:47:37 -0400 Received: by mail-wm0-x241.google.com with SMTP id h76so869688wme.4 for ; Tue, 13 Mar 2018 15:47:37 -0700 (PDT) Received: from donizetti.lan (94-36-191-219.adsl-ull.clienti.tiscali.it. [94.36.191.219]) by smtp.gmail.com with ESMTPSA id x107sm1557951wrb.97.2018.03.13.15.47.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Mar 2018 15:47:35 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=gtR/SPNNKJE6NzAdl6SnmtzuQMkpvyJ2O56FC8US/yk=; b=fOjLpNlHDnIIX3q10FaPM66jiv65FUeRZlh6WX7L4AW7nk2s7T8JAOkcFBwtlyoop5 78In72khEz/I5V370O0DxNjfiYaYoBE6jRXZr4yIpEQityYo4m6oQswAHe/5TA1U77uq 3WQUYiXqi+YXqs8pI0eUDcOysnqsYFuq7HxBuUtBrnTVtmegyA+Mj6Nwyx3D3R++U7Q6 U1ChnNr77+e7rEW8qUn7UNH35QFbWGm/wWfC87a5agBiLkOGMzQ5gzXm0lgcXH7M/eNf hIB1CBgel9k5oa4IwPVLHgiFzyipJaVbLEXQcCHrpS6TpClYKkfKmZ7MQRAlbKoy9LFf Og9Q== 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:mime-version:content-transfer-encoding; bh=gtR/SPNNKJE6NzAdl6SnmtzuQMkpvyJ2O56FC8US/yk=; b=okKPhSb6Rhyd/+3yAK/lb3B5cwIbskyIpvfgdJnR/Meam2ce8Y0bQMj4BCrTLdEl/e 6zal0rJDeF/v2UG+zp4/3FCOmzRt/5jLQmKVNf7a0Yg1dfp2XqCC25lGXfy+t6Ad6gsD VGxnz7ANcXBEyW3iZ4rRLDKgzHgKcbIxOCXDHWn9NrRA9uaOjp1la879gg6ZW4GSMRoK xie//eY0K1aIe/tcH9SCYSz8U+Umt2lGErf0oswrsvfId494iBWXWVCI+FQ4LYZYrlnL mmPyouUsvFkiO6qLLQeClrmL9z89qtMowune1vmjpvCFEgWNqbXLBlTt2Hqf2acjNuC5 +Y3A== X-Gm-Message-State: AElRT7EXeOgsNwFmG6KHZBB/jwrBggjw6QVILs/p1LwrsvVgRQjBf/km qnmoMUn86ZBwFzEF9kZNwLZ2Y5qe X-Google-Smtp-Source: AG47ELs+R6ME2jU8Z3rvBAEQ8+AqvKRHKgRkpe9vsMRvQm0X69XQ47DHpQl7sIk/602VJfAHCmJ/aQ== X-Received: by 10.28.17.77 with SMTP id 74mr2090244wmr.67.1520981255885; Tue, 13 Mar 2018 15:47:35 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 23:46:22 +0100 Message-Id: <20180313224719.4954-13-pbonzini@redhat.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313224719.4954-1-pbonzini@redhat.com> References: <20180313224719.4954-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::241 Subject: [Qemu-devel] [PULL 12/69] chardev: update net listener gcontext 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 Xu 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 From: Peter Xu TCP chardevs can be using QIO network listeners working in the background when in listening mode. However the network listeners are always running in main context. This can race with chardevs that are running in non-main contexts. To solve this, we need to re-setup the net listeners in tcp_chr_update_read_handler() with the newly cached gcontext. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Peter Xu Message-Id: <20180306053320.15401-4-peterx@redhat.com> Acked-by: Stefan Hajnoczi Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Paolo Bonzini --- chardev/char-socket.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/chardev/char-socket.c b/chardev/char-socket.c index 541fcf487d..2475e1d52f 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -423,8 +423,8 @@ static void tcp_chr_disconnect(Chardev *chr) tcp_chr_free_connection(chr); =20 if (s->listener) { - qio_net_listener_set_client_func(s->listener, tcp_chr_accept, - chr, NULL); + qio_net_listener_set_client_func_full(s->listener, tcp_chr_accept, + chr, NULL, chr->gcontext); } update_disconnected_filename(s); if (emit_close) { @@ -560,6 +560,16 @@ static void tcp_chr_update_read_handler(Chardev *chr) { SocketChardev *s =3D SOCKET_CHARDEV(chr); =20 + if (s->listener) { + /* + * It's possible that chardev context is changed in + * qemu_chr_be_update_read_handlers(). Reset it for QIO net + * listener if there is. + */ + qio_net_listener_set_client_func_full(s->listener, tcp_chr_accept, + chr, NULL, chr->gcontext); + } + if (!s->connected) { return; } @@ -744,7 +754,8 @@ static int tcp_chr_new_client(Chardev *chr, QIOChannelS= ocket *sioc) qio_channel_set_delay(s->ioc, false); } if (s->listener) { - qio_net_listener_set_client_func(s->listener, NULL, NULL, NULL); + qio_net_listener_set_client_func_full(s->listener, NULL, NULL, + NULL, chr->gcontext); } =20 if (s->tls_creds) { @@ -825,7 +836,8 @@ static void char_socket_finalize(Object *obj) tcp_chr_reconn_timer_cancel(s); qapi_free_SocketAddress(s->addr); if (s->listener) { - qio_net_listener_set_client_func(s->listener, NULL, NULL, NULL); + qio_net_listener_set_client_func_full(s->listener, NULL, NULL, + NULL, chr->gcontext); object_unref(OBJECT(s->listener)); } if (s->tls_creds) { @@ -981,8 +993,10 @@ static void qmp_chardev_open_socket(Chardev *chr, return; } if (!s->ioc) { - qio_net_listener_set_client_func(s->listener, tcp_chr_acce= pt, - chr, NULL); + qio_net_listener_set_client_func_full(s->listener, + tcp_chr_accept, + chr, NULL, + chr->gcontext); } } else if (qemu_chr_wait_connected(chr, errp) < 0) { goto error; --=20 2.14.3