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 10/14] skbuff: drop zero check from skb_zcopy_set
Date: Tue, 11 Jan 2022 01:21:43 +0000 [thread overview]
Message-ID: <d9a6ae91295e88f15d73b42823f1d67906bc52ab.1641863490.git.asml.silence@gmail.com> (raw)
In-Reply-To: <cover.1641863490.git.asml.silence@gmail.com>
Only two skb_zcopy_set() callers may pass a NULL skb, so kill the zero
check from inside the function, which can't be compiled out, and place
it where needed. It's also needed by the following patch.
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
---
include/linux/skbuff.h | 2 +-
net/ipv4/ip_output.c | 3 ++-
net/ipv6/ip6_output.c | 3 ++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 642acb0d1646..8a7d0d03a100 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -1499,7 +1499,7 @@ static inline void skb_zcopy_init(struct sk_buff *skb, struct ubuf_info *uarg)
static inline void skb_zcopy_set(struct sk_buff *skb, struct ubuf_info *uarg,
bool *have_ref)
{
- if (skb && uarg && !skb_zcopy(skb)) {
+ if (uarg && !skb_zcopy(skb)) {
if (unlikely(have_ref && *have_ref))
*have_ref = false;
else
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 57c1d8431386..87d4472545a5 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1010,7 +1010,8 @@ static int __ip_append_data(struct sock *sk,
paged = true;
} else {
uarg->zerocopy = 0;
- skb_zcopy_set(skb, uarg, &extra_uref);
+ if (skb)
+ skb_zcopy_set(skb, uarg, &extra_uref);
}
}
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 6a7bba4dd04d..9881b61da493 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1522,7 +1522,8 @@ static int __ip6_append_data(struct sock *sk,
paged = true;
} else {
uarg->zerocopy = 0;
- skb_zcopy_set(skb, uarg, &extra_uref);
+ if (skb)
+ skb_zcopy_set(skb, uarg, &extra_uref);
}
}
--
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 ` [PATCH 06/14] ipv6: pass full cork into __ip6_append_data() Pavel Begunkov
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 ` Pavel Begunkov [this message]
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=d9a6ae91295e88f15d73b42823f1d67906bc52ab.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).