From patchwork Fri Jun 23 11:44:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13290408 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 29FEAEB64DD for ; Fri, 23 Jun 2023 11:45:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C65DC8D000B; Fri, 23 Jun 2023 07:45:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C3DA78D0001; Fri, 23 Jun 2023 07:45:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B05EB8D000B; Fri, 23 Jun 2023 07:45:02 -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 A022F8D0001 for ; Fri, 23 Jun 2023 07:45:02 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 60D34160E84 for ; Fri, 23 Jun 2023 11:45:02 +0000 (UTC) X-FDA: 80933831244.06.766FE91 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf09.hostedemail.com (Postfix) with ESMTP id 3E35314001E for ; Fri, 23 Jun 2023 11:44:59 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="YzV/pTMg"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf09.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.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=1687520700; 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=PSe/ILwvcvKNAe9EBhS3HTJsxWKySCoAZiMEUxcxN8I=; b=H65hDQJboxtBKQDuDHF0Nep8wiyi9D6LHP8cNi01qsLMscahvx+zDhS/bRxIiI9YZ4Gnfl V3lleE972alsNDdszBZJ2CMsHWdOVlYalzKfr9rX3IqX4Z+ez2JWKH/1mOl+5/N0oUzXPA UNjbPOsClY+mjY2YbZV1zJt19zoxfc0= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="YzV/pTMg"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf09.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687520700; a=rsa-sha256; cv=none; b=UOE/yaUgc0Wem2c/Xh0MrNVcUuMZ669CiqP9s0ola4XIKh9Owsky5LZYfFzvM5cHJMs5P/ 3BPAw/QFhXbPmrd85MhKN5PXprelgChYO5KIZ6tCKMrHgru4VBLeOLnlwMWSzL1D8WVBdl re1jcXPCI6w+hPNBh4BjKnws5RiZIH4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687520699; 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=PSe/ILwvcvKNAe9EBhS3HTJsxWKySCoAZiMEUxcxN8I=; b=YzV/pTMgMCe5MzbtgVoY0HZlqPRFzLDBDpeG14gYkNANcpkQfKJvdN8ZqOW/rDMk/fy2m+ 9LIy+TSGtiSsFMtqZZdTny6Xa0VglY9f/9jMQYhTyXnj+lzuHSXg2RuO7m2QnwNYMZcTJ0 kopuy2LLnHnFUf+TgpUoTHd3aIeBQr0= 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-134-x-hqviP7O_yozn6WZokJng-1; Fri, 23 Jun 2023 07:44:54 -0400 X-MC-Unique: x-hqviP7O_yozn6WZokJng-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D7DEB8E44EE; Fri, 23 Jun 2023 11:44:52 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id C1CB740C6CD1; Fri, 23 Jun 2023 11:44:50 +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 v4 09/15] smc: Drop smc_sendpage() in favour of smc_sendmsg() + MSG_SPLICE_PAGES Date: Fri, 23 Jun 2023 12:44:19 +0100 Message-ID: <20230623114425.2150536-10-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.2 X-Rspamd-Queue-Id: 3E35314001E X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: q87ax6jr6bt8ss5e44shbsmzruu5zjm8 X-HE-Tag: 1687520699-91246 X-HE-Meta: U2FsdGVkX1+dCVrdDPRKfzrDX+2ydIYQ5TzREGW9rr0l6PJJwTMadwGe9suDqRtd3iLmyq5w96NkcGtu/a1LmpgKbvMBG6xiy3bZeVKt2ee6wadQ3zImLdwNKgOUJxtCle9ACMzArCiJgP4OUF7ac0lIuoZzRnjdhGEY+fbguwUGT8fhXi8wsYOuXsCHTKr2hDxOWKUiXAi6auO//LJNKSqCe5ubU73GsGnMFbjU7I1IVBiS7tfBJTBMW8NPIwSQ+iMX4nwrugOfVpHSNn441SAnIgFNsspdlgAaZpmTLkN9o1GfASxJXEHQyyVL36SddbJlevFKHrOkv6mXO6nHCVFUEqYMnsvN00T9EzMq3gcZBCTj1pE6GscUEEDKaXdF7KWKWTr1zz25aAdOTz/EJvBFS3FPveBwyKkv8BZeE51gkO/r6QL4bIaJjJ29ygU25wzgmhYGibRLr67r6AR6Fu2MsUpa2/wEPhImAmFgMjKmK0/F9T+GZ+CQmGmG+jxd2F5rSBI6gTpQR2PhuWgdKbQStbgG6c97SkMygvxOHsbFxsXJxR0UPOfzBpddnjBJRP1dPPNwUQ5YVb/rU8rVCt/BPGaliGz3XEAric/W4zDR9Lwj3u3XR7SCBsYvN4VazQq9gqAdJEBRQwv9HsmgBari9o5AiozcJ6COf//e0iNdhPMjJTImSM0DwdBI0W6boiiil4vTBgBTVnTsrHjKj/qlC89sHUF2ZNzc6DsJtt4w/mCW4afTlnka1zYbCQGuomOPFxivfE31DBg7fBitMYA1ekj1HIfjwm9ZNJluOy8383gDpmR68xoAqfYL9u+ma5E4yaEsc6fZ3ZyhvdOqyqhsd/dY/Mkr7XC4VjHhBuaEJbYw9ClmMVKwGCGwFB2gwj/N6iszgvOnAYRDTGKCDbodAwAt6GkgVK80NUpINuNnDro8VweJ//l0Aqa+tFlZQy6K7MQxqtqoU71Y6oP 6X8txgOW pTZiC8cAzgZ6ZFuBtVaIQ6A8mLwYL39S8O80F1+y4G9PfYEp0X119ZCgIrmVlkWSiOTIaL8VxVNZeF5avOfeFdGVc6/rE1CkNd3mZJW4rZchlx9maSoxSkYg/+bvLeMTfimThDYaWGMXm7S/Je44LYc2UIjBM96aFdO7FDDqqlkIR+HZRdSJqxiM0Lt69z8d9pw4rpiVhzjzTVzzcu2g431duvlcB5/pr0pt+DLWUWaEskqUrIiol26bDQwYv6vo3cqZJTa39gyinBTplfK6mXozFzVX+UXqhrsmptAtwH2uwtxceCIMUIQA2mU/83m4RXAF1mSyG+lYRQ0tSvxZGLgfNCRq+14ti6EggjdfBsPip6gfSuSku2qgyYrJx/pR7zqK7moEODbX5lFMdpFKnKOydfHGoKueNy26DgEH09MwF74Yq9PL7fGQtsN2670SSaQLHMNStUCfmxk4DKGSpXBTahKeUrI4vbBi4ECKSXJVVkKrYHV1pEFf75cfL3ivyXFLJRH913nVt70ck3F9RaskfLyisWvznwQEW 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 | 19 ------------------- net/smc/smc_tx.h | 2 -- 5 files changed, 1 insertion(+), 52 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..3b0ff3b589c7 100644 --- a/net/smc/smc_tx.c +++ b/net/smc/smc_tx.c @@ -297,25 +297,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);