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>,
Philipp Reisner <philipp.reisner@linbit.com>,
Sagi Grimberg <sagi@grimberg.me>
Subject: [PATCH v8 5/7] drbd: code cleanup by using sendpage_ok() to check page for kernel_sendpage()
Date: Fri, 25 Sep 2020 23:01:17 +0800 [thread overview]
Message-ID: <20200925150119.112016-6-colyli@suse.de> (raw)
In-Reply-To: <20200925150119.112016-1-colyli@suse.de>
In _drbd_send_page() a page is checked by following code before sending
it by kernel_sendpage(),
(page_count(page) < 1) || PageSlab(page)
If the check is true, this page won't be send by kernel_sendpage() and
handled by sock_no_sendpage().
This kind of check is exactly what macro sendpage_ok() does, which is
introduced into include/linux/net.h to solve a similar send page issue
in nvme-tcp code.
This patch uses macro sendpage_ok() to replace the open coded checks to
page type and refcount in _drbd_send_page(), as a code cleanup.
Signed-off-by: Coly Li <colyli@suse.de>
Cc: Philipp Reisner <philipp.reisner@linbit.com>
Cc: Sagi Grimberg <sagi@grimberg.me>
---
drivers/block/drbd/drbd_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 04b6bde9419d..573dbf6f0c31 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -1553,7 +1553,7 @@ static int _drbd_send_page(struct drbd_peer_device *peer_device, struct page *pa
* put_page(); and would cause either a VM_BUG directly, or
* __page_cache_release a page that would actually still be referenced
* by someone, leading to some obscure delayed Oops somewhere else. */
- if (drbd_disable_sendpage || (page_count(page) < 1) || PageSlab(page))
+ if (drbd_disable_sendpage || !sendpage_ok(page))
return _drbd_no_send_page(peer_device, page, offset, size, msg_flags);
msg_flags |= MSG_NOSIGNAL;
--
2.26.2
next prev parent reply other threads:[~2020-09-25 15:02 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-25 15:01 [PATCH v8 0/7] Introduce sendpage_ok() to detect misused sendpage in network related drivers Coly Li
2020-09-25 15:01 ` [PATCH v8 1/7] net: introduce helper sendpage_ok() in include/linux/net.h Coly Li
2020-09-25 15:18 ` Greg KH
2020-09-26 13:28 ` Coly Li
2020-09-27 12:21 ` Greg KH
2020-09-25 15:01 ` [PATCH v8 2/7] net: add WARN_ONCE in kernel_sendpage() for improper zero-copy send Coly Li
2020-09-25 15:01 ` [PATCH v8 3/7] nvme-tcp: check page by sendpage_ok() before calling kernel_sendpage() Coly Li
2020-09-25 15:01 ` [PATCH v8 4/7] tcp: use sendpage_ok() to detect misused .sendpage Coly Li
2020-09-25 15:01 ` Coly Li [this message]
2020-09-25 15:01 ` [PATCH v8 6/7] scsi: libiscsi: use sendpage_ok() in iscsi_tcp_segment_map() Coly Li
2020-09-25 20:54 ` Martin K. Petersen
2020-09-25 15:01 ` [PATCH v8 7/7] libceph: use sendpage_ok() in ceph_tcp_sendpage() Coly Li
2020-09-25 15:13 ` Jeff Layton
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=20200925150119.112016-6-colyli@suse.de \
--to=colyli@suse.de \
--cc=ceph-devel@vger.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 \
--cc=philipp.reisner@linbit.com \
--cc=sagi@grimberg.me \
/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).