From: Coly Li <colyli@suse.de>
To: davem@davemloft.net, linux-block@vger.kernel.org,
linux-nvme@lists.infradead.org, netdev@vger.kernel.org,
open-iscsi@googlegroups.com, linux-scsi@vger.kernel.org,
ceph-devel@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Coly Li <colyli@suse.de>,
Jeff Layton <jlayton@kernel.org>,
Ilya Dryomov <idryomov@gmail.com>
Subject: [PATCH v10 7/7] libceph: use sendpage_ok() in ceph_tcp_sendpage()
Date: Fri, 2 Oct 2020 16:27:34 +0800 [thread overview]
Message-ID: <20201002082734.13925-8-colyli@suse.de> (raw)
In-Reply-To: <20201002082734.13925-1-colyli@suse.de>
In libceph, ceph_tcp_sendpage() does the following checks before handle
the page by network layer's zero copy sendpage method,
if (page_count(page) >= 1 && !PageSlab(page))
This check is exactly what sendpage_ok() does. This patch replace the
open coded checks by sendpage_ok() as a code cleanup.
Signed-off-by: Coly Li <colyli@suse.de>
Acked-by: Jeff Layton <jlayton@kernel.org>
Cc: Ilya Dryomov <idryomov@gmail.com>
---
net/ceph/messenger.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index bdfd66ba3843..d4d7a0e52491 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -575,7 +575,7 @@ static int ceph_tcp_sendpage(struct socket *sock, struct page *page,
* coalescing neighboring slab objects into a single frag which
* triggers one of hardened usercopy checks.
*/
- if (page_count(page) >= 1 && !PageSlab(page))
+ if (sendpage_ok(page))
sendpage = sock->ops->sendpage;
else
sendpage = sock_no_sendpage;
--
2.26.2
next prev parent reply other threads:[~2020-10-02 8:29 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-02 8:27 [PATCH v10 0/7] Introduce sendpage_ok() to detect misused sendpage in network related drivers Coly Li
2020-10-02 8:27 ` [PATCH v10 1/7] net: introduce helper sendpage_ok() in include/linux/net.h Coly Li
2020-10-02 8:27 ` [PATCH v10 2/7] net: add WARN_ONCE in kernel_sendpage() for improper zero-copy send Coly Li
2020-10-02 8:27 ` [PATCH v10 3/7] nvme-tcp: check page by sendpage_ok() before calling kernel_sendpage() Coly Li
2020-10-02 8:27 ` [PATCH v10 4/7] tcp: use sendpage_ok() to detect misused .sendpage Coly Li
2020-10-02 8:27 ` [PATCH v10 5/7] drbd: code cleanup by using sendpage_ok() to check page for kernel_sendpage() Coly Li
2020-10-02 8:27 ` [PATCH v10 6/7] scsi: libiscsi: use sendpage_ok() in iscsi_tcp_segment_map() Coly Li
2020-10-02 8:27 ` Coly Li [this message]
2020-10-02 22:28 ` [PATCH v10 0/7] Introduce sendpage_ok() to detect misused sendpage in network related drivers David Miller
2020-10-03 10:42 ` Coly Li
2020-10-04 3:38 ` [PATCH v10 0/7] Introduce sendpage_ok() to detect misused sendpage in network related drivers Coly Li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201002082734.13925-8-colyli@suse.de \
--to=colyli@suse.de \
--cc=ceph-devel@vger.kernel.org \
--cc=davem@davemloft.net \
--cc=idryomov@gmail.com \
--cc=jlayton@kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-scsi@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=open-iscsi@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).