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=202502 header.b=MP2OzpXh; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by passt.top (Postfix) with ESMTPS id 2CB815A0624 for ; Wed, 12 Feb 2025 08:07:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202502; t=1739344044; bh=CRVoARCyYb5yNtpt0nySAzZ0e8joMRpQiHFWxQLgIgc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MP2OzpXh4nSXH0QxUTh/yBS7bxw2BoV+oyKsHa5YA5FFrpxgokRHBkKi3rniIk08a sHKfozlYl/ir+NzNhe9KFf4+3TiY/tNHgDO6/MGP+yakLv8r7fSvOa5g/UcviFFRU6 Kv42G2B7Afr7YpiH195REG3oquDmZCH8tHNyWzwWeKdCuZJ9Cv97tY6HGdncpq7tq5 l/iKex9P5qozTbgWjQ2vLD9qBpdduT+qm/GsGrTzUOz3m4hQgP5bBq8zu5GrAJRQKS v+ybhGd8YysE5yi8tafUa/zgo9RTczA9UFfNMGtuE3+pvr2GyUowLXrJTtuy9Ppw+H HuXN+fjSRMrXg== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4Yt8Ww42Gfz4x3S; Wed, 12 Feb 2025 18:07:24 +1100 (AEDT) From: David Gibson To: passt-dev@passt.top, Stefano Brivio Subject: [PATCH v18 9/9] debug Date: Wed, 12 Feb 2025 18:07:21 +1100 Message-ID: <20250212070721.1746128-10-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250212070721.1746128-1-david@gibson.dropbear.id.au> References: <20250212070721.1746128-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: Z354PIQ5HUBWOBPOSLZCOMYX3JCBTNBP X-Message-ID-Hash: Z354PIQ5HUBWOBPOSLZCOMYX3JCBTNBP 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: David Gibson 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: --- tcp.c | 4 ++++ test/lib/setup | 4 +++- test/migrate/rampstream_in | 7 ++++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/tcp.c b/tcp.c index 9717c355..e70e8410 100644 --- a/tcp.c +++ b/tcp.c @@ -3237,6 +3237,8 @@ int tcp_flow_migrate_source_ext(int fd, int fidx, t->sndq, t->notsent, t->rcvq); debug(" window: snd_wl1 %u snd_wnd %u max %u rcv_wnd %u rcv_wup %u", t->snd_wl1, t->snd_wnd, t->max_window, t->rcv_wnd, t->rcv_wup); + debug(" SO_PEEK_OFF %s offset=%"PRIu32, + peek_offset_cap ? "enabled" : "disabled", peek_offset); /* Endianness fix-ups */ t->seq_snd = htonl(t->seq_snd); @@ -3444,6 +3446,8 @@ int tcp_flow_migrate_target_ext(struct ctx *c, union flow *flow, int fd) t.sndq, t.notsent, t.rcvq); debug(" window: snd_wl1 %u snd_wnd %u max %u rcv_wnd %u rcv_wup %u", t.snd_wl1, t.snd_wnd, t.max_window, t.rcv_wnd, t.rcv_wup); + debug(" SO_PEEK_OFF %s offset=%"PRIu32, + peek_offset_cap ? "enabled" : "disabled", peek_offset); if (t.sndq > TCP_MIGRATE_SND_QUEUE_MAX || t.notsent > t.sndq || t.rcvq > TCP_MIGRATE_RCV_QUEUE_MAX) { diff --git a/test/lib/setup b/test/lib/setup index 575bc215..8b9927bf 100755 --- a/test/lib/setup +++ b/test/lib/setup @@ -350,6 +350,8 @@ setup_migrate() { sleep 1 + [ ${PCAP} -eq 1 ] && context_run_bg mon dumpcap -w ${LOGDIR}/fabric.pcap -i lo + __opts="--vhost-user" [ ${PCAP} -eq 1 ] && __opts="${__opts} -p ${LOGDIR}/passt_1.pcap" [ ${DEBUG} -eq 1 ] && __opts="${__opts} -d" @@ -365,7 +367,7 @@ setup_migrate() { [ ${DEBUG} -eq 1 ] && __opts="${__opts} -d" [ ${TRACE} -eq 1 ] && __opts="${__opts} --trace" - context_run_bg passt_2 "./passt -s ${STATESETUP}/passt_2.socket -P ${STATESETUP}/passt_2.pid -f ${__opts} -t 10004 -u 10004" + context_run_bg passt_2 "strace -o ${LOGDIR}/passt_2.strace ./passt -s ${STATESETUP}/passt_2.socket -P ${STATESETUP}/passt_2.pid -f ${__opts} -t 10004 -u 10004" wait_for [ -f "${STATESETUP}/passt_2.pid" ] context_run_bg passt_repair_2 "./passt-repair ${STATESETUP}/passt_2.socket.repair" diff --git a/test/migrate/rampstream_in b/test/migrate/rampstream_in index a37606f0..7c8892af 100644 --- a/test/migrate/rampstream_in +++ b/test/migrate/rampstream_in @@ -29,9 +29,10 @@ check [ -n "__IFNAME1__" ] test DHCP: address guest1 ip link set dev __IFNAME1__ up guest1 /sbin/dhclient -4 __IFNAME1__ -g1out ADDR1 ip -j -4 addr show|jq -rM '.[] | select(.ifname == "__IFNAME1__").addr_info[0].local' -hout HOST_ADDR ip -j -4 addr show|jq -rM '.[] | select(.ifname == "__HOST_IFNAME__").addr_info[0].local' -check [ "__ADDR1__" = "__HOST_ADDR__" ] +#g1out ADDR1 ip -j -4 addr show|jq -rM '.[] | select(.ifname == "__IFNAME1__").addr_info[0].local' +#hout HOST_ADDR ip -j -4 addr show|jq -rM '.[] | select(.ifname == "__HOST_IFNAME__").addr_info[0].local' +#check [ "__ADDR1__" = "__HOST_ADDR__" ] +set ADDR1 127.0.0.1 test DHCPv6: address # Link is up now, wait for DAD to complete -- 2.48.1