From nobody Mon Feb 9 12:02:05 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CCE85EB64D7 for ; Fri, 16 Jun 2023 16:15:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344902AbjFPQPo (ORCPT ); Fri, 16 Jun 2023 12:15:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41170 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344729AbjFPQOo (ORCPT ); Fri, 16 Jun 2023 12:14:44 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 350983A92 for ; Fri, 16 Jun 2023 09:13:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686932031; 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=9Poz7OqJAkVJsv5byM8EW5EOnvfZYE9IRVGDTeluoLg=; b=Fb+2UBy6eTs6pbHpgPWkUlSNyvajWfjdM9pY4OektoMvlB7LTT75OCytNo1FIifwIXB6Ep gb0xc6xStF1Q/d8G0t24n/FEIQ4qDpVIaYbvKt7n+lGIYE6q5++1utQE3wyUlAuvpTXXRG ziPpwb19bZo9aazyOd+IKEyv3u6EA3A= 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-151-E4yhn9g7O6WajN0Qa6IrDA-1; Fri, 16 Jun 2023 12:13:46 -0400 X-MC-Unique: E4yhn9g7O6WajN0Qa6IrDA-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 816103C0E455; Fri, 16 Jun 2023 16:13:45 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.51]) by smtp.corp.redhat.com (Postfix) with ESMTP id 513131121314; Fri, 16 Jun 2023 16:13:43 +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, Mark Fasheh , Joel Becker , Joseph Qi , ocfs2-devel@oss.oracle.com Subject: [PATCH net-next 12/17] ocfs2: Use sendmsg(MSG_SPLICE_PAGES) rather than sendpage() Date: Fri, 16 Jun 2023 17:12:55 +0100 Message-ID: <20230616161301.622169-13-dhowells@redhat.com> In-Reply-To: <20230616161301.622169-1-dhowells@redhat.com> References: <20230616161301.622169-1-dhowells@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Fix ocfs2 to use the page fragment allocator rather than kzalloc in order to allocate the buffers for the handshake message and keepalive request and reply messages. Switch from using sendpage() to using sendmsg() + MSG_SPLICE_PAGES so that sendpage can be phased out. Signed-off-by: David Howells cc: Mark Fasheh cc: Joel Becker cc: Joseph Qi cc: "David S. Miller" cc: Eric Dumazet cc: Jakub Kicinski cc: Paolo Abeni cc: ocfs2-devel@oss.oracle.com cc: netdev@vger.kernel.org --- fs/ocfs2/cluster/tcp.c | 107 ++++++++++++++++++++++------------------- 1 file changed, 58 insertions(+), 49 deletions(-) diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c index aecbd712a00c..b543f72d85f2 100644 --- a/fs/ocfs2/cluster/tcp.c +++ b/fs/ocfs2/cluster/tcp.c @@ -110,9 +110,6 @@ static struct work_struct o2net_listen_work; static struct o2hb_callback_func o2net_hb_up, o2net_hb_down; #define O2NET_HB_PRI 0x1 =20 -static struct o2net_handshake *o2net_hand; -static struct o2net_msg *o2net_keep_req, *o2net_keep_resp; - static int o2net_sys_err_translations[O2NET_ERR_MAX] =3D {[O2NET_ERR_NONE] =3D 0, [O2NET_ERR_NO_HNDLR] =3D -ENOPROTOOPT, @@ -930,19 +927,22 @@ static int o2net_send_tcp_msg(struct socket *sock, st= ruct kvec *vec, } =20 static void o2net_sendpage(struct o2net_sock_container *sc, - void *kmalloced_virt, - size_t size) + void *virt, size_t size) { struct o2net_node *nn =3D o2net_nn_from_num(sc->sc_node->nd_num); + struct msghdr msg =3D {}; + struct bio_vec bv; ssize_t ret; =20 + bvec_set_virt(&bv, virt, size); + iov_iter_bvec(&msg.msg_iter, ITER_SOURCE, &bv, 1, size); + while (1) { + msg.msg_flags =3D MSG_DONTWAIT | MSG_SPLICE_PAGES; mutex_lock(&sc->sc_send_lock); - ret =3D sc->sc_sock->ops->sendpage(sc->sc_sock, - virt_to_page(kmalloced_virt), - offset_in_page(kmalloced_virt), - size, MSG_DONTWAIT); + ret =3D sock_sendmsg(sc->sc_sock, &msg); mutex_unlock(&sc->sc_send_lock); + if (ret =3D=3D size) break; if (ret =3D=3D (ssize_t)-EAGAIN) { @@ -1168,6 +1168,7 @@ static int o2net_process_message(struct o2net_sock_co= ntainer *sc, struct o2net_msg *hdr) { struct o2net_node *nn =3D o2net_nn_from_num(sc->sc_node->nd_num); + struct o2net_msg *keep_resp; int ret =3D 0, handler_status; enum o2net_system_error syserr; struct o2net_msg_handler *nmh =3D NULL; @@ -1186,8 +1187,16 @@ static int o2net_process_message(struct o2net_sock_c= ontainer *sc, be32_to_cpu(hdr->status)); goto out; case O2NET_MSG_KEEP_REQ_MAGIC: - o2net_sendpage(sc, o2net_keep_resp, - sizeof(*o2net_keep_resp)); + keep_resp =3D alloc_skb_frag(sizeof(*keep_resp), + GFP_KERNEL); + if (!keep_resp) { + ret =3D -ENOMEM; + goto out; + } + memset(keep_resp, 0, sizeof(*keep_resp)); + keep_resp->magic =3D cpu_to_be16(O2NET_MSG_KEEP_RESP_MAGIC); + o2net_sendpage(sc, keep_resp, sizeof(*keep_resp)); + folio_put(virt_to_folio(keep_resp)); goto out; case O2NET_MSG_KEEP_RESP_MAGIC: goto out; @@ -1439,15 +1448,22 @@ static void o2net_rx_until_empty(struct work_struct= *work) sc_put(sc); } =20 -static void o2net_initialize_handshake(void) +static struct o2net_handshake *o2net_initialize_handshake(void) { - o2net_hand->o2hb_heartbeat_timeout_ms =3D cpu_to_be32( - O2HB_MAX_WRITE_TIMEOUT_MS); - o2net_hand->o2net_idle_timeout_ms =3D cpu_to_be32(o2net_idle_timeout()); - o2net_hand->o2net_keepalive_delay_ms =3D cpu_to_be32( - o2net_keepalive_delay()); - o2net_hand->o2net_reconnect_delay_ms =3D cpu_to_be32( - o2net_reconnect_delay()); + struct o2net_handshake *hand; + + hand =3D alloc_skb_frag(sizeof(*hand), GFP_KERNEL); + if (!hand) + return NULL; + + memset(hand, 0, sizeof(*hand)); + hand->protocol_version =3D cpu_to_be64(O2NET_PROTOCOL_VERSION); + hand->connector_id =3D cpu_to_be64(1); + hand->o2hb_heartbeat_timeout_ms =3D cpu_to_be32(O2HB_MAX_WRITE_TIMEOUT_MS= ); + hand->o2net_idle_timeout_ms =3D cpu_to_be32(o2net_idle_timeout()); + hand->o2net_keepalive_delay_ms =3D cpu_to_be32(o2net_keepalive_delay()); + hand->o2net_reconnect_delay_ms =3D cpu_to_be32(o2net_reconnect_delay()); + return hand; } =20 /* ------------------------------------------------------------ */ @@ -1456,16 +1472,22 @@ static void o2net_initialize_handshake(void) * rx path will see the response and mark the sc valid */ static void o2net_sc_connect_completed(struct work_struct *work) { + struct o2net_handshake *hand; struct o2net_sock_container *sc =3D container_of(work, struct o2net_sock_container, sc_connect_work); =20 + hand =3D o2net_initialize_handshake(); + if (!hand) + goto out; + mlog(ML_MSG, "sc sending handshake with ver %llu id %llx\n", (unsigned long long)O2NET_PROTOCOL_VERSION, - (unsigned long long)be64_to_cpu(o2net_hand->connector_id)); + (unsigned long long)be64_to_cpu(hand->connector_id)); =20 - o2net_initialize_handshake(); - o2net_sendpage(sc, o2net_hand, sizeof(*o2net_hand)); + o2net_sendpage(sc, hand, sizeof(*hand)); + folio_put(virt_to_folio(hand)); +out: sc_put(sc); } =20 @@ -1475,8 +1497,15 @@ static void o2net_sc_send_keep_req(struct work_struc= t *work) struct o2net_sock_container *sc =3D container_of(work, struct o2net_sock_container, sc_keepalive_work.work); + struct o2net_msg *keep_req; =20 - o2net_sendpage(sc, o2net_keep_req, sizeof(*o2net_keep_req)); + keep_req =3D alloc_skb_frag(sizeof(*keep_req), GFP_KERNEL); + if (keep_req) { + memset(keep_req, 0, sizeof(*keep_req)); + keep_req->magic =3D cpu_to_be16(O2NET_MSG_KEEP_REQ_MAGIC); + o2net_sendpage(sc, keep_req, sizeof(*keep_req)); + folio_put(virt_to_folio(keep_req)); + } sc_put(sc); } =20 @@ -1780,6 +1809,7 @@ static int o2net_accept_one(struct socket *sock, int = *more) struct socket *new_sock =3D NULL; struct o2nm_node *node =3D NULL; struct o2nm_node *local_node =3D NULL; + struct o2net_handshake *hand; struct o2net_sock_container *sc =3D NULL; struct o2net_node *nn; unsigned int nofs_flag; @@ -1882,8 +1912,11 @@ static int o2net_accept_one(struct socket *sock, int= *more) o2net_register_callbacks(sc->sc_sock->sk, sc); o2net_sc_queue_work(sc, &sc->sc_rx_work); =20 - o2net_initialize_handshake(); - o2net_sendpage(sc, o2net_hand, sizeof(*o2net_hand)); + hand =3D o2net_initialize_handshake(); + if (hand) { + o2net_sendpage(sc, hand, sizeof(*hand)); + folio_put(virt_to_folio(hand)); + } =20 out: if (new_sock) @@ -2090,21 +2123,8 @@ int o2net_init(void) unsigned long i; =20 o2quo_init(); - o2net_debugfs_init(); =20 - o2net_hand =3D kzalloc(sizeof(struct o2net_handshake), GFP_KERNEL); - o2net_keep_req =3D kzalloc(sizeof(struct o2net_msg), GFP_KERNEL); - o2net_keep_resp =3D kzalloc(sizeof(struct o2net_msg), GFP_KERNEL); - if (!o2net_hand || !o2net_keep_req || !o2net_keep_resp) - goto out; - - o2net_hand->protocol_version =3D cpu_to_be64(O2NET_PROTOCOL_VERSION); - o2net_hand->connector_id =3D cpu_to_be64(1); - - o2net_keep_req->magic =3D cpu_to_be16(O2NET_MSG_KEEP_REQ_MAGIC); - o2net_keep_resp->magic =3D cpu_to_be16(O2NET_MSG_KEEP_RESP_MAGIC); - for (i =3D 0; i < ARRAY_SIZE(o2net_nodes); i++) { struct o2net_node *nn =3D o2net_nn_from_num(i); =20 @@ -2122,21 +2142,10 @@ int o2net_init(void) } =20 return 0; - -out: - kfree(o2net_hand); - kfree(o2net_keep_req); - kfree(o2net_keep_resp); - o2net_debugfs_exit(); - o2quo_exit(); - return -ENOMEM; } =20 void o2net_exit(void) { o2quo_exit(); - kfree(o2net_hand); - kfree(o2net_keep_req); - kfree(o2net_keep_resp); o2net_debugfs_exit(); }