From: Coly Li <colyli@suse.de> To: 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>, Ilya Dryomov <idryomov@gmail.com>, Jeff Layton <jlayton@kernel.org> Subject: [PATCH v7 6/6] libceph: use sendpage_ok() in ceph_tcp_sendpage() Date: Tue, 18 Aug 2020 21:12:27 +0800 [thread overview] Message-ID: <20200818131227.37020-7-colyli@suse.de> (raw) In-Reply-To: <20200818131227.37020-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> Cc: Ilya Dryomov <idryomov@gmail.com> Cc: Jeff Layton <jlayton@kernel.org> --- 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 27d6ab11f9ee..6a349da7f013 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
WARNING: multiple messages have this Message-ID (diff)
From: Coly Li <colyli@suse.de> To: 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: Ilya Dryomov <idryomov@gmail.com>, Jeff Layton <jlayton@kernel.org>, linux-kernel@vger.kernel.org, Coly Li <colyli@suse.de> Subject: [PATCH v7 6/6] libceph: use sendpage_ok() in ceph_tcp_sendpage() Date: Tue, 18 Aug 2020 21:12:27 +0800 [thread overview] Message-ID: <20200818131227.37020-7-colyli@suse.de> (raw) In-Reply-To: <20200818131227.37020-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> Cc: Ilya Dryomov <idryomov@gmail.com> Cc: Jeff Layton <jlayton@kernel.org> --- 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 27d6ab11f9ee..6a349da7f013 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 _______________________________________________ Linux-nvme mailing list Linux-nvme@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-nvme
next prev parent reply other threads:[~2020-08-18 13:14 UTC|newest] Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-08-18 13:12 [PATCH v7 0/6] Introduce sendpage_ok() to detect misused sendpage in network related drivers Coly Li 2020-08-18 13:12 ` Coly Li 2020-08-18 13:12 ` [PATCH v7 1/6] net: introduce helper sendpage_ok() in include/linux/net.h Coly Li 2020-08-18 13:12 ` Coly Li 2020-08-18 16:24 ` Christoph Hellwig 2020-08-18 16:24 ` Christoph Hellwig 2020-08-18 16:33 ` Coly Li 2020-08-18 16:33 ` Coly Li 2020-08-18 19:49 ` Christoph Hellwig 2020-08-18 19:49 ` Christoph Hellwig 2020-08-19 4:22 ` Coly Li 2020-08-19 4:22 ` Coly Li 2020-09-23 8:43 ` Christoph Hellwig 2020-09-23 8:43 ` Christoph Hellwig 2020-09-23 8:45 ` Coly Li 2020-09-23 8:45 ` Coly Li 2020-08-18 13:12 ` [PATCH v7 2/6] nvme-tcp: check page by sendpage_ok() before calling kernel_sendpage() Coly Li 2020-08-18 13:12 ` Coly Li 2020-08-18 13:12 ` [PATCH v7 3/6] tcp: use sendpage_ok() to detect misused .sendpage Coly Li 2020-08-18 13:12 ` Coly Li 2020-08-18 13:12 ` [PATCH v7 4/6] drbd: code cleanup by using sendpage_ok() to check page for kernel_sendpage() Coly Li 2020-08-18 13:12 ` Coly Li 2020-08-18 13:12 ` [PATCH v7 5/6] scsi: libiscsi: use sendpage_ok() in iscsi_tcp_segment_map() Coly Li 2020-08-18 13:12 ` Coly Li 2020-08-18 13:12 ` Coly Li [this message] 2020-08-18 13:12 ` [PATCH v7 6/6] libceph: use sendpage_ok() in ceph_tcp_sendpage() 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=20200818131227.37020-7-colyli@suse.de \ --to=colyli@suse.de \ --cc=ceph-devel@vger.kernel.org \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.