Skip to content

Commit 84223ad

Browse files
halil-pasicKelsey Skunberg
authored andcommitted
s390/pv: fix the forcing of the swiotlb
BugLink: https://bugs.launchpad.net/bugs/1946802 commit 93ebb68 upstream. Since commit 903cd0f ("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 64e1f0c ("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. Signed-off-by: Halil Pasic <pasic@linux.ibm.com> Tested-by: Christian Borntraeger <borntraeger@de.ibm.com> Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com> Fixes: 903cd0f ("swiotlb: Use is_swiotlb_force_bounce for swiotlb data bouncing") Fixes: 64e1f0c ("s390/mm: force swiotlb for protected virtualization") Cc: stable@vger.kernel.org #5.3+ Signed-off-by: Konrad Rzeszutek Wilk <konrad@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Kamal Mostafa <kamal@canonical.com> Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>
1 parent 8aed9ab commit 84223ad

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/s390/mm/init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,9 @@ static void pv_init(void)
168168
return;
169169

170170
/* make sure bounce buffers are shared */
171+
swiotlb_force = SWIOTLB_FORCE;
171172
swiotlb_init(1);
172173
swiotlb_update_mem_attributes();
173-
swiotlb_force = SWIOTLB_FORCE;
174174
}
175175

176176
void __init mem_init(void)

0 commit comments

Comments
 (0)