diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2025-08-07 07:36:23 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-08-07 07:36:23 +0300 |
| commit | 2095cf558f65d9aad9a945e4fd1077b97bf61383 (patch) | |
| tree | 9740dac311ac8ebf1733ab8caab46978843cf07a | |
| parent | Merge tag 'vfio-v6.17-rc1-v2' of https://github.com/awilliam/linux-vfio (diff) | |
| parent | RDMA/siw: Fix the sendmsg byte count in siw_tcp_sendpages (diff) | |
| download | wireguard-linux-2095cf558f65d9aad9a945e4fd1077b97bf61383.tar.xz wireguard-linux-2095cf558f65d9aad9a945e4fd1077b97bf61383.zip | |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma
Pull rdma fix from Jason Gunthorpe:
"Single fix to correct the iov_iter construction in soft iwarp. This
avoids blktest crashes with recent changes to the allocators"
* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
RDMA/siw: Fix the sendmsg byte count in siw_tcp_sendpages
| -rw-r--r-- | drivers/infiniband/sw/siw/siw_qp_tx.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/infiniband/sw/siw/siw_qp_tx.c b/drivers/infiniband/sw/siw/siw_qp_tx.c index 3a08f57d2211..f7dd32c6e5ba 100644 --- a/drivers/infiniband/sw/siw/siw_qp_tx.c +++ b/drivers/infiniband/sw/siw/siw_qp_tx.c @@ -340,18 +340,17 @@ static int siw_tcp_sendpages(struct socket *s, struct page **page, int offset, if (!sendpage_ok(page[i])) msg.msg_flags &= ~MSG_SPLICE_PAGES; bvec_set_page(&bvec, page[i], bytes, offset); - iov_iter_bvec(&msg.msg_iter, ITER_SOURCE, &bvec, 1, size); + iov_iter_bvec(&msg.msg_iter, ITER_SOURCE, &bvec, 1, bytes); try_page_again: lock_sock(sk); - rv = tcp_sendmsg_locked(sk, &msg, size); + rv = tcp_sendmsg_locked(sk, &msg, bytes); release_sock(sk); if (rv > 0) { size -= rv; sent += rv; if (rv != bytes) { - offset += rv; bytes -= rv; goto try_page_again; } |