]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
IB/iser: bound protection_sg size by data_sg size
authorMax Gurtovoy <maxg@mellanox.com>
Tue, 24 Sep 2019 21:03:47 +0000 (00:03 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 31 Dec 2019 15:34:49 +0000 (16:34 +0100)
[ Upstream commit 7718cf03c3ce4b6ebd90107643ccd01c952a1fce ]

In case we don't set the sg_prot_tablesize, the scsi layer assign the
default size (65535 entries). We should limit this size since we should
take into consideration the underlaying device capability. This cap is
considered when calculating the sg_tablesize. Otherwise, for example,
we can get that /sys/block/sdb/queue/max_segments is 128 and
/sys/block/sdb/queue/max_integrity_segments is 65535.

Link: https://lore.kernel.org/r/1569359027-10987-1-git-send-email-maxg@mellanox.com
Signed-off-by: Max Gurtovoy <maxg@mellanox.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/infiniband/ulp/iser/iscsi_iser.c

index 3fecd87c9f2bdc2ce23f88343471153f9cf3a698..b4e0ae0245754d77ac7e51ea79abb3f2179e82b5 100644 (file)
@@ -646,6 +646,7 @@ iscsi_iser_session_create(struct iscsi_endpoint *ep,
                if (ib_conn->pi_support) {
                        u32 sig_caps = ib_conn->device->ib_device->attrs.sig_prot_cap;
 
+                       shost->sg_prot_tablesize = shost->sg_tablesize;
                        scsi_host_set_prot(shost, iser_dif_prot_caps(sig_caps));
                        scsi_host_set_guard(shost, SHOST_DIX_GUARD_IP |
                                                   SHOST_DIX_GUARD_CRC);