]> www.infradead.org Git - users/hch/block.git/commitdiff
drbd: use sendpages_ok() instead of sendpage_ok()
authorOfir Gal <ofir.gal@volumez.com>
Thu, 18 Jul 2024 08:45:14 +0000 (11:45 +0300)
committerJens Axboe <axboe@kernel.dk>
Sun, 28 Jul 2024 22:47:52 +0000 (16:47 -0600)
Currently _drbd_send_page() use sendpage_ok() in order to enable
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 _drbd_send_page() 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 enable MSG_SPLICE_PAGES
solves the issue.

Acked-by: Christoph Böhmwalder <christoph.boehmwalder@linbit.com>
Signed-off-by: Ofir Gal <ofir.gal@volumez.com>
Link: https://lore.kernel.org/r/20240718084515.3833733-4-ofir.gal@volumez.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/block/drbd/drbd_main.c

index a9e49b212341bebe58883949c5d3ef9174ab9253..449123eb54bf925310d4bec79b86ff899880d4e0 100644 (file)
@@ -1550,7 +1550,7 @@ static int _drbd_send_page(struct drbd_peer_device *peer_device, struct page *pa
         * put_page(); and would cause either a VM_BUG directly, or
         * __page_cache_release a page that would actually still be referenced
         * by someone, leading to some obscure delayed Oops somewhere else. */
-       if (!drbd_disable_sendpage && sendpage_ok(page))
+       if (!drbd_disable_sendpage && sendpages_ok(page, len, offset))
                msg.msg_flags |= MSG_NOSIGNAL | MSG_SPLICE_PAGES;
 
        drbd_update_congested(peer_device->connection);