From nobody Tue May 14 23:26:59 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1619004673; cv=none; d=zohomail.com; s=zohoarc; b=iZOrETST9fbgCZ5gvViuMP2/gGu4Xr916+KQv7z2rVyKjG2zMgwBPCVuzktHpHuX+tcsQcyi+5uxOA+OP/e+1Xqsq3hHFHTDbzDS2G/VbsNmTRAOiAcCSt9Vj7rNb5MhtHx/LtbGRYTfshDRRYJ7TfVTp/YrAUHVM7vb+ib/KDI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619004673; h=Content-Type:Content-Transfer-Encoding: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=tq8tauyRARF498O0IZpeR9xfKrbqjlQeEsGQ9JIUkXI=; b=Wi3t3faFgPJ2sG4s8LPoblYH5lQs8NmPaWfGtsyXKB2MPkkK6FfPfHnjYf/kDBEDRncVVV5JG/yD7V3TcbZhbd/nxfTADoWJPtRo13FWSg4uNS3UQgMfc3bCsD4TgAFt1tBpr/xF9d9JoZRG53DX9vmSnZ2fg7wpUK2Z+RCJ8tM= 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; 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 1619004673138852.9526468571078; Wed, 21 Apr 2021 04:31:13 -0700 (PDT) Received: from localhost ([::1]:44374 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lZB4Z-0005J2-TN for importer@patchew.org; Wed, 21 Apr 2021 07:31:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38534) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZB2h-0004As-CM for qemu-devel@nongnu.org; Wed, 21 Apr 2021 07:29:15 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:40728) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZB2e-0000N4-Jp for qemu-devel@nongnu.org; Wed, 21 Apr 2021 07:29:15 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-375-ifiwEpT5NZCNTXpzWqGfJA-1; Wed, 21 Apr 2021 07:29:10 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 394461008304 for ; Wed, 21 Apr 2021 11:28:41 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-114-29.ams2.redhat.com [10.36.114.29]) by smtp.corp.redhat.com (Postfix) with ESMTP id 724D76268F; Wed, 21 Apr 2021 11:28:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619004552; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tq8tauyRARF498O0IZpeR9xfKrbqjlQeEsGQ9JIUkXI=; b=B7mnRZxPRVsneHl2hwy1rr+s2gSdFQky4dOxhGQxuj1WmOXB+fcBB2zfNBkLeWZR4srGZX LSdv7N09jR7qy8YKO/KxUoBhewIlW1gKZx6JvyGgWmiSK+sx9jO1qVtX8uaqheKQCKePgP CEEeO7/8IqbFUZ9mA1Pyku0/cf+GP7w= X-MC-Unique: ifiwEpT5NZCNTXpzWqGfJA-1 From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, berrange@redhat.com, kraxel@redhat.com, eblake@redhat.com, armbru@redhat.com, pabeni@redhat.com Subject: [PATCH v2 1/5] channel-socket: Only set CLOEXEC if we have space for fds Date: Wed, 21 Apr 2021 12:28:30 +0100 Message-Id: <20210421112834.107651-2-dgilbert@redhat.com> In-Reply-To: <20210421112834.107651-1-dgilbert@redhat.com> References: <20210421112834.107651-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dgilbert@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=216.205.24.124; envelope-from=dgilbert@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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: peterx@redhat.com, quintela@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: "Dr. David Alan Gilbert" MSG_CMSG_CLOEXEC cleans up received fd's; it's really only for Unix sockets, but currently we enable it for everything; some socket types (IP_MPTCP) don't like this. Only enable it when we're giving the recvmsg room to receive fd's anyway. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Daniel P. Berrang=C3=A9 --- io/channel-socket.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/io/channel-socket.c b/io/channel-socket.c index de259f7eed..606ec97cf7 100644 --- a/io/channel-socket.c +++ b/io/channel-socket.c @@ -487,15 +487,15 @@ static ssize_t qio_channel_socket_readv(QIOChannel *i= oc, =20 memset(control, 0, CMSG_SPACE(sizeof(int) * SOCKET_MAX_FDS)); =20 -#ifdef MSG_CMSG_CLOEXEC - sflags |=3D MSG_CMSG_CLOEXEC; -#endif - msg.msg_iov =3D (struct iovec *)iov; msg.msg_iovlen =3D niov; if (fds && nfds) { msg.msg_control =3D control; msg.msg_controllen =3D sizeof(control); +#ifdef MSG_CMSG_CLOEXEC + sflags |=3D MSG_CMSG_CLOEXEC; +#endif + } =20 retry: --=20 2.31.1 From nobody Tue May 14 23:26:59 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1619004824; cv=none; d=zohomail.com; s=zohoarc; b=AO+HEOpJXF15VjUENX7fCl6HQHjXu5cwW3sWn07BKaL9rOYXu3DG9NMo60/GWmzICUHBbJxArMR5SVIsdumEj43nTCuM8FTPwG9RfK6VCtffw4CSNzF1iUMzOLywWD1bMLVwSD2n6bog3dz3U+/1QnEIdjfcwCUkW7dmplOYCaA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619004824; h=Content-Type:Content-Transfer-Encoding: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=ejMOe7Z6JxKP7STo5faGFHlyrnVP7/syI7UjLQeO2oc=; b=fL0TxeHOqSBPOLIxfuy/Zd6GLoEn9uckBySoe+C+rfjosQg7DI2dLj7U13Byuzzy02juQKz9vsaxGTHt6fLHq4StMLU8KmXLpM8qJPDHvd6X0s5gc3+1GWGdtcTu7au8WNVEgQzlVWEE3ZrKcJpbmA+sN//wz8eFS0gfqOmed3g= 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; 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 1619004824400661.71429945483; Wed, 21 Apr 2021 04:33:44 -0700 (PDT) Received: from localhost ([::1]:51012 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lZB71-00087H-Ez for importer@patchew.org; Wed, 21 Apr 2021 07:33:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38580) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZB2x-0004Lk-6F for qemu-devel@nongnu.org; Wed, 21 Apr 2021 07:29:31 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:47601) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZB2s-0000U8-MY for qemu-devel@nongnu.org; Wed, 21 Apr 2021 07:29:30 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-146-JQiWFTqmOCGid9a6Guddgg-1; Wed, 21 Apr 2021 07:29:24 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5883B100A8E0 for ; Wed, 21 Apr 2021 11:28:43 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-114-29.ams2.redhat.com [10.36.114.29]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8665663634; Wed, 21 Apr 2021 11:28:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619004566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ejMOe7Z6JxKP7STo5faGFHlyrnVP7/syI7UjLQeO2oc=; b=IvVwM3dqV6sdu0gLqpmr5cN7l2+DVbSG0m2hQZu7Biqy//oRw0wN3ncMVa/Jyk8uiqmaVV DFo0sl+EKl9/ifTGQOH8m6hVEqes42yjKhY+B0JxyIBkqxYz3j3lSdjX4sBkZI4vp+EjEJ GGfSqi4SA/UxKwt0Ify+C6orkYQGRWo= X-MC-Unique: JQiWFTqmOCGid9a6Guddgg-1 From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, berrange@redhat.com, kraxel@redhat.com, eblake@redhat.com, armbru@redhat.com, pabeni@redhat.com Subject: [PATCH v2 2/5] io/net-listener: Call the notifier during finalize Date: Wed, 21 Apr 2021 12:28:31 +0100 Message-Id: <20210421112834.107651-3-dgilbert@redhat.com> In-Reply-To: <20210421112834.107651-1-dgilbert@redhat.com> References: <20210421112834.107651-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dgilbert@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=170.10.133.124; envelope-from=dgilbert@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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: peterx@redhat.com, quintela@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: "Dr. David Alan Gilbert" Call the notifier during finalize; it's currently only called if we change it, which is not the intent. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Daniel P. Berrang=C3=A9 --- io/net-listener.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/io/net-listener.c b/io/net-listener.c index 46c2643d00..1c984d69c6 100644 --- a/io/net-listener.c +++ b/io/net-listener.c @@ -292,6 +292,9 @@ static void qio_net_listener_finalize(Object *obj) QIONetListener *listener =3D QIO_NET_LISTENER(obj); size_t i; =20 + if (listener->io_notify) { + listener->io_notify(listener->io_data); + } qio_net_listener_disconnect(listener); =20 for (i =3D 0; i < listener->nsioc; i++) { --=20 2.31.1 From nobody Tue May 14 23:26:59 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1619004897; cv=none; d=zohomail.com; s=zohoarc; b=CDSVlu+HSsYTvI+3CjmelbrsSDpQXASpdI+QHYSuBrqunoHHOZ/0En511W4WwvxTU14QOaQwxM/V8mvawCy4TsogIMR2IHvW0GEbd5UsXVvL8zrK46XBok86SBH6L338mmTOoYT5UXlPkqtmxoSeMRk7k4vXEp+EWd2O0A2aJ1M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619004897; h=Content-Type:Content-Transfer-Encoding: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=H5VL2YPbY2EtEXByGnh80RXTV+u6r2Sjz3BJ3ZT9dJE=; b=AMCNjPE0xw+aBvN9+cFXrFkTokJw8PMQxqbGt271Qd2aN8SvUUcHW1tzQBHOWF6XHqUDRAMOcaBK2pYuHKJiwSClLd6UxiQRbUm9PiGKWpXxjw4XIGAgRlnzVbYnyO8V3+WacOMQEwbmDAwZf/AGbe0+1riRPq7VmY9hzdduxWg= 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; 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 161900489767626.048340790068437; Wed, 21 Apr 2021 04:34:57 -0700 (PDT) Received: from localhost ([::1]:53656 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lZB8B-0000oL-NG for importer@patchew.org; Wed, 21 Apr 2021 07:34:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38618) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZB36-0004OA-Eb for qemu-devel@nongnu.org; Wed, 21 Apr 2021 07:29:40 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:26998) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZB32-0000Xg-Dm for qemu-devel@nongnu.org; Wed, 21 Apr 2021 07:29:40 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-124-AIkPoacUNumzqrVrvfJsug-1; Wed, 21 Apr 2021 07:29:33 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 73FAA108BD0B for ; Wed, 21 Apr 2021 11:28:45 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-114-29.ams2.redhat.com [10.36.114.29]) by smtp.corp.redhat.com (Postfix) with ESMTP id AAD53629DA; Wed, 21 Apr 2021 11:28:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619004575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=H5VL2YPbY2EtEXByGnh80RXTV+u6r2Sjz3BJ3ZT9dJE=; b=hJBUFoZIVQtEWcAj3kHtjkPTl7noJUXMkMorrcWdAcuBCzNzJsBGN3tSs483jlDj0RD3sE +bkknDSt5BhF6Rs3KsgReCqwWhWa+7SHW7RW/vHAnIqC+c9/cTwevABLRA804NQFzLBMkU uBZAhca+/pWFZ/wQ4UyVV/8UIzTYbME= X-MC-Unique: AIkPoacUNumzqrVrvfJsug-1 From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, berrange@redhat.com, kraxel@redhat.com, eblake@redhat.com, armbru@redhat.com, pabeni@redhat.com Subject: [PATCH v2 3/5] migration: Add cleanup hook for inwards migration Date: Wed, 21 Apr 2021 12:28:32 +0100 Message-Id: <20210421112834.107651-4-dgilbert@redhat.com> In-Reply-To: <20210421112834.107651-1-dgilbert@redhat.com> References: <20210421112834.107651-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dgilbert@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=170.10.133.124; envelope-from=dgilbert@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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: peterx@redhat.com, quintela@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: "Dr. David Alan Gilbert" Add a cleanup hook for incoming migration that gets called at the end as a way for a transport to allow cleanup. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Daniel P. Berrang=C3=A9 --- migration/migration.c | 3 +++ migration/migration.h | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/migration/migration.c b/migration/migration.c index 8ca034136b..d48986fbbb 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -279,6 +279,9 @@ void migration_incoming_state_destroy(void) g_array_free(mis->postcopy_remote_fds, TRUE); mis->postcopy_remote_fds =3D NULL; } + if (mis->transport_cleanup) { + mis->transport_cleanup(mis->transport_data); + } =20 qemu_event_reset(&mis->main_thread_load_event); =20 diff --git a/migration/migration.h b/migration/migration.h index db6708326b..1b4c5da917 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -49,6 +49,10 @@ struct PostcopyBlocktimeContext; struct MigrationIncomingState { QEMUFile *from_src_file; =20 + /* A hook to allow cleanup at the end of incoming migration */ + void *transport_data; + void (*transport_cleanup)(void *data); + /* * Free at the start of the main state load, set as the main thread fi= nishes * loading state. --=20 2.31.1 From nobody Tue May 14 23:26:59 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1619004721; cv=none; d=zohomail.com; s=zohoarc; b=NRbaRlRBWyVbtjMs15mtm6pSTXTbGdglcD/VO8A2OHw7Mj76WB67Sr2bbVPjU/hVlWICFrKqhsme0/2j9fzx5InCwOmI9BODKEvNNEmBY/CtdCnUgYTVD5rQM/lnkO012Trk0n0hrAYFULzpiyfZLD3wLnZUgrC7Vq5JR8Ln8LE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619004721; h=Content-Type:Content-Transfer-Encoding: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=f0ULvFUc+8wygy2rEDUBjdOaQWsj2vdAkDbIIEwVpSA=; b=Cc7iC66b9WdMTJsThYVBR+WqHLQtfgkdRVpuFLTnfgRAmdCkDa5OLXfkHPjkHoXby9Z+tXF6sDcPZztREXcta4EQhF6jXeNyBnRSFSuVGxa2WmiXFaQ49uYYzfRv62SEWDOM34g9ovDvsvqWVaNWSVFxhAeVuA0kPHbiASJbTxM= 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; 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 1619004721797756.1109034044266; Wed, 21 Apr 2021 04:32:01 -0700 (PDT) Received: from localhost ([::1]:46288 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lZB5M-0006A5-OB for importer@patchew.org; Wed, 21 Apr 2021 07:32:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38656) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZB3L-0004c1-Sz for qemu-devel@nongnu.org; Wed, 21 Apr 2021 07:29:55 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:43203) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZB3K-0000fo-7A for qemu-devel@nongnu.org; Wed, 21 Apr 2021 07:29:55 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-470-lyS0vncjN_WVwg_qyZxwWQ-1; Wed, 21 Apr 2021 07:29:46 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 807E48BAB73 for ; Wed, 21 Apr 2021 11:28:47 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-114-29.ams2.redhat.com [10.36.114.29]) by smtp.corp.redhat.com (Postfix) with ESMTP id C34CF5B6BE; Wed, 21 Apr 2021 11:28:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619004593; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=f0ULvFUc+8wygy2rEDUBjdOaQWsj2vdAkDbIIEwVpSA=; b=Ii6mCOTv4yDjCwcb8VBA1X825owqMvyVR3dAglfqWPIwSMQJiyoJpQxS+IJBfLHm80d6KF UBLmyhSCfhg0GK/8nb+ufa5lIqzb9ewQDHIDxTWHfUrjvcWDwOLJloeaKUy7GaYjy/Q1Oi liaP0yaDzQk11AEfnGSBH2HlunZdCSg= X-MC-Unique: lyS0vncjN_WVwg_qyZxwWQ-1 From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, berrange@redhat.com, kraxel@redhat.com, eblake@redhat.com, armbru@redhat.com, pabeni@redhat.com Subject: [PATCH v2 4/5] migration/socket: Close the listener at the end Date: Wed, 21 Apr 2021 12:28:33 +0100 Message-Id: <20210421112834.107651-5-dgilbert@redhat.com> In-Reply-To: <20210421112834.107651-1-dgilbert@redhat.com> References: <20210421112834.107651-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dgilbert@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=170.10.133.124; envelope-from=dgilbert@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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: peterx@redhat.com, quintela@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: "Dr. David Alan Gilbert" Delay closing the listener until the cleanup hook at the end; mptcp needs the listener to stay open while the other paths come in. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Daniel P. Berrang=C3=A9 --- migration/multifd.c | 5 +++++ migration/socket.c | 24 ++++++++++++++++++------ 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/migration/multifd.c b/migration/multifd.c index a6677c45c8..cebd9029b9 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -1165,6 +1165,11 @@ bool multifd_recv_all_channels_created(void) return true; } =20 + if (!multifd_recv_state) { + /* Called before any connections created */ + return false; + } + return thread_count =3D=3D qatomic_read(&multifd_recv_state->count); } =20 diff --git a/migration/socket.c b/migration/socket.c index 6016642e04..05705a32d8 100644 --- a/migration/socket.c +++ b/migration/socket.c @@ -126,22 +126,31 @@ static void socket_accept_incoming_migration(QIONetLi= stener *listener, { trace_migration_socket_incoming_accepted(); =20 - qio_channel_set_name(QIO_CHANNEL(cioc), "migration-socket-incoming"); - migration_channel_process_incoming(QIO_CHANNEL(cioc)); - if (migration_has_all_channels()) { - /* Close listening socket as its no longer needed */ - qio_net_listener_disconnect(listener); - object_unref(OBJECT(listener)); + error_report("%s: Extra incoming migration connection; ignoring", + __func__); + return; } + + qio_channel_set_name(QIO_CHANNEL(cioc), "migration-socket-incoming"); + migration_channel_process_incoming(QIO_CHANNEL(cioc)); } =20 +static void +socket_incoming_migration_end(void *opaque) +{ + QIONetListener *listener =3D opaque; + + qio_net_listener_disconnect(listener); + object_unref(OBJECT(listener)); +} =20 static void socket_start_incoming_migration_internal(SocketAddress *saddr, Error **errp) { QIONetListener *listener =3D qio_net_listener_new(); + MigrationIncomingState *mis =3D migration_incoming_get_current(); size_t i; int num =3D 1; =20 @@ -156,6 +165,9 @@ socket_start_incoming_migration_internal(SocketAddress = *saddr, return; } =20 + mis->transport_data =3D listener; + mis->transport_cleanup =3D socket_incoming_migration_end; + qio_net_listener_set_client_func_full(listener, socket_accept_incoming_migration, NULL, NULL, --=20 2.31.1 From nobody Tue May 14 23:26:59 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1619004743; cv=none; d=zohomail.com; s=zohoarc; b=MzKv9UBdT8I9RO/bjZE3KVmj6g2rCxVRJuXEPLPSX50lbndNB1W4M8Zllr3RiQFCBa/j2CXFUm9/CHCetsmZDehXIcMg65aJXjgIdKj4HPeS1le+nOYatJXSwUPnhgNX5h0RI71SoAHYNx6DXCIuMFNFw7Mycul7jPqcThKhF6E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619004743; h=Content-Type:Content-Transfer-Encoding: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=mMUqbXWzaqX32o8JwjV7L/8gcPeFSjXmqK0cmd0KwLE=; b=kfWUmlYDVCAJZk8RV6dT1ryhe3OgupenScrLfnrW5E9gVbqW9cQdn2j3KFgO8CUdwFG5QYZkbBeIunNHpSxomRfdpdvyZ5dz3373AKkLkgMkLkizYAdFsE2xLnaEaThiC1yHiuBC1zOFGo98OGFGulxBOLBCxbmeoxX1sq9MSD0= 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; 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 161900474349131.146022612250817; Wed, 21 Apr 2021 04:32:23 -0700 (PDT) Received: from localhost ([::1]:48146 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lZB5i-0006vp-Ad for importer@patchew.org; Wed, 21 Apr 2021 07:32:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38774) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZB3p-0005Hz-6q for qemu-devel@nongnu.org; Wed, 21 Apr 2021 07:30:25 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:24544) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZB3n-0000wp-EM for qemu-devel@nongnu.org; Wed, 21 Apr 2021 07:30:24 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-545-WWtO9j79PbK8sfOXatuP6Q-1; Wed, 21 Apr 2021 07:29:47 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 93BA510890E5 for ; Wed, 21 Apr 2021 11:28:49 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-114-29.ams2.redhat.com [10.36.114.29]) by smtp.corp.redhat.com (Postfix) with ESMTP id DAAAE62693; Wed, 21 Apr 2021 11:28:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619004622; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mMUqbXWzaqX32o8JwjV7L/8gcPeFSjXmqK0cmd0KwLE=; b=LwQ/Wphum56GsjZxhw4979xfeUPjx44ljMWLqZ6YXK2fDvFHoi95H0bTZLpWzdGmMgkBWn /MIMc94i1IVmxGZNYYSnv9NqO7xoIj+IEGH86U0/Zi430nTMRrgRuHN6/uaKF11h1g5mWs 2SiJNY6cnl2Vpy2odXVCC4+Hxf0pseY= X-MC-Unique: WWtO9j79PbK8sfOXatuP6Q-1 From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, berrange@redhat.com, kraxel@redhat.com, eblake@redhat.com, armbru@redhat.com, pabeni@redhat.com Subject: [PATCH v2 5/5] sockets: Support multipath TCP Date: Wed, 21 Apr 2021 12:28:34 +0100 Message-Id: <20210421112834.107651-6-dgilbert@redhat.com> In-Reply-To: <20210421112834.107651-1-dgilbert@redhat.com> References: <20210421112834.107651-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dgilbert@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=216.205.24.124; envelope-from=dgilbert@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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: peterx@redhat.com, quintela@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" Multipath TCP allows combining multiple interfaces/routes into a single socket, with very little work for the user/admin. It's enabled by 'mptcp' on most socket addresses: ./qemu-system-x86_64 -nographic -incoming tcp:0:4444,mptcp Signed-off-by: Dr. David Alan Gilbert Acked-by: Markus Armbruster Reviewed-by: Daniel P. Berrang=C3=A9 --- io/dns-resolver.c | 4 ++++ qapi/sockets.json | 5 ++++- util/qemu-sockets.c | 23 +++++++++++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/io/dns-resolver.c b/io/dns-resolver.c index 743a0efc87..a5946a93bf 100644 --- a/io/dns-resolver.c +++ b/io/dns-resolver.c @@ -122,6 +122,10 @@ static int qio_dns_resolver_lookup_sync_inet(QIODNSRes= olver *resolver, .ipv4 =3D iaddr->ipv4, .has_ipv6 =3D iaddr->has_ipv6, .ipv6 =3D iaddr->ipv6, +#ifdef IPPROTO_MPTCP + .has_mptcp =3D iaddr->has_mptcp, + .mptcp =3D iaddr->mptcp, +#endif }; =20 (*addrs)[i] =3D newaddr; diff --git a/qapi/sockets.json b/qapi/sockets.json index 2e83452797..735eb4abb5 100644 --- a/qapi/sockets.json +++ b/qapi/sockets.json @@ -57,6 +57,8 @@ # @keep-alive: enable keep-alive when connecting to this socket. Not suppo= rted # for passive sockets. (Since 4.2) # +# @mptcp: enable multi-path TCP. (Since 6.1) +# # Since: 1.3 ## { 'struct': 'InetSocketAddress', @@ -66,7 +68,8 @@ '*to': 'uint16', '*ipv4': 'bool', '*ipv6': 'bool', - '*keep-alive': 'bool' } } + '*keep-alive': 'bool', + '*mptcp': { 'type': 'bool', 'if': 'defined(IPPROTO_MPTCP)' } } } =20 ## # @UnixSocketAddress: diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index 8af0278f15..ba7cb1ec4f 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -278,6 +278,11 @@ static int inet_listen_saddr(InetSocketAddress *saddr, =20 /* create socket + bind/listen */ for (e =3D res; e !=3D NULL; e =3D e->ai_next) { +#ifdef IPPROTO_MPTCP + if (saddr->has_mptcp && saddr->mptcp) { + e->ai_protocol =3D IPPROTO_MPTCP; + } +#endif getnameinfo((struct sockaddr*)e->ai_addr,e->ai_addrlen, uaddr,INET6_ADDRSTRLEN,uport,32, NI_NUMERICHOST | NI_NUMERICSERV); @@ -456,6 +461,13 @@ int inet_connect_saddr(InetSocketAddress *saddr, Error= **errp) for (e =3D res; e !=3D NULL; e =3D e->ai_next) { error_free(local_err); local_err =3D NULL; + +#ifdef IPPROTO_MPTCP + if (saddr->has_mptcp && saddr->mptcp) { + e->ai_protocol =3D IPPROTO_MPTCP; + } +#endif + sock =3D inet_connect_addr(saddr, e, &local_err); if (sock >=3D 0) { break; @@ -687,6 +699,17 @@ int inet_parse(InetSocketAddress *addr, const char *st= r, Error **errp) } addr->has_keep_alive =3D true; } +#ifdef IPPROTO_MPTCP + begin =3D strstr(optstr, ",mptcp"); + if (begin) { + if (inet_parse_flag("mptcp", begin + strlen(",mptcp"), + &addr->mptcp, errp) < 0) + { + return -1; + } + addr->has_mptcp =3D true; + } +#endif return 0; } =20 --=20 2.31.1