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>,
	Vasily Averin <vvs@virtuozzo.com>, Cong Wang <amwang@redhat.com>,
	Mike Christie <michaelc@cs.wisc.edu>,
	Lee Duncan <lduncan@suse.com>, Chris Leech <cleech@redhat.com>,
	Christoph Hellwig <hch@lst.de>, Hannes Reinecke <hare@suse.de>
Subject: [PATCH v7 5/6] scsi: libiscsi: use sendpage_ok() in iscsi_tcp_segment_map()
Date: Tue, 18 Aug 2020 21:12:26 +0800	[thread overview]
Message-ID: <20200818131227.37020-6-colyli@suse.de> (raw)
In-Reply-To: <20200818131227.37020-1-colyli@suse.de>

In iscsci driver, iscsi_tcp_segment_map() uses the following code to
check whether the page should or not be handled by sendpage:
    if (!recv && page_count(sg_page(sg)) >= 1 && !PageSlab(sg_page(sg)))

The "page_count(sg_page(sg)) >= 1 && !PageSlab(sg_page(sg)" part is to
make sure the page can be sent to network layer's zero copy path. This
part is exactly what sendpage_ok() does.

This patch uses  use sendpage_ok() in iscsi_tcp_segment_map() to replace
the original open coded checks.

Signed-off-by: Coly Li <colyli@suse.de>
Cc: Vasily Averin <vvs@virtuozzo.com>
Cc: Cong Wang <amwang@redhat.com>
Cc: Mike Christie <michaelc@cs.wisc.edu>
Cc: Lee Duncan <lduncan@suse.com>
Cc: Chris Leech <cleech@redhat.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Hannes Reinecke <hare@suse.de>
---
 drivers/scsi/libiscsi_tcp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/libiscsi_tcp.c b/drivers/scsi/libiscsi_tcp.c
index 6ef93c7af954..31cd8487c16e 100644
--- a/drivers/scsi/libiscsi_tcp.c
+++ b/drivers/scsi/libiscsi_tcp.c
@@ -128,7 +128,7 @@ static void iscsi_tcp_segment_map(struct iscsi_segment *segment, int recv)
 	 * coalescing neighboring slab objects into a single frag which
 	 * triggers one of hardened usercopy checks.
 	 */
-	if (!recv && page_count(sg_page(sg)) >= 1 && !PageSlab(sg_page(sg)))
+	if (!recv && sendpage_ok(sg_page(sg)))
 		return;
 
 	if (recv) {
-- 
2.26.2


  parent reply	other threads:[~2020-08-18 13:13 UTC|newest]

Thread overview: 13+ 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 ` [PATCH v7 1/6] net: introduce helper sendpage_ok() in include/linux/net.h Coly Li
2020-08-18 16:24   ` Christoph Hellwig
2020-08-18 16:33     ` Coly Li
2020-08-18 19:49       ` Christoph Hellwig
2020-08-19  4:22         ` Coly Li
2020-09-23  8:43           ` Christoph Hellwig
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 ` [PATCH v7 3/6] tcp: use sendpage_ok() to detect misused .sendpage 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 [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-6-colyli@suse.de \
    --to=colyli@suse.de \
    --cc=amwang@redhat.com \
    --cc=ceph-devel@vger.kernel.org \
    --cc=cleech@redhat.com \
    --cc=hare@suse.de \
    --cc=hch@lst.de \
    --cc=lduncan@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=michaelc@cs.wisc.edu \
    --cc=netdev@vger.kernel.org \
    --cc=open-iscsi@googlegroups.com \
    --cc=vvs@virtuozzo.com \
    --subject='Re: [PATCH v7 5/6] scsi: libiscsi: use sendpage_ok() in iscsi_tcp_segment_map()' \
    /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).