From patchwork Fri Jun 23 11:44:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 112106 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp5723160vqr; Fri, 23 Jun 2023 05:11:18 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5a5vtrGTqiu1kcwcMm1t/DnfduxxIIXMkiqjo2GZSo9O9+jVP2LxyK6lzg5adatnJcdz02 X-Received: by 2002:a05:6a20:3d15:b0:121:9e73:5518 with SMTP id y21-20020a056a203d1500b001219e735518mr12406248pzi.18.1687522277562; Fri, 23 Jun 2023 05:11:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687522277; cv=none; d=google.com; s=arc-20160816; b=WWaXFloNiGr3dv6O/N/+++th2AvmHq2gBtKLumkYy5+ZzM/0PsKDmM+Uy/avHlgUhw pMyK9CVCen49U/578YYdc29FS/FVC5gr3d7GPt1o0R68dpf8uVN7chmazcLjGnUnxjK4 NRFyebaMCd819qzw3N4wWgNYlq8LPqfx7ZBSeJZcrKPRJeWxOtjXlrpvHZPQJpHSV/LB a55p9LfDA1ReoYMsCAYpKabl7UBCSA4UoTuPNeTG8FE4sAyxLC9pozFuSJxrcUzwGx7k E9BWr27W945e2vvF4y/JVBKooNL0PciS6PWiUPdPIi7Lkr7QOyz/eQjS6OFzihLOTSv9 JmaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=CX0szcw738ZS8htZ0RxEmjBFgUMhbKSUPMuc1XxmplE=; b=LlXFw6uNs46RlaVHIEJOa4Ybz7AdAxgVzsULLjc4DXwRrOAzDmA73ommGkPxRKxJWS CMmfcCVObv4hQmpwgFA+yvYWRNSe5mDQLTXhlEOwWiiC0rVgaHc9eZAEnVCoYoprH3mh 2OQ54Mn+I6rcNLaOZRENMWCgGS6TjsU9TANOyVHaweoyN/xF012YTQuioALL8mU4ibq1 D0V5mukvD0bqSKCYSDkXY16dbIhk/PnBKNgaQ+JO/gABaQtxZgGIRg009Z+fguWiBfrd xCbII7n4LvVPy2mI0iewYuJqaR0j0lH1PotxgstOG6UwZwAD6VI+chBZ3GKsTf6FcIOp +KTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=DUJ9cGLG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y17-20020aa79e11000000b006642e5dd553si2304568pfq.221.2023.06.23.05.11.04; Fri, 23 Jun 2023 05:11:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=DUJ9cGLG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231857AbjFWLq4 (ORCPT + 99 others); Fri, 23 Jun 2023 07:46:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37788 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231684AbjFWLqL (ORCPT ); Fri, 23 Jun 2023 07:46:11 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D63312686 for ; Fri, 23 Jun 2023 04:44:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687520690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CX0szcw738ZS8htZ0RxEmjBFgUMhbKSUPMuc1XxmplE=; b=DUJ9cGLGwn65QCyqFW5WMy/soE1IyMHy0BfXxaJOddViNW8jHWxNrVwUQ1SZlnuyD8TJl5 9ptN7FOHV1qS53QFcMvi+jUwLi5Vg4RjZurGvLoUeFI3+VxnnOGkjorJ1cdO3pm304K3Co a/+TunEtx7e3yJcj/u5G2YuleHNBUOg= 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-610-pOqU4RdaNZuHTBXvo8Lefw-1; Fri, 23 Jun 2023 07:44:45 -0400 X-MC-Unique: pOqU4RdaNZuHTBXvo8Lefw-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B5ADC28EC10F; Fri, 23 Jun 2023 11:44:44 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id 04E2C1121314; Fri, 23 Jun 2023 11:44:42 +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, Christine Caulfield , David Teigland , cluster-devel@redhat.com Subject: [PATCH net-next v4 06/15] dlm: Use sendmsg(MSG_SPLICE_PAGES) rather than sendpage Date: Fri, 23 Jun 2023 12:44:16 +0100 Message-ID: <20230623114425.2150536-7-dhowells@redhat.com> In-Reply-To: <20230623114425.2150536-1-dhowells@redhat.com> References: <20230623114425.2150536-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769495359892597296?= X-GMAIL-MSGID: =?utf-8?q?1769495359892597296?= When transmitting data, call down a layer using a single sendmsg with MSG_SPLICE_PAGES to indicate that content should be spliced rather using sendpage. This allows ->sendpage() to be replaced by something that can handle multiple multipage folios in a single transaction. Signed-off-by: David Howells cc: Christine Caulfield cc: David Teigland cc: "David S. Miller" cc: Eric Dumazet cc: Jakub Kicinski cc: Paolo Abeni cc: Jens Axboe cc: Matthew Wilcox cc: cluster-devel@redhat.com cc: netdev@vger.kernel.org --- fs/dlm/lowcomms.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c index 3d3802c47b8b..5c12d8cdfc16 100644 --- a/fs/dlm/lowcomms.c +++ b/fs/dlm/lowcomms.c @@ -1395,8 +1395,11 @@ int dlm_lowcomms_resend_msg(struct dlm_msg *msg) /* Send a message */ static int send_to_sock(struct connection *con) { - const int msg_flags = MSG_DONTWAIT | MSG_NOSIGNAL; struct writequeue_entry *e; + struct bio_vec bvec; + struct msghdr msg = { + .msg_flags = MSG_SPLICE_PAGES | MSG_DONTWAIT | MSG_NOSIGNAL, + }; int len, offset, ret; spin_lock_bh(&con->writequeue_lock); @@ -1412,8 +1415,9 @@ static int send_to_sock(struct connection *con) WARN_ON_ONCE(len == 0 && e->users == 0); spin_unlock_bh(&con->writequeue_lock); - ret = kernel_sendpage(con->sock, e->page, offset, len, - msg_flags); + bvec_set_page(&bvec, e->page, len, offset); + iov_iter_bvec(&msg.msg_iter, ITER_SOURCE, &bvec, 1, len); + ret = sock_sendmsg(con->sock, &msg); trace_dlm_send(con->nodeid, ret); if (ret == -EAGAIN || ret == 0) { lock_sock(con->sock->sk);