From patchwork Fri Jun 16 16:12:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13282945 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 C9360EB64DA for ; Fri, 16 Jun 2023 16:14:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A239A940008; Fri, 16 Jun 2023 12:13:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9F9E38E0001; 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 851E4940008; 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 667AC8E0001 for ; Fri, 16 Jun 2023 12:13:59 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 3F25DAF282 for ; Fri, 16 Jun 2023 16:13:59 +0000 (UTC) X-FDA: 80909107398.08.351BA26 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf08.hostedemail.com (Postfix) with ESMTP id 53072160014 for ; Fri, 16 Jun 2023 16:13:56 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=EricP103; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf08.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=1686932036; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=9Poz7OqJAkVJsv5byM8EW5EOnvfZYE9IRVGDTeluoLg=; b=JAzPXdfQuaR8SjV37IMtOF7Spi0apwkBWZvSa08ZPejXdgzS0OPI1BOvTe/tHVR3Jd1Gb9 1XBp5mbVQPyatDB3/mNWraMxPpUvmrsFoa6qQClOoUah8bPhWRnN7plunq8cKXabN78fUA /lFhW3lETYdcD8W0x4INwtyY4Ihv8WA= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=EricP103; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf08.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=1686932036; a=rsa-sha256; cv=none; b=hVWyM3UzxrDpZ1eZOoQ86Js5ZGBVeShH2KnBfNeTIPbujcP0xDm34zAYSDHBWd3DFFJ8IU stUfnm9U8Pg9FpDqybyYBARKc1vzT7Wa5b3Q6uNc7yYniwddAZ3ue6G11C6WrgDyU5FMo9 exVpf8XXeoc++gkA39LnDehMV2eoKeo= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686932034; 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=EricP103sL3V/G2sP+29+VvpXUvyCu20qySt7L3uzw3Hbsmk7TJzO2+rfjniT/q4b8TVa+ qw1zLBcU5JwUngM9eRRSFnNAOVWyrggcSlZ77Dr33hqa/SVg5/VD9Q+6yXKqFz4giWKusS gDG0hykdx6Oh2eurbDnbtucT486fMhM= 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 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 53072160014 X-Stat-Signature: yzw6riot5ipnmxhwk4opzd5rs8g99r8e X-HE-Tag: 1686932036-848341 X-HE-Meta: U2FsdGVkX197uTJ9KRUtit7Ic6qXMui2Ie6SQ2fQy0J9boxhZ1iIPZQLrZjh5XiGbeUWCyZjkmZOY69W0hEFSkV11wM98rkti/OkU3PWNIzLsqHDAi983cp9nf+mXFAeniQc2gKv70cQVKioGjirWxaWmw3fgmWk8jHFkUL+0OHgxEr6/euBGlnRhiTDnL1se1oc9gOCfB9j6xh6EG6wt7n7z1XhnJdlt5dSaM2WMjNG5ugUxm8BMxi+Sxj7gV7aNho0jijQ5vNokYRWtpplj2q2KrnC2q7DENKoBTWLxvqjMpSzMBo1yUF0QdRol2BRt/AfVGj98u/+4CfdB1oxub1uOEh4f43PvgkPwaH3C0wUawtwKaPlFId70aE+LV+uU2sv+HcLuqhiN8WzDHuiBcBLaXecQl/p9ZWYbgmQFCPTcuX1X0Xw9g8YoqmaFXhdASnfRPprMphUXxcmQzzQyohWGfpq18E/3fXkuvZ/8d9Bpfaj8bIabetVxdgYE3y8e+Xqe4DVAewENggm/pRksHITV42vm25L5b03+PJBYgSBshgLFPgJx8QJDtS6h+HAklacyq6wlLyF2dCMbNtAzy45iMJvCqqjk3scsoGc9zzAPTmmAlAZajmLEyotO59wdrII9gQvmRNCc9ugT8cdxXyoJEht0lXGVv2Y4NR+fYe4Vsgt8BrWBgnkEy3fYVGbCbjVfVRl4/RoFcZK/x5WEDxsw8Xb39iLriB+v+nuGmp9FkyrGOyhyvfvW3TSYojyv0iQvUM/DxBx5fnZR8BzdiW1YJKCnPN2WRzjomrnw94my5a6mbvoaUllEeJXxGzFwarfoyC3T1VFpx97AosGX4jeRR/7VWn1LGRxvcQiQx7ZR28KtRTHsKi5udqk5UkSeRHtS+CeLe5i1qug9p297nZGFw2Orrnvt1pkABuvl5hIxpBAMi0jTyCKc44p2BS3XfJm8KpsIklugr+gAUo k17LVnuQ i99GrcUKjbrxkLM1TD7I05FJHkP9cR6im+jcdXz+pGqDzAZKKBjeNGJt1CPaExBPQhNohzi1XcB6YGuacgooN4NaGOvU2+cZryXVMbz8ms5yCQWRTj5gwrIvI2AUx7pm7/C4IF7gcVAttYKI8HF86sbxfWUrLMcESYql3R1gQDV1G8fJT5IfL/ayo6am0iG31bWQmVlRaHisxTrBklLzjFSoWZaUbZM5sBbUrYyS/pfRrghe5hjvZ9UktcSmH27/f8/Z/wI6zCdHz7KEVKETQlT+RAfjIiIEdvKgcCE5IrWxf3QVvXH68ZO9Lf1TWmEo2RYPUB1hKmNxUewd4ExUQMS4OEXaN93cNWY6GvrzDMvTRDo4TBTesNlLMS+hv8V12o1Edv5qXxi2qsWG8jCtfuCrOR0veGGjRSBzrmNYEFX4AqC3tgp2QxlEdMtEGKDUKzit1+t/0dj4zsZvT/DKivzjX03uM2StPgXsFjoXyB5I4yyWAM4c8akLsCA2n5oEY7dVGVGCIq65U6P0q/4AkJtm0fejQjME3WmLrcCBvn7xo9GqM76AFU+PsIS9IwNGYgbfcktV0zUivFk2s0k5rGWEYcu/ORhqa5a/j 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: 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 -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] = {[O2NET_ERR_NONE] = 0, [O2NET_ERR_NO_HNDLR] = -ENOPROTOOPT, @@ -930,19 +927,22 @@ static int o2net_send_tcp_msg(struct socket *sock, struct kvec *vec, } static void o2net_sendpage(struct o2net_sock_container *sc, - void *kmalloced_virt, - size_t size) + void *virt, size_t size) { struct o2net_node *nn = o2net_nn_from_num(sc->sc_node->nd_num); + struct msghdr msg = {}; + struct bio_vec bv; ssize_t ret; + bvec_set_virt(&bv, virt, size); + iov_iter_bvec(&msg.msg_iter, ITER_SOURCE, &bv, 1, size); + while (1) { + msg.msg_flags = MSG_DONTWAIT | MSG_SPLICE_PAGES; mutex_lock(&sc->sc_send_lock); - ret = sc->sc_sock->ops->sendpage(sc->sc_sock, - virt_to_page(kmalloced_virt), - offset_in_page(kmalloced_virt), - size, MSG_DONTWAIT); + ret = sock_sendmsg(sc->sc_sock, &msg); mutex_unlock(&sc->sc_send_lock); + if (ret == size) break; if (ret == (ssize_t)-EAGAIN) { @@ -1168,6 +1168,7 @@ static int o2net_process_message(struct o2net_sock_container *sc, struct o2net_msg *hdr) { struct o2net_node *nn = o2net_nn_from_num(sc->sc_node->nd_num); + struct o2net_msg *keep_resp; int ret = 0, handler_status; enum o2net_system_error syserr; struct o2net_msg_handler *nmh = NULL; @@ -1186,8 +1187,16 @@ static int o2net_process_message(struct o2net_sock_container *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 = alloc_skb_frag(sizeof(*keep_resp), + GFP_KERNEL); + if (!keep_resp) { + ret = -ENOMEM; + goto out; + } + memset(keep_resp, 0, sizeof(*keep_resp)); + keep_resp->magic = 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); } -static void o2net_initialize_handshake(void) +static struct o2net_handshake *o2net_initialize_handshake(void) { - o2net_hand->o2hb_heartbeat_timeout_ms = cpu_to_be32( - O2HB_MAX_WRITE_TIMEOUT_MS); - o2net_hand->o2net_idle_timeout_ms = cpu_to_be32(o2net_idle_timeout()); - o2net_hand->o2net_keepalive_delay_ms = cpu_to_be32( - o2net_keepalive_delay()); - o2net_hand->o2net_reconnect_delay_ms = cpu_to_be32( - o2net_reconnect_delay()); + struct o2net_handshake *hand; + + hand = alloc_skb_frag(sizeof(*hand), GFP_KERNEL); + if (!hand) + return NULL; + + memset(hand, 0, sizeof(*hand)); + hand->protocol_version = cpu_to_be64(O2NET_PROTOCOL_VERSION); + hand->connector_id = cpu_to_be64(1); + hand->o2hb_heartbeat_timeout_ms = cpu_to_be32(O2HB_MAX_WRITE_TIMEOUT_MS); + hand->o2net_idle_timeout_ms = cpu_to_be32(o2net_idle_timeout()); + hand->o2net_keepalive_delay_ms = cpu_to_be32(o2net_keepalive_delay()); + hand->o2net_reconnect_delay_ms = cpu_to_be32(o2net_reconnect_delay()); + return hand; } /* ------------------------------------------------------------ */ @@ -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 = container_of(work, struct o2net_sock_container, sc_connect_work); + hand = 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)); - 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); } @@ -1475,8 +1497,15 @@ static void o2net_sc_send_keep_req(struct work_struct *work) struct o2net_sock_container *sc = container_of(work, struct o2net_sock_container, sc_keepalive_work.work); + struct o2net_msg *keep_req; - o2net_sendpage(sc, o2net_keep_req, sizeof(*o2net_keep_req)); + keep_req = alloc_skb_frag(sizeof(*keep_req), GFP_KERNEL); + if (keep_req) { + memset(keep_req, 0, sizeof(*keep_req)); + keep_req->magic = 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); } @@ -1780,6 +1809,7 @@ static int o2net_accept_one(struct socket *sock, int *more) struct socket *new_sock = NULL; struct o2nm_node *node = NULL; struct o2nm_node *local_node = NULL; + struct o2net_handshake *hand; struct o2net_sock_container *sc = 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); - o2net_initialize_handshake(); - o2net_sendpage(sc, o2net_hand, sizeof(*o2net_hand)); + hand = o2net_initialize_handshake(); + if (hand) { + o2net_sendpage(sc, hand, sizeof(*hand)); + folio_put(virt_to_folio(hand)); + } out: if (new_sock) @@ -2090,21 +2123,8 @@ int o2net_init(void) unsigned long i; o2quo_init(); - o2net_debugfs_init(); - o2net_hand = kzalloc(sizeof(struct o2net_handshake), GFP_KERNEL); - o2net_keep_req = kzalloc(sizeof(struct o2net_msg), GFP_KERNEL); - o2net_keep_resp = kzalloc(sizeof(struct o2net_msg), GFP_KERNEL); - if (!o2net_hand || !o2net_keep_req || !o2net_keep_resp) - goto out; - - o2net_hand->protocol_version = cpu_to_be64(O2NET_PROTOCOL_VERSION); - o2net_hand->connector_id = cpu_to_be64(1); - - o2net_keep_req->magic = cpu_to_be16(O2NET_MSG_KEEP_REQ_MAGIC); - o2net_keep_resp->magic = cpu_to_be16(O2NET_MSG_KEEP_RESP_MAGIC); - for (i = 0; i < ARRAY_SIZE(o2net_nodes); i++) { struct o2net_node *nn = o2net_nn_from_num(i); @@ -2122,21 +2142,10 @@ int o2net_init(void) } return 0; - -out: - kfree(o2net_hand); - kfree(o2net_keep_req); - kfree(o2net_keep_resp); - o2net_debugfs_exit(); - o2quo_exit(); - return -ENOMEM; } void o2net_exit(void) { o2quo_exit(); - kfree(o2net_hand); - kfree(o2net_keep_req); - kfree(o2net_keep_resp); o2net_debugfs_exit(); }