Skip to contentSkip to conversation

ioatdma: add ioat_raid_enabled module parameter

PATCH Brice Goglin 4 participants 14 messages Jul 31, 2013 – Aug 12, 2013 dmaengine

lore
Share & tools
lore
#0 lore raw

ioatdma: add ioat_raid_enabled module parameter

Commit f26df1a1 added a 64-byte alignment requirement for legacy operations to work around a silicon errata when mixing legacy and RAID descriptors.
Passing ioat_raid_enabled=0 now disables RAID offload entirely in the ioatdma driver so that legacy operations (memcpy, etc.) can work without alignment restrictions anymore.

---
 drivers/dma/ioat/dma_v3.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/dma/ioat/dma_v3.c +7 -2
Index: b/drivers/dma/ioat/dma_v3.c
===================================================================
@@ -67,6 +67,11 @@
 #include "dma.h"
 #include "dma_v2.h"
 
+static int ioat_raid_enabled = 1;
+module_param(ioat_raid_enabled, int, 0444);
+MODULE_PARM_DESC(ioat_raid_enabled,
+		 "control support of RAID offload (default: 1)");
+
 /* ioat hardware assumes at least two sources for raid operations */
 #define src_cnt_to_sw(x) ((x) + 2)
 #define src_cnt_to_hw(x) ((x) - 2)
@@ -1775,7 +1780,7 @@ int ioat3_dma_probe(struct ioatdma_devic
 	dma->device_alloc_chan_resources = ioat2_alloc_chan_resources;
 	dma->device_free_chan_resources = ioat2_free_chan_resources;
 
-	if (is_xeon_cb32(pdev))
+	if (is_xeon_cb32(pdev) && ioat_raid_enabled)
 		dma->copy_align = 6;
 
 	dma_cap_set(DMA_INTERRUPT, dma->cap_mask);
@@ -1783,7 +1788,7 @@ int ioat3_dma_probe(struct ioatdma_devic
 
 	device->cap = readl(device->reg_base + IOAT_DMA_CAP_OFFSET);
 
-	if (is_bwd_noraid(pdev))
+	if (!ioat_raid_enabled || is_bwd_noraid(pdev))
 		device->cap &= ~(IOAT_CAP_XOR | IOAT_CAP_PQ | IOAT_CAP_RAID16SS);
 
 	/* dca is incompatible with raid operations */
Acked-by
#1 lore raw

I'm ok with enabling this for people that just want to use DMA and not RAID.

Quoted 41 lines · Brice Goglin

ioatdma: add ioat_raid_enabled module parameter

Commit f26df1a1 added a 64-byte alignment requirement for legacy operations to work around a silicon errata when mixing legacy and RAID descriptors.
Passing ioat_raid_enabled=0 now disables RAID offload entirely in the ioatdma driver so that legacy operations (memcpy, etc.) can work without alignment restrictions anymore.

---
 drivers/dma/ioat/dma_v3.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

Index: b/drivers/dma/ioat/dma_v3.c
===================================================================

drivers/dma/ioat/dma_v3.c +6 -1
@@ -67,6 +67,11 @@
 #include "dma.h"
 #include "dma_v2.h"
 
+static int ioat_raid_enabled = 1;
+module_param(ioat_raid_enabled, int, 0444);
+MODULE_PARM_DESC(ioat_raid_enabled,
+		 "control support of RAID offload (default: 1)");
+
 /* ioat hardware assumes at least two sources for raid operations */
 #define src_cnt_to_sw(x) ((x) + 2)
 #define src_cnt_to_hw(x) ((x) - 2)
@@ -1775,7 +1780,7 @@ int ioat3_dma_probe(struct ioatdma_devic
 	dma->device_alloc_chan_resources = ioat2_alloc_chan_resources;
 	dma->device_free_chan_resources = ioat2_free_chan_resources;
 
-	if (is_xeon_cb32(pdev))
+	if (is_xeon_cb32(pdev) && ioat_raid_enabled)
 		dma->copy_align = 6;
 
 	dma_cap_set(DMA_INTERRUPT, dma->cap_mask);

drivers/dma/ioat/dma_v3.c int ioat3_dma_probe(struct ioatdma_devic · line 1794

Quoted 8 lines
drivers/dma/ioat/dma_v3.c +1 -1
@@ -1783,7 +1788,7 @@ int ioat3_dma_probe(struct ioatdma_devic
 
 	device->cap = readl(device->reg_base + IOAT_DMA_CAP_OFFSET);
 
-	if (is_bwd_noraid(pdev))
+	if (!ioat_raid_enabled || is_bwd_noraid(pdev))
 		device->cap &= ~(IOAT_CAP_XOR | IOAT_CAP_PQ | IOAT_CAP_RAID16SS);
 
 	/* dca is incompatible with raid operations */

���{.n�+�������+%�����ݶ��w��{.n�+����{��G�����{ay�ʇڙ�,j��f���h��������z_�(�階�ݢj"���m������G������?����&���~��iO��z��v�^�m���� ������?�I�

#2 lore raw
Quoted 2 lines · Dave

I'm ok with enabling this for people that just want to use DMA and not RAID.

I might be crazy, but I'd be in favor of disabling the RAID offload by default on non-Atom platforms.

Thanks,
Jon

Quoted 54 lines
Quoted 49 lines · Brice Goglin

ioatdma: add ioat_raid_enabled module parameter

Commit f26df1a1 added a 64-byte alignment requirement for legacy operations to work around a silicon errata when mixing legacy and RAID descriptors.
Passing ioat_raid_enabled=0 now disables RAID offload entirely in the ioatdma driver so that legacy operations (memcpy, etc.) can work without alignment restrictions anymore.

---
 drivers/dma/ioat/dma_v3.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

Index: b/drivers/dma/ioat/dma_v3.c
===================================================================

drivers/dma/ioat/dma_v3.c +7 -2
@@ -67,6 +67,11 @@
 #include "dma.h"
 #include "dma_v2.h"
 
+static int ioat_raid_enabled = 1;
+module_param(ioat_raid_enabled, int, 0444);
+MODULE_PARM_DESC(ioat_raid_enabled,
+		 "control support of RAID offload (default: 1)");
+
 /* ioat hardware assumes at least two sources for raid operations */
 #define src_cnt_to_sw(x) ((x) + 2)
 #define src_cnt_to_hw(x) ((x) - 2)
@@ -1775,7 +1780,7 @@ int ioat3_dma_probe(struct ioatdma_devic
 	dma->device_alloc_chan_resources = ioat2_alloc_chan_resources;
 	dma->device_free_chan_resources = ioat2_free_chan_resources;
 
-	if (is_xeon_cb32(pdev))
+	if (is_xeon_cb32(pdev) && ioat_raid_enabled)
 		dma->copy_align = 6;
 
 	dma_cap_set(DMA_INTERRUPT, dma->cap_mask);
@@ -1783,7 +1788,7 @@ int ioat3_dma_probe(struct ioatdma_devic
 
 	device->cap = readl(device->reg_base + IOAT_DMA_CAP_OFFSET);
 
-	if (is_bwd_noraid(pdev))
+	if (!ioat_raid_enabled || is_bwd_noraid(pdev))
 		device->cap &= ~(IOAT_CAP_XOR | IOAT_CAP_PQ | IOAT_CAP_RAID16SS);
 
 	/* dca is incompatible with raid operations */
#3 lore raw
Quoted 7 lines · Jon Mason
Quoted 2 lines · Dave

I'm ok with enabling this for people that just want to use DMA and not RAID.

I might be crazy, but I'd be in favor of disabling the RAID offload by default on non-Atom platforms.

I suppose. Technically it is disabled starting with 3.10 because of the channel switch issue. I'm ok with this disabled by default for the 3.2 platforms that has broken pq-val.

Quoted 57 lines

Thanks,
Jon

Quoted 54 lines
Quoted 49 lines · Brice Goglin

ioatdma: add ioat_raid_enabled module parameter

Commit f26df1a1 added a 64-byte alignment requirement for legacy operations to work around a silicon errata when mixing legacy and RAID descriptors.
Passing ioat_raid_enabled=0 now disables RAID offload entirely in the ioatdma driver so that legacy operations (memcpy, etc.) can work without alignment restrictions anymore.

---
 drivers/dma/ioat/dma_v3.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

Index: b/drivers/dma/ioat/dma_v3.c
===================================================================

drivers/dma/ioat/dma_v3.c +7 -2
@@ -67,6 +67,11 @@
 #include "dma.h"
 #include "dma_v2.h"
 
+static int ioat_raid_enabled = 1;
+module_param(ioat_raid_enabled, int, 0444);
+MODULE_PARM_DESC(ioat_raid_enabled,
+		 "control support of RAID offload (default: 1)");
+
 /* ioat hardware assumes at least two sources for raid operations */
 #define src_cnt_to_sw(x) ((x) + 2)
 #define src_cnt_to_hw(x) ((x) - 2)
@@ -1775,7 +1780,7 @@ int ioat3_dma_probe(struct ioatdma_devic
 	dma->device_alloc_chan_resources = ioat2_alloc_chan_resources;
 	dma->device_free_chan_resources = ioat2_free_chan_resources;
 
-	if (is_xeon_cb32(pdev))
+	if (is_xeon_cb32(pdev) && ioat_raid_enabled)
 		dma->copy_align = 6;
 
 	dma_cap_set(DMA_INTERRUPT, dma->cap_mask);
@@ -1783,7 +1788,7 @@ int ioat3_dma_probe(struct ioatdma_devic
 
 	device->cap = readl(device->reg_base + IOAT_DMA_CAP_OFFSET);
 
-	if (is_bwd_noraid(pdev))
+	if (!ioat_raid_enabled || is_bwd_noraid(pdev))
 		device->cap &= ~(IOAT_CAP_XOR | IOAT_CAP_PQ | IOAT_CAP_RAID16SS);
 
 	/* dca is incompatible with raid operations */

���{.n�+�������+%�����ݶ��w��{.n�+����{��G�����{ay�ʇڙ�,j��f���h��������z_�(�階�ݢj"���m������G������?����&���~��iO��z��v�^�m���� ������?�I�

#4 lore raw
Quoted 11 lines · Dave
Quoted 6 lines · Jon Mason
Quoted 2 lines · Dave

I'm ok with enabling this for people that just want to use DMA and not RAID.

I might be crazy, but I'd be in favor of disabling the RAID offload by default on non-Atom platforms.

I suppose. Technically it is disabled starting with 3.10 because of the channel switch issue. I'm ok with this disabled by default for the 3.2 platforms that has broken pq-val.

Here's a patch that may do what you guys are saying.

Brice

ioatdma: disable RAID by default when buggy and add module param

Commit f26df1a1 added a 64-byte alignment requirement for legacy operations to work around a silicon errata when mixing legacy and RAID descriptors.

RAID offload is now disabled by default on buggy 3.2 platforms. Passing ioat_raid_enabled=1 force-enables it on all platforms (previous behavior).
Passing ioat_raid_enabled=0 force-disables it everywhere.

When RAID offload is disabled, legacy operations (memcpy, etc.) can work again without alignment restrictions.

---
 drivers/dma/ioat/dma_v3.c |   16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)
drivers/dma/ioat/dma_v3.c +14 -2
Index: b/drivers/dma/ioat/dma_v3.c
===================================================================
@@ -67,6 +67,11 @@
 #include "dma.h"
 #include "dma_v2.h"
 
+static int ioat_raid_enabled = -1;
+module_param(ioat_raid_enabled, int, 0444);
+MODULE_PARM_DESC(ioat_raid_enabled,
+		 "control support of RAID offload (-1=enabled unless broken [default], 0=disabled, 1=enabled)");
+
 /* ioat hardware assumes at least two sources for raid operations */
 #define src_cnt_to_sw(x) ((x) + 2)
 #define src_cnt_to_hw(x) ((x) - 2)
@@ -1775,7 +1780,7 @@ int ioat3_dma_probe(struct ioatdma_devic
 	dma->device_alloc_chan_resources = ioat2_alloc_chan_resources;
 	dma->device_free_chan_resources = ioat2_free_chan_resources;
 
-	if (is_xeon_cb32(pdev))
+	if (ioat_raid_enabled == 1 && is_xeon_cb32(pdev))
 		dma->copy_align = 6;
 
 	dma_cap_set(DMA_INTERRUPT, dma->cap_mask);
@@ -1783,7 +1788,14 @@ int ioat3_dma_probe(struct ioatdma_devic
 
 	device->cap = readl(device->reg_base + IOAT_DMA_CAP_OFFSET);
 
-	if (is_bwd_noraid(pdev))
+	/* disable RAID if:
+	 *    force-disabled by module param,
+	 * or not force-enabled on buggy 3.2 platforms,
+	 * or not actually supported.
+	 */
+	if (ioat_raid_enabled == 0
+	    || (ioat_raid_enabled != 1 && is_xeon_cb32(pdev))
+	    || is_bwd_noraid(pdev))
 		device->cap &= ~(IOAT_CAP_XOR | IOAT_CAP_PQ | IOAT_CAP_RAID16SS);
 
 	/* dca is incompatible with raid operations */
Acked-by
#5 lore raw

That looks fine.

Quoted 71 lines · Brice Goglin
Quoted 11 lines · Dave
Quoted 6 lines · Jon Mason
Quoted 2 lines · Dave

I'm ok with enabling this for people that just want to use DMA and not RAID.

I might be crazy, but I'd be in favor of disabling the RAID offload by default on non-Atom platforms.

I suppose. Technically it is disabled starting with 3.10 because of the channel switch issue. I'm ok with this disabled by default for the 3.2 platforms that has broken pq-val.

Here's a patch that may do what you guys are saying.

Brice

ioatdma: disable RAID by default when buggy and add module param

Commit f26df1a1 added a 64-byte alignment requirement for legacy operations to work around a silicon errata when mixing legacy and RAID descriptors.

RAID offload is now disabled by default on buggy 3.2 platforms. Passing ioat_raid_enabled=1 force-enables it on all platforms (previous behavior).
Passing ioat_raid_enabled=0 force-disables it everywhere.

When RAID offload is disabled, legacy operations (memcpy, etc.) can work again without alignment restrictions.

---
 drivers/dma/ioat/dma_v3.c |   16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

Index: b/drivers/dma/ioat/dma_v3.c
===================================================================

drivers/dma/ioat/dma_v3.c +7 -2
@@ -67,6 +67,11 @@
 #include "dma.h"
 #include "dma_v2.h"
 
+static int ioat_raid_enabled = -1;
+module_param(ioat_raid_enabled, int, 0444);
+MODULE_PARM_DESC(ioat_raid_enabled,
+		 "control support of RAID offload (-1=enabled unless broken [default], 0=disabled, 1=enabled)");
+
 /* ioat hardware assumes at least two sources for raid operations */
 #define src_cnt_to_sw(x) ((x) + 2)
 #define src_cnt_to_hw(x) ((x) - 2)
@@ -1775,7 +1780,7 @@ int ioat3_dma_probe(struct ioatdma_devic
 	dma->device_alloc_chan_resources = ioat2_alloc_chan_resources;
 	dma->device_free_chan_resources = ioat2_free_chan_resources;
 
-	if (is_xeon_cb32(pdev))
+	if (ioat_raid_enabled == 1 && is_xeon_cb32(pdev))
 		dma->copy_align = 6;
 
 	dma_cap_set(DMA_INTERRUPT, dma->cap_mask);
@@ -1783,7 +1788,14 @@ int ioat3_dma_probe(struct ioatdma_devic
 
 	device->cap = readl(device->reg_base + IOAT_DMA_CAP_OFFSET);
 
-	if (is_bwd_noraid(pdev))
+	/* disable RAID if:

drivers/dma/ioat/dma_v3.c int ioat3_dma_probe(struct ioatdma_devic · line 1801

Quoted 10 lines
drivers/dma/ioat/dma_v3.c +7 -0
+	 *    force-disabled by module param,
+	 * or not force-enabled on buggy 3.2 platforms,
+	 * or not actually supported.
+	 */
+	if (ioat_raid_enabled == 0
+	    || (ioat_raid_enabled != 1 && is_xeon_cb32(pdev))
+	    || is_bwd_noraid(pdev))
 		device->cap &= ~(IOAT_CAP_XOR | IOAT_CAP_PQ | IOAT_CAP_RAID16SS);
 
 	/* dca is incompatible with raid operations */

���{.n�+�������+%�����ݶ��w��{.n�+����{��G�����{ay�ʇڙ�,j��f���h��������z_�(�階�ݢj"���m������G������?����&���~��iO��z��v�^�m���� ������?�I�

#7 lore raw
In reply to Dan Williams
Quoted 93 lines · Dan Williams
Quoted 56 lines · Brice Goglin
Quoted 11 lines · Dave
Quoted 6 lines · Jon Mason
Quoted 2 lines · Dave

I'm ok with enabling this for people that just want to use DMA and not RAID.

I might be crazy, but I'd be in favor of disabling the RAID offload by default on non-Atom platforms.

I suppose. Technically it is disabled starting with 3.10 because of the channel switch issue. I'm ok with this disabled by default for the 3.2 platforms that has broken pq-val.

Here's a patch that may do what you guys are saying.

Brice

ioatdma: disable RAID by default when buggy and add module param

Commit f26df1a1 added a 64-byte alignment requirement for legacy operations to work around a silicon errata when mixing legacy and RAID descriptors.

RAID offload is now disabled by default on buggy 3.2 platforms. Passing ioat_raid_enabled=1 force-enables it on all platforms (previous behavior).
Passing ioat_raid_enabled=0 force-disables it everywhere.

When RAID offload is disabled, legacy operations (memcpy, etc.) can work again without alignment restrictions.

---
drivers/dma/ioat/dma_v3.c | 16 ++++++++++++++--

1 file changed, 14 insertions(+), 2 deletions(-)

Index: b/drivers/dma/ioat/dma_v3.c
===================================================================

drivers/dma/ioat/dma_v3.c +5 -0
@@ -67,6 +67,11 @@
 #include "dma.h"
 #include "dma_v2.h"
 
+static int ioat_raid_enabled = -1;
+module_param(ioat_raid_enabled, int, 0444);
+MODULE_PARM_DESC(ioat_raid_enabled,
+		 "control support of RAID offload (-1=enabled unless broken [default],
 0=disabled, 1=enabled)");
+
 /* ioat hardware assumes at least two sources for raid operations */
 #define src_cnt_to_sw(x) ((x) + 2)

#define src_cnt_to_hw(x) ((x) - 2)

drivers/dma/ioat/dma_v3.c int ioat3_dma_probe(struct ioatdma_devic · line 1784

Quoted 6 lines
drivers/dma/ioat/dma_v3.c +1 -1
@@ -1775,7 +1780,7 @@ int ioat3_dma_probe(struct ioatdma_devic
 	dma->device_alloc_chan_resources = ioat2_alloc_chan_resources;
 	dma->device_free_chan_resources = ioat2_free_chan_resources;
 
-	if (is_xeon_cb32(pdev))
+	if (ioat_raid_enabled == 1 && is_xeon_cb32(pdev))
 		dma->copy_align = 6;

Actually we can delete this now because is_xeon_cb32() already effectively means that raid offload will not be used.

Quoted 9 lines
drivers/dma/ioat/dma_v3.c +1 -1
 	dma_cap_set(DMA_INTERRUPT, dma->cap_mask);
@@ -1783,7 +1788,14 @@ int ioat3_dma_probe(struct ioatdma_devic
 
 	device->cap = readl(device->reg_base + IOAT_DMA_CAP_OFFSET);
 
-	if (is_bwd_noraid(pdev))
+	/* disable RAID if:

drivers/dma/ioat/dma_v3.c int ioat3_dma_probe(struct ioatdma_devic · line 1801

Quoted 10 lines
drivers/dma/ioat/dma_v3.c +7 -0
+	 *    force-disabled by module param,
+	 * or not force-enabled on buggy 3.2 platforms,
+	 * or not actually supported.
+	 */
+	if (ioat_raid_enabled == 0
+	    || (ioat_raid_enabled != 1 && is_xeon_cb32(pdev))
+	    || is_bwd_noraid(pdev))
 		device->cap &= ~(IOAT_CAP_XOR | IOAT_CAP_PQ | IOAT_CAP_RAID16SS);
 
 	/* dca is incompatible with raid operations */

I like Jon¹s suggestion. Just make raid disabled by default on non-atom platforms. When if a non-atom platform comes along without the previous restrictions it can add itself to this list.

Quoted 2 lines

So let¹s drop the module parameter and just cleanup the 3.2 support to reflect the current reality of raid being disabled.

Works for me. Then we won't have to worry about the channel switch mess on 3.2.

Quoted 4 lines

--
Dan

���{.n�+�������+%�����ݶ��w��{.n�+����{��G�����{ay�ʇڙ�,j��f���h��������z_�(�階�ݢj"���m������G������?����&���~��iO��z��v�^�m���� ������?�I�

#8 lore raw
In reply to Dan Williams
Quoted 6 lines · Dan Williams

I like Jon¹s suggestion. Just make raid disabled by default on non-atom platforms. When if a non-atom platform comes along without the previous restrictions it can add itself to this list.

So let¹s drop the module parameter and just cleanup the 3.2 support to reflect the current reality of raid being disabled.

So you want this instead ?

Brice

ioatdma: disable RAID on non-Atom platforms and reenable unaligned copies

Disable RAID on non-Atom platform and remove the 64-byte alignement restriction on legacy DMA operations (introduced in commit f26df1a1 as a workaround for silicon errata).

---
 drivers/dma/ioat/dma_v3.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/dma/ioat/dma_v3.c +1 -4
Index: b/drivers/dma/ioat/dma_v3.c
===================================================================
@@ -1775,15 +1775,12 @@ int ioat3_dma_probe(struct ioatdma_devic
 	dma->device_alloc_chan_resources = ioat2_alloc_chan_resources;
 	dma->device_free_chan_resources = ioat2_free_chan_resources;
 
-	if (is_xeon_cb32(pdev))
-		dma->copy_align = 6;
-
 	dma_cap_set(DMA_INTERRUPT, dma->cap_mask);
 	dma->device_prep_dma_interrupt = ioat3_prep_interrupt_lock;
 
 	device->cap = readl(device->reg_base + IOAT_DMA_CAP_OFFSET);
 
-	if (is_bwd_noraid(pdev))
+	if (is_xeon_cb32(pdev) || is_bwd_noraid(pdev))
 		device->cap &= ~(IOAT_CAP_XOR | IOAT_CAP_PQ | IOAT_CAP_RAID16SS);
 
 	/* dca is incompatible with raid operations */
#6 lore raw
In reply to Brice Goglin
Quoted 56 lines · Brice Goglin
Quoted 11 lines · Dave
Quoted 6 lines · Jon Mason
Quoted 2 lines · Dave

I'm ok with enabling this for people that just want to use DMA and not RAID.

I might be crazy, but I'd be in favor of disabling the RAID offload by default on non-Atom platforms.

I suppose. Technically it is disabled starting with 3.10 because of the channel switch issue. I'm ok with this disabled by default for the 3.2 platforms that has broken pq-val.

Here's a patch that may do what you guys are saying.

Brice

ioatdma: disable RAID by default when buggy and add module param

Commit f26df1a1 added a 64-byte alignment requirement for legacy operations to work around a silicon errata when mixing legacy and RAID descriptors.

RAID offload is now disabled by default on buggy 3.2 platforms. Passing ioat_raid_enabled=1 force-enables it on all platforms (previous behavior).
Passing ioat_raid_enabled=0 force-disables it everywhere.

When RAID offload is disabled, legacy operations (memcpy, etc.) can work again without alignment restrictions.

---
drivers/dma/ioat/dma_v3.c | 16 ++++++++++++++--

1 file changed, 14 insertions(+), 2 deletions(-)

Index: b/drivers/dma/ioat/dma_v3.c
===================================================================

drivers/dma/ioat/dma_v3.c +5 -0
@@ -67,6 +67,11 @@
 #include "dma.h"
 #include "dma_v2.h"
 
+static int ioat_raid_enabled = -1;
+module_param(ioat_raid_enabled, int, 0444);
+MODULE_PARM_DESC(ioat_raid_enabled,
+		 "control support of RAID offload (-1=enabled unless broken [default],
 0=disabled, 1=enabled)");
+
 /* ioat hardware assumes at least two sources for raid operations */
 #define src_cnt_to_sw(x) ((x) + 2)

#define src_cnt_to_hw(x) ((x) - 2)

drivers/dma/ioat/dma_v3.c int ioat3_dma_probe(struct ioatdma_devic · line 1784

Quoted 6 lines
drivers/dma/ioat/dma_v3.c +1 -1
@@ -1775,7 +1780,7 @@ int ioat3_dma_probe(struct ioatdma_devic
 	dma->device_alloc_chan_resources = ioat2_alloc_chan_resources;
 	dma->device_free_chan_resources = ioat2_free_chan_resources;
 
-	if (is_xeon_cb32(pdev))
+	if (ioat_raid_enabled == 1 && is_xeon_cb32(pdev))
 		dma->copy_align = 6;

Actually we can delete this now because is_xeon_cb32() already effectively means that raid offload will not be used.

Quoted 9 lines
drivers/dma/ioat/dma_v3.c +1 -1
 	dma_cap_set(DMA_INTERRUPT, dma->cap_mask);
@@ -1783,7 +1788,14 @@ int ioat3_dma_probe(struct ioatdma_devic
 
 	device->cap = readl(device->reg_base + IOAT_DMA_CAP_OFFSET);
 
-	if (is_bwd_noraid(pdev))
+	/* disable RAID if:

drivers/dma/ioat/dma_v3.c int ioat3_dma_probe(struct ioatdma_devic · line 1801

Quoted 10 lines
drivers/dma/ioat/dma_v3.c +7 -0
+	 *    force-disabled by module param,
+	 * or not force-enabled on buggy 3.2 platforms,
+	 * or not actually supported.
+	 */
+	if (ioat_raid_enabled == 0
+	    || (ioat_raid_enabled != 1 && is_xeon_cb32(pdev))
+	    || is_bwd_noraid(pdev))
 		device->cap &= ~(IOAT_CAP_XOR | IOAT_CAP_PQ | IOAT_CAP_RAID16SS);
 
 	/* dca is incompatible with raid operations */

I like Jon¹s suggestion. Just make raid disabled by default on non-atom platforms. When if a non-atom platform comes along without the previous restrictions it can add itself to this list.

So let¹s drop the module parameter and just cleanup the 3.2 support to reflect the current reality of raid being disabled.

--
Dan

#9 lore raw
In reply to Brice Goglin
Quoted 9 lines · Brice Goglin
Quoted 6 lines · Dan Williams

I like Jon¹s suggestion. Just make raid disabled by default on non-atom platforms. When if a non-atom platform comes along without the previous restrictions it can add itself to this list.

So let¹s drop the module parameter and just cleanup the 3.2 support to reflect the current reality of raid being disabled.

So you want this instead ?

Yup, but should also fold in the deletions of the other is_xeon_cb32() alignment fixups further below.

Actually all the alignment settings can be removed now.

...and the PQ_VAL/XOR_VAL fixup for is_xeon_cb32() can go.

#13 lore raw
In reply to Dan Williams
Quoted 87 lines · Dan Williams
Quoted 56 lines · Brice Goglin
Quoted 11 lines · Dave
Quoted 6 lines · Jon Mason
Quoted 2 lines · Dave

I'm ok with enabling this for people that just want to use DMA and not RAID.

I might be crazy, but I'd be in favor of disabling the RAID offload by default on non-Atom platforms.

I suppose. Technically it is disabled starting with 3.10 because of the channel switch issue. I'm ok with this disabled by default for the 3.2 platforms that has broken pq-val.

Here's a patch that may do what you guys are saying.

Brice

ioatdma: disable RAID by default when buggy and add module param

Commit f26df1a1 added a 64-byte alignment requirement for legacy operations to work around a silicon errata when mixing legacy and RAID descriptors.

RAID offload is now disabled by default on buggy 3.2 platforms. Passing ioat_raid_enabled=1 force-enables it on all platforms (previous behavior).
Passing ioat_raid_enabled=0 force-disables it everywhere.

When RAID offload is disabled, legacy operations (memcpy, etc.) can work again without alignment restrictions.

---
drivers/dma/ioat/dma_v3.c | 16 ++++++++++++++--

1 file changed, 14 insertions(+), 2 deletions(-)

Index: b/drivers/dma/ioat/dma_v3.c
===================================================================

drivers/dma/ioat/dma_v3.c +5 -0
@@ -67,6 +67,11 @@
 #include "dma.h"
 #include "dma_v2.h"
 
+static int ioat_raid_enabled = -1;
+module_param(ioat_raid_enabled, int, 0444);
+MODULE_PARM_DESC(ioat_raid_enabled,
+		 "control support of RAID offload (-1=enabled unless broken [default],
 0=disabled, 1=enabled)");
+
 /* ioat hardware assumes at least two sources for raid operations */
 #define src_cnt_to_sw(x) ((x) + 2)

#define src_cnt_to_hw(x) ((x) - 2)

drivers/dma/ioat/dma_v3.c int ioat3_dma_probe(struct ioatdma_devic · line 1784

Quoted 6 lines
drivers/dma/ioat/dma_v3.c +1 -1
@@ -1775,7 +1780,7 @@ int ioat3_dma_probe(struct ioatdma_devic
 	dma->device_alloc_chan_resources = ioat2_alloc_chan_resources;
 	dma->device_free_chan_resources = ioat2_free_chan_resources;
 
-	if (is_xeon_cb32(pdev))
+	if (ioat_raid_enabled == 1 && is_xeon_cb32(pdev))
 		dma->copy_align = 6;

Actually we can delete this now because is_xeon_cb32() already effectively means that raid offload will not be used.

Quoted 17 lines
drivers/dma/ioat/dma_v3.c +8 -1
 	dma_cap_set(DMA_INTERRUPT, dma->cap_mask);
@@ -1783,7 +1788,14 @@ int ioat3_dma_probe(struct ioatdma_devic
 
 	device->cap = readl(device->reg_base + IOAT_DMA_CAP_OFFSET);
 
-	if (is_bwd_noraid(pdev))
+	/* disable RAID if:
+	 *    force-disabled by module param,
+	 * or not force-enabled on buggy 3.2 platforms,
+	 * or not actually supported.
+	 */
+	if (ioat_raid_enabled == 0
+	    || (ioat_raid_enabled != 1 && is_xeon_cb32(pdev))
+	    || is_bwd_noraid(pdev))
 		device->cap &= ~(IOAT_CAP_XOR | IOAT_CAP_PQ | IOAT_CAP_RAID16SS);
 
Quoted 6 lines

drivers/dma/ioat/dma_v3.c int ioat3_dma_probe(struct ioatdma_devic · line 1801

Quoted 2 lines
drivers/dma/ioat/dma_v3.c +0 -0
 	/* dca is incompatible with raid operations */

I like Jon¹s suggestion. Just make raid disabled by default on non-atom platforms. When if a non-atom platform comes along without the previous restrictions it can add itself to this list.

Awesome! This greatly increases NTB performance when using DMA engines.

Thanks,
Jon

Quoted 7 lines

So let¹s drop the module parameter and just cleanup the 3.2 support to reflect the current reality of raid being disabled.

--
Dan

#10 lore raw
In reply to Dan Williams
Quoted 6 lines · Dan Williams

Yup, but should also fold in the deletions of the other is_xeon_cb32() alignment fixups further below.

Actually all the alignment settings can be removed now.

...and the PQ_VAL/XOR_VAL fixup for is_xeon_cb32() can go.

Ok, here's another one, but we're close to the limit of my understanding of this driver's internals.

Removed all alignment fixups and all is_xeon_cb32() fixups.

Brice

ioatdma: disable RAID on non-Atom platforms and reenable unaligned copies

Disable RAID on non-Atom platform and remove related fixups such as the 64-byte alignement restriction on legacy DMA operations (introduced in commit f26df1a1 as a workaround for silicon errata).

---
 drivers/dma/ioat/dma_v3.c |   24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)
drivers/dma/ioat/dma_v3.c +1 -23
Index: b/drivers/dma/ioat/dma_v3.c
===================================================================
@@ -1775,15 +1775,12 @@ int ioat3_dma_probe(struct ioatdma_devic
 	dma->device_alloc_chan_resources = ioat2_alloc_chan_resources;
 	dma->device_free_chan_resources = ioat2_free_chan_resources;
 
-	if (is_xeon_cb32(pdev))
-		dma->copy_align = 6;
-
 	dma_cap_set(DMA_INTERRUPT, dma->cap_mask);
 	dma->device_prep_dma_interrupt = ioat3_prep_interrupt_lock;
 
 	device->cap = readl(device->reg_base + IOAT_DMA_CAP_OFFSET);
 
-	if (is_bwd_noraid(pdev))
+	if (is_xeon_cb32(pdev) || is_bwd_noraid(pdev))
 		device->cap &= ~(IOAT_CAP_XOR | IOAT_CAP_PQ | IOAT_CAP_RAID16SS);
 
 	/* dca is incompatible with raid operations */
@@ -1793,7 +1790,6 @@ int ioat3_dma_probe(struct ioatdma_devic
 	if (device->cap & IOAT_CAP_XOR) {
 		is_raid_device = true;
 		dma->max_xor = 8;
-		dma->xor_align = 6;
 
 		dma_cap_set(DMA_XOR, dma->cap_mask);
 		dma->device_prep_dma_xor = ioat3_prep_xor;
@@ -1812,13 +1808,8 @@ int ioat3_dma_probe(struct ioatdma_devic
 
 		if (device->cap & IOAT_CAP_RAID16SS) {
 			dma_set_maxpq(dma, 16, 0);
-			dma->pq_align = 0;
 		} else {
 			dma_set_maxpq(dma, 8, 0);
-			if (is_xeon_cb32(pdev))
-				dma->pq_align = 6;
-			else
-				dma->pq_align = 0;
 		}
 
 		if (!(device->cap & IOAT_CAP_XOR)) {
@@ -1829,13 +1820,8 @@ int ioat3_dma_probe(struct ioatdma_devic
 
 			if (device->cap & IOAT_CAP_RAID16SS) {
 				dma->max_xor = 16;
-				dma->xor_align = 0;
 			} else {
 				dma->max_xor = 8;
-				if (is_xeon_cb32(pdev))
-					dma->xor_align = 6;
-				else
-					dma->xor_align = 0;
 			}
 		}
 	}
@@ -1844,14 +1830,6 @@ int ioat3_dma_probe(struct ioatdma_devic
 	device->cleanup_fn = ioat3_cleanup_event;
 	device->timer_fn = ioat3_timer_event;
 
-	if (is_xeon_cb32(pdev)) {
-		dma_cap_clear(DMA_XOR_VAL, dma->cap_mask);
-		dma->device_prep_dma_xor_val = NULL;
-
-		dma_cap_clear(DMA_PQ_VAL, dma->cap_mask);
-		dma->device_prep_dma_pq_val = NULL;
-	}
-
 	/* starting with CB3.3 super extended descriptors are supported */
 	if (device->cap & IOAT_CAP_RAID16SS) {
 		char pool_name[14];
#11 lore raw
Quoted 6 lines · Brice Goglin
Quoted 5 lines · Dan Williams

Yup, but should also fold in the deletions of the other is_xeon_cb32() alignment fixups further below.

Actually all the alignment settings can be removed now.

Quoted 8 lines
Quoted 1 line

...and the PQ_VAL/XOR_VAL fixup for is_xeon_cb32() can go.

Ok, here's another one, but we're close to the limit of my understanding of this driver's internals.

Removed all alignment fixups and all is_xeon_cb32() fixups.

Brice

Dan/Vinod, I would really like for this to get into 3.12. It dovetails very nicely with my patch to use DMA engines in NTB, which I am aiming for 3.12 as well (though still waiting for some review, hint-hint). Is this doable?

Thanks,
Jon

Quoted 87 lines

ioatdma: disable RAID on non-Atom platforms and reenable unaligned copies

Disable RAID on non-Atom platform and remove related fixups such as the 64-byte alignement restriction on legacy DMA operations (introduced in commit f26df1a1 as a workaround for silicon errata).

---
 drivers/dma/ioat/dma_v3.c |   24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

Index: b/drivers/dma/ioat/dma_v3.c
===================================================================

drivers/dma/ioat/dma_v3.c +1 -23
@@ -1775,15 +1775,12 @@ int ioat3_dma_probe(struct ioatdma_devic
 	dma->device_alloc_chan_resources = ioat2_alloc_chan_resources;
 	dma->device_free_chan_resources = ioat2_free_chan_resources;
 
-	if (is_xeon_cb32(pdev))
-		dma->copy_align = 6;
-
 	dma_cap_set(DMA_INTERRUPT, dma->cap_mask);
 	dma->device_prep_dma_interrupt = ioat3_prep_interrupt_lock;
 
 	device->cap = readl(device->reg_base + IOAT_DMA_CAP_OFFSET);
 
-	if (is_bwd_noraid(pdev))
+	if (is_xeon_cb32(pdev) || is_bwd_noraid(pdev))
 		device->cap &= ~(IOAT_CAP_XOR | IOAT_CAP_PQ | IOAT_CAP_RAID16SS);
 
 	/* dca is incompatible with raid operations */
@@ -1793,7 +1790,6 @@ int ioat3_dma_probe(struct ioatdma_devic
 	if (device->cap & IOAT_CAP_XOR) {
 		is_raid_device = true;
 		dma->max_xor = 8;
-		dma->xor_align = 6;
 
 		dma_cap_set(DMA_XOR, dma->cap_mask);
 		dma->device_prep_dma_xor = ioat3_prep_xor;
@@ -1812,13 +1808,8 @@ int ioat3_dma_probe(struct ioatdma_devic
 
 		if (device->cap & IOAT_CAP_RAID16SS) {
 			dma_set_maxpq(dma, 16, 0);
-			dma->pq_align = 0;
 		} else {
 			dma_set_maxpq(dma, 8, 0);
-			if (is_xeon_cb32(pdev))
-				dma->pq_align = 6;
-			else
-				dma->pq_align = 0;
 		}
 
 		if (!(device->cap & IOAT_CAP_XOR)) {
@@ -1829,13 +1820,8 @@ int ioat3_dma_probe(struct ioatdma_devic
 
 			if (device->cap & IOAT_CAP_RAID16SS) {
 				dma->max_xor = 16;
-				dma->xor_align = 0;
 			} else {
 				dma->max_xor = 8;
-				if (is_xeon_cb32(pdev))
-					dma->xor_align = 6;
-				else
-					dma->xor_align = 0;
 			}
 		}
 	}
@@ -1844,14 +1830,6 @@ int ioat3_dma_probe(struct ioatdma_devic
 	device->cleanup_fn = ioat3_cleanup_event;
 	device->timer_fn = ioat3_timer_event;
 
-	if (is_xeon_cb32(pdev)) {
-		dma_cap_clear(DMA_XOR_VAL, dma->cap_mask);
-		dma->device_prep_dma_xor_val = NULL;
-
-		dma_cap_clear(DMA_PQ_VAL, dma->cap_mask);
-		dma->device_prep_dma_pq_val = NULL;
-	}
-
 	/* starting with CB3.3 super extended descriptors are supported */
 	if (device->cap & IOAT_CAP_RAID16SS) {
 		char pool_name[14];
#12 lore raw
Quoted 12 lines · Jon Mason
Quoted 11 lines · Brice Goglin
Quoted 6 lines · Dan Williams

Yup, but should also fold in the deletions of the other is_xeon_cb32() alignment fixups further below.

Actually all the alignment settings can be removed now.

...and the PQ_VAL/XOR_VAL fixup for is_xeon_cb32() can go.

Ok, here's another one, but we're close to the limit of my understanding of this driver's internals.

Quoted 8 lines
Quoted 3 lines

Removed all alignment fixups and all is_xeon_cb32() fixups.

Brice

Dan/Vinod, I would really like for this to get into 3.12. It dovetails very nicely with my patch to use DMA engines in NTB, which I am aiming for 3.12 as well (though still waiting for some review, hint-hint). Is this doable?

Yes, look for an update in my tree by this weekend.

--
Dan