From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id D31C5EB64D7 for ; Fri, 16 Jun 2023 16:13:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7168A8E000B; Fri, 16 Jun 2023 12:13:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 69ED08E000C; Fri, 16 Jun 2023 12:13:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 518518E000B; Fri, 16 Jun 2023 12:13:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 41DDB8E0001 for ; Fri, 16 Jun 2023 12:13:59 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id E5C21120CF3 for ; Fri, 16 Jun 2023 16:13:58 +0000 (UTC) X-FDA: 80909107356.07.8866BFC Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf09.hostedemail.com (Postfix) with ESMTP id 2C9F7140019 for ; Fri, 16 Jun 2023 16:13:56 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=U2GDvDjR; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf09.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1686932037; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=p9xwt/KxOmKt8o2VLLrb8jjs8WGzx+nDwsNmG750aho=; b=yN5WQi40IhQkM7UsW9gKhz6X/jWiNYLxjlRw9vHT3JxUO6qgf+I5fxcJxxFosYqUTWoerD ofnJBkMZE3UIZDyJ+ECUNqnYZcoIVGOCxtJ7ADEGvDWKYBLAimVSjoDHh6155CD89w/vvK NifCa9EMurMET7aC5PA1nSy9c4F5aPs= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=U2GDvDjR; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf09.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686932037; a=rsa-sha256; cv=none; b=gcm18uH+W5kV7+eaJeupxgIGhELP+dUDzh5fqV1Y0nCVrtSo7+LvSG5I7t8h0MOzo/I3kf vIGk19ycLKVzTFBTCyno13MROSOWFdmIu3MiqeCz04DejgJ8YSgQyPwz5FZD23kkVrsDqc b33CaLNKTFhHIETI3j0YUZy+gvjqGCU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686932036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=p9xwt/KxOmKt8o2VLLrb8jjs8WGzx+nDwsNmG750aho=; b=U2GDvDjRqVAaUzHDVzx68EGKV+GG6BFkkhHW+WYNR5iaP27vg8ePrUiOydRGTlsuRAdalQ uXF7oJZ7WmNIttJNU5yi74iXnACrSKAjMQPa3txZvP8eYH+7cNldObZKYr61NmXr1+/St0 2yrOIRlpw53h/Cy+UEzaKEOuygcFWMo= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-437-eFc4iCLxMeSIHuIkvb1k0A-1; Fri, 16 Jun 2023 12:13:50 -0400 X-MC-Unique: eFc4iCLxMeSIHuIkvb1k0A-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6958F80120F; Fri, 16 Jun 2023 16:13:49 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.51]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4E1BD40CF8F6; Fri, 16 Jun 2023 16:13:46 +0000 (UTC) From: David Howells To: netdev@vger.kernel.org Cc: David Howells , Alexander Duyck , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Willem de Bruijn , David Ahern , Matthew Wilcox , Jens Axboe , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Philipp Reisner , Lars Ellenberg , =?UTF-8?q?Christoph=20B=C3=B6hmwalder?= , drbd-dev@lists.linbit.com, linux-block@vger.kernel.org Subject: [PATCH net-next 13/17] drbd: Use sendmsg(MSG_SPLICE_PAGES) rather than sendpage() Date: Fri, 16 Jun 2023 17:12:56 +0100 Message-ID: <20230616161301.622169-14-dhowells@redhat.com> In-Reply-To: <20230616161301.622169-1-dhowells@redhat.com> References: <20230616161301.622169-1-dhowells@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 2C9F7140019 X-Stat-Signature: b77qhxj9ad93cgyhfxbio1d7uk5tnhfu X-HE-Tag: 1686932036-676646 X-HE-Meta: U2FsdGVkX187TSq+K/MmntA3iAQ0Zz68siECZqqSoljYgDyytyncxIe8VJO7AtDH3VfIk+0itj90th5Yn9tMfYzpG52/vOY/Dmprs8ueQyOaZcvbfFaUEHuuCdJo4ucF/rmdpWqaBXmLzWBBlM8LGJMNS7ozuS2mt8oXiQW9BcumF4Nj7GlYJOivqeon5iv+9eYgALLZf8JNkjPi/faWLku97P0c6SkPUSlIxHYePWdUslUewf1fv08GpGvDnfDMJvLV5QrPEu7cH5YnqNkOFeauwu9VpbYPmbmemti6mUk/3tYmKmAB9xYgsOkANRC2wf9VeknIIpDDHScJneRN1lwuLzOkj0tzb4NmZK6IucmZ+xVcQm4RbmtJUlvFeJRb3/vgfUUta6ha01Vy42ED2A5CXvxzIjk6R0VZhQNwBA6cl4tg8R2dh9EMk7aWItCGxVMBL2YB9FhdWvDAfvmBIwkqu1L1b2lVH/n61dyeU7XaFdEnKbgUUVLGXJv4nbROrQwnbK5L6TP3OyoxCnC1tU5DcAFGv1M04fFY6gapLEdzTk7NTKukGEG/MVp1V2yHciWd0nYlOf6TTjlLU4gNU4LK7H2N6UK+ERPcbjaLL+zAbrLPTAvYGUnmoXcLQy8uDXRkg9D/wZiFQaFfsJ4Y1VStdxChMvx+mQXTbNi5W7Z1C3KQh4xw5ZryRGVmwbG7uygHkmtiBiXsONmwHfH+MDWtlCpuo7KOsVPkRjY6/o9J/cS0c24gIOh16zolQPfJ7Hrupqb1rQH5Gucf+LzYzUBtZkjVpiYvh07ssvdSxFaurbceDkvg8qGmLOcdQ3+yRNu2vPIM71IPoMHJ1vW7wZmexVpN89Tzwtb429+O7M/qdMysWcq86+oEexs871RybdVRfc9WPciw6dvhvVYtVsJbL8O4YHn2eogU0GDI2aIOBe5oGcqaMy7H7zFWGnvNy0U4B+1V1rQXQqSoQRi FoWhhtk8 0H2one/3Qk6qtEyEswuLH9FQ3fciPZw4dVzK2ALCn9DNBcnd0uYCL+/r6Az4R+sCKIBlvjSJRp7IBmHsYF6UOaEBYkUR610AMNzxCfJW47K4qkQJGGkKKLnZa320uJTjn8uPHFlplFodcI4TLSupkBkcbNdfaS5DN0DMu+sk3+c0eA06cF18pL4GN7unIiSxVUpmnzg56nLwgsNAl6rRTv7mUdW1vj0Q57qWRdH1xQ1yOCctRQHuhjewtY31lu0hUULKeURGxqIKnItFq22jrSv5qWpIszkjm/HJSWOZpHcxnyxZD1Ar2gQiX6Tv7FNwyT7Xi09/hQ0t1ygneysQSKmQPvPUyRhPqnvSXTxeNz7CCN5J2+9xLzXm8qkgTpdToPV2sjZDnWvv2XgtXMSMNGvOA4lkaWG5mrHjVxhABRmLRryXdS3s101tlO3jMby1+4KoMg8HfFqLspP9KmiTTXTStlCor7HuTfSz0hvjGwsuWZ/kw5D0YQMiFAA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Use sendmsg() conditionally with MSG_SPLICE_PAGES in _drbd_send_page() rather than calling sendpage() or _drbd_no_send_page(). Signed-off-by: David Howells cc: Philipp Reisner cc: Lars Ellenberg cc: "Christoph Böhmwalder" cc: Jens Axboe cc: "David S. Miller" cc: Eric Dumazet cc: Jakub Kicinski cc: Paolo Abeni cc: drbd-dev@lists.linbit.com cc: linux-block@vger.kernel.org cc: netdev@vger.kernel.org --- drivers/block/drbd/drbd_main.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index 83987e7a5ef2..c9d84183844c 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -1540,7 +1540,8 @@ static int _drbd_send_page(struct drbd_peer_device *peer_device, struct page *pa int offset, size_t size, unsigned msg_flags) { struct socket *socket = peer_device->connection->data.socket; - int len = size; + struct bio_vec bvec; + struct msghdr msg = { .msg_flags = msg_flags, }; int err = -EIO; /* e.g. XFS meta- & log-data is in slab pages, which have a @@ -1549,33 +1550,33 @@ 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)) - return _drbd_no_send_page(peer_device, page, offset, size, msg_flags); + if (!drbd_disable_sendpage && sendpage_ok(page)) + msg.msg_flags |= MSG_NOSIGNAL | MSG_SPLICE_PAGES; + + bvec_set_page(&bvec, page, offset, size); + iov_iter_bvec(&msg.msg_iter, ITER_SOURCE, &bvec, 1, size); - msg_flags |= MSG_NOSIGNAL; drbd_update_congested(peer_device->connection); do { int sent; - sent = socket->ops->sendpage(socket, page, offset, len, msg_flags); + sent = sock_sendmsg(socket, &msg); if (sent <= 0) { if (sent == -EAGAIN) { if (we_should_drop_the_connection(peer_device->connection, socket)) break; continue; } - drbd_warn(peer_device->device, "%s: size=%d len=%d sent=%d\n", - __func__, (int)size, len, sent); + drbd_warn(peer_device->device, "%s: size=%d len=%zu sent=%d\n", + __func__, (int)size, msg_data_left(&msg), sent); if (sent < 0) err = sent; break; } - len -= sent; - offset += sent; - } while (len > 0 /* THINK && device->cstate >= C_CONNECTED*/); + } while (msg_data_left(&msg) /* THINK && device->cstate >= C_CONNECTED*/); clear_bit(NET_CONGESTED, &peer_device->connection->flags); - if (len == 0) { + if (!msg_data_left(&msg)) { err = 0; peer_device->device->send_cnt += size >> 9; }