From nobody Mon Apr 18 09:33:51 2022 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 5DE2B11E46D2; Mon, 18 Apr 2022 09:33:53 +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 4KhhZm30Ghz3Cxv; Mon, 18 Apr 2022 09:33:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650274433; 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=uK5BqYv93FCr/3KpRmxkTAUCAz6jdoDsVdKHsiHAkzc=; b=o7DqSKKWKHAzo/+4Y1k/+SdBn0DDipIOj0e3G2/gerIGHyl8gOYwNlRR6LokGFTsanJwOv nmAOafscV79N8jSUt0evU3yZkPUhHzV3y6Ss9jvTGPk1gi0NOLvwd+Tyyz/c76NitNqIJ8 DCzmI9IcpmmbO2uVYG7nYQY3JGH6QVMF0KOVvD4bE8EKYdao8JXrjMOCnXbi/mL3Up+qIM KbXSIEJV7kDrHEMIT03GLu7pcOwBC0akyHrikXiV2ZtDWuzporjEhq8mzGWEmx30p7W4k7 u2MPAHbl07emzOryCCnxPBg2ECNf/bJ4P7tm+thfZzobUnxDVTHFw6INSbrF3Q== 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 EF4991061B; Mon, 18 Apr 2022 09:33:51 +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 23I9Xpwh018541; Mon, 18 Apr 2022 09:33:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23I9Xpb8018540; Mon, 18 Apr 2022 09:33:51 GMT (envelope-from git) Date: Mon, 18 Apr 2022 09:33:51 GMT Message-Id: <202204180933.23I9Xpb8018540@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: c39947cdd369 - stable/13 - LinuxKPI: skbuff: start implementing skb_copy() 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: c39947cdd36988852a6144586a735f6be95f4861 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650274433; 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=uK5BqYv93FCr/3KpRmxkTAUCAz6jdoDsVdKHsiHAkzc=; b=ZRmlx+i4a8USsDMAIRWN5XpnGODHu1mgWdx9dhWtXSNquR0Wks0e5Jcy8w52x4fv7DDK7m E28Ut0hOUIrDAXChLH8ow7RXWdTZ+UlsmF9M9SDT/K2/n06BTXwdduYvPPHkQvy1kRpH8m /ZpJ6YJdQwh4iJ5Mz0bVf5vHqn/591OKviTOk94PLxKZWqdxRuiwLd9QE/dStw8Y2yCKWk bMVQhSHaXEqSDb580bsAdjzJ00zp3DEXtWntUv5Qg+B3XMROWr2aqxXh/mRj5MHRbWujnz E/PR1HveEdevzog28BnUMChzKOhu/s1LsXTMxI0j9Eyy3biaDYqs4L6TPMXZIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650274433; a=rsa-sha256; cv=none; b=D088ffv32rrSYN8buO49nPsRuUyJq6jWdaKA6S5DC6irT+rpGt9j4JI5JTzz3HASFTn8ea 4ujD4RkxdhPae5Tjuemz7z4gmST67SJg8lJCZsLPf7Ksj1Na9k1t4aN+ecITYNXfbla/Tq 2VtOD2HDITfmnr/EhWbMcUUa1Hd/TOlCC1o23V6GHDZZSWoD+6kdkgc42sSU2afIWJT+hz MfgkewSNbjOAnYsOSN8yc7OvGeT3mTQoYlLt9r4vY5+6SmUKGa2hRHFhYxx8pcZyK1Bzo6 zwCdkHzAcVCY8qXxgYQlXQ/m7rvcwHFenzMJIXrdfx1YSlZzZWS9CQBpqrJabA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c39947cdd36988852a6144586a735f6be95f4861 commit c39947cdd36988852a6144586a735f6be95f4861 Author: Bjoern A. Zeeb AuthorDate: 2022-04-15 12:30:51 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-04-18 09:32:58 +0000 LinuxKPI: skbuff: start implementing skb_copy() Implement skb_copy() with omissions of fragments and possibly other fields for now. Should we hit frags at any point a log message will let us know. For the few cases we need this currently this is enough. Sponsored by: The FreeBSD Foundation (cherry picked from commit 349b042b90057c1e9dbb64dfdb894fe03ea20a1d) --- sys/compat/linuxkpi/common/include/linux/skbuff.h | 10 ++++-- sys/compat/linuxkpi/common/src/linux_skbuff.c | 38 +++++++++++++++++++++++ 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/skbuff.h b/sys/compat/linuxkpi/common/include/linux/skbuff.h index 2b1b66844640..3caf7059dd15 100644 --- a/sys/compat/linuxkpi/common/include/linux/skbuff.h +++ b/sys/compat/linuxkpi/common/include/linux/skbuff.h @@ -172,6 +172,8 @@ struct sk_buff *linuxkpi_alloc_skb(size_t, gfp_t); struct sk_buff *linuxkpi_dev_alloc_skb(size_t, gfp_t); void linuxkpi_kfree_skb(struct sk_buff *); +struct sk_buff *linuxkpi_skb_copy(struct sk_buff *, gfp_t); + /* -------------------------------------------------------------------------- */ static inline struct sk_buff * @@ -667,9 +669,11 @@ skb_queue_prev(struct sk_buff_head *q, struct sk_buff *skb) static inline struct sk_buff * skb_copy(struct sk_buff *skb, gfp_t gfp) { - SKB_TRACE(skb); - SKB_TODO(); - return (NULL); + struct sk_buff *new; + + new = linuxkpi_skb_copy(skb, gfp); + SKB_TRACE2(skb, new); + return (new); } static inline void diff --git a/sys/compat/linuxkpi/common/src/linux_skbuff.c b/sys/compat/linuxkpi/common/src/linux_skbuff.c index dfa9dfb2ceb4..df1f6439c694 100644 --- a/sys/compat/linuxkpi/common/src/linux_skbuff.c +++ b/sys/compat/linuxkpi/common/src/linux_skbuff.c @@ -111,6 +111,44 @@ linuxkpi_dev_alloc_skb(size_t size, gfp_t gfp) return (skb); } +struct sk_buff * +linuxkpi_skb_copy(struct sk_buff *skb, gfp_t gfp) +{ + struct sk_buff *new; + struct skb_shared_info *shinfo; + size_t len; + unsigned int headroom; + + /* Full buffer size + any fragments. */ + len = skb->end - skb->head + skb->data_len; + + new = linuxkpi_alloc_skb(len, gfp); + if (new == NULL) + return (NULL); + + headroom = skb_headroom(skb); + /* Fixup head and end. */ + skb_reserve(new, headroom); /* data and tail move headroom forward. */ + skb_put(new, skb->len); /* tail and len get adjusted */ + + /* Copy data. */ + memcpy(new->head, skb->data - headroom, headroom + skb->len); + + /* Deal with fragments. */ + shinfo = skb->shinfo; + if (shinfo->nr_frags > 0) { + printf("%s:%d: NOT YET SUPPORTED; missing %d frags\n", + __func__, __LINE__, shinfo->nr_frags); + SKB_TODO(); + } + + /* Deal with header fields. */ + memcpy(new->cb, skb->cb, sizeof(skb->cb)); + SKB_IMPROVE("more header fields to copy?"); + + return (new); +} + void linuxkpi_kfree_skb(struct sk_buff *skb) {