From patchwork Tue Jun 20 14:53:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13286013 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 D561EEB64D7 for ; Tue, 20 Jun 2023 14:56:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 777BD8D000E; Tue, 20 Jun 2023 10:56:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 726AB8D0001; Tue, 20 Jun 2023 10:56:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5EEE28D000E; Tue, 20 Jun 2023 10:56:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 4EED68D0001 for ; Tue, 20 Jun 2023 10:56:56 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id DF0871C9693 for ; Tue, 20 Jun 2023 14:56:54 +0000 (UTC) X-FDA: 80923428348.29.E8F029C Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf13.hostedemail.com (Postfix) with ESMTP id CBA8E20023 for ; Tue, 20 Jun 2023 14:56:52 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=euyB9UC+; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf13.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=1687273012; 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=iAUCq6AQpwiSNlqp6e2886GYsbEpCz4tvlCIXkUtiq4=; b=ERr2UiCajw8p3prfljdrzzdH/t98Fxhk8WrzMiFYCv8QgYgLZcEWRb23iy3iM05R9+xm6z eX3bK27CewbHyqsiwt2snkB79LFyMtFAsZJKmqj+FY+lq+ETfCMeICjaN4lG4zqyvg72Fh Xw6eFRa+fWhlhuIUby+Tj51mZXQDgKE= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=euyB9UC+; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf13.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=1687273012; a=rsa-sha256; cv=none; b=gRP413dgME3VWf+B0tkYLsFRHS72heKzvd/5rNJPoQ3jPbY5PBcnW5WkNbq2W56dIoBURI JwNMq91KJ7Qupe9KU/PGeHw3Ba4ZUZOomw7edu4q1iLvad7yXSpeDXBWOk71dz/Z6Eqj9J qJmjFTU0k0TQXKgk6vjOWcl6AbJNbCs= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687273012; 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=iAUCq6AQpwiSNlqp6e2886GYsbEpCz4tvlCIXkUtiq4=; b=euyB9UC+VnIArbCJBaj8gKO7/jV/U5HLYbjWMcJ/w/nm85/FqMeIrbu8IGZ4uvz3WQgRis tfkKKwB6uxKOsKR31oeR2ZJo8VhXftwXaovLDQmcRSBfJb3/MJ3GWLMKTDNXlhZjrKPcb6 5XF/ezM0+G6Tj5Ug1ABsgIP26sZ1y+w= 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-269-aatl8iayPtWLIAC2EOAbnw-1; Tue, 20 Jun 2023 10:56:49 -0400 X-MC-Unique: aatl8iayPtWLIAC2EOAbnw-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 C3B3A8870EA; Tue, 20 Jun 2023 14:54:30 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id B1AD5200A398; Tue, 20 Jun 2023 14:54:28 +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, Karsten Graul , Wenjia Zhang , Jan Karcher , "D. Wythe" , Tony Lu , Wen Gu , linux-s390@vger.kernel.org Subject: [PATCH net-next v3 12/18] smc: Drop smc_sendpage() in favour of smc_sendmsg() + MSG_SPLICE_PAGES Date: Tue, 20 Jun 2023 15:53:31 +0100 Message-ID: <20230620145338.1300897-13-dhowells@redhat.com> In-Reply-To: <20230620145338.1300897-1-dhowells@redhat.com> References: <20230620145338.1300897-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: CBA8E20023 X-Stat-Signature: j3dbsnorbar1bjryzdp6c6z541jj1xpk X-Rspam-User: X-HE-Tag: 1687273012-414065 X-HE-Meta: U2FsdGVkX18DJxV/KG5SCvXGM3tSEUC9jtzvzzjUcQlNinoaGrmGFLYKHXPfjVAUsHnxbKfyvB/NeCJH6ivCSAi/1Y+7+5yDTDHmmOrR21/2cbHxwcQlDB7PktMILD7d0ypa/PA2PtU325/eQEuGJA1ddBfn8i3WscqgTPdoZnLtpNgcrJr+w1wHZK4HTlOypL5BRPVLrBQ98K8tFSA1EJ/d1Jhf17cR5MOMefjdoGVPeK7WR4K9anECTHoRIunD400yFLqfufAHKH0pTf9PQPNMejPkpELYOeeelNFl6ezv10gIrv2O5nLUYLMyw2/EgLAXGd5UyPt9I82NtoinwA0QNaSndJ1Zx7c2IRGZvaOUEbETYikzjC6AEaj8i8IWQ+27RUm5LdHVUY2JvTQP5AQJfiUZ77TtRyqLUp2QHpgIYKo8mQNFldUA7RKKh2PXXWkxvWH5ChpwZTY8Ku74LEg63LtMJhfnyhP6Xh8PYQzzVG4Xug6BYioVNbdIg/miqAHDQGNjxi0+om3PbqNr7osPzXUL3DzOwg/f44iKbnOhDDp9PPjuH0By+gNiwYrbqxip+ix+DnV5Q77CSLsRNLrEkNDXsslFtQ5uT9DttpI5ykKoZehYP28cgQV09TgUgAmUE20qlTbR9TrWgSXFS25DYaZv33JjGFNsn+koYuj2purL2gObop0DCvw4Li2OHaq5I3dpjnMCYDSo2VyV28hb3O57YBtqHQ6fVI2Jh/xRevEIMfjI8c4De1po554cJlpbATytCBdO5bKB5TBehCnsZUXiyo3Yb+qqVbZj/deYk1I4yjHz5h0EHf9OXxuZSr2R82qmfwsffkZijLGBKJUrlCD+BiSu4NNRtbVoPnRd9zyTTE0WimOSUIwUQCCD4fqDAbHEatlzviHM4TPdSt/8gxIIpDGHfJE/Fo4SaSqnwRTsirODJwVMWqjmhyDAEKh1rW2Y9X7K9LGQUXD HnZSy/2k Z+h4uDR+oRJ9qHhY4bpiYIHxbQZf3iwTXBdu4+NewxNVRf7vjs7e7kQcDvEAk81Hh0T3LtRl88kYgo9IzhIDjlOjxQaJFMY31rEFxR55kVQLGN+gHqc8ck0a41XJLHRbJdAlWjFbSv8uNnIzCBjLKNtxYBLHfmxNA2POvr8pMRetDHN+h4BukiIWQOsqXLb6KeEccclQbNnQdHM6iV415bk8gMIWQemL253aYHaFmR8jyfRUDwd8i7Nu4KXi9xCR8j/lVBVpdeXuJegBeUrEEejuEAq+0hs9k2OGgzjVzqoYmMg/hAd8bBX9WoCY4JXv0dAD7wmmj4sXGbYIRxUXKXG/TvjviuS3ywVqlDW79BGhOLPgpP5dk21gREcKfhYmEI0iwa2MF4nVGNaGMdivpGIlPFgrwSqMXtl+ke4sNIzzMV+PqIoy2F0fweHtgu7slslYCCO+PNpTU0rl1uG8oPRDjAD50YoRl2DWvzJvjqiygc2owkSH36SAFSTm8n3swj9cGcuD2evmHi68IbAnmL9GeqTUtWRGt9aP8 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: "D. Wythe" cc: Tony Lu cc: Wen Gu 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 | 22 +--------------------- net/smc/smc_tx.h | 2 -- 5 files changed, 2 insertions(+), 54 deletions(-) diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c index 538e9c6ec8c9..a7f887d91d89 100644 --- a/net/smc/af_smc.c +++ b/net/smc/af_smc.c @@ -3133,34 +3133,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. @@ -3232,7 +3204,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 9b9e0a190734..5147207808e5 100644 --- a/net/smc/smc_tx.c +++ b/net/smc/smc_tx.c @@ -167,8 +167,7 @@ static bool smc_tx_should_cork(struct smc_sock *smc, struct msghdr *msg) * sndbuf_space is still available. The applications * should known how/when to uncork it. */ - if ((msg->msg_flags & MSG_MORE || - smc_tx_is_corked(smc)) && + if ((msg->msg_flags & MSG_MORE || smc_tx_is_corked(smc)) && atomic_read(&conn->sndbuf_space)) return true; @@ -297,25 +296,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; - - if (flags & MSG_SENDPAGE_NOTLAST) - msg.msg_flags |= MSG_MORE; - - 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);