From nobody Fri Jul 17 15:49:21 2026 X-Original-To: dev-commits-src-main@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 4h1vV95tpXz6m3xX for ; Fri, 17 Jul 2026 15:49:21 +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 4h1vV95FFZz3qc8 for ; Fri, 17 Jul 2026 15:49:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784303361; 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=u/vm2rkcO6tgQu8+i6gXRHGrOlZzygwgRffAmOFyjts=; b=xr20A6zpvDs3DeChDzS0IcpEiTMdIj4y5qEYsdnfZWBJ19bvCNwgUPGofmq4nhPEHCjA1S nTEBMsr10dQBKASnI7XbuBHagsO/Vzz4uHS86v5KAPDxb3ZiJlSfW3oAe3QR6kuQs3JVwO XRlyy95zyKvBSsuCIfcvfvlFE9FoYDGNdhk5MM9nsE3cQ1q/uqKOT60gJkOQhafL3mD8FH Eqhp17TgImzkYrmPnZlJShpR9MO/q0qHtI8nB9a8klhX3YAJe2aXyFlI5BsJZYvse2Miik mCdXkjME7nrzXQI9Yd5yeNBQ/I0h07XT/wrlw20b78v0+YC8sIhQ59VwRgm3qg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784303361; a=rsa-sha256; cv=none; b=eKqn5dylBsq16NPcyw7gp5W7vgG7Zl2EWtY6UDL6XAGD874Md0rAEQ7vXrSu4m+3+MEpgX Nd7aUaXuxsC4MGqpf00rY7YBxlGMjkZJMKFDvTjX3GcXg0C30XpcTw0aw7frrdZBSDNX2S L5S/Adcv1A7qQH7Q+EhRtGtiV3XbO/qj4cIKXtxY2koifvqENrtvSSZ6nK2xpI5xQ7nFwS rVjGKriTJIdjoAZiQzhLOEeAieaiw6lrcMZCdkqXD6MBV4qYlELh+prV+Dvj+C8ig/EmDI fdfaSPnfXNvLa5CzapJI29Zlvycd729v+naOjO63UqfXvylhpVTjoKQiqXB1PA== 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=1784303361; 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=u/vm2rkcO6tgQu8+i6gXRHGrOlZzygwgRffAmOFyjts=; b=hVVvCYUpsX7VR6+z0zSAYSIjF/vqesh+rlm/VPj7JKYFwnBlwOCw80bvJUef4Xrlc1l3Li YeA6GEVsNpEGsnnl7r0ZzPn1nm4thLAs0mG0PHhCnV0WwpJS2U4Jzs2tFm8wfHYVbyruHt DrVOILDVs6A/fnnVUwZPaFaR27DrUE+m+Q3sUYCdvHqX2D/dpxk9Ti9/6no7izjf4Cas5R 5kR3wDNg6dDmOY6M6k6AuLeIlK6jYqOL7z1Edr7+fXxAvd+SQBR4Ra7xY3sbztlkuRR262 ga2KnelPdWQ6o7YIPxXdrwG3k9aoVtCTwQPcXs45/SCn6l9uHyvIfFTRij63+A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h1vV93h72ztYL for ; Fri, 17 Jul 2026 15:49:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f828 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 17 Jul 2026 15:49:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: e5bcf7b99fcb - main - LinuxKPI: skbuff: improve debugging List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: e5bcf7b99fcbe06d381525ffdd5027b846cdc1d3 Auto-Submitted: auto-generated Date: Fri, 17 Jul 2026 15:49:21 +0000 Message-Id: <6a5a4f01.1f828.15afe505@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=e5bcf7b99fcbe06d381525ffdd5027b846cdc1d3 commit e5bcf7b99fcbe06d381525ffdd5027b846cdc1d3 Author: Bjoern A. Zeeb AuthorDate: 2026-02-03 22:13:24 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-07-17 15:48:52 +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 MFC after: 3 days --- 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;