From patchwork Wed Mar 29 14:13:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13192553 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 89876C6FD18 for ; Wed, 29 Mar 2023 14:16:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F3708280006; Wed, 29 Mar 2023 10:16:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E6F80280001; Wed, 29 Mar 2023 10:16:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D0F1D280006; Wed, 29 Mar 2023 10:16:09 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id C01B6280001 for ; Wed, 29 Mar 2023 10:16:09 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id A682FC087B for ; Wed, 29 Mar 2023 14:16:09 +0000 (UTC) X-FDA: 80622135258.11.6028E76 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf04.hostedemail.com (Postfix) with ESMTP id DFA3840025 for ; Wed, 29 Mar 2023 14:16:07 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=KBOPmya5; spf=pass (imf04.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.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=1680099367; 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=7fCBjYGLxHqikc/tNao5Lfq+HewWC5ZgTjyFTAyeW0Q=; b=TEHAuHzibRgmAljNU09jynAyrvfgvt3QXfKPf9ldCNv/Ndzafilf8hNnFUEUuEbkjdap7S b23zt2gQRDHn3p1b5A46fnkYmOw0Xtam8YLXe3krKr2rAtquAd7FFvF0LzWSd7qpIj6Dpp 5/b5oH7leOtE219+S+Anmj6GNpjOR/I= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=KBOPmya5; spf=pass (imf04.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.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=1680099367; a=rsa-sha256; cv=none; b=bsjqt3CnvZ+IF1fF52H7yv0HGzyTuoXtqU+cmyPM/WcHA/C/WJoXCM81QFzeefj6iES7RK yQ4xah+VjUuK4EM56+kspn7zC7Vgi5/3wxMZYaF7AmsQ5KRcwh+6LS7EK4fpAsMXL6mA8F XRkjPQZHwZPYPnAnI/ZBoep5BHbwqzI= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680099367; 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=7fCBjYGLxHqikc/tNao5Lfq+HewWC5ZgTjyFTAyeW0Q=; b=KBOPmya57uLtfFCnt6RqWs1HdcNCaRpAyGONfZh+qQoOoz/ce+iLhvkprxUZwcLi08j9Qo 6ilriPPUbRFmw/l7VP4o/LWAd6yEqvqifHV7oMGpKG+B9jSfzcyueSek70M/zoNIFwVi4R QaAYN4sV6DrsF2BJIJriiGusxH4Il+g= 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-114-46eAsXOAN6OrZ73_2qvGIA-1; Wed, 29 Mar 2023 10:16:03 -0400 X-MC-Unique: 46eAsXOAN6OrZ73_2qvGIA-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 5E15C8030D4; Wed, 29 Mar 2023 14:16:01 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1928E202701F; Wed, 29 Mar 2023 14:15:59 +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, Karsten Graul , Wenjia Zhang , Jan Karcher , linux-s390@vger.kernel.org Subject: [RFC PATCH v2 44/48] smc: Drop smc_sendpage() in favour of smc_sendmsg() + MSG_SPLICE_PAGES Date: Wed, 29 Mar 2023 15:13:50 +0100 Message-Id: <20230329141354.516864-45-dhowells@redhat.com> In-Reply-To: <20230329141354.516864-1-dhowells@redhat.com> References: <20230329141354.516864-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: 8ad3pf9i643or1jm646wgxi83efafz9s X-Rspamd-Queue-Id: DFA3840025 X-HE-Tag: 1680099367-346507 X-HE-Meta: U2FsdGVkX19BTS5qkq7+e1Q9ifoIZOLR32hwXnkNIAp/wbMfGvPpjEczLzWtfXOq808EOxXYeK0LAatqxJZU1GMAaw2fccW0iWS9EFRDpI3oI6OM3czJZZ63lJudSpL7BKA7Mv78o418sUd4o4TISCJjWNdFd8rD3s7x411OxiRj/GsQNPAe4FYN8KpKOd4cnVOUugPrWZnSXXhm5+Rssp6lABemsjL9g/T7lMIK+GAC6AYSS9kKndS1aBRbtkVDCa0M39lxpW/yZro+PNGYiXm/IeJu55r7UbnHeX1gLT/tfl6kNgwvHHt3KXjYW6NbanydEjhggzYcYvj9SNJFJtfAMKomDiRZZcQiTMOh9oPybVoSRx0TxcmDta7SLFAAcc7EKcKv/OtwOEolzksJFLo06oEpGI1l5+oJ/EsvFoXkmJ5GQy0Kt8FMnDyazKdgL4vZsskXBpiG8i22JnBOz+slmac8mI7af5xFgt0FEadCjqxUS37RuFFffd60zRtBY+N/4ppHn+T+DkYKRYTGHTspM3sSVxRJdiWX/uR8xNzdKBzAFUJ1+sBuHBkiy3JpGTB8Bng5Oii3gG6E3wFenlHWKqw6FYpy8ljpLuSQsL5KYGCFJ5B5qoQOL6wn1SgLElCWU1Ua4TUZjyvjaQuyA6F1E59gddJ2libOEjTg2UOUMVln3N4vLGtwP4LOOAVbgbzm+mddQUwipuYMDGgyq/9psNzW2Sc8bH1ohRhcYHMeP+5kpg5GPaJ4AiQzgTa1OL0K9hsQFCOY+vLfqehxcUitBnLo/9awIc5p5l43QL298pqCTZ00ne0mgfXcHf8GsfV2/BWmHxRV0WBkvmmO+k1Ubrrbju463nW3sNtSyjcVR3qfGiISR87DwOqdRQGBD/p25UZRTZ6dq6EJXrtTeo/uz9qBgz8U+/XoGad9rOISgegWbmI5pdUlixxKwRJ0wBDsoE2vOQrrHTxDa90 zRL3kN2u TkGYp7IqRlg71AZBWTGy1XNKJlGhg4b78GzW0KIfngCJEIN1qt1CTMfNN4mV584xD9jb01BSRmT7Ei70fKKJwvOxOrXpA5EtGZLwunjamuKDNErg7wrEp8xl3WmEsex6h6S8Hcxw9upImC6UBpz1cqP0K7WH5DMoXyZYbWktoEElSLK3QfjKuMfUZ1/SOBk27vjPj8b5oiNv0t8/AwrQhvo3bzZ9jEEEYKMl2Snry9pfTO6FelTz1nE+bUFuqRwwB1oUMQQgyZwCJWWa9F/X9OjBv4p9fnM+UdaFwIM/FD3bvImjI1lBxoD4MXeiafLHG0thklX6f4ntUfXGYIg6CfmZ5OouaKsL4PhAcLKdEspg+40Nm71yoBYrVNsAFRE/GlMHTFjCd/Gf+pXSAapxh6Gp8kHVegdyE3pvWodrQDW/37CL4SgtXLBc6Go0qt4NMZRt9i8miNXlTgnYLes/B5vVVaQ== 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: Drop the smc_sendpage() code as smc_sendmsg() just passes the call down to the underlying TCP socket and smc_tx_sendpage() is just a wrapper around its sendmsg implementation. Signed-off-by: David Howells cc: Karsten Graul cc: Wenjia Zhang cc: Jan Karcher cc: "David S. Miller" cc: Eric Dumazet cc: Jakub Kicinski cc: Paolo Abeni cc: Jens Axboe cc: Matthew Wilcox cc: linux-s390@vger.kernel.org cc: netdev@vger.kernel.org --- net/smc/af_smc.c | 29 ----------------------------- net/smc/smc_stats.c | 2 +- net/smc/smc_stats.h | 1 - net/smc/smc_tx.c | 16 ---------------- net/smc/smc_tx.h | 2 -- 5 files changed, 1 insertion(+), 49 deletions(-) diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c index a4cccdfdc00a..d4113c8a7cda 100644 --- a/net/smc/af_smc.c +++ b/net/smc/af_smc.c @@ -3125,34 +3125,6 @@ static int smc_ioctl(struct socket *sock, unsigned int cmd, return put_user(answ, (int __user *)arg); } -static ssize_t smc_sendpage(struct socket *sock, struct page *page, - int offset, size_t size, int flags) -{ - struct sock *sk = sock->sk; - struct smc_sock *smc; - int rc = -EPIPE; - - smc = smc_sk(sk); - lock_sock(sk); - if (sk->sk_state != SMC_ACTIVE) { - release_sock(sk); - goto out; - } - release_sock(sk); - if (smc->use_fallback) { - rc = kernel_sendpage(smc->clcsock, page, offset, - size, flags); - } else { - lock_sock(sk); - rc = smc_tx_sendpage(smc, page, offset, size, flags); - release_sock(sk); - SMC_STAT_INC(smc, sendpage_cnt); - } - -out: - return rc; -} - /* Map the affected portions of the rmbe into an spd, note the number of bytes * to splice in conn->splice_pending, and press 'go'. Delays consumer cursor * updates till whenever a respective page has been fully processed. @@ -3224,7 +3196,6 @@ static const struct proto_ops smc_sock_ops = { .sendmsg = smc_sendmsg, .recvmsg = smc_recvmsg, .mmap = sock_no_mmap, - .sendpage = smc_sendpage, .splice_read = smc_splice_read, }; diff --git a/net/smc/smc_stats.c b/net/smc/smc_stats.c index e80e34f7ac15..ca14c0f3a07d 100644 --- a/net/smc/smc_stats.c +++ b/net/smc/smc_stats.c @@ -227,7 +227,7 @@ static int smc_nl_fill_stats_tech_data(struct sk_buff *skb, SMC_NLA_STATS_PAD)) goto errattr; if (nla_put_u64_64bit(skb, SMC_NLA_STATS_T_SENDPAGE_CNT, - smc_tech->sendpage_cnt, + 0, SMC_NLA_STATS_PAD)) goto errattr; if (nla_put_u64_64bit(skb, SMC_NLA_STATS_T_CORK_CNT, diff --git a/net/smc/smc_stats.h b/net/smc/smc_stats.h index 84b7ecd8c05c..b60fe1eb37ab 100644 --- a/net/smc/smc_stats.h +++ b/net/smc/smc_stats.h @@ -71,7 +71,6 @@ struct smc_stats_tech { u64 clnt_v2_succ_cnt; u64 srv_v1_succ_cnt; u64 srv_v2_succ_cnt; - u64 sendpage_cnt; u64 urg_data_cnt; u64 splice_cnt; u64 cork_cnt; diff --git a/net/smc/smc_tx.c b/net/smc/smc_tx.c index f4b6a71ac488..d31ce8209fa2 100644 --- a/net/smc/smc_tx.c +++ b/net/smc/smc_tx.c @@ -298,22 +298,6 @@ int smc_tx_sendmsg(struct smc_sock *smc, struct msghdr *msg, size_t len) return rc; } -int smc_tx_sendpage(struct smc_sock *smc, struct page *page, int offset, - size_t size, int flags) -{ - struct msghdr msg = {.msg_flags = flags}; - char *kaddr = kmap(page); - struct kvec iov; - int rc; - - iov.iov_base = kaddr + offset; - iov.iov_len = size; - iov_iter_kvec(&msg.msg_iter, ITER_SOURCE, &iov, 1, size); - rc = smc_tx_sendmsg(smc, &msg, size); - kunmap(page); - return rc; -} - /***************************** sndbuf consumer *******************************/ /* sndbuf consumer: actual data transfer of one target chunk with ISM write */ diff --git a/net/smc/smc_tx.h b/net/smc/smc_tx.h index 34b578498b1f..a59f370b8b43 100644 --- a/net/smc/smc_tx.h +++ b/net/smc/smc_tx.h @@ -31,8 +31,6 @@ void smc_tx_pending(struct smc_connection *conn); void smc_tx_work(struct work_struct *work); void smc_tx_init(struct smc_sock *smc); int smc_tx_sendmsg(struct smc_sock *smc, struct msghdr *msg, size_t len); -int smc_tx_sendpage(struct smc_sock *smc, struct page *page, int offset, - size_t size, int flags); int smc_tx_sndbuf_nonempty(struct smc_connection *conn); void smc_tx_sndbuf_nonfull(struct smc_sock *smc); void smc_tx_consumer_update(struct smc_connection *conn, bool force);