From: Mat Martineau <mathew.j.martineau@linux.intel.com>
To: netdev@vger.kernel.org, mptcp@lists.01.org
Cc: Paolo Abeni <pabeni@redhat.com>,
Mat Martineau <mathew.j.martineau@linux.intel.com>
Subject: [PATCH net-next 11/11] skb: add helpers to allocate ext independently from sk_buff
Date: Fri, 13 Dec 2019 15:00:22 -0800 [thread overview]
Message-ID: <20191213230022.28144-12-mathew.j.martineau@linux.intel.com> (raw)
In-Reply-To: <20191213230022.28144-1-mathew.j.martineau@linux.intel.com>
From: Paolo Abeni <pabeni@redhat.com>
Currently we can allocate the extension only after the skb,
this change allows the user to do the opposite, will simplify
allocation failure handling from MPTCP.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
---
include/linux/skbuff.h | 3 +++
net/core/skbuff.c | 35 +++++++++++++++++++++++++++++++++--
2 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 1a261c3ee074..af9b6cf79a65 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -4115,6 +4115,9 @@ struct skb_ext {
char data[0] __aligned(8);
};
+struct skb_ext *__skb_ext_alloc(void);
+void *__skb_ext_set(struct sk_buff *skb, enum skb_ext_id id,
+ struct skb_ext *ext);
void *skb_ext_add(struct sk_buff *skb, enum skb_ext_id id);
void __skb_ext_del(struct sk_buff *skb, enum skb_ext_id id);
void __skb_ext_put(struct skb_ext *ext);
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index fa67036dd928..504e9bd5ebce 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -5983,7 +5983,14 @@ static void *skb_ext_get_ptr(struct skb_ext *ext, enum skb_ext_id id)
return (void *)ext + (ext->offset[id] * SKB_EXT_ALIGN_VALUE);
}
-static struct skb_ext *skb_ext_alloc(void)
+/**
+ * __skb_ext_alloc - allocate a new skb extensions storage
+ *
+ * Returns the newly allocated pointer. The pointer can later attached to a
+ * skb via __skb_ext_set().
+ * Note: caller must handle the skb_ext as an opaque data.
+ */
+struct skb_ext *__skb_ext_alloc(void)
{
struct skb_ext *new = kmem_cache_alloc(skbuff_ext_cache, GFP_ATOMIC);
@@ -6023,6 +6030,30 @@ static struct skb_ext *skb_ext_maybe_cow(struct skb_ext *old,
return new;
}
+/**
+ * __skb_ext_set - attach the specified extension storage to this skb
+ * @skb: buffer
+ * @id: extension id
+ * @ext: extension storage previously allocated via __skb_ext_alloc()
+ *
+ * Existing extensions, if any, are cleared.
+ *
+ * Returns the pointer to the extension.
+ */
+void *__skb_ext_set(struct sk_buff *skb, enum skb_ext_id id,
+ struct skb_ext *ext)
+{
+ unsigned int newlen, newoff = SKB_EXT_CHUNKSIZEOF(*ext);
+
+ skb_ext_put(skb);
+ newlen = newoff + skb_ext_type_len[id];
+ ext->chunks = newlen;
+ ext->offset[id] = newoff;
+ skb->extensions = ext;
+ skb->active_extensions = 1 << id;
+ return skb_ext_get_ptr(ext, id);
+}
+
/**
* skb_ext_add - allocate space for given extension, COW if needed
* @skb: buffer
@@ -6056,7 +6087,7 @@ void *skb_ext_add(struct sk_buff *skb, enum skb_ext_id id)
} else {
newoff = SKB_EXT_CHUNKSIZEOF(*new);
- new = skb_ext_alloc();
+ new = __skb_ext_alloc();
if (!new)
return NULL;
}
--
2.24.1
prev parent reply other threads:[~2019-12-13 23:01 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-13 23:00 [PATCH net-next 00/11] Multipath TCP: Prerequisites Mat Martineau
2019-12-13 23:00 ` [PATCH net-next 01/11] net: Make sock protocol value checks more specific Mat Martineau
2019-12-13 23:00 ` [PATCH net-next 02/11] sock: Make sk_protocol a 16-bit value Mat Martineau
2019-12-13 23:16 ` Eric Dumazet
2019-12-14 0:06 ` Mat Martineau
2019-12-13 23:00 ` [PATCH net-next 03/11] tcp: Define IPPROTO_MPTCP Mat Martineau
2019-12-13 23:00 ` [PATCH net-next 04/11] tcp: Add MPTCP option number Mat Martineau
2019-12-13 23:00 ` [PATCH net-next 05/11] tcp, ulp: Add clone operation to tcp_ulp_ops Mat Martineau
2019-12-13 23:00 ` [PATCH net-next 06/11] mptcp: Add MPTCP to skb extensions Mat Martineau
2019-12-13 23:00 ` [PATCH net-next 07/11] tcp: Prevent coalesce/collapse when skb has MPTCP extensions Mat Martineau
2019-12-13 23:00 ` [PATCH net-next 08/11] tcp: Export TCP functions and ops struct Mat Martineau
2019-12-13 23:00 ` [PATCH net-next 09/11] tcp: Check for filled TCP option space before SACK Mat Martineau
2019-12-13 23:22 ` Eric Dumazet
2019-12-14 0:28 ` Mat Martineau
2019-12-16 12:52 ` [MPTCP] " Paolo Abeni
2019-12-16 16:55 ` Eric Dumazet
2019-12-16 17:28 ` Paolo Abeni
2019-12-13 23:00 ` [PATCH net-next 10/11] tcp: clean ext on tx recycle Mat Martineau
2019-12-13 23:00 ` Mat Martineau [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191213230022.28144-12-mathew.j.martineau@linux.intel.com \
--to=mathew.j.martineau@linux.intel.com \
--cc=mptcp@lists.01.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).