| Message ID | 20240530132629.4180932-3-ofir.gal@volumez.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/4] net: introduce helper sendpages_ok() | expand |
On 5/30/24 15:26, Ofir Gal wrote: > 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. > > Signed-off-by: Ofir Gal <ofir.gal@volumez.com> > --- > drivers/nvme/host/tcp.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c > index 8b5e4327fe83..9f0fd14cbcb7 100644 > --- a/drivers/nvme/host/tcp.c > +++ b/drivers/nvme/host/tcp.c > @@ -1051,7 +1051,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); Reviewed-by: Hannes Reinecke <hare@suse.de> Cheers, Hannes
diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index 8b5e4327fe83..9f0fd14cbcb7 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -1051,7 +1051,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);
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. Signed-off-by: Ofir Gal <ofir.gal@volumez.com> --- drivers/nvme/host/tcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)