From patchwork Wed Aug 7 21:13:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hopps X-Patchwork-Id: 13756748 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 55A4F149DFD for ; Wed, 7 Aug 2024 21:14: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=1723065261; cv=none; b=G2xEU+q4LaTak7dQ9i4cYovHgkwLcL1Zhcv+toq1wPCw0yv/va1jIQUVx2GVcJWupNUJRyt1IO8bA6nyxiicPckaY/5JrXuZzh4Xp4qfl1z6jCYvDKBNFdJQbtCFcHcQv+A9Y33LkiRR6DcM4nZLres08jHhM29Ctai8rX732JM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723065261; c=relaxed/simple; bh=gK4wXU3AYM6cXllfbFCyDlDkH/xHwqarXPfU5XSngxw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Rynw34ekusBF9gepUJYeeJkm85Uc7QLrtcd8zYeyRFEvVsdO9pyTYvOr/gqEuL53QmgqFvsZq2SVFWsMcMiNybPjf+pstAfKfQW9y8SEqqvLqsK1vsns9wf8FLVQBK2QP7EsPZe2mODpYd5s+RuwhU/Z4qHdZGrZzQ15UZxob3g= 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 7529D7D115; Wed, 7 Aug 2024 21:14:19 +0000 (UTC) From: Christian Hopps To: devel@linux-ipsec.org Cc: Steffen Klassert , netdev@vger.kernel.org, Christian Hopps , Christian Hopps Subject: [PATCH ipsec-next v9 01/17] net: refactor common skb header copy code for re-use Date: Wed, 7 Aug 2024 17:13:15 -0400 Message-ID: <20240807211331.1081038-2-chopps@chopps.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240807211331.1081038-1-chopps@chopps.org> References: <20240807211331.1081038-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 | 7 ++++++- 2 files changed, 7 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..3e88a2a59607 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,11 @@ 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); +} + +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