From nobody Tue Apr 29 11:41:45 2025 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 4Zmz1P6Dkwz5tvBy; Tue, 29 Apr 2025 11:41:45 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zmz1P1gvJz3wtv; Tue, 29 Apr 2025 11:41:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745926905; 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=5M2nLcPYG4GYIBoXhCvj68D2tpJv6ifsFgXJ5aztCz8=; b=wMq0NQHTur/LjTozSKl4dGzm4BkK+gTaucyfRclq1ULMMXVR8/zUcbxccb+zWdMhdolGd0 0tql83INJ8uDlFVHI9MgLdkDogRXSmE7WtOB/PAeKZF4goBpFOl1ZBGulOGx5KDsCZOxkE oSvYhh8/FmHRpUMFoxpxNQ0ou5tjaBtKyyvqy7WYDymcFk+sobchcTW6mtCn8hzu7HzM1N sXDwHV5wmo4qc0oaylwwNtmyZ5jv0lTN45HzvJ2AmZois94JEImsT7Q28tb+/sTn4No49G RQuCyndBs2WSsO07Ofa8n++9Ht0at1rIbz9QgmK+nXHT1+o0IiWq79ArY2troA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745926905; a=rsa-sha256; cv=none; b=q17Pvsuvvxxz/CBGYGH9j2R59rsqGj+QpPnPZL6eF3Y/asXTwKEyWMLolVL6JDJCpKFrsd nmf6O6I7g0L/loemzi3UvDNt6buGWrpbaXbl+0C9ZSQ0oyeYFnqltIPZPQhYVURcRQP8Sg esJl5ZYI5k0MemN8azaEBRpKLz6yUE/WiwBUwq6mTN7XlF5surnV3mnE57xgu2QXsAVWGF oJYGfcpTezSSE8upQQqsCX+4T9cwA1v0dPLKc6vNQhmVeHukSIE9vd2DNbRHnQg25n4wdj 4eORLjUvv+rTE6wOCcER9tj2EYtb2QrfRD3lyylk9gebB9nMfIl1P+FMFMKaNA== 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=1745926905; 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=5M2nLcPYG4GYIBoXhCvj68D2tpJv6ifsFgXJ5aztCz8=; b=fIhf6H41W+eGfeavl0VSNdcYy/imFIMRSwc3CpnaWJXWrBtb8fF1yaY08VTlUwwp1UXNCN nE3EO5Xa4vqWfvRYGJ4D7CcbWcj7yv2wyXOSFOHJIfah+AlH3+G3TLceKH2shhGOBgPfpX GkymIpPUplkeIP0NdzT50dqFN8NSQa5nSt5yrV7uosHeHEM/bwjxJyYjUXsGTlf9Gbrb+F rqVTdnlQ3t9DV8JL7D55KqDttP7EPu968bXJo6tvGV/LOJemzszwO/TdwFTRqcQ+t7U+34 jtzOiwA194FIoDXXEP6u61yypolHG2yc5LHtPm0J2lnTOL+IHnHpr4yCIUcung== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zmz1P1G3Vz43Z; Tue, 29 Apr 2025 11:41:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53TBfjeB046004; Tue, 29 Apr 2025 11:41:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53TBfjAk045998; Tue, 29 Apr 2025 11:41:45 GMT (envelope-from git) Date: Tue, 29 Apr 2025 11:41:45 GMT Message-Id: <202504291141.53TBfjAk045998@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 7f4088f4286c - stable/14 - LinuxKPI: skbuff: remove _alloc_len field 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7f4088f4286c850d0c8cc694922ca5cbd5df8470 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=7f4088f4286c850d0c8cc694922ca5cbd5df8470 commit 7f4088f4286c850d0c8cc694922ca5cbd5df8470 Author: Bjoern A. Zeeb AuthorDate: 2025-04-22 20:24:03 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-04-29 10:49:29 +0000 LinuxKPI: skbuff: remove _alloc_len field Initially we saved the exact allocation length for contigfree(9). contigfree can now be replaced by free(9) so there is no need to remember that value anymore. Removing it also simplifies the linuxkpi_kfree_skb() code. Sponsored by: The FreeBSD Foundation (cherry picked from commit 73e3969fd435eea296b44f3bd40ff76c042c9a36) --- sys/compat/linuxkpi/common/include/linux/skbuff.h | 1 - sys/compat/linuxkpi/common/src/linux_80211.c | 4 ++-- sys/compat/linuxkpi/common/src/linux_skbuff.c | 13 ++----------- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/skbuff.h b/sys/compat/linuxkpi/common/include/linux/skbuff.h index 9db29c72e20c..7a8521e6fd38 100644 --- a/sys/compat/linuxkpi/common/include/linux/skbuff.h +++ b/sys/compat/linuxkpi/common/include/linux/skbuff.h @@ -154,7 +154,6 @@ struct sk_buff { }; struct list_head list; }; - uint32_t _alloc_len; /* Length of alloc data-buf. XXX-BZ give up for truesize? */ uint32_t len; /* ? */ uint32_t data_len; /* ? If we have frags? */ uint32_t truesize; /* The total size of all buffers, incl. frags. */ diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index f3464f370a13..8e56862d7a92 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -6545,9 +6545,9 @@ linuxkpi_ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb, goto no_trace_beacons; if (linuxkpi_debug_80211 & D80211_TRACE_RX) - printf("TRACE-RX: %s: skb %p a/l/d/t-len (%u/%u/%u/%u) " + printf("TRACE-RX: %s: skb %p l/d/t-len (%u/%u/%u) " "h %p d %p t %p e %p sh %p (%u) m %p plen %u len %u%s\n", - __func__, skb, skb->_alloc_len, skb->len, skb->data_len, + __func__, skb, skb->len, skb->data_len, skb->truesize, skb->head, skb->data, skb->tail, skb->end, shinfo, shinfo->nr_frags, m, m->m_pkthdr.len, m->m_len, is_beacon ? " beacon" : ""); diff --git a/sys/compat/linuxkpi/common/src/linux_skbuff.c b/sys/compat/linuxkpi/common/src/linux_skbuff.c index 16a7083123be..4139295fc837 100644 --- a/sys/compat/linuxkpi/common/src/linux_skbuff.c +++ b/sys/compat/linuxkpi/common/src/linux_skbuff.c @@ -115,7 +115,6 @@ linuxkpi_alloc_skb(size_t size, gfp_t gfp) #endif if (skb == NULL) return (skb); - skb->_alloc_len = len; skb->truesize = size; skb->head = skb->data = skb->tail = (uint8_t *)(skb+1); @@ -258,14 +257,7 @@ linuxkpi_kfree_skb(struct sk_buff *skb) skb_free_frag(p); } -#ifdef __LP64__ - if (__predict_true(linuxkpi_skb_memlimit == 0)) - free(skb, M_LKPISKB); - else - contigfree(skb, skb->_alloc_len, M_LKPISKB); -#else free(skb, M_LKPISKB); -#endif } #ifdef DDB @@ -284,9 +276,8 @@ DB_SHOW_COMMAND(skb, db_show_skb) db_printf("skb %p\n", skb); db_printf("\tnext %p prev %p\n", skb->next, skb->prev); db_printf("\tlist %p\n", &skb->list); - db_printf("\t_alloc_len %u len %u data_len %u truesize %u mac_len %u\n", - skb->_alloc_len, skb->len, skb->data_len, skb->truesize, - skb->mac_len); + db_printf("\tlen %u data_len %u truesize %u mac_len %u\n", + skb->len, skb->data_len, skb->truesize, skb->mac_len); db_printf("\tcsum %#06x l3hdroff %u l4hdroff %u priority %u qmap %u\n", skb->csum, skb->l3hdroff, skb->l4hdroff, skb->priority, skb->qmap); db_printf("\tpkt_type %d dev %p sk %p\n",