From nobody Mon Jul 27 00:10: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 4h7fBM5TwBz6m9PK for ; Mon, 27 Jul 2026 00:10:35 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h7fBM0K46z43By for ; Mon, 27 Jul 2026 00:10:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785111035; 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=xmsZj1FrY5yTsWZ1sPJCJDSz/YCxFwEMcBhjnGkq89w=; b=wIwfUrRwyYZdSqGbWGFlMUyz2Vf9rsgXFv/zcDz1PEvXvq/Celsw8I6ShXBuoU3RsUUx/X E7bPkPTUVjPJUqKuF62MViEU4601/B0VpRvTutOlHHgepBhNHNRRcwR/0JQKp5Gq/LCX2H SbZBrq+h1Py/pIScC9yccIZcMQdzS0fycZgUfgz7YaM4IrFWJYkn14PSmd+UwC3r61Rr3w YVOPAJr6IX9uVGeXbNO4IU5F45bECzvY6eBjm0Rl4IOOr6G3P3oHvgXntg0PI/+Ipuoum0 LseC88JphlrRvMUUe1XR13fUB1tCLGwfwXpzSsx8OzK1e425EGeQtJjO5eVtqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785111035; a=rsa-sha256; cv=none; b=J0OcdwMmQxga+nsxGKviaLVr0W1SughO8NOUFAfJYbnHDylq8lAI5gy7mB0KBw6qDO5jvi kV/tt4X7rCi3Ztgm1PPWZPqIFTjl0vcOJD4FtNpe8fpMM5+8H5GpO5oBIl9vt/jplsqQTa bmUuEYl31v9ooTLaikMNaOC9MPrQIxXFKBX5qpEs3Vq4V3Z7GRQcZ9vdgBHfI5IYPn8fyT Bhza2rfmoqJ3kR4J23JKfSBPzxXVCiZAN+NRsr/dZ5GwMvJ92an3Aa/l6+iDsnAFLw8l1Y dxTkhaK43zU6gZvT9FbqTojuBWdrZgU6g931bTHD2PvA8BkwUvWdA9cviaFvGw== 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=1785111035; 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=xmsZj1FrY5yTsWZ1sPJCJDSz/YCxFwEMcBhjnGkq89w=; b=nKsCPxHsUe1ihD2IwiuAEF6G4EMgn7yIo2QJ7QuTA94uLRc+om0lrwIs9lLFSiNfdu+ljz i919TAtHkEaZEFWDN4bCv+4rEP1KAfdYCULoti8zhH5AOLjmmzwdNuaraA3cIZjLY7LRGW 05Ak7CYMdqZGXgOp52IRfp80Z8XKKuCCiIM8e281T5Sjzngu5MnEDTKkJ0qd6/KxEoeIEU 22Ty9p3jGjHJ8Zn/JGIvR+qkItoeeeDmDhDuk+HrCa3tuwJHqZiMsJ33nBjtZs1K1zas8e KYWu7dnknPhJeMk1hS90wIL8UvIeP63P8QKZ120Vy0BoZwlH0dP8tK57kkAYzA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h7fBL6Lx3zl3V for ; Mon, 27 Jul 2026 00:10:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26d3a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 27 Jul 2026 00:10:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: f16c8e3dda5d - stable/15 - LinuxKPI: skbuff: improve debugging 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f16c8e3dda5da9bb0d0e4504b70647d8f0ad5301 Auto-Submitted: auto-generated Date: Mon, 27 Jul 2026 00:10:34 +0000 Message-Id: <6a66a1fa.26d3a.12d98a5c@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f16c8e3dda5da9bb0d0e4504b70647d8f0ad5301 commit f16c8e3dda5da9bb0d0e4504b70647d8f0ad5301 Author: Bjoern A. Zeeb AuthorDate: 2026-02-03 22:13:24 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-07-26 16:48:00 +0000 LinuxKPI: skbuff: improve debugging Deal with SKB_TRACE_FMT optional arguments; while here properly indent. Add KASSERT to __skb_unlink() to catch incorrect skbuffs encountered while debugging a wireless driver (which had other pre-conditions failing). Sponsored by: The FreeBSD Foundation (cherry picked from commit e5bcf7b99fcbe06d381525ffdd5027b846cdc1d3) --- sys/compat/linuxkpi/common/include/linux/skbuff.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/skbuff.h b/sys/compat/linuxkpi/common/include/linux/skbuff.h index c43d6daff5ee..3133944ed72e 100644 --- a/sys/compat/linuxkpi/common/include/linux/skbuff.h +++ b/sys/compat/linuxkpi/common/include/linux/skbuff.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2020-2025 The FreeBSD Foundation + * Copyright (c) 2020-2026 The FreeBSD Foundation * Copyright (c) 2021-2025 Bjoern A. Zeeb * * This software was developed by Björn Zeeb under sponsorship from @@ -74,9 +74,9 @@ extern int linuxkpi_debug_skb; if (linuxkpi_debug_skb & DSKB_TRACE) \ printf("SKB_TRACE %s:%d %p, %p\n", __func__, __LINE__, _s, _p) #define SKB_TRACE_FMT(_s, _fmt, ...) \ - if (linuxkpi_debug_skb & DSKB_TRACE) \ + if ((linuxkpi_debug_skb & DSKB_TRACE) != 0) \ printf("SKB_TRACE %s:%d %p " _fmt "\n", __func__, __LINE__, _s, \ - __VA_ARGS__) + ##__VA_ARGS__) #else #define SKB_TODO() do { } while(0) #define SKB_IMPROVE(...) do { } while(0) @@ -653,6 +653,8 @@ __skb_unlink(struct sk_buff *skb, struct sk_buff_head *q) WRITE_ONCE(q->qlen, q->qlen - 1); p = skb->prev; n = skb->next; + KASSERT(p != NULL && n != NULL, + ("%s: skb %p q %p p %p n %p\n", __func__, skb, q, p, n)); WRITE_ONCE(n->prev, p); WRITE_ONCE(p->next, n); skb->prev = skb->next = NULL;