Skip to contentSkip to conversation

s390/pv: fix the forcing of the swiotlb

PATCH In review Halil Pasic 4 participants 6 messages Jul 23, 2021 – Jul 27, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 s390/pv: fix the forcing of the swiotlb

Since commit 903cd0f315fe ("swiotlb: Use is_swiotlb_force_bounce for swiotlb data bouncing") if code sets swiotlb_force it needs to do so before the swiotlb is initialised. Otherwise io_tlb_default_mem->force_bounce will not get set to true, and devices that use (the default) swiotlb will not bounce despite switolb_force having the value of SWIOTLB_FORCE.

Let us restore swiotlb functionality for PV by fulfilling this new requirement.

This change addresses what turned out to be a fragility in commit 64e1f0c531d1 ("s390/mm: force swiotlb for protected virtualization"), which ain't exactly broken in its original context, but could give us some more headache if people backport the broken change and forget this fix.

Fixes 903cd0f315fe ("swiotlb: Use is_swiotlb_force_bounce for swiotlb data bouncing")
Fixes 64e1f0c531d1 ("s390/mm: force swiotlb for protected virtualization")

---

I'm aware that this fix does not really satisfy the formal requirements for the stable process. But to avoid problems with backports we would like this fix applied to 5.3+ stable kernels.

---
 arch/s390/mm/init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/s390/mm/init.c +1 -1
index d85bd7f5d8dc..1c8f8ccebfb7 100644
@@ -186,9 +186,9 @@ static void pv_init(void)
 		return;
 
 	/* make sure bounce buffers are shared */
+	swiotlb_force = SWIOTLB_FORCE;
 	swiotlb_init(1);
 	swiotlb_update_mem_attributes();
-	swiotlb_force = SWIOTLB_FORCE;
 }
 
 void __init mem_init(void)

base-commit: 90d856e71443a2fcacca8e7539bac44d9cb3f7ab

Signature · 6 lines
2.25.1

_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
#1 lore raw
Quoted 16 lines · Halil Pasic

Since commit 903cd0f315fe ("swiotlb: Use is_swiotlb_force_bounce for swiotlb data bouncing") if code sets swiotlb_force it needs to do so before the swiotlb is initialised. Otherwise io_tlb_default_mem->force_bounce will not get set to true, and devices that use (the default) swiotlb will not bounce despite switolb_force having the value of SWIOTLB_FORCE.

Let us restore swiotlb functionality for PV by fulfilling this new requirement.

This change addresses what turned out to be a fragility in commit 64e1f0c531d1 ("s390/mm: force swiotlb for protected virtualization"), which ain't exactly broken in its original context, but could give us some more headache if people backport the broken change and forget this fix.

Quoted 8 lines
Fixes 903cd0f315fe ("swiotlb: Use is_swiotlb_force_bounce for swiotlb data bouncing")
Fixes 64e1f0c531d1 ("s390/mm: force swiotlb for protected virtualization")

---

Picked it up and stuck it in linux-next with the other set of patches (Will's fixes).

#2 lore raw
Quoted 24 lines · On Fri, 23 Jul 2021 20:27:56 -0400 Konrad Rzeszutek Wilk <[email protected]>…
Quoted 23 lines · Halil Pasic

Since commit 903cd0f315fe ("swiotlb: Use is_swiotlb_force_bounce for swiotlb data bouncing") if code sets swiotlb_force it needs to do so before the swiotlb is initialised. Otherwise io_tlb_default_mem->force_bounce will not get set to true, and devices that use (the default) swiotlb will not bounce despite switolb_force having the value of SWIOTLB_FORCE.

Let us restore swiotlb functionality for PV by fulfilling this new requirement.

This change addresses what turned out to be a fragility in commit 64e1f0c531d1 ("s390/mm: force swiotlb for protected virtualization"), which ain't exactly broken in its original context, but could give us some more headache if people backport the broken change and forget this fix.

Fixes 903cd0f315fe ("swiotlb: Use is_swiotlb_force_bounce for swiotlb data bouncing")
Fixes 64e1f0c531d1 ("s390/mm: force swiotlb for protected virtualization")
Quoted 3 lines
Quoted 1 line

---

Picked it up and stuck it in linux-next with the other set of patches (Will's fixes).

Thanks!

_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu

#3 lore raw
In reply to Konrad Rzeszutek Wilk
Quoted 24 lines · Konrad Rzeszutek Wilk
Quoted 23 lines · Halil Pasic

Since commit 903cd0f315fe ("swiotlb: Use is_swiotlb_force_bounce for swiotlb data bouncing") if code sets swiotlb_force it needs to do so before the swiotlb is initialised. Otherwise io_tlb_default_mem->force_bounce will not get set to true, and devices that use (the default) swiotlb will not bounce despite switolb_force having the value of SWIOTLB_FORCE.

Let us restore swiotlb functionality for PV by fulfilling this new requirement.

This change addresses what turned out to be a fragility in commit 64e1f0c531d1 ("s390/mm: force swiotlb for protected virtualization"), which ain't exactly broken in its original context, but could give us some more headache if people backport the broken change and forget this fix.

Fixes 903cd0f315fe ("swiotlb: Use is_swiotlb_force_bounce for swiotlb data bouncing")
Fixes 64e1f0c531d1 ("s390/mm: force swiotlb for protected virtualization")
Quoted 3 lines
Quoted 1 line

---

Picked it up and stuck it in linux-next with the other set of patches (Will's fixes).

Can you push out to kernel.org?

_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu

#4 lore raw
Quoted 26 lines · Christian Borntraeger
Quoted 24 lines · Konrad Rzeszutek Wilk
Quoted 23 lines · Halil Pasic

Since commit 903cd0f315fe ("swiotlb: Use is_swiotlb_force_bounce for swiotlb data bouncing") if code sets swiotlb_force it needs to do so before the swiotlb is initialised. Otherwise io_tlb_default_mem->force_bounce will not get set to true, and devices that use (the default) swiotlb will not bounce despite switolb_force having the value of SWIOTLB_FORCE.

Let us restore swiotlb functionality for PV by fulfilling this new requirement.

This change addresses what turned out to be a fragility in commit 64e1f0c531d1 ("s390/mm: force swiotlb for protected virtualization"), which ain't exactly broken in its original context, but could give us some more headache if people backport the broken change and forget this fix.

Fixes 903cd0f315fe ("swiotlb: Use is_swiotlb_force_bounce for swiotlb data bouncing")
Fixes 64e1f0c531d1 ("s390/mm: force swiotlb for protected virtualization")
Quoted 5 lines
Quoted 3 lines
Quoted 1 line

---

Picked it up and stuck it in linux-next with the other set of patches (Will's fixes).

Can you push out to kernel.org?

It's pushed to the swiotlb tree:

https://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git/log/?h=devel/for-linus-5.15

Since none of the restricted DMA series is in mainline yet, I don't think it's needed anywhere else.

Will

#5 lore raw
Quoted 31 lines · Will Deacon
Quoted 30 lines · Christian Borntraeger
Quoted 27 lines · Konrad Rzeszutek Wilk
Quoted 16 lines · Halil Pasic

Since commit 903cd0f315fe ("swiotlb: Use is_swiotlb_force_bounce for swiotlb data bouncing") if code sets swiotlb_force it needs to do so before the swiotlb is initialised. Otherwise io_tlb_default_mem->force_bounce will not get set to true, and devices that use (the default) swiotlb will not bounce despite switolb_force having the value of SWIOTLB_FORCE.

Let us restore swiotlb functionality for PV by fulfilling this new requirement.

This change addresses what turned out to be a fragility in commit 64e1f0c531d1 ("s390/mm: force swiotlb for protected virtualization"), which ain't exactly broken in its original context, but could give us some more headache if people backport the broken change and forget this fix.

Quoted 8 lines
Fixes 903cd0f315fe ("swiotlb: Use is_swiotlb_force_bounce for swiotlb data bouncing")
Fixes 64e1f0c531d1 ("s390/mm: force swiotlb for protected virtualization")

---

Picked it up and stuck it in linux-next with the other set of patches (Will's fixes).

Quoted 8 lines
Quoted 1 line

Can you push out to kernel.org?

It's pushed to the swiotlb tree:

https://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git/log/?h=devel/for-linus-5.15

Since none of the restricted DMA series is in mainline yet, I don't think it's needed anywhere else.

Ah right. It is not yet in todays next, so it might just be that yesterdays next pulled from Konrad too early. Sorry for the noise.
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu