From nobody Sun Apr 26 08:09:34 2026 X-Original-To: dev-commits-src-all@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 4g3K9V66qlz6bDQt for ; Sun, 26 Apr 2026 08:09:34 +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 4g3K9V3WZwz45mD for ; Sun, 26 Apr 2026 08:09:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777190974; 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=KK+KYe95zSQ8U3BhKM7Of934wr+BluWq2iKruT8DFOo=; b=oiSu7kNY5AY3hv3fqCvK53R0fyPraoIwjxojvTaxXVdsGx2reHvoB9smyERPlLfckXsYDx AwWCkYXoGPMT5/xr4hKKB4xIoaow2IOr+y3A8Pz9ViLsuKLqGqGpg8PyRmj3+PlK3WOu65 RIqe0Pm1ho8ELD+H2rI1Vcx1hPzJ4oIiGwgqGMtYQL2vwrraQXjbuZ2IGW0nloZwyZBN2a rHLZ8txI3XpybuAH0XLpl/4x6WAty4mr1sFRyY+VzCgjYbZed9Ok73o1b1HqvE/WJEQTxl KZRpBOiSedQgvYvGF8AwBKggYLHTwJQZWU5B0+H9X09w3HweXBRg3wxAuX2OfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777190974; a=rsa-sha256; cv=none; b=eUQgtASRMXMG4vV1TaMrA6sDGB8gcDBMofcNNMhNC1+qgnZJR98DFeuVCGtwxaUnwTPA97 CzNStc6MUdDKkXUs7oxRGWBQQxd7Wapa/McyTlx6Q0GUFDENZN7G2umKbnUmt5Sen0eIH9 nuq+J6H96agg8Boadl8PvtFsVspS6+6RwsNGyHp1ZtU5WAXiMjsaKybmyLBGDa34pFPUY9 3RVmWRFT7n5oUfxu6Ct/Od0kQI1lYtMdIexCmq0WUfN69luGOkjYWmQy/MwrqMWQk3HWgr ECGrMBZDuUO1rOvqMdfYHgEcdHNKBNOJ30u2cuFKkDmPY2MQpNxGYl2INYoo6w== 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=1777190974; 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=KK+KYe95zSQ8U3BhKM7Of934wr+BluWq2iKruT8DFOo=; b=BAwUlZoBnYtU4AIZQpzxR6FNefWcHwbDxEjmp/4nlv/x52wy/vg78U3j6FtdyElNYMAAjM 9TkD/6iRWfS0vm1+qrZhYon6+RBCk2zYP/5d/eOCnmY5YGPvX7SvQ7T8r2Hl3beYON3Jov HHi7NqZCcQU1wnq23p32pTR92z4Drm5XeTQ8fJVv1y9yFjcsgtrjcP72pDdxPv35+n09vJ B9dubvsb9zdcSD97eD+oyZPNOYh4oEFDXV+7bKHBh9KwtE1D0MtElxcb1LWXX6l+1W7aGi i7K5txeVM+a4WpKBCKldGHhY+p3Zobghw8gBiXISr3fWHdg7tqJ1fjXc/4n7hQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g3K9V36yqz1BCF for ; Sun, 26 Apr 2026 08:09:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30605 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 26 Apr 2026 08:09:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 8e629780d32f - stable/15 - bpf: fix handling the read timeout on ppc64 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/15 X-Git-Reftype: branch X-Git-Commit: 8e629780d32f4405359e33f128e57a7bb704f684 Auto-Submitted: auto-generated Date: Sun, 26 Apr 2026 08:09:34 +0000 Message-Id: <69edc83e.30605.3010c78@gitrepo.freebsd.org> The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=8e629780d32f4405359e33f128e57a7bb704f684 commit 8e629780d32f4405359e33f128e57a7bb704f684 Author: Michael Tuexen AuthorDate: 2026-04-15 19:24:05 +0000 Commit: Michael Tuexen CommitDate: 2026-04-26 08:08:05 +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 f598733773d0..ff30aa7a3a9a 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -1439,7 +1439,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); @@ -1447,6 +1447,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: @@ -1641,23 +1654,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 @@ -1672,31 +1681,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; }