net/rds: rds_sendmsg should not discard payload_len

Commit 3db6e0d172c9 ("rds: use RCU to synchronize work-enqueue with
connection teardown") modifies rds_sendmsg to avoid enqueueing work
while a tear down is in progress. However, it also changed the return
value of rds_sendmsg to that of rds_send_xmit instead of the
payload_len. This means the user may incorrectly receive errno values
when it should have simply received a payload of 0 while the peer
attempts a reconnections.  So this patch corrects the teardown handling
code to only use the out error path in that case, thus restoring the
original payload_len return value.

Fixes: 3db6e0d172c9 ("rds: use RCU to synchronize work-enqueue with connection teardown")
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Allison Henderson <achender@kernel.org>
Link: https://patch.msgid.link/20260213035409.1963391-1-achender@kernel.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/net/rds/send.c b/net/rds/send.c
index 6e96f108473ebb4dd2e59b3f1e08f83a3e41f26e..a1039e422a38fd83dcc290e8d78765bf5d76766c 100644 (file)
--- a/net/rds/send.c
+++ b/net/rds/send.c
@@ -1431,9 +1431,11 @@ int rds_sendmsg(struct socket *sock, struct msghdr *msg, size_t payload_len)
                else
                        queue_delayed_work(cpath->cp_wq, &cpath->cp_send_w, 1);
                rcu_read_unlock();
+
+               if (ret)
+                       goto out;
        }
-       if (ret)
-               goto out;
+
        rds_message_put(rm);
 
        for (ind = 0; ind < vct.indx; ind++)