Message ID | 1520425743-1923-1-git-send-email-jianchao.w.wang@oracle.com (mailing list archive) |
---|---|
State | Accepted |
Headers | show |
Would anyone please take a review at this patch ? Thanks in advace Jianchao On 03/07/2018 08:29 PM, Jianchao Wang wrote: > iscsi tcp will first send out data, then calculate and send data > digest. If we don't have BDI_CAP_STABLE_WRITES, the page cache will > be written in spite of the on going writeback. Consequently, wrong > digest will be got and sent to target. > > To fix this, set BDI_CAP_STABLE_WRITES when data digest is enabled > in iscsi_tcp .slave_configure callback. > > Signed-off-by: Jianchao Wang <jianchao.w.wang@oracle.com> > --- > drivers/scsi/iscsi_tcp.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c > index 6198559..261c686 100644 > --- a/drivers/scsi/iscsi_tcp.c > +++ b/drivers/scsi/iscsi_tcp.c > @@ -37,6 +37,7 @@ > #include <linux/kfifo.h> > #include <linux/scatterlist.h> > #include <linux/module.h> > +#include <linux/backing-dev.h> > #include <net/tcp.h> > #include <scsi/scsi_cmnd.h> > #include <scsi/scsi_device.h> > @@ -954,6 +955,12 @@ static int iscsi_sw_tcp_slave_alloc(struct scsi_device *sdev) > > static int iscsi_sw_tcp_slave_configure(struct scsi_device *sdev) > { > + struct iscsi_sw_tcp_host *tcp_sw_host = iscsi_host_priv(sdev->host); > + struct iscsi_session *session = tcp_sw_host->session; > + struct iscsi_conn *conn = session->leadconn; > + > + if (conn->datadgst_en) > + sdev->request_queue->backing_dev_info->capabilities |= BDI_CAP_STABLE_WRITES; > blk_queue_bounce_limit(sdev->request_queue, BLK_BOUNCE_ANY); > blk_queue_dma_alignment(sdev->request_queue, 0); > return 0; >
> iscsi tcp will first send out data, then calculate and send data > digest. If we don't have BDI_CAP_STABLE_WRITES, the page cache will > be written in spite of the on going writeback. Consequently, wrong > digest will be got and sent to target. > > To fix this, set BDI_CAP_STABLE_WRITES when data digest is enabled > in iscsi_tcp .slave_configure callback. Lee, Chris: Please review!
I reviewed this several days before but mistakenly replied only to the open-iscsi list. Signed-off-by: Lee Duncan <lduncan@suse.com> -- Lee-Man Duncan Sent from my iPhone, dude > On Mar 14, 2018, at 10:11 PM, Martin K. Petersen <martin.petersen@oracle.com> wrote: > > >> iscsi tcp will first send out data, then calculate and send data >> digest. If we don't have BDI_CAP_STABLE_WRITES, the page cache will >> be written in spite of the on going writeback. Consequently, wrong >> digest will be got and sent to target. >> >> To fix this, set BDI_CAP_STABLE_WRITES when data digest is enabled >> in iscsi_tcp .slave_configure callback. > > Lee, Chris: Please review! > > -- > Martin K. Petersen Oracle Linux Engineering > > -- > You received this message because you are subscribed to a topic in the Google Groups "open-iscsi" group. > To unsubscribe from this topic, visit https://groups.google.com/d/topic/open-iscsi/owLIZAXfgoA/unsubscribe. > To unsubscribe from this group and all its topics, send an email to open-iscsi+unsubscribe@googlegroups.com. > To post to this group, send email to open-iscsi@googlegroups.com. > Visit this group at https://groups.google.com/group/open-iscsi. > For more options, visit https://groups.google.com/d/optout.
On Wed, Mar 07, 2018 at 08:29:03PM +0800, Jianchao Wang wrote: > iscsi tcp will first send out data, then calculate and send data > digest. If we don't have BDI_CAP_STABLE_WRITES, the page cache will > be written in spite of the on going writeback. Consequently, wrong > digest will be got and sent to target. > > To fix this, set BDI_CAP_STABLE_WRITES when data digest is enabled > in iscsi_tcp .slave_configure callback. > > Signed-off-by: Jianchao Wang <jianchao.w.wang@oracle.com> > --- > drivers/scsi/iscsi_tcp.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c > index 6198559..261c686 100644 > --- a/drivers/scsi/iscsi_tcp.c > +++ b/drivers/scsi/iscsi_tcp.c > @@ -37,6 +37,7 @@ > #include <linux/kfifo.h> > #include <linux/scatterlist.h> > #include <linux/module.h> > +#include <linux/backing-dev.h> > #include <net/tcp.h> > #include <scsi/scsi_cmnd.h> > #include <scsi/scsi_device.h> > @@ -954,6 +955,12 @@ static int iscsi_sw_tcp_slave_alloc(struct scsi_device *sdev) > > static int iscsi_sw_tcp_slave_configure(struct scsi_device *sdev) > { > + struct iscsi_sw_tcp_host *tcp_sw_host = iscsi_host_priv(sdev->host); > + struct iscsi_session *session = tcp_sw_host->session; > + struct iscsi_conn *conn = session->leadconn; > + > + if (conn->datadgst_en) > + sdev->request_queue->backing_dev_info->capabilities |= BDI_CAP_STABLE_WRITES; > blk_queue_bounce_limit(sdev->request_queue, BLK_BOUNCE_ANY); > blk_queue_dma_alignment(sdev->request_queue, 0); > return 0; > -- Thanks for fixing this issue with data digests! Signed-off-by: Chris Leech <cleech@redhat.com>
Jianchao, > iscsi tcp will first send out data, then calculate and send data > digest. If we don't have BDI_CAP_STABLE_WRITES, the page cache will > be written in spite of the on going writeback. Consequently, wrong > digest will be got and sent to target. > > To fix this, set BDI_CAP_STABLE_WRITES when data digest is enabled > in iscsi_tcp .slave_configure callback. Applied to 4.16/scsi-fixes. Thanks!
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c index 6198559..261c686 100644 --- a/drivers/scsi/iscsi_tcp.c +++ b/drivers/scsi/iscsi_tcp.c @@ -37,6 +37,7 @@ #include <linux/kfifo.h> #include <linux/scatterlist.h> #include <linux/module.h> +#include <linux/backing-dev.h> #include <net/tcp.h> #include <scsi/scsi_cmnd.h> #include <scsi/scsi_device.h> @@ -954,6 +955,12 @@ static int iscsi_sw_tcp_slave_alloc(struct scsi_device *sdev) static int iscsi_sw_tcp_slave_configure(struct scsi_device *sdev) { + struct iscsi_sw_tcp_host *tcp_sw_host = iscsi_host_priv(sdev->host); + struct iscsi_session *session = tcp_sw_host->session; + struct iscsi_conn *conn = session->leadconn; + + if (conn->datadgst_en) + sdev->request_queue->backing_dev_info->capabilities |= BDI_CAP_STABLE_WRITES; blk_queue_bounce_limit(sdev->request_queue, BLK_BOUNCE_ANY); blk_queue_dma_alignment(sdev->request_queue, 0); return 0;
iscsi tcp will first send out data, then calculate and send data digest. If we don't have BDI_CAP_STABLE_WRITES, the page cache will be written in spite of the on going writeback. Consequently, wrong digest will be got and sent to target. To fix this, set BDI_CAP_STABLE_WRITES when data digest is enabled in iscsi_tcp .slave_configure callback. Signed-off-by: Jianchao Wang <jianchao.w.wang@oracle.com> --- drivers/scsi/iscsi_tcp.c | 7 +++++++ 1 file changed, 7 insertions(+)