diff options
| author | David S. Miller <davem@davemloft.net> | 2019-03-28 03:37:58 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-03-28 03:37:58 +0300 |
| commit | 356d71e00d278d865f8c7f68adebd6ce4698a7e2 (patch) | |
| tree | 8cb2dabf7440b56c6dee76b4253210c6b603b98e /drivers/scsi/libiscsi_tcp.c | |
| parent | df453700e8d81b1bdafdf684365ee2b9431fb702 (diff) | |
| parent | 1a9df9e29c2afecf6e3089442d429b377279ca3c (diff) | |
| download | linux-356d71e00d278d865f8c7f68adebd6ce4698a7e2.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/scsi/libiscsi_tcp.c')
| -rw-r--r-- | drivers/scsi/libiscsi_tcp.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/scsi/libiscsi_tcp.c b/drivers/scsi/libiscsi_tcp.c index 9923e9e3b884..c3fe3f3a78f5 100644 --- a/drivers/scsi/libiscsi_tcp.c +++ b/drivers/scsi/libiscsi_tcp.c @@ -129,12 +129,17 @@ static void iscsi_tcp_segment_map(struct iscsi_segment *segment, int recv) BUG_ON(sg->length == 0); /* + * We always map for the recv path. + * * If the page count is greater than one it is ok to send * to the network layer's zero copy send path. If not we - * have to go the slow sendmsg path. We always map for the - * recv path. + * have to go the slow sendmsg path. + * + * Same goes for slab pages: skb_can_coalesce() allows + * coalescing neighboring slab objects into a single frag which + * triggers one of hardened usercopy checks. */ - if (page_count(sg_page(sg)) >= 1 && !recv) + if (!recv && page_count(sg_page(sg)) >= 1 && !PageSlab(sg_page(sg))) return; if (recv) { |