Skip to content

Commit 6af7331

Browse files
ofirgallaxboe
authored andcommitted
nvme-tcp: use sendpages_ok() instead of sendpage_ok()
Currently nvme_tcp_try_send_data() use sendpage_ok() in order to disable MSG_SPLICE_PAGES, it check the first page of the iterator, the iterator may represent contiguous pages. MSG_SPLICE_PAGES enables skb_splice_from_iter() which checks all the pages it sends with sendpage_ok(). When nvme_tcp_try_send_data() sends an iterator that the first page is sendable, but one of the other pages isn't skb_splice_from_iter() warns and aborts the data transfer. Using the new helper sendpages_ok() in order to disable MSG_SPLICE_PAGES solves the issue. Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Hannes Reinecke <hare@suse.de> Reviewed-by: Sagi Grimberg <sagi@grimberg.me> Signed-off-by: Ofir Gal <ofir.gal@volumez.com> Link: https://lore.kernel.org/r/20240718084515.3833733-3-ofir.gal@volumez.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 23a55f4 commit 6af7331

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/nvme/host/tcp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1051,7 +1051,7 @@ static int nvme_tcp_try_send_data(struct nvme_tcp_request *req)
10511051
else
10521052
msg.msg_flags |= MSG_MORE;
10531053

1054-
if (!sendpage_ok(page))
1054+
if (!sendpages_ok(page, len, offset))
10551055
msg.msg_flags &= ~MSG_SPLICE_PAGES;
10561056

10571057
bvec_set_page(&bvec, page, len, offset);

0 commit comments

Comments
 (0)