From: Mina Almasry <almasrymina@google.com>
To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-kselftest@vger.kernel.org
Cc: Mina Almasry <almasrymina@google.com>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Simon Horman <horms@kernel.org>,
Jesper Dangaard Brouer <hawk@kernel.org>,
Ilias Apalodimas <ilias.apalodimas@linaro.org>,
Neal Cardwell <ncardwell@google.com>,
Kuniyuki Iwashima <kuniyu@amazon.com>,
David Ahern <dsahern@kernel.org>,
Andrew Lunn <andrew+netdev@lunn.ch>,
Shuah Khan <shuah@kernel.org>,
sdf@fomichev.me, ap420073@gmail.com, praan@google.com,
shivajikant@google.com
Subject: [PATCH net-next v2 3/8] net: devmem: preserve sockc_err
Date: Fri, 23 May 2025 23:05:19 +0000 [thread overview]
Message-ID: <20250523230524.1107879-4-almasrymina@google.com> (raw)
In-Reply-To: <20250523230524.1107879-1-almasrymina@google.com>
Preserve the error code returned by sock_cmsg_send and return that on
err.
Signed-off-by: Mina Almasry <almasrymina@google.com>
---
v2:
- Remove unnecessary !! (Stan)
---
net/ipv4/tcp.c | 24 ++++++++++--------------
1 file changed, 10 insertions(+), 14 deletions(-)
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index b7b6ab41b496..f64f8276a73c 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -1067,7 +1067,7 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size)
int flags, err, copied = 0;
int mss_now = 0, size_goal, copied_syn = 0;
int process_backlog = 0;
- bool sockc_valid = true;
+ int sockc_err = 0;
int zc = 0;
long timeo;
@@ -1075,13 +1075,10 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size)
sockc = (struct sockcm_cookie){ .tsflags = READ_ONCE(sk->sk_tsflags) };
if (msg->msg_controllen) {
- err = sock_cmsg_send(sk, msg, &sockc);
- if (unlikely(err))
- /* Don't return error until MSG_FASTOPEN has been
- * processed; that may succeed even if the cmsg is
- * invalid.
- */
- sockc_valid = false;
+ sockc_err = sock_cmsg_send(sk, msg, &sockc);
+ /* Don't return error until MSG_FASTOPEN has been processed;
+ * that may succeed even if the cmsg is invalid.
+ */
}
if ((flags & MSG_ZEROCOPY) && size) {
@@ -1092,7 +1089,7 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size)
} else if (sock_flag(sk, SOCK_ZEROCOPY)) {
skb = tcp_write_queue_tail(sk);
uarg = msg_zerocopy_realloc(sk, size, skb_zcopy(skb),
- sockc_valid && !!sockc.dmabuf_id);
+ !sockc_err && sockc.dmabuf_id);
if (!uarg) {
err = -ENOBUFS;
goto out_err;
@@ -1102,7 +1099,7 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size)
else
uarg_to_msgzc(uarg)->zerocopy = 0;
- if (sockc_valid && sockc.dmabuf_id) {
+ if (!sockc_err && sockc.dmabuf_id) {
binding = net_devmem_get_binding(sk, sockc.dmabuf_id);
if (IS_ERR(binding)) {
err = PTR_ERR(binding);
@@ -1116,7 +1113,7 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size)
zc = MSG_SPLICE_PAGES;
}
- if (sockc_valid && sockc.dmabuf_id &&
+ if (!sockc_err && sockc.dmabuf_id &&
(!(flags & MSG_ZEROCOPY) || !sock_flag(sk, SOCK_ZEROCOPY))) {
err = -EINVAL;
goto out_err;
@@ -1160,9 +1157,8 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size)
/* 'common' sending to sendq */
}
- if (!sockc_valid) {
- if (!err)
- err = -EINVAL;
+ if (sockc_err) {
+ err = sockc_err;
goto out_err;
}
--
2.49.0.1151.ga128411c76-goog
next prev parent reply other threads:[~2025-05-23 23:05 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-23 23:05 [PATCH net-next v2 0/8] Devmem TCP minor cleanups and ksft improvements Mina Almasry
2025-05-23 23:05 ` [PATCH net-next v2 1/8] net: devmem: move list_add to net_devmem_bind_dmabuf Mina Almasry
2025-05-27 15:34 ` Stanislav Fomichev
2025-05-23 23:05 ` [PATCH net-next v2 2/8] page_pool: fix ugly page_pool formatting Mina Almasry
2025-05-27 15:34 ` Stanislav Fomichev
2025-05-23 23:05 ` Mina Almasry [this message]
2025-05-27 15:34 ` [PATCH net-next v2 3/8] net: devmem: preserve sockc_err Stanislav Fomichev
2025-05-23 23:05 ` [PATCH net-next v2 4/8] net: devmem: ksft: add ipv4 support Mina Almasry
2025-05-27 15:33 ` Stanislav Fomichev
2025-05-23 23:05 ` [PATCH net-next v2 5/8] net: devmem: ksft: add exit_wait to make rx test pass Mina Almasry
2025-05-23 23:05 ` [PATCH net-next v2 6/8] net: devmem: ksft: add 5 tuple FS support Mina Almasry
2025-05-27 15:33 ` Stanislav Fomichev
2025-05-23 23:05 ` [PATCH net-next v2 7/8] net: devmem: ksft: upgrade rx test to send 1K data Mina Almasry
2025-05-23 23:05 ` [PATCH net-next v2 8/8] net: devmem: ncdevmem: remove unused variable Mina Almasry
2025-05-28 2:30 ` [PATCH net-next v2 0/8] Devmem TCP minor cleanups and ksft improvements patchwork-bot+netdevbpf
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=20250523230524.1107879-4-almasrymina@google.com \
--to=almasrymina@google.com \
--cc=andrew+netdev@lunn.ch \
--cc=ap420073@gmail.com \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=edumazet@google.com \
--cc=hawk@kernel.org \
--cc=horms@kernel.org \
--cc=ilias.apalodimas@linaro.org \
--cc=kuba@kernel.org \
--cc=kuniyu@amazon.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=ncardwell@google.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=praan@google.com \
--cc=sdf@fomichev.me \
--cc=shivajikant@google.com \
--cc=shuah@kernel.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
all inboxes | Powered by JetHome®