From nobody Tue Apr 22 23:46:16 2025 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 4ZhzQc5nbLz5tN6k; Tue, 22 Apr 2025 23:46:16 +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 4ZhzQc3bBNz3qM0; Tue, 22 Apr 2025 23:46:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745365576; 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=GYI3QbxOR38kdkPpM/6m4NcKulN5vtUQcuJwhJqxFV8=; b=ouJkxhbSBudB78SFZfz/qg0EKHkdhz/pEkScPj1hGju2el3uY1E9cY8II8fpSm8kV7lNnv F1yjfrZZDZ76VJGNYcKjwTboDF6CKPTC/Q8e2ke9PAqIGF+bhCt3H3XN2+NJPxQLUUjXqk VJB5FuopFm9t9Q+/dPWwoN0yJswEsd+RjUiuMGJv6yTsvyyemGJnq8LQhcHhxW2dKZGYwu PtWrNVUksWHRZlru2l+KDtTdPuLEzW9/oleZOqFDpFbq99TUIbu/ZXCWCyck6XBHgwaK4n atBIfHziAnuvaEzik8y8M6GLJxB5hSVssUatniARm/rFdhRiEJ8ncyHFSmcKog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745365576; a=rsa-sha256; cv=none; b=ffTSnl57IkTE4Bz/2Jjar4NtzRHVQ6Pr8Pt1QjQX5exMpYs5bLFP/D8Q8reco06Q03UoBw QxDv6NRnXDBJCCQnHEF6yaliTyDeBINKWTEliz36zIn0CyfrUoPcEEsLca2pP/su73M6ug AL2EYeE7nfGEF9JOME5gOmyu2m+xiRYJT2zk9Sh9yJVWMNrbwhPDQy04gwYIU4bewlobGU zr5nkUQlJkxImCnSl3Ww5N4LwGvdaXoWeEGDols5Fa5jztUrHoLFGgGJn8GNHHYktbU4TW VtaWweAnmz82UQc5QC/phvdZtQ9LnyM3vxoZcjDaUMmLVl47st+cSvT9fANJ3g== 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=1745365576; 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=GYI3QbxOR38kdkPpM/6m4NcKulN5vtUQcuJwhJqxFV8=; b=jcBJIWJQE9dT+MpuMFZ7nCW+hSAUb2O5tO4dbpV8o800oADJd8fdqnzirtsuWY972iObrz iSfChT9+43HWpXJyDtbTpg0QrP6dAtXfSc8hSutbxCuY4XThtJBXe/jhzfUWb9hH/xAHFM ogUI6GPkLBGjidJfSRIB8OrAf1gwyYDj7E68HM4BZgF8Yggj8n00U6iWZW3363SO4K/CDE er6kZ8LME57CQWv/IqEIk90sun0XnSI+T/N+SkRidScxkrqJpkCQTAY5QZUlbvfvvzimWx pxmkAu0SZ1MgptdoZOLnAFL9maHhGhqTmM1xrpvdno+AJvlcr7wMaYeM3BnV2Q== 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 4ZhzQc3C8Xzg1f; Tue, 22 Apr 2025 23:46:16 +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 53MNkGti009696; Tue, 22 Apr 2025 23:46:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53MNkGou009693; Tue, 22 Apr 2025 23:46:16 GMT (envelope-from git) Date: Tue, 22 Apr 2025 23:46:16 GMT Message-Id: <202504222346.53MNkGou009693@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 73e3969fd435 - main - LinuxKPI: skbuff: remove _alloc_len field 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 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: 73e3969fd435eea296b44f3bd40ff76c042c9a36 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=73e3969fd435eea296b44f3bd40ff76c042c9a36 commit 73e3969fd435eea296b44f3bd40ff76c042c9a36 Author: Bjoern A. Zeeb AuthorDate: 2025-04-22 20:24:03 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-04-22 23:45:33 +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 MFC after: 3 days --- 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 47eb52677cdf..cbf1db5e17de 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",