swiotlb: Adjust SWIOTBL bounce buffer size for SEV guests.
Subsystems (3)
PATCH v8 1/1 swiotlb: Adjust SWIOTBL bounce buffer size for SEV guests.
From: Ashish Kalra <[email protected]>
For SEV, all DMA to and from guest has to use shared (un-encrypted) pages. SEV uses SWIOTLB to make this happen without requiring changes to device drivers. However, depending on workload being run, the default 64MB of SWIOTLB might not be enough and SWIOTLB may run out of buffers to use for DMA, resulting in I/O errors and/or performance degradation for high I/O workloads.
Adjust the default size of SWIOTLB for SEV guests using a percentage of the total memory available to guest for SWIOTLB buffers.
Using late_initcall() interface to invoke swiotlb_adjust() does not work as the size adjustment needs to be done before mem_encrypt_init() and reserve_crashkernel() which use the allocated SWIOTLB buffer size, hence call it explicitly from setup_arch().
The SWIOTLB default size adjustment needs to be added as an architecture specific interface/callback to allow architectures such as those supporting memory encryption to adjust/expand SWIOTLB size for their use.
v5 fixed build errors and warnings as
--- arch/x86/kernel/setup.c | 2 ++ arch/x86/mm/mem_encrypt.c | 37 +++++++++++++++++++++++++++++++++++++ include/linux/swiotlb.h | 6 ++++++ kernel/dma/swiotlb.c | 22 ++++++++++++++++++++++ 4 files changed, 67 insertions(+)
arch/x86/kernel/setup.c +2 -0
@@ -1149,6 +1149,8 @@ void __init setup_arch(char **cmdline_p)if (boot_cpu_has (X86_FEATURE_GBPAGES ))hugetlb_cma_reserve (PUD_SHIFT -PAGE_SHIFT ); +swiotlb_adjust (); +/* * Reserve memory for crash kernel after SRAT is parsed so that it * won't consume hotpluggable memory.
arch/x86/mm/mem_encrypt.c +37 -0
@@ -485,7 +485,44 @@ static void print_mem_encrypt_feature_info(void)pr_cont ("\n" ); } +/* +* The percentage of guest memory used here for SWIOTLB buffers +* is more of an approximation of the static adjustment which +* is 128M for <1G guests, 256M for 1G-4G guests and 512M for >4G guests. +*/ +#define SEV_ADJUST_SWIOTLB_SIZE_PERCENT 6 +/* Architecture __weak replacement functions */ +unsigned long __init arch_swiotlb_adjust (unsigned long iotlb_default_size) +{ +unsigned long size = iotlb_default_size; + +/* +* For SEV, all DMA has to occur via shared/unencrypted pages. +* SEV uses SWOTLB to make this happen without changing device +* drivers. However, depending on the workload being run, the +* default 64MB of SWIOTLB may not be enough and`SWIOTLB may +* run out of buffers for DMA, resulting in I/O errors and/or +* performance degradation especially with high I/O workloads. +* Adjust the default size of SWIOTLB for SEV guests using +* a percentage of guest memory for SWIOTLB buffers. +* Also as the SWIOTLB bounce buffer memory is allocated +* from low memory, ensure that the adjusted size is within +* the limits of low available memory. +* +*/ +if (sev_active ()) { +phys_addr_t total_mem =memblock_phys_mem_size (); + + size = total_mem *SEV_ADJUST_SWIOTLB_SIZE_PERCENT /100 ; + size =clamp_val (size, iotlb_default_size,SZ_1G ); +pr_info ("SWIOTLB bounce buffer size adjusted to %luMB for SEV" , + size >>20 ); + } + +return size; +} +void __init mem_encrypt_init (void ) {if (!sme_me_mask)
include/linux/swiotlb.h +6 -0
@@ -33,6 +33,7 @@ extern void swiotlb_init(int verbose);int swiotlb_init_with_tbl (char *tlb,unsigned long nslabs,int verbose);extern unsigned long swiotlb_nr_tbl (void );unsigned long swiotlb_size_or_default (void ); +unsigned long __init arch_swiotlb_adjust (unsigned long size);extern int swiotlb_late_init_with_tbl (char *tlb,unsigned long nslabs);extern int swiotlb_late_init_with_default_size (size_t default_size);extern void __init swiotlb_update_mem_attributes (void );
@@ -77,6 +78,7 @@ void __init swiotlb_exit(void);unsigned int swiotlb_max_segment (void );size_t swiotlb_max_mapping_size (struct device *dev);bool is_swiotlb_active (void ); +void __init swiotlb_adjust (void );#else #define swiotlb_force SWIOTLB_NO_FORCEstatic inline bool is_swiotlb_buffer (phys_addr_t paddr)
@@ -99,6 +101,10 @@ static inline bool is_swiotlb_active(void) {return false; } + +static inline void swiotlb_adjust (void ) +{ +}#endif /* CONFIG_SWIOTLB */ extern void swiotlb_print_info (void );
kernel/dma/swiotlb.c +22 -0
@@ -163,6 +163,28 @@ unsigned long swiotlb_size_or_default(void)return size ? size : (IO_TLB_DEFAULT_SIZE ); } +unsigned long __init __weak arch_swiotlb_adjust (unsigned long size) +{ +return size; +} + +void __init swiotlb_adjust (void ) +{ +unsigned long size; + +/* +* If swiotlb parameter has not been specified, give a chance to +* architectures such as those supporting memory encryption to +* adjust/expand SWIOTLB size for their use. +*/ +if (!io_tlb_nslabs) { + size =arch_swiotlb_adjust (IO_TLB_DEFAULT_SIZE ); + size =ALIGN (size,1 <<IO_TLB_SHIFT ); + io_tlb_nslabs = size >>IO_TLB_SHIFT ; + io_tlb_nslabs =ALIGN (io_tlb_nslabs,IO_TLB_SEGSIZE ); + } +} +void swiotlb_print_info (void ) {unsigned long bytes = io_tlb_nslabs <<IO_TLB_SHIFT ;
Signature · 6 lines
2.17.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Quoted 50 lines · Ashish Kalra
From: Ashish Kalra <[email protected]>
For SEV, all DMA to and from guest has to use shared (un-encrypted) pages. SEV uses SWIOTLB to make this happen without requiring changes to device drivers. However, depending on workload being run, the default 64MB of SWIOTLB might not be enough and SWIOTLB may run out of buffers to use for DMA, resulting in I/O errors and/or performance degradation for high I/O workloads.
Adjust the default size of SWIOTLB for SEV guests using a percentage of the total memory available to guest for SWIOTLB buffers.
Using
late_initcall()interface to invokeswiotlb_adjust()does not work as the size adjustment needs to be done beforemem_encrypt_init()andreserve_crashkernel()which use the allocated SWIOTLB buffer size, hence call it explicitly fromsetup_arch().The SWIOTLB default size adjustment needs to be added as an architecture specific interface/callback to allow architectures such as those supporting memory encryption to adjust/expand SWIOTLB size for their use.
v5 fixed build errors and warnings as
Reported-by kbuild test robot <[email protected]>Signed-off-by Ashish Kalra <[email protected]>--- arch/x86/kernel/setup.c | 2 ++ arch/x86/mm/mem_encrypt.c | 37 +++++++++++++++++++++++++++++++++++++ include/linux/swiotlb.h | 6 ++++++ kernel/dma/swiotlb.c | 22 ++++++++++++++++++++++ 4 files changed, 67 insertions(+)arch/x86/kernel/setup.c +2
-0@@ -1149,6 +1149,8 @@ void __init setup_arch(char **cmdline_p)if (boot_cpu_has (X86_FEATURE_GBPAGES ))hugetlb_cma_reserve (PUD_SHIFT -PAGE_SHIFT ); +swiotlb_adjust (); +/* * Reserve memory for crash kernel after SRAT is parsed so that it * won't consume hotpluggable memory. arch/x86/mm/mem_encrypt.c +0
-0
arch/x86/mm/mem_encrypt.c static void print_mem_encrypt_feature_info(void) · line 491
Quoted 7 lines
arch/x86/mm/mem_encrypt.c +4
-0@@ -485,7 +485,44 @@ static void print_mem_encrypt_feature_info(void)pr_cont ("\n" ); } +/* +* The percentage of guest memory used here for SWIOTLB buffers +* is more of an approximation of the static adjustment which +* is 128M for <1G guests, 256M for 1G-4G guests and 512M for >4G guests.
No?
it is 64MB for <1G, and ~128M to 256M for 1G-to-4G
I will fix it up.
Quoted 104 lines
arch/x86/mm/mem_encrypt.c +33
-0+*/ +#define SEV_ADJUST_SWIOTLB_SIZE_PERCENT 6 +/* Architecture __weak replacement functions */ +unsigned long __init arch_swiotlb_adjust (unsigned long iotlb_default_size) +{ +unsigned long size = iotlb_default_size; + +/* +* For SEV, all DMA has to occur via shared/unencrypted pages. +* SEV uses SWOTLB to make this happen without changing device +* drivers. However, depending on the workload being run, the +* default 64MB of SWIOTLB may not be enough and`SWIOTLB may +* run out of buffers for DMA, resulting in I/O errors and/or +* performance degradation especially with high I/O workloads. +* Adjust the default size of SWIOTLB for SEV guests using +* a percentage of guest memory for SWIOTLB buffers. +* Also as the SWIOTLB bounce buffer memory is allocated +* from low memory, ensure that the adjusted size is within +* the limits of low available memory. +* +*/ +if (sev_active ()) { +phys_addr_t total_mem =memblock_phys_mem_size (); + + size = total_mem *SEV_ADJUST_SWIOTLB_SIZE_PERCENT /100 ; + size =clamp_val (size, iotlb_default_size,SZ_1G ); +pr_info ("SWIOTLB bounce buffer size adjusted to %luMB for SEV" , + size >>20 ); + } + +return size; +} +void __init mem_encrypt_init (void ) {if (!sme_me_mask)include/linux/swiotlb.h +6
-0@@ -33,6 +33,7 @@ extern void swiotlb_init(int verbose);int swiotlb_init_with_tbl (char *tlb,unsigned long nslabs,int verbose);extern unsigned long swiotlb_nr_tbl (void );unsigned long swiotlb_size_or_default (void ); +unsigned long __init arch_swiotlb_adjust (unsigned long size);extern int swiotlb_late_init_with_tbl (char *tlb,unsigned long nslabs);extern int swiotlb_late_init_with_default_size (size_t default_size);extern void __init swiotlb_update_mem_attributes (void );@@ -77,6 +78,7 @@ void __init swiotlb_exit(void);unsigned int swiotlb_max_segment (void );size_t swiotlb_max_mapping_size (struct device *dev);bool is_swiotlb_active (void ); +void __init swiotlb_adjust (void );#else #define swiotlb_force SWIOTLB_NO_FORCEstatic inline bool is_swiotlb_buffer (phys_addr_t paddr)@@ -99,6 +101,10 @@ static inline bool is_swiotlb_active(void) {return false; } + +static inline void swiotlb_adjust (void ) +{ +}#endif /* CONFIG_SWIOTLB */ extern void swiotlb_print_info (void );kernel/dma/swiotlb.c +22
-0@@ -163,6 +163,28 @@ unsigned long swiotlb_size_or_default(void)return size ? size : (IO_TLB_DEFAULT_SIZE ); } +unsigned long __init __weak arch_swiotlb_adjust (unsigned long size) +{ +return size; +} + +void __init swiotlb_adjust (void ) +{ +unsigned long size; + +/* +* If swiotlb parameter has not been specified, give a chance to +* architectures such as those supporting memory encryption to +* adjust/expand SWIOTLB size for their use. +*/ +if (!io_tlb_nslabs) { + size =arch_swiotlb_adjust (IO_TLB_DEFAULT_SIZE ); + size =ALIGN (size,1 <<IO_TLB_SHIFT ); + io_tlb_nslabs = size >>IO_TLB_SHIFT ; + io_tlb_nslabs =ALIGN (io_tlb_nslabs,IO_TLB_SEGSIZE ); + } +} +void swiotlb_print_info (void ) {unsigned long bytes = io_tlb_nslabs <<IO_TLB_SHIFT ;Signature · 1 line
2.17.1
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Borislav Petkov
maintainerQuoted 1 line · Konrad Rzeszutek Wilk
I will fix it up.
So who's picking this up? If not me then I probably should have a detailed look at the x86 bits before it goes in...
Signature · 8 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommuQuoted 5 lines · Borislav Petkov
Quoted 1 line · Konrad Rzeszutek Wilk
I will fix it up.
So who's picking this up? If not me then I probably should have a detailed look at the x86 bits before it goes in...
I was planning to pick this up (got one more SWIOTLB related patch).
That said if you have the time to take a peek at the x86 bits - that would be awesome!
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Borislav Petkov
maintainerQuoted 2 lines · Konrad Rzeszutek Wilk
That said if you have the time to take a peek at the x86 bits - that would be awesome!
Sure, tomorrow.
Good night. :-)
Signature · 8 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommuBorislav Petkov
maintainerQuoted 1 line
Subject: Re: [PATCH v8] swiotlb: Adjust SWIOTBL bounce buffer size for SEV guests.
Fix subject prefix to "x86, swiotlb: ... SWIOTLB ... for SEV guests
Fix typo and no fullstop at the end.
Quoted 5 lines · Ashish Kalra
From: Ashish Kalra <[email protected]>
For SEV, all DMA to and from guest has to use shared (un-encrypted) pages. SEV uses SWIOTLB to make this happen without requiring changes to device drivers. However, depending on workload being run, the default 64MB of
^ the
Quoted 1 line
SWIOTLB might not be enough and SWIOTLB may run out of buffers to use
s/SWIOTLB/it/
Quoted 5 lines
for DMA, resulting in I/O errors and/or performance degradation for high I/O workloads.
Adjust the default size of SWIOTLB for SEV guests using a percentage of the total memory available to guest for SWIOTLB buffers.
^ the
Quoted 5 lines
Using
late_initcall()interface to invokeswiotlb_adjust()does not work as the size adjustment needs to be done beforemem_encrypt_init()andreserve_crashkernel()which use the allocated SWIOTLB buffer size, hence call it explicitly fromsetup_arch().
So setup_arch() is x86-specific and already a dumping ground for all kinds of init stuff.
Why don't you call swiotlb_adjust() in mem_encrypt_init() where it already does swiotlb stuff - swiotlb_update_mem_attributes() - and avoid all the arch-agnostic function glue?
That is, unless Konrad wants to do other swiotlb adjusting on !x86 too...
Quoted 3 lines
The SWIOTLB default size adjustment needs to be added as an architecture specific interface/callback to allow architectures such as those supporting memory encryption to adjust/expand SWIOTLB size for their use.
So are other arches wanting this or is this just an assumption? If latter, you can do x86 only now and let the others extend it when they really need it.
Quoted 28 lines
v5 fixed build errors and warnings as
Reported-by kbuild test robot <[email protected]>Signed-off-by Ashish Kalra <[email protected]>--- arch/x86/kernel/setup.c | 2 ++ arch/x86/mm/mem_encrypt.c | 37 +++++++++++++++++++++++++++++++++++++ include/linux/swiotlb.h | 6 ++++++ kernel/dma/swiotlb.c | 22 ++++++++++++++++++++++ 4 files changed, 67 insertions(+)arch/x86/mm/mem_encrypt.c +8
-0@@ -485,7 +485,44 @@ static void print_mem_encrypt_feature_info(void)pr_cont ("\n" ); } +/* +* The percentage of guest memory used here for SWIOTLB buffers +* is more of an approximation of the static adjustment which +* is 128M for <1G guests, 256M for 1G-4G guests and 512M for >4G guests. +*/ +#define SEV_ADJUST_SWIOTLB_SIZE_PERCENT 6 +/* Architecture __weak replacement functions */ +unsigned long __init arch_swiotlb_adjust (unsigned long iotlb_default_size)
arch/x86/mm/mem_encrypt.c static void print_mem_encrypt_feature_info(void) · line 506
Quoted 10 lines
arch/x86/mm/mem_encrypt.c +10
-0+{ +unsigned long size = iotlb_default_size; + +/* +* For SEV, all DMA has to occur via shared/unencrypted pages. +* SEV uses SWOTLB to make this happen without changing device +* drivers. However, depending on the workload being run, the +* default 64MB of SWIOTLB may not be enough and`SWIOTLB may +* run out of buffers for DMA, resulting in I/O errors and/or +* performance degradation especially with high I/O workloads.
<--- newline in the comment here.
arch/x86/mm/mem_encrypt.c static void print_mem_encrypt_feature_info(void) · line 509
Quoted 3 lines
arch/x86/mm/mem_encrypt.c +3
-0+* Adjust the default size of SWIOTLB for SEV guests using +* a percentage of guest memory for SWIOTLB buffers. +* Also as the SWIOTLB bounce buffer memory is allocated
^ ,
Quoted 9 lines
arch/x86/mm/mem_encrypt.c +9
-0+* from low memory, ensure that the adjusted size is within +* the limits of low available memory. +* +*/ +if (sev_active ()) { +phys_addr_t total_mem =memblock_phys_mem_size (); + + size = total_mem *SEV_ADJUST_SWIOTLB_SIZE_PERCENT /100 ; + size =clamp_val (size, iotlb_default_size,SZ_1G );
arch/x86/mm/mem_encrypt.c static void print_mem_encrypt_feature_info(void) · line 528
Quoted 10 lines
arch/x86/mm/mem_encrypt.c +7
-0+pr_info ("SWIOTLB bounce buffer size adjusted to %luMB for SEV" , + size >>20 ); + } + +return size; +} +void __init mem_encrypt_init (void ) {if (!sme_me_mask)
Thx.
Signature · 8 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommuQuoted 33 lines · Borislav Petkov
Quoted 1 line
Subject: Re: [PATCH v8] swiotlb: Adjust SWIOTBL bounce buffer size for SEV guests.
Fix subject prefix to "x86, swiotlb: ... SWIOTLB ... for SEV guests
Fix typo and no fullstop at the end.
Quoted 5 lines · Ashish Kalra
From: Ashish Kalra <[email protected]>
For SEV, all DMA to and from guest has to use shared (un-encrypted) pages. SEV uses SWIOTLB to make this happen without requiring changes to device drivers. However, depending on workload being run, the default 64MB of
^ theQuoted 1 line
SWIOTLB might not be enough and SWIOTLB may run out of buffers to use
s/SWIOTLB/it/
Quoted 5 lines
for DMA, resulting in I/O errors and/or performance degradation for high I/O workloads.
Adjust the default size of SWIOTLB for SEV guests using a percentage of the total memory available to guest for SWIOTLB buffers.
^ theQuoted 5 lines
Using
late_initcall()interface to invokeswiotlb_adjust()does not work as the size adjustment needs to be done beforemem_encrypt_init()andreserve_crashkernel()which use the allocated SWIOTLB buffer size, hence call it explicitly fromsetup_arch().
Quoted 7 lines
So
setup_arch()is x86-specific and already a dumping ground for all kinds of init stuff.Why don't you call
swiotlb_adjust()inmem_encrypt_init()where it already does swiotlb stuff -swiotlb_update_mem_attributes()- and avoid all the arch-agnostic function glue?
As i mentioned in the main comments above, this cannot be called in mem_encrypt_init() as that breaks reserve_crashkernel() which depends on SWIOTLB buffer size and is called before mem_encrypt_init(), therefore, it needs to be called from setup_atch() before reserve_crashkernel().
Quoted 9 lines
That is, unless Konrad wants to do other swiotlb adjusting on !x86 too...
Quoted 3 lines
The SWIOTLB default size adjustment needs to be added as an architecture specific interface/callback to allow architectures such as those supporting memory encryption to adjust/expand SWIOTLB size for their use.
So are other arches wanting this or is this just an assumption? If latter, you can do x86 only now and let the others extend it when they really need it.
I believe that other memory encryption architectures such as s390 are also looking for something similar to be available.
Thanks,
Ashish
Borislav Petkov
maintainerQuoted 3 lines · Ashish Kalra
As i mentioned in the main comments above, this cannot be called in
mem_encrypt_init()as that breaksreserve_crashkernel()which depends on SWIOTLB buffer size
Please elaborate how does it break.
Quoted 2 lines
and is called before
mem_encrypt_init(), therefore, it needs to be called fromsetup_atch()beforereserve_crashkernel().
I know you have your requirements what needs to be called when like all the other vendors who want to run stuff early in a particular order but our boot init order is a single fragile mess. So this better be done right!
Also,
[ 0.016630] software IO TLB: swiotlb_adjust: [ 0.017005] reserve_crashkernel: [ 0.050523] software IO TLB: swiotlb_init:
this looks strange - we're doing a swiotlb size adjust before init.
It probably makes sense as in: adjust the size before the SWIOTLB is initialized so that it uses the correct size but this better be spelled out.
Quoted 2 lines
I believe that other memory encryption architectures such as s390 are also looking for something similar to be available.
Until you have something more palpable than belief, "let the others extend it when they really need it." as I already mentioned.
Thx.
Signature · 8 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommuQuoted 7 lines · Borislav Petkov
Quoted 3 lines · Ashish Kalra
As i mentioned in the main comments above, this cannot be called in
mem_encrypt_init()as that breaksreserve_crashkernel()which depends on SWIOTLB buffer sizePlease elaborate how does it break.
reserve_crashkernel() calls swiotlb_size_or_default() to get SWIOTLB buffer size and then accordingly allocates low memory for crashkernel. If SWIOTLB buffer size is adjusted after reserve_crashkernel() and swiotlb_size_or_default(), then SWIOTLB buffers will overlap the memory reserved for crashkernel. Hence any SWIOTLB buffer adjustment needs to be done before or in swiotlb_size_or_default(), but Konrad is not in favor of modifying swiotlb_size_or_default(), hence this separate swiotlb_adjust() interface is introduced.
Quoted 14 lines
Quoted 2 lines
and is called before
mem_encrypt_init(), therefore, it needs to be called fromsetup_atch()beforereserve_crashkernel().I know you have your requirements what needs to be called when like all the other vendors who want to run stuff early in a particular order but our boot init order is a single fragile mess. So this better be done right!
Also,
[ 0.016630] software IO TLB: swiotlb_adjust: [ 0.017005] reserve_crashkernel: [ 0.050523] software IO TLB: swiotlb_init:
Quoted 6 lines
this looks strange - we're doing a swiotlb size adjust before init.
It probably makes sense as in: adjust the size before the SWIOTLB is initialized so that it uses the correct size but this better be spelled out.
Yes the adjustment is done before init.
Quoted 5 lines
Quoted 2 lines
I believe that other memory encryption architectures such as s390 are also looking for something similar to be available.
Until you have something more palpable than belief, "let the others extend it when they really need it." as I already mentioned.
There is a need to introduce an architecture specific callback for swiotlb_adjust() because of the following reason :
The sev_active() function is only available to x86, so this will break other archs, if we use this function in generic swiotlb code.
Therefore, we need arch-specific callback/interface to be invoked from generic swiotlb code to do the SEV specific actions such as SWIOTLB buffer size adjustment.
Thanks,
Ashish
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Borislav Petkov
maintainerQuoted 1 line · Ashish Kalra
reserve_crashkernel()callsswiotlb_size_or_default()to get SWIOTLB
...
Thanks for explaining.
Quoted 2 lines
There is a need to introduce an architecture specific callback for
swiotlb_adjust()because of the following reason :
So what your version currently does is:
1. from arch code, call generic code - swiotlb_adjust
2. in generic code, call back into arch code - arch_swiotlb_adjust
But that's twice the work needed to get you where you wanna go.
What you wanna do is, from arch code, call into swiotlb generic code. That's it, no more.
Just like mem_encrypt.c calls swiotlb_update_mem_attributes(), for example.
And other architectures can simply do the same thing and you have it all solved and other architectures don't even need to refactor - they simply copy what x86 does.
IOW, something like this:
---
arch/x86/include/asm/mem_encrypt.h +2 -0
@@ -37,6 +37,7 @@ void __init sme_map_bootdata(char *real_mode_data);void __init sme_unmap_bootdata (char *real_mode_data);void __init sme_early_init (void ); +void __init sev_setup_arch (void );void __init sme_encrypt_kernel (struct boot_params *bp);void __init sme_enable (struct boot_params *bp);
@@ -69,6 +70,7 @@ static inline void __init sme_map_bootdata(char *real_mode_data) { }static inline void __init sme_unmap_bootdata (char *real_mode_data) { }static inline void __init sme_early_init (void ) { } +static inline void __init sev_setup_arch (void ) { }static inline void __init sme_encrypt_kernel (struct boot_params *bp) { }static inline void __init sme_enable (struct boot_params *bp) { }
arch/x86/kernel/setup.c +6 -0
@@ -1049,6 +1049,12 @@ void __init setup_arch(char **cmdline_p)memblock_set_current_limit (ISA_END_ADDRESS );e820__memblock_setup (); +/* +* Needs to run after memblock setup because it needs the physical +* memory size. +*/ +sev_setup_arch (); +reserve_bios_regions ();efi_fake_memmap ();
arch/x86/mm/mem_encrypt.c +31 -0
@@ -198,6 +198,37 @@ void __init sme_early_init(void) swiotlb_force =SWIOTLB_FORCE ; } +void __init sev_setup_arch (void ) +{ +phys_addr_t total_mem =memblock_phys_mem_size (); +unsigned long size; + +if (!sev_active ()) +return ; + +/* +* For SEV, all DMA has to occur via shared/unencrypted pages. +* SEV uses SWOTLB to make this happen without changing device +* drivers. However, depending on the workload being run, the +* default 64MB of SWIOTLB may not be enough and`SWIOTLB may +* run out of buffers for DMA, resulting in I/O errors and/or +* performance degradation especially with high I/O workloads. +* +* Adjust the default size of SWIOTLB for SEV guests using +* a percentage of guest memory for SWIOTLB buffers. +* Also as the SWIOTLB bounce buffer memory is allocated +* from low memory, ensure that the adjusted size is within +* the limits of low available memory. +* +* The percentage of guest memory used here for SWIOTLB buffers +* is more of an approximation of the static adjustment which +* 64MB for <1G, and ~128M to 256M for 1G-to-4G, i.e., the 6% +*/ + size = total_mem *6 /100 ; + size =clamp_val (size,IO_TLB_DEFAULT_SIZE ,SZ_1G ); +swiotlb_adjust_size (size); +} +static void __init __set_clr_pte_enc (pte_t *kpte,int level,bool enc) {pgprot_t old_prot, new_prot;
include/linux/swiotlb.h +8 -0
@@ -30,6 +30,9 @@ enum swiotlb_force {*/ #define IO_TLB_SHIFT 11 +/* default to 64MB */ +#define IO_TLB_DEFAULT_SIZE (64UL<<20) +extern void swiotlb_init (int verbose);int swiotlb_init_with_tbl (char *tlb,unsigned long nslabs,int verbose);extern unsigned long swiotlb_nr_tbl (void );
@@ -78,6 +81,7 @@ void __init swiotlb_exit(void);unsigned int swiotlb_max_segment (void );size_t swiotlb_max_mapping_size (struct device *dev);bool is_swiotlb_active (void ); +void __init swiotlb_adjust_size (unsigned long new_size);#else #define swiotlb_force SWIOTLB_NO_FORCEstatic inline bool is_swiotlb_buffer (phys_addr_t paddr)
@@ -100,6 +104,10 @@ static inline bool is_swiotlb_active(void) {return false; } + +static void swiotlb_adjust_size (unsigned long new_size) +{ +}#endif /* CONFIG_SWIOTLB */ extern void swiotlb_print_info (void );
kernel/dma/swiotlb.c +18 -2
@@ -152,8 +152,6 @@ void swiotlb_set_max_segment(unsigned int val) max_segment =rounddown (val,PAGE_SIZE ); } -/* default to 64MB */ -#define IO_TLB_DEFAULT_SIZE (64UL<<20)unsigned long swiotlb_size_or_default (void ) {unsigned long size;
@@ -163,6 +161,24 @@ unsigned long swiotlb_size_or_default(void)return size ? size : (IO_TLB_DEFAULT_SIZE ); } +void __init swiotlb_adjust_size (unsigned long new_size) +{ +unsigned long size; + +/* +* If swiotlb parameter has not been specified, give a chance to +* architectures such as those supporting memory encryption to +* adjust/expand SWIOTLB size for their use. +*/ +if (!io_tlb_nslabs) { + size =ALIGN (new_size,1 <<IO_TLB_SHIFT ); + io_tlb_nslabs = size >>IO_TLB_SHIFT ; + io_tlb_nslabs =ALIGN (io_tlb_nslabs,IO_TLB_SEGSIZE ); + +pr_info ("SWIOTLB bounce buffer size adjusted to %luMB" , size >>20 ); + } +} +void swiotlb_print_info (void ) {unsigned long bytes = io_tlb_nslabs <<IO_TLB_SHIFT ;
Signature · 8 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommuQuoted 20 lines · Borislav Petkov
Quoted 1 line · Ashish Kalra
reserve_crashkernel()callsswiotlb_size_or_default()to get SWIOTLB...
Thanks for explaining.
Quoted 2 lines
There is a need to introduce an architecture specific callback for
swiotlb_adjust()because of the following reason :So what your version currently does is:
1. from arch code, call generic code -
swiotlb_adjust2. in generic code, call back into arch code -
arch_swiotlb_adjustBut that's twice the work needed to get you where you wanna go.
What you wanna do is, from arch code, call into swiotlb generic code. That's it, no more.
Quoted 9 lines
Just like
mem_encrypt.ccallsswiotlb_update_mem_attributes(), for example.And other architectures can simply do the same thing and you have it all solved and other architectures don't even need to refactor - they simply copy what x86 does.
IOW, something like this:
This should work, but i am concerned about making IO_TLB_DEFAULT_SIZE (which is pretty much private to generic swiotlb code) to be visible externally, i don't know if there are any concerns with that ?
Thanks,
Ashish
Quoted 157 lines
---
arch/x86/include/asm/mem_encrypt.h +2
-0@@ -37,6 +37,7 @@ void __init sme_map_bootdata(char *real_mode_data);void __init sme_unmap_bootdata (char *real_mode_data);void __init sme_early_init (void ); +void __init sev_setup_arch (void );void __init sme_encrypt_kernel (struct boot_params *bp);void __init sme_enable (struct boot_params *bp);@@ -69,6 +70,7 @@ static inline void __init sme_map_bootdata(char *real_mode_data) { }static inline void __init sme_unmap_bootdata (char *real_mode_data) { }static inline void __init sme_early_init (void ) { } +static inline void __init sev_setup_arch (void ) { }static inline void __init sme_encrypt_kernel (struct boot_params *bp) { }static inline void __init sme_enable (struct boot_params *bp) { }arch/x86/kernel/setup.c +6
-0@@ -1049,6 +1049,12 @@ void __init setup_arch(char **cmdline_p)memblock_set_current_limit (ISA_END_ADDRESS );e820__memblock_setup (); +/* +* Needs to run after memblock setup because it needs the physical +* memory size. +*/ +sev_setup_arch (); +reserve_bios_regions ();efi_fake_memmap ();arch/x86/mm/mem_encrypt.c +31
-0@@ -198,6 +198,37 @@ void __init sme_early_init(void) swiotlb_force =SWIOTLB_FORCE ; } +void __init sev_setup_arch (void ) +{ +phys_addr_t total_mem =memblock_phys_mem_size (); +unsigned long size; + +if (!sev_active ()) +return ; + +/* +* For SEV, all DMA has to occur via shared/unencrypted pages. +* SEV uses SWOTLB to make this happen without changing device +* drivers. However, depending on the workload being run, the +* default 64MB of SWIOTLB may not be enough and`SWIOTLB may +* run out of buffers for DMA, resulting in I/O errors and/or +* performance degradation especially with high I/O workloads. +* +* Adjust the default size of SWIOTLB for SEV guests using +* a percentage of guest memory for SWIOTLB buffers. +* Also as the SWIOTLB bounce buffer memory is allocated +* from low memory, ensure that the adjusted size is within +* the limits of low available memory. +* +* The percentage of guest memory used here for SWIOTLB buffers +* is more of an approximation of the static adjustment which +* 64MB for <1G, and ~128M to 256M for 1G-to-4G, i.e., the 6% +*/ + size = total_mem *6 /100 ; + size =clamp_val (size,IO_TLB_DEFAULT_SIZE ,SZ_1G ); +swiotlb_adjust_size (size); +} +static void __init __set_clr_pte_enc (pte_t *kpte,int level,bool enc) {pgprot_t old_prot, new_prot;include/linux/swiotlb.h +8
-0@@ -30,6 +30,9 @@ enum swiotlb_force {*/ #define IO_TLB_SHIFT 11 +/* default to 64MB */ +#define IO_TLB_DEFAULT_SIZE (64UL<<20) +extern void swiotlb_init (int verbose);int swiotlb_init_with_tbl (char *tlb,unsigned long nslabs,int verbose);extern unsigned long swiotlb_nr_tbl (void );@@ -78,6 +81,7 @@ void __init swiotlb_exit(void);unsigned int swiotlb_max_segment (void );size_t swiotlb_max_mapping_size (struct device *dev);bool is_swiotlb_active (void ); +void __init swiotlb_adjust_size (unsigned long new_size);#else #define swiotlb_force SWIOTLB_NO_FORCEstatic inline bool is_swiotlb_buffer (phys_addr_t paddr)@@ -100,6 +104,10 @@ static inline bool is_swiotlb_active(void) {return false; } + +static void swiotlb_adjust_size (unsigned long new_size) +{ +}#endif /* CONFIG_SWIOTLB */ extern void swiotlb_print_info (void );kernel/dma/swiotlb.c +18
-2@@ -152,8 +152,6 @@ void swiotlb_set_max_segment(unsigned int val) max_segment =rounddown (val,PAGE_SIZE ); } -/* default to 64MB */ -#define IO_TLB_DEFAULT_SIZE (64UL<<20)unsigned long swiotlb_size_or_default (void ) {unsigned long size;@@ -163,6 +161,24 @@ unsigned long swiotlb_size_or_default(void)return size ? size : (IO_TLB_DEFAULT_SIZE ); } +void __init swiotlb_adjust_size (unsigned long new_size) +{ +unsigned long size; + +/* +* If swiotlb parameter has not been specified, give a chance to +* architectures such as those supporting memory encryption to +* adjust/expand SWIOTLB size for their use. +*/ +if (!io_tlb_nslabs) { + size =ALIGN (new_size,1 <<IO_TLB_SHIFT ); + io_tlb_nslabs = size >>IO_TLB_SHIFT ; + io_tlb_nslabs =ALIGN (io_tlb_nslabs,IO_TLB_SEGSIZE ); + +pr_info ("SWIOTLB bounce buffer size adjusted to %luMB" , size >>20 ); + } +} +void swiotlb_print_info (void ) {unsigned long bytes = io_tlb_nslabs <<IO_TLB_SHIFT ;Signature · 5 lines
-- Regards/Gruss, Boris. https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpeople.kernel.org%2Ftglx%2Fnotes-about-netiquette&data=04%7C01%7Cashish.kalra%40amd.com%7C426a6f6ef2334ac4f8e308d89c6b03cf%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637431330751727796%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=xdEJqIPZUvIRmKbvM9Zv%2BVLvoyNYlSejjSyQ3ip%2FiQ0%3D&reserved=0
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Borislav Petkov
maintainerQuoted 3 lines · Ashish Kalra
This should work, but i am concerned about making
IO_TLB_DEFAULT_SIZE(which is pretty much private to generic swiotlb code) to be visible externally, i don't know if there are any concerns with that ?
Meh, it's just a define and it is not a secret that swiotlb size by default is 64M.
Btw, pls trim your reply by removing quoted text you're not responding to.
Thx.
Signature · 8 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu