From patchwork Fri Aug 9 08:34:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hopps X-Patchwork-Id: 13758553 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.chopps.org (smtp.chopps.org [54.88.81.56]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C3E7B16C6A2 for ; Fri, 9 Aug 2024 08:36:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=54.88.81.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723192582; cv=none; b=WSLFW8WGj749Jj4ElZuzKFrKPEjzm7LgCIaVvhVWRHxRTcmnFevZqPgAHbbFwEjQhJI1BEskS2QBCSYwfLePKwRdrMIPapY8wq4NjJQztX3lG9en3icQt8/cg6enp2o5TNeQ3p2pT7rXPhsK5+q8nqAZP7zd3XBJIaIoRNcZ3j0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723192582; c=relaxed/simple; bh=cbgTpwOS/qRfqB5SjxeDdukIKfKA58ahGwKHhqhrTEU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fmE3F0jNN9SBUdIAlog08bYWu3GB5QAr8rA2WPi8IUPW8O9/qrbuKG8JaRfLoZ4BEmc13ROfczKtdqAOhT9wRCK2BI3dM0DvlSq+arBIFHyZZNkE2O+9+cmtmpIFb2asr53ifBqQZOTqs3RiwWlGVxXB4L7FNvLqKiXPjhqCRpQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=chopps.org; spf=fail smtp.mailfrom=chopps.org; arc=none smtp.client-ip=54.88.81.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=chopps.org Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=chopps.org Received: from labnh.int.chopps.org (syn-172-222-091-149.res.spectrum.com [172.222.91.149]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (Client did not present a certificate) by smtp.chopps.org (Postfix) with ESMTPSA id AB5A77D10C; Fri, 9 Aug 2024 08:36:19 +0000 (UTC) From: Christian Hopps To: devel@linux-ipsec.org Cc: Steffen Klassert , netdev@vger.kernel.org, "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Florian Westphal , Sabrina Dubroca , Simon Horman , Antony Antony , Christian Hopps , Christian Hopps Subject: [PATCH ipsec-next v2 1/2] net: refactor common skb header copy code for re-use Date: Fri, 9 Aug 2024 04:34:59 -0400 Message-ID: <20240809083500.2822656-2-chopps@chopps.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240809083500.2822656-1-chopps@chopps.org> References: <20240809083500.2822656-1-chopps@chopps.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Christian Hopps Factor out some common skb header copying code so that it can be re-used outside of skbuff. Signed-off-by: Christian Hopps --- include/linux/skbuff.h | 1 + net/core/skbuff.c | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 29c3ea5b6e93..8626f9a343db 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -1374,6 +1374,7 @@ struct sk_buff *skb_morph(struct sk_buff *dst, struct sk_buff *src); void skb_headers_offset_update(struct sk_buff *skb, int off); int skb_copy_ubufs(struct sk_buff *skb, gfp_t gfp_mask); struct sk_buff *skb_clone(struct sk_buff *skb, gfp_t priority); +void ___copy_skb_header(struct sk_buff *new, const struct sk_buff *old); void skb_copy_header(struct sk_buff *new, const struct sk_buff *old); struct sk_buff *skb_copy(const struct sk_buff *skb, gfp_t priority); struct sk_buff *__pskb_copy_fclone(struct sk_buff *skb, int headroom, diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 83f8cd8aa2d1..da5a47d2c9ab 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -1515,7 +1515,7 @@ EXPORT_SYMBOL(napi_consume_skb); BUILD_BUG_ON(offsetof(struct sk_buff, field) != \ offsetof(struct sk_buff, headers.field)); \ -static void __copy_skb_header(struct sk_buff *new, const struct sk_buff *old) +void ___copy_skb_header(struct sk_buff *new, const struct sk_buff *old) { new->tstamp = old->tstamp; /* We do not copy old->sk */ @@ -1524,6 +1524,12 @@ static void __copy_skb_header(struct sk_buff *new, const struct sk_buff *old) skb_dst_copy(new, old); __skb_ext_copy(new, old); __nf_copy(new, old, false); +} +EXPORT_SYMBOL_GPL(___copy_skb_header); + +static void __copy_skb_header(struct sk_buff *new, const struct sk_buff *old) +{ + ___copy_skb_header(new, old); /* Note : this field could be in the headers group. * It is not yet because we do not want to have a 16 bit hole From patchwork Fri Aug 9 08:35:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hopps X-Patchwork-Id: 13758554 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.chopps.org (smtp.chopps.org [54.88.81.56]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9133D18E03F for ; Fri, 9 Aug 2024 08:36:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=54.88.81.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723192582; cv=none; b=K/8WYYuYpDjf093qFCdcmOnoarPWIqO6q4pKti94Xrd9LgIljGDleBxyGLFW1KOEGHpSTeADIe1kvlM78rXVeJheUb3HGt7laKhaoi6CIFu8bsz0NxPltNTLgI9TeXnJU/6WDiusQgf84eIwsTi/38qzEJxeW814PTmOrH1v4Sg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723192582; c=relaxed/simple; bh=nF8EzlxLvMJDyF4wqlbQUAdIv70V4gH1PtJSEMY93Qs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JTTB/FQik6s5+1CI8ibIqEG/73tp9JooJBWPX7QMu8/ln2x8zke0EghndKTJLzUOeOQKPaxPAGucV084o/DNo1Vi8CAm47Z4Lvoy98XXcZ6hkOifSs/s5oT5atW+jvrCVt+FC91NwWPc0Tz40g2gEZvPDKHCTGJBEWzWKT+2fh4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=chopps.org; spf=fail smtp.mailfrom=chopps.org; arc=none smtp.client-ip=54.88.81.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=chopps.org Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=chopps.org Received: from labnh.int.chopps.org (syn-172-222-091-149.res.spectrum.com [172.222.91.149]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (Client did not present a certificate) by smtp.chopps.org (Postfix) with ESMTPSA id 649FF7D120; Fri, 9 Aug 2024 08:36:20 +0000 (UTC) From: Christian Hopps To: devel@linux-ipsec.org Cc: Steffen Klassert , netdev@vger.kernel.org, "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Florian Westphal , Sabrina Dubroca , Simon Horman , Antony Antony , Christian Hopps , Christian Hopps Subject: [PATCH ipsec-next v2 2/2] net: add copy from skb_seq_state to buffer function Date: Fri, 9 Aug 2024 04:35:00 -0400 Message-ID: <20240809083500.2822656-3-chopps@chopps.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240809083500.2822656-1-chopps@chopps.org> References: <20240809083500.2822656-1-chopps@chopps.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Christian Hopps Add an skb helper function to copy a range of bytes from within an existing skb_seq_state. Signed-off-by: Christian Hopps --- include/linux/skbuff.h | 1 + net/core/skbuff.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 8626f9a343db..95f80b6d1d7c 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -1434,6 +1434,7 @@ void skb_prepare_seq_read(struct sk_buff *skb, unsigned int from, unsigned int skb_seq_read(unsigned int consumed, const u8 **data, struct skb_seq_state *st); void skb_abort_seq_read(struct skb_seq_state *st); +int skb_copy_seq_read(struct skb_seq_state *st, int offset, void *to, int len); unsigned int skb_find_text(struct sk_buff *skb, unsigned int from, unsigned int to, struct ts_config *config); diff --git a/net/core/skbuff.c b/net/core/skbuff.c index da5a47d2c9ab..2cc2d1b8d356 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -4415,6 +4415,41 @@ void skb_abort_seq_read(struct skb_seq_state *st) } EXPORT_SYMBOL(skb_abort_seq_read); +/** + * skb_copy_seq_read() - copy from a skb_seq_state to a buffer + * @st: source skb_seq_state + * @offset: offset in source + * @to: destination buffer + * @len: number of bytes to copy + * + * Copy @len bytes from @offset bytes into the source @st to the destination + * buffer @to. `offset` should increase (or be unchanged) with each subsequent + * call to this function. If offset needs to decrease from the previous use `st` + * should be reset first. + * + * Return: 0 on success or a negative error code on failure + */ +int skb_copy_seq_read(struct skb_seq_state *st, int offset, void *to, int len) +{ + const u8 *data; + u32 sqlen; + + for (;;) { + sqlen = skb_seq_read(offset, &data, st); + if (sqlen == 0) + return -ENOMEM; + if (sqlen >= len) { + memcpy(to, data, len); + return 0; + } + memcpy(to, data, sqlen); + to += sqlen; + offset += sqlen; + len -= sqlen; + } +} +EXPORT_SYMBOL(skb_copy_seq_read); + #define TS_SKB_CB(state) ((struct skb_seq_state *) &((state)->cb)) static unsigned int skb_ts_get_next_block(unsigned int offset, const u8 **text,