From patchwork Fri Mar 31 16:09:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13196214 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 9693FC761A6 for ; Fri, 31 Mar 2023 16:12:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 355F06B00AA; Fri, 31 Mar 2023 12:12:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 306076B00BF; Fri, 31 Mar 2023 12:12:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1CE8A6B00C1; Fri, 31 Mar 2023 12:12:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 066276B00AA for ; Fri, 31 Mar 2023 12:12:05 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 9DF801C6BA8 for ; Fri, 31 Mar 2023 16:12:04 +0000 (UTC) X-FDA: 80629684968.12.35E3D3D Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf14.hostedemail.com (Postfix) with ESMTP id C772110001F for ; Fri, 31 Mar 2023 16:12:02 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=embEthkB; spf=pass (imf14.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1680279122; 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=ZJvfcCj7beM2l3aL2q8ZqMjrzC72DifYH9bqCAjpsUU=; b=384mFAJvm9tLFc5kgTQbgTvKJW5kUG5W5ILu5nDMkhYWiN5zBiRk1xzrX8z67E6uLkgFyY Srhd+RGtEBSKcJBzWi0V94bskYkGwzUxAwQd2ZpwH9LcuVBsYXb2/3NiGzEEMHLD921Lon z3Ra9HxEv+rM8amLqMm81iT9X1OQvjc= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=embEthkB; spf=pass (imf14.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1680279122; a=rsa-sha256; cv=none; b=rZoJ3yQKkhzyul6U177m1nvhMe1mcyUxfhshAJ1sg+/+GxsPW5C9zZ30B49nSsStHZih3U aqKfqvMCeej/JiEkMAR/YC5bZPSQFXim8dMCxz5qXUWQmBKliPXLnF/mMMuF7RZoSARJDf cXLJmNGLjNY0nFp5b+sH1SxavguSmeA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680279122; 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=ZJvfcCj7beM2l3aL2q8ZqMjrzC72DifYH9bqCAjpsUU=; b=embEthkBFt7qj12O8BEqCwkRtC1P4Dtpjnshepl6p8KR90nmwO5yN3Og151lB63h+OEc7I el11xgH3pmNIeCEzsCQuntOrx//9ep8xaEjRrJKzd08ZcOUu+wu50efD7PLECZf8aH/5B2 AHjnp+wb5w+QEt57PY/29TeoNqJLesk= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-207-st4ET5OBOuuljcmLdN9DFg-1; Fri, 31 Mar 2023 12:11:56 -0400 X-MC-Unique: st4ET5OBOuuljcmLdN9DFg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 39B1529AA2DF; Fri, 31 Mar 2023 16:11:49 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id CE1C52027040; Fri, 31 Mar 2023 16:11:46 +0000 (UTC) From: David Howells To: Matthew Wilcox , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: David Howells , Al Viro , Christoph Hellwig , Jens Axboe , Jeff Layton , Christian Brauner , Chuck Lever III , Linus Torvalds , netdev@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Philipp Reisner , Lars Ellenberg , =?utf-8?q?Christoph_B=C3=B6hmwa?= =?utf-8?q?lder?= , drbd-dev@lists.linbit.com, linux-block@vger.kernel.org Subject: [PATCH v3 53/55] drbd: Use sendmsg(MSG_SPLICE_PAGES) rather than sendmsg() Date: Fri, 31 Mar 2023 17:09:12 +0100 Message-Id: <20230331160914.1608208-54-dhowells@redhat.com> In-Reply-To: <20230331160914.1608208-1-dhowells@redhat.com> References: <20230331160914.1608208-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: qxa8ndwzjodupmd7fzfzpj8mztor1at4 X-Rspamd-Queue-Id: C772110001F X-HE-Tag: 1680279122-162117 X-HE-Meta: U2FsdGVkX188ViwA3gwyXTP5SW4n18GX2MhxjiSgfeND2RL5jdOnZt9ZpwwcU8vjUicrQhEgt1w7X7bmadknCxLmXkvqyV8NmxWUNDpPxTQH6s+OtcvnLsT4EzZV9F0b2zLdrsmEyfIvG5dSgAQTKnOf1fPGGOKtEFlZIuBSfgfpakxd/QjFVfCnEzBH6etxJNPNSL/S8XGMymIuwzkA0LKojLHFPIoorS/QMDIzrjlFzG9D76/orBDshNoq2VWc9+0xC+oQIjScvRNEGds5NJ1AV/6gqMyPjPyaB9Mw92g+5YAd5HG8+JOMst1cqsb4KJc0qhukBBEelZsWfGpfpx8HimX7AA+3LEn/9UffTeDfIHyjxhCczXgsi6F4Bhe7Xi+xe+4RyXglUXGoiddJMcmP5eNx1+vDsafHYDxBSvNtlI5WzUM2PE1erLpnvW2qhpXGOd6hTOrkwcSk0IBXjUlGNCSUXGpRdeXZmi24XnPAiI6rA/DWkKvcOfqiKIOipCbS0u4A5xGK9872q2cRvg44admET8lx9M2WyyBilRxLLq5T9+hfJuoqHdDm3FnrTCLa+Hfer1DFl0uyFrtsMGFFMOYbOle0GwxIsON32EvkAf645z4hs9ksLvmvpsQbSwyC88Zq2cp8WmlOv3wdbodQd9SyuJb4cRooBTvjOdv28+qtIzsjHJ5mbDF9aRmvtwb7PCJP7tCaOn3ZXQvH+U75RF3PESQ7ND4HSKsPQD68Qa0GVE950mGuENlv2R3MTwbyYALhiN3HWKDqFe9y59JnKnqD6UmwZPk+maO/JnGur4To6mXyIbDTTJSI8KGF9CiobjwOhVi9MRxfPp5EeT1Lxlzg60W5D7kKB2fHJCpSa6aTOa21/W08LeK+ZYWB4COocjsShkjJLx9uukp2LmSQQKVr5SV7AE+9Whf3xtAQK1My2Vo9wYrGpyoc97zZ9UxRX+IbOViP/Pa7zlH n7iMWRHY R7LpRYeaX4CuQB0PRpcoWa3nSFIrM4dup1Xql5S1jqzw32ZJmXWgoZll4SjtsVi8OkN1lSgwQ/1Cn26bECWBpr8ydR2j37Fd7U7/f5O5CnfqW8cagcPymmhCIrbtcBn3YSeM3j69Es+0zMAHXYnjFEArdO2Mev0TWd47hOY1sMnvugOS1SMyXYNKGvyU7iJ/ZV/jkcpQrTXqyyrdX9P4bjbuCODQd40ar5Ww3FOTOVZYul6on9Ege1wgR02t0ulzFBXVrUzCTXX45BlLO7xRGeQQVheXsUe4lLFrFalP7Jo/tOiiuTz9J2gDzDRSCX/rdh6KuyY1o4aV37DaAvsrZaXf32oxwDR123HlYFheEPC0v1Id2C9cNP0TwuI7iuHLmFEslN8Sz7kALFZq07/9lQtdKsUs8iqCYKDT84MmQmxRd/c0gSIOiFbsPCFMoHI92FPMB 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 2c764f7ee4a7..e5f90abd29b6 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -1532,7 +1532,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 @@ -1541,33 +1542,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; }