From nobody Mon Jun 26 12:08:45 2023 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 4QqRTB22cZz4k6sg; Mon, 26 Jun 2023 12:08:46 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QqRT95wm0z3jKh; Mon, 26 Jun 2023 12:08:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687781325; 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=b52qBV2HOi8uR8GLkry2HxnyDEbvWkHM9yGCxJKCP2c=; b=pkiI/U1MTgwJCfJmR1NbAom0Cn8lXDq/AMqY41c3i+tCDdZncuz4/VtczV3ngnUkX1IbWp rtWPxdamW4CnyoRAbdK3F70Nd9F/50vkF6hIlYAEhBHxkhViSfp7Kz7ce0nWI2V47gALVf zX0X3uFNv8t/XPcqidvRg2fyoisyyOzUx/J5vjfuB21Xsq1POHuH9CuSzaJonCr9YK4NhH IlSP1CFHLwJc2DeIdI3A2cE6Jtbx0qb0pmkPvs3WF+m4DMSoS+9HBQA83ySZqqtKRi5B7p +TcS35C9TRNdU1d3iEGLE5Eo45auj8JytLjz7vdZx4ksvKixZOoJ2UPUP6v8ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687781325; 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=b52qBV2HOi8uR8GLkry2HxnyDEbvWkHM9yGCxJKCP2c=; b=Dl3P37cLRCkgFQ4Ml5vYppA82dlUZxYkSbJd3AbcHmhAHc/IqLM7qFYRQxZ381b0wPnwYl FZM/Kowean/8FKEWdnxjzBPwXAbvzMS81DyLpwwuXvJ2oGD8d3BGb3mYzCN7gxfsYHbA3F Ay9YCbZFHPuMXMtPV1z1afvMDyXeQ0rzQIQtGfry7dfzWT7NIYFuQB37BlgZJH55HyCQVD 8Z0YMDqEXkggrt+FjPxTp301MN/5ozG2KZvm6/SfO3qhg8aqPyIMkhrXBCkOAH8IKgHGWx OZTsgcBkReJvGdmtT2hHO34N4GYyRbSz2IfGwkfLL0eujXf6t9yctg8JOm+6/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687781325; a=rsa-sha256; cv=none; b=TqN5TYsnwSf+uQgPB+6FWJOFag2O37FTGyhSKwmTio7PfyVKJFOWBKCY2+7hv157aE0esr 7VJRV6pQto199oZhRfTXQOtH3feNxZY3tUe6gXcUw43ggHsKrmoaDX6gG//O0N9DYDChlF nI+Dib8cX/N4M/PP00f9EC/6/KRkJwfp6548+RCrnPHzBpE3yS5J7bO6JJE0tP770spK5P YHHnzET8lrnJPpFV+EcVtly4Sks/+1r5gIkKm3g71bxGcAG0FuBMBO3BHmKGvJvhJgMdq9 uJ5K8Tkg2hKjstVM1VXrDY0p+kWUnxb/2IJAi0oMcBNWx+WBjYToZdX9UmIeDw== 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 4QqRT94y63z18Lb; Mon, 26 Jun 2023 12:08:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35QC8jHF083266; Mon, 26 Jun 2023 12:08:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35QC8jvF083265; Mon, 26 Jun 2023 12:08:45 GMT (envelope-from git) Date: Mon, 26 Jun 2023 12:08:45 GMT Message-Id: <202306261208.35QC8jvF083265@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: b30d9f2e5204 - stable/13 - LinuxKPI: skbuff.h: add more (skeleton) functions used by wireless drivers 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: b30d9f2e5204b475cf79150542b758c3dab14e70 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=b30d9f2e5204b475cf79150542b758c3dab14e70 commit b30d9f2e5204b475cf79150542b758c3dab14e70 Author: Bjoern A. Zeeb AuthorDate: 2023-05-16 21:22:34 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-06-26 09:15:20 +0000 LinuxKPI: skbuff.h: add more (skeleton) functions used by wireless drivers Add a dummy skb_hwtstamps() function for now, and implement skb_mac_header(), skb_reset_mac_header(), and skb_set_mac_header(). Add a dummy implementation of skb_get_hash() until we'll hit and implement it. Add napi_build_skb() and skb_mark_for_recycle(). Sponsored by: The FreeBSD Foundation (cherry picked from commit 262c5e81937ff1682632f33e92c3e42bc92e5a77) (cherry picked from commit 369264acf7d2a317383599141ab2f36ee3d2130c) (cherry picked from commit 1213a6bea8a16dc797efea5a7ed7d6a4d7cb4675) --- sys/compat/linuxkpi/common/include/linux/skbuff.h | 60 ++++++++++++++++++++--- 1 file changed, 53 insertions(+), 7 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/skbuff.h b/sys/compat/linuxkpi/common/include/linux/skbuff.h index fca161537837..8d4fefdb1a2b 100644 --- a/sys/compat/linuxkpi/common/include/linux/skbuff.h +++ b/sys/compat/linuxkpi/common/include/linux/skbuff.h @@ -1,6 +1,6 @@ /*- - * Copyright (c) 2020-2022 The FreeBSD Foundation - * Copyright (c) 2021-2022 Bjoern A. Zeeb + * Copyright (c) 2020-2023 The FreeBSD Foundation + * Copyright (c) 2021-2023 Bjoern A. Zeeb * * This software was developed by Björn Zeeb under sponsorship from * the FreeBSD Foundation. @@ -46,6 +46,7 @@ #include #include #include +#include /* #define SKB_DEBUG */ #ifdef SKB_DEBUG @@ -85,6 +86,10 @@ enum sk_buff_pkt_type { PACKET_OTHERHOST, }; +struct skb_shared_hwtstamps { + ktime_t hwtstamp; +}; + #define NET_SKB_PAD max(CACHE_LINE_SIZE, 32) struct sk_buff_head { @@ -154,6 +159,7 @@ struct sk_buff { uint16_t _flags; /* Internal flags. */ #define _SKB_FLAGS_SKBEXTFRAG 0x0001 enum sk_buff_pkt_type pkt_type; + uint16_t mac_header; /* offset of mac_header */ /* "Scratch" area for layers to store metadata. */ /* ??? I see sizeof() operations so probably an array. */ @@ -928,22 +934,38 @@ skb_header_cloned(struct sk_buff *skb) } static inline uint8_t * -skb_mac_header(struct sk_buff *skb) +skb_mac_header(const struct sk_buff *skb) { SKB_TRACE(skb); - SKB_TODO(); - return (NULL); + /* Make sure the mac_header was set as otherwise we return garbage. */ + WARN_ON(skb->mac_header == 0); + return (skb->head + skb->mac_header); +} +static inline void +skb_reset_mac_header(struct sk_buff *skb) +{ + SKB_TRACE(skb); + skb->mac_header = skb->data - skb->head; } static inline void -skb_orphan(struct sk_buff *skb) +skb_set_mac_header(struct sk_buff *skb, const size_t len) +{ + SKB_TRACE(skb); + skb_reset_mac_header(skb); + skb->mac_header += len; +} + +static inline struct skb_shared_hwtstamps * +skb_hwtstamps(struct sk_buff *skb) { SKB_TRACE(skb); SKB_TODO(); + return (NULL); } static inline void -skb_reset_mac_header(struct sk_buff *skb) +skb_orphan(struct sk_buff *skb) { SKB_TRACE(skb); SKB_TODO(); @@ -1024,6 +1046,30 @@ napi_consume_skb(struct sk_buff *skb, int budget) SKB_TODO(); } +static inline struct sk_buff * +napi_build_skb(void *data, size_t len) +{ + + SKB_TRACE(skb); + SKB_TODO(); + return (NULL); +} + +static inline uint32_t +skb_get_hash(struct sk_buff *skb) +{ + SKB_TRACE(skb); + SKB_TODO(); + return (0); +} + +static inline void +skb_mark_for_recycle(struct sk_buff *skb) +{ + SKB_TRACE(skb); + SKB_TODO(); +} + #define SKB_WITH_OVERHEAD(_s) \ (_s) - ALIGN(sizeof(struct skb_shared_info), CACHE_LINE_SIZE)