Message ID | 20230331160914.1608208-52-dhowells@redhat.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp698440vqo; Fri, 31 Mar 2023 09:46:55 -0700 (PDT) X-Google-Smtp-Source: AKy350Yujr5y7ab4nDqNINAF4uRaIjDDcf1ZHxq2xuKVLzVYZw8kYiP0grU44vSsDWEeeB/KSdcs X-Received: by 2002:aa7:cacf:0:b0:502:32ba:37a9 with SMTP id l15-20020aa7cacf000000b0050232ba37a9mr21979906edt.0.1680281214966; Fri, 31 Mar 2023 09:46:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680281214; cv=none; d=google.com; s=arc-20160816; b=EcrPb/bNwvYaKNSduVr0oLjplB+3AKkhf+mehbksZSbg0WyuxOTyTxsWS7OgWaMtuC uOtpOaz5XMoAIG5LN5PZAKgV+/Lndz7eutyTToL8RrQ6zlPEwiHr6U6bzJQN658fhjvB eeYR3ZtnXcRuyFy+q3nkDV8GNnMklbtt9N0gTDAKqTItRTLYwKrS7Jv5d6dQcwoDPoe8 IqA+KqUVjIT5j5G8hPnZnZtDPBt/fFpzII12t9Rps1JYR/0ojUkuLTzS1XbhedZjbHJY jhmrNwyamZFauOWl5npDp/ymZKNI3NZAvaD9iGF4ZsGID/iMlTrw1iAPgM54iz1zwoIC PlIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=7fCBjYGLxHqikc/tNao5Lfq+HewWC5ZgTjyFTAyeW0Q=; b=eQ01W9ibKNWLVHMJKaNbePu0JWRGz2ixIX4tVZUfnlRqN+gIvjaReA5ZBIzoZ/NlcE J4hd8YEvBybaBS5c/FrOKFSXXxP+JPI9sR04jT1XFklrslBABe7mrTZDL1sD09DhTXG+ GvPKt/OPzbYSRhnQXa0UKVxKs8eWbXA88REEBy7A469e+ETZ9EG0v4rNQhq/EaSxLleI rpvmoqStYZ92Kcs4sY7WUwYh9xT8D7os15wkGUDPaeU043MUs0LTVxiz6MUZxq1b8c8b UJwjpUKaoMLDl35PmX+rZ5CBGM3c1mUAOt7ySQ0+ksxfA/H45cxFsi3LN0K08XxXtH4Q Ewhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PEtnKC7P; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r16-20020aa7cb90000000b004fc66bd07dbsi2349963edt.369.2023.03.31.09.46.31; Fri, 31 Mar 2023 09:46:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PEtnKC7P; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232628AbjCaQms (ORCPT <rfc822;dexuan.linux@gmail.com> + 99 others); Fri, 31 Mar 2023 12:42:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231818AbjCaQmL (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Fri, 31 Mar 2023 12:42:11 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 30FE2236BF for <linux-kernel@vger.kernel.org>; Fri, 31 Mar 2023 09:37:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680280629; 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=PEtnKC7P0Cm9lXn3Z3f+5Y5kteGRZq3QsyuzyDCmDsjJXjKMl7/rwtfyOww994hRZnWo8k x5qsZa9sEK1y7t4nQEAT5Xj0XXM1R86dl/J8Gi5BfvNxz03PPak/Te+KVTCu9+HK8tQWaa N2uLlr2GUhmmH2PG57tvMGg/PsKQR8c= 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-47-U_ILvhbNNGasHHvG4A8zOg-1; Fri, 31 Mar 2023 12:11:44 -0400 X-MC-Unique: U_ILvhbNNGasHHvG4A8zOg-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3770D3C0F38A; Fri, 31 Mar 2023 16:11:43 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id AF40D140E94F; Fri, 31 Mar 2023 16:11:40 +0000 (UTC) From: David Howells <dhowells@redhat.com> To: Matthew Wilcox <willy@infradead.org>, "David S. Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com> Cc: David Howells <dhowells@redhat.com>, Al Viro <viro@zeniv.linux.org.uk>, Christoph Hellwig <hch@infradead.org>, Jens Axboe <axboe@kernel.dk>, Jeff Layton <jlayton@kernel.org>, Christian Brauner <brauner@kernel.org>, Chuck Lever III <chuck.lever@oracle.com>, Linus Torvalds <torvalds@linux-foundation.org>, netdev@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Karsten Graul <kgraul@linux.ibm.com>, Wenjia Zhang <wenjia@linux.ibm.com>, Jan Karcher <jaka@linux.ibm.com>, linux-s390@vger.kernel.org Subject: [PATCH v3 51/55] smc: Drop smc_sendpage() in favour of smc_sendmsg() + MSG_SPLICE_PAGES Date: Fri, 31 Mar 2023 17:09:10 +0100 Message-Id: <20230331160914.1608208-52-dhowells@redhat.com> In-Reply-To: <20230331160914.1608208-1-dhowells@redhat.com> References: <20230331160914.1608208-1-dhowells@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761902554897972090?= X-GMAIL-MSGID: =?utf-8?q?1761902554897972090?= |
Series |
splice, net: Replace sendpage with sendmsg(MSG_SPLICE_PAGES)
|
|
Commit Message
David Howells
March 31, 2023, 4:09 p.m. UTC
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 <dhowells@redhat.com>
cc: Karsten Graul <kgraul@linux.ibm.com>
cc: Wenjia Zhang <wenjia@linux.ibm.com>
cc: Jan Karcher <jaka@linux.ibm.com>
cc: "David S. Miller" <davem@davemloft.net>
cc: Eric Dumazet <edumazet@google.com>
cc: Jakub Kicinski <kuba@kernel.org>
cc: Paolo Abeni <pabeni@redhat.com>
cc: Jens Axboe <axboe@kernel.dk>
cc: Matthew Wilcox <willy@infradead.org>
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(-)
Comments
Hi David, Fallback is one of the most important features of SMC, which automatically downgrades to TCP when SMC discovers that the peer does not support SMC. After fallback, SMC hopes the the ability can be consistent with that of TCP sock. If you delete the smc_sendpage, when fallback occurs, it means that the sock after the fallback loses the ability of sendpage( tcp_sendpage). Thanks D. Wythe On 4/1/23 12:09 AM, David Howells wrote: > 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 <dhowells@redhat.com> > cc: Karsten Graul <kgraul@linux.ibm.com> > cc: Wenjia Zhang <wenjia@linux.ibm.com> > cc: Jan Karcher <jaka@linux.ibm.com> > cc: "David S. Miller" <davem@davemloft.net> > cc: Eric Dumazet <edumazet@google.com> > cc: Jakub Kicinski <kuba@kernel.org> > cc: Paolo Abeni <pabeni@redhat.com> > cc: Jens Axboe <axboe@kernel.dk> > cc: Matthew Wilcox <willy@infradead.org> > 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);
On 4/26/23 9:07 PM, D. Wythe wrote: > > Hi David, > > Fallback is one of the most important features of SMC, which > automatically downgrades to TCP > when SMC discovers that the peer does not support SMC. After fallback, > SMC hopes the the ability can be > consistent with that of TCP sock. If you delete the smc_sendpage, when > fallback occurs, it means that the sock after the fallback > loses the ability of sendpage( tcp_sendpage). > > Thanks > D. Wythe Sorry, I missed the key email context. The problem mentioned here does not exist ... > > On 4/1/23 12:09 AM, David Howells wrote: >> 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 <dhowells@redhat.com> >> cc: Karsten Graul <kgraul@linux.ibm.com> >> cc: Wenjia Zhang <wenjia@linux.ibm.com> >> cc: Jan Karcher <jaka@linux.ibm.com> >> cc: "David S. Miller" <davem@davemloft.net> >> cc: Eric Dumazet <edumazet@google.com> >> cc: Jakub Kicinski <kuba@kernel.org> >> cc: Paolo Abeni <pabeni@redhat.com> >> cc: Jens Axboe <axboe@kernel.dk> >> cc: Matthew Wilcox <willy@infradead.org> >> 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); >
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);