From nobody Sun Apr 26 09:26:27 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g3LtC360lz6bLxt for ; Sun, 26 Apr 2026 09:26:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g3LtC1yhJz4LJY for ; Sun, 26 Apr 2026 09:26:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777195587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VvFOl/Jivq7o5b5Qkh4mad9ZdPMEy+h1nGxNZvIHMyg=; b=MVIf1Ioa++T7smNLrnnROjihbj4z62CByU9WJnwoMqrka4Jpe9yzhKxCk3JXMGNVVsZR2h N9YQBDQlxoyJGEGPnETMj1j+z+0dDWGVSfNEw4GUQywsaruwW7cP8AAJpeC2ndmqaWJqxi iaVY2ViH3YXN1kjtInerW/QNT4ZUh1eB7Mz3IqYtBccx1IvjTVzhYHTn6aklY4PugULqM5 /BHwg0deGU9K35yAwUeunLRkjhFVfu5tUgwOvqBFaluzuoALqiM8MgRp/w7nuVVpgCuxb3 TPzEqTJUqtXOBu1qVQ/mwgH986ocdyFc1wQjhwceTTWdiRuyLYoI7f9ugQJBWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777195587; a=rsa-sha256; cv=none; b=avoypOOXaxu/XJ8raOEtvuVf4vZrkn59L/VYvqGwsJHXn43KG4euAFw01qUsoAmQb+ROIJ EV/56GpGZ9LDhHWqGTQdZ7sdefm6p6rN/w/znHMikYGf/0qCDIy2IDKPRRsLR4dR1FeURj VCqe4Be4C7PDqa3z3SXcd/FRtCqoDFcGMkrLFbu0QSUSvCgL0x/yZD7g/oG0/5whhzTQi4 xbANXhlSVmSjCcTYHOieXq6fSLOwLrU2AfzSWDSrzAlfJMaZ+xQRj3wj9uq1wTXRE0LeLA IIG8GHxtSUvKqFPWaMKDouqm2qCbO16vrFQtnpiN/sPeGZ5dvMqkusqM+cxAwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777195587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VvFOl/Jivq7o5b5Qkh4mad9ZdPMEy+h1nGxNZvIHMyg=; b=I0JFMjBs8mIm9C5t09CVpcXKkFVK4RWxxugitD+fB5f/qt21JpgcJJXvYg08lUeu09F6x0 AQ/bpti26VJHOoi+4zhQr+THseJ/SDZi9iUVFDBh8P3GGd6mw9yRp6Edt1YMmXZqvwtchu R4kobyKVCccgVR5q+i+OMUCByQw3KJlV4OX6qVfx3E+Ei9NA9lpa0NiqNH9LhBfKxi/+Kj XTdT6baNLff2/r+iMU7O092YL8u98F5q+hpj/B7H+2WG3ldpVSwTQvgR2ATt1c5FLqPIGm xmLVIG6bhp7WDw38EAs9gEFJZOuQziTrWMU6qznIic+6xYxli/fw7x8byF69Qw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g3LtC0yTgzKZ for ; Sun, 26 Apr 2026 09:26:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39731 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 26 Apr 2026 09:26:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 68a749fbd497 - stable/14 - bpf: fix handling the read timeout on ppc64 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 68a749fbd49797f1f6bfc59c69360302f1381eb6 Auto-Submitted: auto-generated Date: Sun, 26 Apr 2026 09:26:27 +0000 Message-Id: <69edda43.39731.520b649f@gitrepo.freebsd.org> The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=68a749fbd49797f1f6bfc59c69360302f1381eb6 commit 68a749fbd49797f1f6bfc59c69360302f1381eb6 Author: Michael Tuexen AuthorDate: 2026-04-15 19:24:05 +0000 Commit: Michael Tuexen CommitDate: 2026-04-26 07:24:50 +0000 bpf: fix handling the read timeout on ppc64 On platforms other than amd64, BIOCSRTIMEOUT is equal to BIOCSRTIMEOUT32. Therefore, running the COMPAT_FREEBSD32 code basically clears tv_usec on big endian platforms. When tcpdump is used, the timeout requested is 100ms, which gets cleared to 0 on ppc64 platforms. This results in tcpdump showing the packets only when the read buffer is full. Thanks to kib for guiding me to the correct fix. Reported by: ivy Reviewed by: adrian, kib Differential Revision: https://reviews.freebsd.org/D56399 Event: Wiesbaden Hackathon 2026 (cherry picked from commit 04b994d19eec68a6b5d27ff4b0fa223a05f00e1f) --- sys/net/bpf.c | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/sys/net/bpf.c b/sys/net/bpf.c index a5222c3659c7..39d711c3e021 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -1437,7 +1437,7 @@ bpfioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flags, case BIOCGDLTLIST32: case BIOCGRTIMEOUT32: case BIOCSRTIMEOUT32: - if (SV_PROC_FLAG(td->td_proc, SV_ILP32)) { + if (SV_CURPROC_FLAG(SV_ILP32)) { BPFD_LOCK(d); d->bd_compat32 = 1; BPFD_UNLOCK(d); @@ -1445,6 +1445,19 @@ bpfioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flags, } #endif +#if defined(COMPAT_FREEBSD32) + if (SV_CURPROC_FLAG(SV_ILP32)) { + /* + * On platforms other than amd64, BIOC[GS]RTIMEOUT32 is equal to + * BIOC[GS]RTIMEOUT. Since this is difficult to handle in the + * switch command, map them. + */ + if (cmd == BIOCSRTIMEOUT32) + cmd = BIOCSRTIMEOUT; + if (cmd == BIOCGRTIMEOUT32) + cmd = BIOCGRTIMEOUT; + } +#endif CURVNET_SET(TD_TO_VNET(td)); switch (cmd) { default: @@ -1639,23 +1652,19 @@ bpfioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flags, * Set read timeout. */ case BIOCSRTIMEOUT: -#if defined(COMPAT_FREEBSD32) && defined(__amd64__) - case BIOCSRTIMEOUT32: -#endif { struct timeval *tv = (struct timeval *)addr; -#if defined(COMPAT_FREEBSD32) +#ifdef COMPAT_FREEBSD32 struct timeval32 *tv32; struct timeval tv64; - if (cmd == BIOCSRTIMEOUT32) { + if (SV_CURPROC_FLAG(SV_ILP32)) { tv32 = (struct timeval32 *)addr; tv = &tv64; tv->tv_sec = tv32->tv_sec; tv->tv_usec = tv32->tv_usec; - } else + } #endif - tv = (struct timeval *)addr; /* * Subtract 1 tick from tvtohz() since this isn't @@ -1670,31 +1679,24 @@ bpfioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flags, * Get read timeout. */ case BIOCGRTIMEOUT: -#if defined(COMPAT_FREEBSD32) && defined(__amd64__) - case BIOCGRTIMEOUT32: -#endif { - struct timeval *tv; -#if defined(COMPAT_FREEBSD32) && defined(__amd64__) + struct timeval *tv = (struct timeval *)addr; +#ifdef COMPAT_FREEBSD32 struct timeval32 *tv32; struct timeval tv64; - if (cmd == BIOCGRTIMEOUT32) + if (SV_CURPROC_FLAG(SV_ILP32)) tv = &tv64; - else #endif - tv = (struct timeval *)addr; - tv->tv_sec = d->bd_rtout / hz; tv->tv_usec = (d->bd_rtout % hz) * tick; -#if defined(COMPAT_FREEBSD32) && defined(__amd64__) - if (cmd == BIOCGRTIMEOUT32) { +#ifdef COMPAT_FREEBSD32 + if (SV_CURPROC_FLAG(SV_ILP32)) { tv32 = (struct timeval32 *)addr; tv32->tv_sec = tv->tv_sec; tv32->tv_usec = tv->tv_usec; } #endif - break; }