From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: passt.top; dkim=pass (2048-bit key; secure) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.a=rsa-sha256 header.s=202412 header.b=Zxq+cxce; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by passt.top (Postfix) with ESMTPS id A8FC75A0625 for ; Fri, 31 Jan 2025 07:32:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202412; t=1738305128; bh=/yV/JCng0KTOyQVqQmtyY4PYjOOgjZOiCXWdZ+fNa/M=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Zxq+cxce9OUevYI+z5ITIZN2VkUfPxh48GBI4afa8CAbHzOkTy1HP217WcXIUMVWG N7FdMjanlmX6cPgyT0l4MIH2Kj1mpuLx+56p9axzb7gJzTpEtzso/5dnKk7ffMqHi9 Le6lExxcHUpuxQuMCNAx3zHcrjEkV+qMyr8ihHr8YldF2nuElsFNylecZF0zFyqPSL lTJldz/YbPvxdETUhVi/cBSePzQo69tS+PVXHou8jD7K14ggAtgEdNlyVy9wB6/6mN CTSk20Zc24MoHqhXZsCTMndo0uyJW6b0M2tqZqVNsuXNHj90RMLtNj3ji2Sjvhtg4x SIETnMZgaINig== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4YkmJm0fK3z4x5k; Fri, 31 Jan 2025 17:32:08 +1100 (AEDT) Date: Fri, 31 Jan 2025 17:23:23 +1100 From: David Gibson To: Stefano Brivio Subject: Re: [PATCH 5/5] migrate: Don't handle the migration channel through epoll Message-ID: References: <20250130083330.917030-1-david@gibson.dropbear.id.au> <20250130083330.917030-6-david@gibson.dropbear.id.au> <20250131063709.25a11049@elisabeth> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="md7Y8e3fivdesV4C" Content-Disposition: inline In-Reply-To: <20250131063709.25a11049@elisabeth> Message-ID-Hash: XY6M62B7752B4PIJL6LF47QV4YG2BPDE X-Message-ID-Hash: XY6M62B7752B4PIJL6LF47QV4YG2BPDE X-MailFrom: dgibson@gandalf.ozlabs.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: passt-dev@passt.top X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: --md7Y8e3fivdesV4C Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Jan 31, 2025 at 06:37:09AM +0100, Stefano Brivio wrote: > On Thu, 30 Jan 2025 19:33:30 +1100 > David Gibson wrote: >=20 > > --- a/migrate.c > > +++ b/migrate.c > > @@ -327,26 +327,6 @@ static int migrate_target(struct ctx *c, int fd) > > return rc; > > } > > =20 > > -/** > > - * set_migration_watch() - Add the migration file descriptor to epoll > > - * @c: Execution context > > - * @fd: File descriptor to add > > - * @target: Are we the target of the migration? > > - */ > > -static void set_migration_watch(const struct ctx *c, int fd, bool targ= et) > > -{ > > - union epoll_ref ref =3D { > > - .type =3D EPOLL_TYPE_DEVICE_STATE, > > - .fd =3D fd, > > - }; > > - struct epoll_event ev =3D { 0 }; > > - > > - ev.data.u64 =3D ref.u64; > > - ev.events =3D target ? EPOLLIN : EPOLLOUT; > > - > > - epoll_ctl(c->epollfd, EPOLL_CTL_ADD, ref.fd, &ev); >=20 > This change should have dropped: >=20 > epoll_del(c, c->device_state_fd); >=20 > from migrate_close(). Oops, yes. I've fixed it in my local version, in case I need to rebase before you've folded it all in. --=20 David Gibson (he or they) | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you, not the other way | around. http://www.ozlabs.org/~dgibson --md7Y8e3fivdesV4C Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEO+dNsU4E3yXUXRK2zQJF27ox2GcFAmecbFoACgkQzQJF27ox 2GeHKw/+N9HMsHLvUGd9b/tCavW/ClDfZrGMbDPcviX3663UAfbxBdJsNaoC/VSG XKpP79OAduFhi1yfUanLgIDoi0RN7GP9byAduZYFQc6j+YCxg8V1X+GZRuuly8o3 QZ5nmsl5ka/jMTjQpls83WAw4MHNC+ejKrvm/GPvS0yhRHbwSJ0iS/c4Fmqu2WTz 3aa8NETDiK5y2ByajN9FKvWwoDhxS320O2d/pByQtiCadH9gb9CtSteEiq9yf7St A1/pAFkQXSxjRMa2ycfex8lUNGXytlFVTDkLKCxPYdnRWaibU7eOomz+B75Xgrgu j+nkCnOwnkBcaYnX7UM2H/J7UXaeF7xyvloQvI+0yhjiNj3ggw7e+30mfRiAEJZZ 9wap2BR8kRK1DCdd77SxG1l6KQYbKJLI6KSpn9H3sukIsemIw6NWkGMzy6jMM4wd PjS989MBKWSjexkf8puBqj+fBziASeqcb/8N0EPeD3hNP8u5KeUQ+HFrsdYBFORz ZcJbvQam/ODIT1zZZAKw+9PS0a6brVQidTNTySxgo+IyxbfnC2ajOnbz99jclUwq pJ3VaZyPES1eDLb7EWD6Vb2dQ5rkZumM7gVJhk++tASkgdTLebYZkwhh55+1FfuQ OeVmu2sZVQFDqOcXm8MzwjTV7DHdHe+8u0OQ1TKFN4DIgHOeImU= =V/sj -----END PGP SIGNATURE----- --md7Y8e3fivdesV4C--