Netdev Archive on lore.kernel.org
help / color / mirror / Atom feed
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>,
Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>,
Christoph Hellwig <hch@lst.de>, Hannes Reinecke <hare@suse.de>,
Jan Kara <jack@suse.com>, Jens Axboe <axboe@kernel.dk>,
Mikhail Skorzhinskii <mskorzhinskiy@solarflare.com>,
Philipp Reisner <philipp.reisner@linbit.com>,
Sagi Grimberg <sagi@grimberg.me>,
Vlastimil Babka <vbabka@suse.com>,
stable@vger.kernel.org
Subject: [PATCH v6 2/6] nvme-tcp: check page by sendpage_ok() before calling kernel_sendpage()
Date: Tue, 18 Aug 2020 20:47:32 +0800 [thread overview]
Message-ID: <20200818124736.5790-3-colyli@suse.de> (raw)
In-Reply-To: <20200818124736.5790-1-colyli@suse.de>
Currently nvme_tcp_try_send_data() doesn't use kernel_sendpage() to
send slab pages. But for pages allocated by __get_free_pages() without
__GFP_COMP, which also have refcount as 0, they are still sent by
kernel_sendpage() to remote end, this is problematic.
The new introduced helper sendpage_ok() checks both PageSlab tag and
page_count counter, and returns true if the checking page is OK to be
sent by kernel_sendpage().
This patch fixes the page checking issue of nvme_tcp_try_send_data()
with sendpage_ok(). If sendpage_ok() returns true, send this page by
kernel_sendpage(), otherwise use sock_no_sendpage to handle this page.
Signed-off-by: Coly Li <colyli@suse.de>
Cc: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Jan Kara <jack@suse.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Mikhail Skorzhinskii <mskorzhinskiy@solarflare.com>
Cc: Philipp Reisner <philipp.reisner@linbit.com>
Cc: Sagi Grimberg <sagi@grimberg.me>
Cc: Vlastimil Babka <vbabka@suse.com>
Cc: stable@vger.kernel.org
---
drivers/nvme/host/tcp.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c
index 62fbaecdc960..902fe742762b 100644
--- a/drivers/nvme/host/tcp.c
+++ b/drivers/nvme/host/tcp.c
@@ -912,12 +912,11 @@ static int nvme_tcp_try_send_data(struct nvme_tcp_request *req)
else
flags |= MSG_MORE | MSG_SENDPAGE_NOTLAST;
- /* can't zcopy slab pages */
- if (unlikely(PageSlab(page))) {
- ret = sock_no_sendpage(queue->sock, page, offset, len,
+ if (sendpage_ok(page)) {
+ ret = kernel_sendpage(queue->sock, page, offset, len,
flags);
} else {
- ret = kernel_sendpage(queue->sock, page, offset, len,
+ ret = sock_no_sendpage(queue->sock, page, offset, len,
flags);
}
if (ret <= 0)
--
2.26.2
next prev parent reply other threads:[~2020-08-18 12:49 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-18 12:47 [PATCH v6 0/6] Introduce sendpage_ok() to detect misused sendpage in network related drivers Coly Li
2020-08-18 12:47 ` [PATCH v6 1/6] net: introduce helper sendpage_ok() in include/linux/net.h Coly Li
2020-08-18 12:47 ` Coly Li [this message]
2020-08-18 12:47 ` [PATCH v6 3/6] tcp: use sendpage_ok() to detect misused .sendpage Coly Li
2020-08-18 12:47 ` [PATCH v6 4/6] drbd: code cleanup by using sendpage_ok() to check page for kernel_sendpage() Coly Li
2020-08-18 12:47 ` [PATCH v6 5/6] scsi: libiscsi: use sendpage_ok() in iscsi_tcp_segment_map() Coly Li
2020-08-18 12:47 ` [PATCH v6 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=20200818124736.5790-3-colyli@suse.de \
--to=colyli@suse.de \
--cc=axboe@kernel.dk \
--cc=ceph-devel@vger.kernel.org \
--cc=chaitanya.kulkarni@wdc.com \
--cc=hare@suse.de \
--cc=hch@lst.de \
--cc=jack@suse.com \
--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=mskorzhinskiy@solarflare.com \
--cc=netdev@vger.kernel.org \
--cc=open-iscsi@googlegroups.com \
--cc=philipp.reisner@linbit.com \
--cc=sagi@grimberg.me \
--cc=stable@vger.kernel.org \
--cc=vbabka@suse.com \
--subject='Re: [PATCH v6 2/6] nvme-tcp: check page by sendpage_ok() before calling kernel_sendpage()' \
/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
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).