nvme-tcp: use sendpages_ok() instead of sendpage_ok()
BugLink: https://bugs.launchpad.net/bugs/2093871 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> (cherry picked from commit 6af7331a70b4888df43ec1d7e1803ae2c43b6981) Signed-off-by: Matthew Ruffell <matthew.ruffell@canonical.com> Acked-by: Koichiro Den <koichiro.den@canonical.com> Acked-by: Manuel Diewald <manuel.diewald@canonical.com> Signed-off-by: Koichiro Den <koichiro.den@canonical.com>
This commit is contained in:
@@ -1058,7 +1058,7 @@ static int nvme_tcp_try_send_data(struct nvme_tcp_request *req)
|
||||
else
|
||||
msg.msg_flags |= MSG_MORE;
|
||||
|
||||
if (!sendpage_ok(page))
|
||||
if (!sendpages_ok(page, len, offset))
|
||||
msg.msg_flags &= ~MSG_SPLICE_PAGES;
|
||||
|
||||
bvec_set_page(&bvec, page, len, offset);
|
||||
|
||||
Reference in New Issue
Block a user