From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: passt.top; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=dkFq04sg; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by passt.top (Postfix) with ESMTPS id 6260C5A026F for ; Tue, 04 Feb 2025 07:44:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1738651460; 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=SWYUkNLe7Dqdl+bTJ5OAQsth0LgJ3YWqehVJpDuZhqg=; b=dkFq04sgxvUlgtbF25KBQp51hnLXayhb/G+c+3SgsCje0QzR4DwyiGIs3XLSKVWCyYkqYc rmNEnO/YSt2IuzCxgXSTy3BZhPPNPWJJ3ZEJTaGrP4aUj+KOjfffOSKcce2tPppHb+kKEr q2/9c1Gvk9xM7m6Q9XqlE/SV2acgioQ= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-43-ZKegRkoXOwuLWT3KEotYUg-1; Tue, 04 Feb 2025 01:44:16 -0500 X-MC-Unique: ZKegRkoXOwuLWT3KEotYUg-1 X-Mimecast-MFC-AGG-ID: ZKegRkoXOwuLWT3KEotYUg Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-4361f371908so37230205e9.0 for ; Mon, 03 Feb 2025 22:44:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738651454; x=1739256254; h=content-transfer-encoding:mime-version:organization:references :in-reply-to:message-id:subject:cc:to:from:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=SWYUkNLe7Dqdl+bTJ5OAQsth0LgJ3YWqehVJpDuZhqg=; b=DosDACYUou6o/qs5loOKdPtpNPlKWR9rODw64NkncDtSpCrj2+xVe0Ymb9MDXlF+QJ dfKkTykeIwv7oJwoljljH96coSePuDohE2KzZLM+QZ7cGbWNZnvxCvozCqyhSdi/1TcD zWWrMPSy3fTPiw1v2Aemj+zl86wwp39LC/IMNVf1mcTisQAsGu/WLlVMtnnyqDbB2NqX +kwqFBadyIqLEWhE143K+H958a6V7FgPdpFPhKwA08jhBFHvRvEXlfl3Dd4pQc83DWpS 8lemSABSxOrbJjld/SnWyyB9THNzK3rjXjboa+Uoc3UcqY8vbaxV6t84CGVpY7h2obvG JVCw== X-Gm-Message-State: AOJu0YzzZUoip1ZkMNue2tmzM4Wfz7+fxjcg9cLBOQp+nMG1RAK3cXmh l0x6aO6DSM6/o76N8dWR6dt5q3c/Gn+OLX4u+NIQBwmKYPQVYe2MjV1usiEB4kBnJVUoCFqxjwP reIU+b039QAkJXyaT181dVj5QJ8MasF6jK0rXj2Sh4A6JCkyABVi0e+R7pQ== X-Gm-Gg: ASbGnctxzPldh1SVeYIe4n+v36MQtq/WRMPZkAOeWNhUfuSyBcF280vlxu7MpHNB8+D vB9AxAlTDtlPaJNLUFn4p8W73WZpvDvSEC4P0/k6UrsRQpHXqFfeBsW4f2SqdyOlewq3Vs61EZr icu/m6lBWXqwr9gJLUZU9oV69Lo//zXapkcN4S4ZrldHZgiQkNb6MJ2oq+DJ0inFEBeBDgZ+gpr IBOrrswH6NHaUSPj5JdhWHmZJFFRyvuirZx0rN7KkQQqM8Atu0YaIh/T7lKoMSeP6+MmGWBDsdk YJRw/7b11gjRbEiy3PvhjbtStjF4uw1UzQ== X-Received: by 2002:a05:600c:1ca3:b0:438:a240:c55 with SMTP id 5b1f17b1804b1-438e70d1b20mr116963845e9.1.1738651454579; Mon, 03 Feb 2025 22:44:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IFYHvjP1AjuZXHmNbjtMfRhQ8Y5Aje66ZTTDcalwseDD186QbcABHyP3AsHfRyk/RzF9GsWpQ== X-Received: by 2002:a05:600c:1ca3:b0:438:a240:c55 with SMTP id 5b1f17b1804b1-438e70d1b20mr116963755e9.1.1738651454100; Mon, 03 Feb 2025 22:44:14 -0800 (PST) Received: from maya.myfinge.rs (ifcgrfdd.trafficplex.cloud. [176.103.220.4]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-438e23e6bf8sm178516695e9.23.2025.02.03.22.44.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Feb 2025 22:44:13 -0800 (PST) Date: Tue, 4 Feb 2025 07:44:10 +0100 From: Stefano Brivio To: David Gibson Subject: Re: [PATCH v4 6/8] flow, tcp: Basic pre-migration source handler to dump sequence numbers Message-ID: <20250204074410.5d0f5eb3@elisabeth> In-Reply-To: References: <20250204004745.97854-1-sbrivio@redhat.com> <20250204004745.97854-7-sbrivio@redhat.com> Organization: Red Hat X-Mailer: Claws Mail 4.2.0 (GTK 3.24.41; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: u4RQCRg7r044Vt_1BxPvoCO176jtGpFgbmfFnAlBH3U_1738651455 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Message-ID-Hash: GAYUDUDE7B4FQMILYX5U5H3QIEF7NKGV X-Message-ID-Hash: GAYUDUDE7B4FQMILYX5U5H3QIEF7NKGV X-MailFrom: sbrivio@redhat.com 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: On Tue, 4 Feb 2025 14:43:07 +1100 David Gibson wrote: > On Tue, Feb 04, 2025 at 01:47:43AM +0100, Stefano Brivio wrote: > > Very much draft quality, but it works. Ask passt-repair to switch > > TCP sockets to repair mode and dump their current sequence numbers to > > the flow table, which will be transferred and used by the target in > > the next step. > > [snip] > > @@ -268,6 +270,7 @@ void migrate_close(struct ctx *c) > > { > > if (c->device_state_fd != -1) { > > debug("Closing migration channel, fd: %d", c->device_state_fd); > > + epoll_del(c, c->device_state_fd); > > You have a stray revert hunks here again which breaks things horribly. > And therefore makes me not confident that I'm actually testing the > same code you are. Well, folding "[PATCH 6/6] migrate: Make migration handlers simpler and more flexible" into the first patches, where it belongs, was a lot of fun. As I mentioned, I didn't test this one, I just build-tested the final result. > > close(c->device_state_fd); > > c->device_state_fd = -1; > > c->device_state_result = -1; > > @@ -282,14 +285,12 @@ void migrate_close(struct ctx *c) > > */ > > void migrate_request(struct ctx *c, int fd, bool target) > > { > > - debug("Migration requested, fd: %d (was %d)", > > - fd, c->device_state_fd); > > + debug("Migration requested, fd: %d", c->device_state_fd); > > > > if (c->device_state_fd != -1) > > migrate_close(c); > > > > c->device_state_fd = fd; > > - c->migrate_target = target; > > And here. Can you please post the fixed rebase...? -- Stefano