Backporting SEV-SNP CVE-2023-20585 to linux-stable
Subsystems (3)
cover Backporting SEV-SNP CVE-2023-20585 to linux-stable
Two commits from Linux 7.1-rc3 fix CVE-2023-20585 which affects SEV-SNP.
"Insufficient checks of the RMP on host buffer access in IOMMU may allow an attacker with privileges and a compromised hypervisor to trigger an out of bounds condition without RMP checks, resulting in a potential loss of confidential guest integrity." [1]
These are suitable candidates for stable branches but [email protected] wasn't CC'ed at the time.
1f44aab79bac ("iommu/amd: Use maximum PPR log buffer size when SNP is enabled on Family 0x19") [v7.1-rc3~24^2~2] 58c0ac6125d8 ("iommu/amd: Use maximum Event log buffer size when SNP is enabled on Family 0x19") [v7.1-rc3~24^2~3]
The upstream commits apply cleanly to linux-7.0.y and linux-6.18.y and an AUTOSEL email[2] was sent (but not pulled so far).
[ The AI analysis in the AUTOSEL patch said that the patches didn't apply
cleanly to linux-6.18.y but that is not my experience. ]
There are conflicts applying them to linux-6.12.y due to the lack of upstream AMD IOMMU kdump buffer reuse code, introduced to v6.18 by commit f32fe7cb0198 ("iommu/amd: Add support to remap/unmap IOMMU buffers for kdump") so I have included patches here which address those.
Tested on AMD machines with Zen4 (impacted) and Zen5 (not impacted) CPUs.
[1] https://www.amd.com/en/resources/product-security/bulletin/amd-sb-3016.html
[2] https://lore.kernel.org/all/[email protected]
Vasant Hegde (2):
iommu/amd: Use maximum Event log buffer size when SNP is enabled on Family 0x19 iommu/amd: Use maximum PPR log buffer size when SNP is enabled on Family 0x19
drivers/iommu/amd/amd_iommu.h | 3 + drivers/iommu/amd/amd_iommu_types.h | 21 ++++--- drivers/iommu/amd/init.c | 90 ++++++++++++++++++++++------- drivers/iommu/amd/iommu.c | 2 +- drivers/iommu/amd/ppr.c | 10 ++-- 5 files changed, 92 insertions(+), 34 deletions(-)
Signature · 1 line
2.52.0
PATCH 1/2 iommu/amd: Use maximum Event log buffer size when SNP is enabled on Family 0x19
From: Vasant Hegde <[email protected]>
commit 58c0ac6125d89bf6ec65a521eaeb52a0e8e20a9f upstream.
Due to CVE-2023-20585, the Event log buffer must use the maximum supported size (512K) on Milan/Genoa (Family 0x19) systems when SNP is enabled, to mitigate a potential security vulnerability. All other systems continue to use the default Event log buffer size (8K).
Apply the errata fix by making the following changes:
* Introduce new global variable (amd_iommu_evtlog_size) to have event log buffer size. Adjust variable size for family 0x19.
* Since 'iommu_snp_enable()' must be called after the core IOMMU subsystem is initialized, it cannot be moved to the early init stage. The SNP errata must also be applied after the 'iommu_snp_enable()' check. Therefore, 'alloc_event_buffer()' and 'iommu_enable_event_buffer()' are now called in the IOMMU_ENABLED state, after the errata is applied.
* Adjust alloc_event_buffer() and iommu_enable_event_buffer() to handle all IOMMU instances.
* Also rename EVT_* macros to make it more readable.
Conflicts:
drivers/iommu/amd/init.c
[ Conflicts in alloc_event_buffer() and iommu_enable_event_buffer()
due to lack of upstream AMD IOMMU kdump buffer reuse code. Similarly, do not add a kdump check when allocating an event log buffer in state_next(). ]
--- drivers/iommu/amd/amd_iommu.h | 2 + drivers/iommu/amd/amd_iommu_types.h | 10 ++-- drivers/iommu/amd/init.c | 77 +++++++++++++++++++++-------- drivers/iommu/amd/iommu.c | 2 +- 4 files changed, 67 insertions(+), 24 deletions(-)
drivers/iommu/amd/amd_iommu.h +2 -0
@@ -11,6 +11,8 @@#include "amd_iommu_types.h" +extern int amd_iommu_evtlog_size; +irqreturn_t amd_iommu_int_thread (int irq,void *data);irqreturn_t amd_iommu_int_thread_evtlog (int irq,void *data);irqreturn_t amd_iommu_int_thread_pprlog (int irq,void *data);
drivers/iommu/amd/amd_iommu_types.h +7 -3
@@ -15,6 +15,7 @@#include <linux/mutex.h> #include <linux/msi.h> #include <linux/list.h> +#include <linux/sizes.h> #include <linux/spinlock.h> #include <linux/pci.h> #include <linux/irqreturn.h>
@@ -132,7 +133,6 @@#define MMIO_STATUS_GALOG_INT_MASK BIT(10)/* event logging constants */ -#define EVENT_ENTRY_SIZE 0x10#define EVENT_TYPE_SHIFT 28#define EVENT_TYPE_MASK 0xf#define EVENT_TYPE_ILL_DEV 0x1
@@ -240,8 +240,12 @@#define MMIO_CMD_SIZE_512 (0x9ULL << MMIO_CMD_SIZE_SHIFT)/* constants for event buffer handling */ -#define EVT_BUFFER_SIZE 8192/* 512 entries */ -#define EVT_LEN_MASK (0x9ULL << 56) +#define EVTLOG_ENTRY_SIZE 0x10 +#define EVTLOG_SIZE_SHIFT 56 +#define EVTLOG_SIZE_DEF SZ_8K/* 512 entries */ +#define EVTLOG_LEN_MASK_DEF (0x9ULL << EVTLOG_SIZE_SHIFT) +#define EVTLOG_SIZE_MAX SZ_512K/* 32K entries */ +#define EVTLOG_LEN_MASK_MAX (0xFULL << EVTLOG_SIZE_SHIFT)/* Constants for PPR Log handling */ #define PPR_LOG_ENTRIES 512
drivers/iommu/amd/init.c +57 -20
148 lines not on this page · raw message
drivers/iommu/amd/iommu.c +1 -1
@@ -1003,7 +1003,7 @@ static void iommu_poll_events(struct amd_iommu *iommu)iommu_print_event (iommu, iommu->evt_buf + head);/* Update head pointer of hardware ring-buffer */ - head = (head +EVENT_ENTRY_SIZE ) %EVT_BUFFER_SIZE ; + head = (head +EVTLOG_ENTRY_SIZE ) % amd_iommu_evtlog_size;writel (head, iommu->mmio_base +MMIO_EVT_HEAD_OFFSET ); }
Signature · 1 line
2.52.0
PATCH 2/2 iommu/amd: Use maximum PPR log buffer size when SNP is enabled on Family 0x19
In reply to Liam MerwickFrom: Vasant Hegde <[email protected]>
commit 1f44aab79bac31f459422dfb213e907bb386509c upstream.
Due to CVE-2023-20585, the PPR log buffer must use the maximum supported size (512K) on Genoa (Family 0x19, model >= 0x10) systems when SNP is enabled, to mitigate a potential security vulnerability. Note that Family 0x19 models below 0x10 (Milan) do not support PPR when SNP is enabled. Hence the PPR log size increase is only applied for model >= 0x10. All other systems continue to use the default PPR log buffer size (8K).
Apply the errata fix by making the following changes:
- Introduce global new variable (amd_iommu_pprlog_size) to have PPR log buffer size. Adjust variable size for Genoa family.
- Extend 'amd_iommu_apply_erratum_snp()' to also set the PPR log buffer size to maximum for Family 0x19 model >= 0x10 when SNP is enabled.
- Rename PPR_* macros to make it more readable.
--- drivers/iommu/amd/amd_iommu.h | 1 + drivers/iommu/amd/amd_iommu_types.h | 11 ++++++----- drivers/iommu/amd/init.c | 13 ++++++++++++- drivers/iommu/amd/ppr.c | 10 ++++++---- 4 files changed, 25 insertions(+), 10 deletions(-)
drivers/iommu/amd/amd_iommu.h +1 -0
@@ -12,6 +12,7 @@#include "amd_iommu_types.h" extern int amd_iommu_evtlog_size; +extern int amd_iommu_pprlog_size;irqreturn_t amd_iommu_int_thread (int irq,void *data);irqreturn_t amd_iommu_int_thread_evtlog (int irq,void *data);
drivers/iommu/amd/amd_iommu_types.h +6 -5
@@ -248,11 +248,12 @@#define EVTLOG_LEN_MASK_MAX (0xFULL << EVTLOG_SIZE_SHIFT)/* Constants for PPR Log handling */ -#define PPR_LOG_ENTRIES 512 -#define PPR_LOG_SIZE_SHIFT 56 -#define PPR_LOG_SIZE_512 (0x9ULL << PPR_LOG_SIZE_SHIFT) -#define PPR_ENTRY_SIZE 16 -#define PPR_LOG_SIZE (PPR_ENTRY_SIZE * PPR_LOG_ENTRIES) +#define PPRLOG_ENTRY_SIZE 0x10 +#define PPRLOG_SIZE_SHIFT 56 +#define PPRLOG_SIZE_DEF SZ_8K/* 512 entries */ +#define PPRLOG_LEN_MASK_DEF (0x9ULL << PPRLOG_SIZE_SHIFT) +#define PPRLOG_SIZE_MAX SZ_512K/* 32K entries */ +#define PPRLOG_LEN_MASK_MAX (0xFULL << PPRLOG_SIZE_SHIFT)/* PAGE_SERVICE_REQUEST PPR Log Buffer Entry flags */ #define PPR_FLAG_EXEC 0x002/* Execute permission requested */
drivers/iommu/amd/init.c +12 -1
@@ -134,6 +134,7 @@ struct ivhd_entry { } __attribute__((packed));int amd_iommu_evtlog_size =EVTLOG_SIZE_DEF ; +int amd_iommu_pprlog_size =PPRLOG_SIZE_DEF ;/* * An AMD IOMMU memory definition structure. It defines things like exclusion
@@ -3265,6 +3266,16 @@ static void amd_iommu_apply_erratum_snp(void) amd_iommu_evtlog_size =EVTLOG_SIZE_MAX ;pr_info ("Applying erratum: Increase Event log size to 0x%x\n" , amd_iommu_evtlog_size); + +/* +* Set PPR log buffer size to max. +* (Family 0x19, model < 0x10 doesn't support PPR when SNP is enabled). +*/ +if (boot_cpu_data.x86_model >=0x10 ) { + amd_iommu_pprlog_size =PPRLOG_SIZE_MAX ; +pr_info ("Applying erratum: Increase PPR log size to 0x%x\n" , + amd_iommu_pprlog_size); + }#endif }
@@ -3906,7 +3917,7 @@ int amd_iommu_snp_disable(void)if (ret)return ret; - ret =iommu_make_shared (iommu->ppr_log,PPR_LOG_SIZE ); + ret =iommu_make_shared (iommu->ppr_log, amd_iommu_pprlog_size);if (ret)return ret;
drivers/iommu/amd/ppr.c +6 -4
@@ -20,7 +20,7 @@int __init amd_iommu_alloc_ppr_log (struct amd_iommu *iommu) { iommu->ppr_log =iommu_alloc_4k_pages (iommu,GFP_KERNEL | __GFP_ZERO, -PPR_LOG_SIZE ); + amd_iommu_pprlog_size);return iommu->ppr_log ?0 : -ENOMEM ; }
@@ -33,7 +33,9 @@ void amd_iommu_enable_ppr_log(struct amd_iommu *iommu)iommu_feature_enable (iommu,CONTROL_PPR_EN ); - entry =iommu_virt_to_phys (iommu->ppr_log) |PPR_LOG_SIZE_512 ; + entry =iommu_virt_to_phys (iommu->ppr_log); + entry |= (amd_iommu_pprlog_size ==PPRLOG_SIZE_DEF ) ? +PPRLOG_LEN_MASK_DEF :PPRLOG_LEN_MASK_MAX ;memcpy_toio (iommu->mmio_base +MMIO_PPR_LOG_OFFSET , &entry,sizeof (entry));
@@ -48,7 +50,7 @@ void amd_iommu_enable_ppr_log(struct amd_iommu *iommu)void __init amd_iommu_free_ppr_log (struct amd_iommu *iommu) { -iommu_free_pages (iommu->ppr_log,get_order (PPR_LOG_SIZE )); +iommu_free_pages (iommu->ppr_log,get_order (amd_iommu_pprlog_size)); }/*
@@ -201,7 +203,7 @@ void amd_iommu_poll_ppr_log(struct amd_iommu *iommu) raw[0 ] = raw[1 ] =0UL ;/* Update head pointer of hardware ring-buffer */ - head = (head +PPR_ENTRY_SIZE ) %PPR_LOG_SIZE ; + head = (head +PPRLOG_ENTRY_SIZE ) % amd_iommu_pprlog_size;writel (head, iommu->mmio_base +MMIO_PPR_HEAD_OFFSET );/* Handle PPR entry */
Signature · 1 line
2.52.0
Sasha Levin
maintainerQuoted 2 lines
The upstream commits apply cleanly to linux-7.0.y and linux-6.18.y and an AUTOSEL email[2] was sent (but not pulled so far).
Queued the series for 6.12, and picked up the upstream commits for 6.18 as well, thanks.
Signature · 2 lines
Thanks, Sasha