From: Pavel Begunkov <asml.silence@gmail.com>
To: netdev@vger.kernel.org, "David S . Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>
Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>,
David Ahern <dsahern@kernel.org>,
Eric Dumazet <edumazet@google.com>,
Willem de Bruijn <willemdebruijn.kernel@gmail.com>,
linux-kernel@vger.kernel.org,
Pavel Begunkov <asml.silence@gmail.com>
Subject: [PATCH 06/14] ipv6: pass full cork into __ip6_append_data()
Date: Tue, 11 Jan 2022 01:21:38 +0000 [thread overview]
Message-ID: <56c58d7537b65a5bcadf5d17f86e010dbba81485.1641863490.git.asml.silence@gmail.com> (raw)
In-Reply-To: <cover.1641863490.git.asml.silence@gmail.com>
Convert a struct inet_cork argument in __ip6_append_data() to struct
inet_cork_full. As one struct contains another inet_cork is still can
be accessed via ->base field. It's a preparation patch making further
changes a bit cleaner.
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
---
net/ipv6/ip6_output.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index b8fdda9ac797..62da09819750 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1424,7 +1424,7 @@ static int ip6_setup_cork(struct sock *sk, struct inet_cork_full *cork,
static int __ip6_append_data(struct sock *sk,
struct flowi6 *fl6,
struct sk_buff_head *queue,
- struct inet_cork *cork,
+ struct inet_cork_full *cork_full,
struct inet6_cork *v6_cork,
struct page_frag *pfrag,
int getfrag(void *from, char *to, int offset,
@@ -1433,6 +1433,7 @@ static int __ip6_append_data(struct sock *sk,
unsigned int flags, struct ipcm6_cookie *ipc6)
{
struct sk_buff *skb, *skb_prev = NULL;
+ struct inet_cork *cork = &cork_full->base;
unsigned int maxfraglen, fragheaderlen, mtu, orig_mtu, pmtu;
struct ubuf_info *uarg = NULL;
int exthdrlen = 0;
@@ -1797,7 +1798,7 @@ int ip6_append_data(struct sock *sk,
transhdrlen = 0;
}
- return __ip6_append_data(sk, fl6, &sk->sk_write_queue, &inet->cork.base,
+ return __ip6_append_data(sk, fl6, &sk->sk_write_queue, &inet->cork,
&np->cork, sk_page_frag(sk), getfrag,
from, length, transhdrlen, flags, ipc6);
}
@@ -1993,7 +1994,7 @@ struct sk_buff *ip6_make_skb(struct sock *sk,
if (ipc6->dontfrag < 0)
ipc6->dontfrag = inet6_sk(sk)->dontfrag;
- err = __ip6_append_data(sk, fl6, &queue, &cork->base, &v6_cork,
+ err = __ip6_append_data(sk, fl6, &queue, cork, &v6_cork,
¤t->task_frag, getfrag, from,
length + exthdrlen, transhdrlen + exthdrlen,
flags, ipc6);
--
2.34.1
next prev parent reply other threads:[~2022-01-11 1:25 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-11 1:21 [PATCH 00/14] udp optimisation Pavel Begunkov
2022-01-11 1:21 ` [PATCH 01/14] ipv6: optimise dst referencing Pavel Begunkov
2022-01-11 1:21 ` [PATCH 02/14] ipv6: shuffle up->pending AF_INET bits Pavel Begunkov
2022-01-11 1:21 ` [PATCH 03/14] ipv6: remove daddr temp buffer in __ip6_make_skb Pavel Begunkov
2022-01-11 1:21 ` [PATCH 04/14] ipv6: clean up cork setup/release Pavel Begunkov
2022-01-11 1:21 ` [PATCH 05/14] ipv6: don't zero cork's flowi after use Pavel Begunkov
2022-01-11 1:21 ` Pavel Begunkov [this message]
2022-01-11 1:21 ` [PATCH 07/14] ipv6: pass flow in ip6_make_skb together with cork Pavel Begunkov
2022-01-11 1:21 ` [PATCH 08/14] ipv6/udp: don't make extra copies of iflow Pavel Begunkov
2022-01-11 1:21 ` [PATCH 09/14] ipv6: hand dst refs to cork setup Pavel Begunkov
2022-01-11 15:39 ` Willem de Bruijn
2022-01-11 15:57 ` Pavel Begunkov
2022-01-11 17:11 ` Paolo Abeni
2022-01-11 20:39 ` Pavel Begunkov
2022-01-12 11:15 ` Paolo Abeni
2022-01-12 16:49 ` Pavel Begunkov
2022-01-11 1:21 ` [PATCH 10/14] skbuff: drop zero check from skb_zcopy_set Pavel Begunkov
2022-01-11 1:21 ` [PATCH 11/14] skbuff: drop null check from skb_zcopy Pavel Begunkov
2022-01-11 1:21 ` [PATCH 12/14] skbuff: optimise alloc_skb_with_frags() Pavel Begunkov
2022-01-11 1:21 ` [PATCH 13/14] net: inline part of skb_csum_hwoffload_help Pavel Begunkov
2022-01-11 9:24 ` David Laight
2022-01-11 16:59 ` Pavel Begunkov
2022-01-11 17:25 ` David Laight
2022-01-11 20:48 ` Pavel Begunkov
2022-01-12 2:41 ` David Laight
2022-01-12 16:43 ` Pavel Begunkov
2022-01-11 1:21 ` [PATCH 14/14] net: inline sock_alloc_send_skb Pavel Begunkov
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=56c58d7537b65a5bcadf5d17f86e010dbba81485.1641863490.git.asml.silence@gmail.com \
--to=asml.silence@gmail.com \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=willemdebruijn.kernel@gmail.com \
--cc=yoshfuji@linux-ipv6.org \
/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).