| Message ID | 20231012045040.22088-1-lukas.bulwahn@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | faed498d0db78adc1eee6bab3a8480bcb7e17e6e |
| Headers | show |
| Series | hardening: x86: drop reference to removed config AMD_IOMMU_V2 | expand |
On 10/12/2023 10:20 AM, Lukas Bulwahn wrote: > Commit 5a0b11a180a9 ("iommu/amd: Remove iommu_v2 module") removes the > config AMD_IOMMU_V2. > > Remove the reference to this config in the x86 architecture-specific > hardening config fragment as well. > > Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com> > --- > Joerg, please pick this patch on top of the commit above. Thanks. > > arch/x86/configs/hardening.config | 1 - Thanks for the fix Lukas. But I don't see this file in upstream linux tree. Am I missing something? -Vasant > 1 file changed, 1 deletion(-) > > diff --git a/arch/x86/configs/hardening.config b/arch/x86/configs/hardening.config > index 19bb0c7a7669..7b497f3b7bc3 100644 > --- a/arch/x86/configs/hardening.config > +++ b/arch/x86/configs/hardening.config > @@ -9,7 +9,6 @@ CONFIG_INTEL_IOMMU=y > CONFIG_INTEL_IOMMU_DEFAULT_ON=y > CONFIG_INTEL_IOMMU_SVM=y > CONFIG_AMD_IOMMU=y > -CONFIG_AMD_IOMMU_V2=y > > # Enable CET Shadow Stack for userspace. > CONFIG_X86_USER_SHADOW_STACK=y
On Thu, Oct 12, 2023 at 10:45:03AM +0530, Vasant Hegde wrote: > > > On 10/12/2023 10:20 AM, Lukas Bulwahn wrote: > > Commit 5a0b11a180a9 ("iommu/amd: Remove iommu_v2 module") removes the > > config AMD_IOMMU_V2. > > > > Remove the reference to this config in the x86 architecture-specific > > hardening config fragment as well. > > > > Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com> > > --- > > Joerg, please pick this patch on top of the commit above. Thanks. > > > > arch/x86/configs/hardening.config | 1 - > > Thanks for the fix Lukas. But I don't see this file in upstream linux tree. Am I > missing something? > It was added on Aug 24 in linux-next. regards, dan carpenter
On 10/12/2023 12:05 PM, Dan Carpenter wrote: > On Thu, Oct 12, 2023 at 10:45:03AM +0530, Vasant Hegde wrote: >> >> >> On 10/12/2023 10:20 AM, Lukas Bulwahn wrote: >>> Commit 5a0b11a180a9 ("iommu/amd: Remove iommu_v2 module") removes the >>> config AMD_IOMMU_V2. >>> >>> Remove the reference to this config in the x86 architecture-specific >>> hardening config fragment as well. >>> >>> Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com> >>> --- >>> Joerg, please pick this patch on top of the commit above. Thanks. >>> >>> arch/x86/configs/hardening.config | 1 - >> >> Thanks for the fix Lukas. But I don't see this file in upstream linux tree. Am I >> missing something? >> > > It was added on Aug 24 in linux-next. Thanks Dan. I can see the patch in linux-next. Reviewed-by: Vasant Hegde <vasant.hegde@amd.com> -Vasant
On Thu, 12 Oct 2023 06:50:40 +0200, Lukas Bulwahn wrote: > Commit 5a0b11a180a9 ("iommu/amd: Remove iommu_v2 module") removes the > config AMD_IOMMU_V2. > > Remove the reference to this config in the x86 architecture-specific > hardening config fragment as well. > > > [...] Applied to for-next/hardening, thanks! [1/1] hardening: x86: drop reference to removed config AMD_IOMMU_V2 https://git.kernel.org/kees/c/faed498d0db7 Take care,
diff --git a/arch/x86/configs/hardening.config b/arch/x86/configs/hardening.config index 19bb0c7a7669..7b497f3b7bc3 100644 --- a/arch/x86/configs/hardening.config +++ b/arch/x86/configs/hardening.config @@ -9,7 +9,6 @@ CONFIG_INTEL_IOMMU=y CONFIG_INTEL_IOMMU_DEFAULT_ON=y CONFIG_INTEL_IOMMU_SVM=y CONFIG_AMD_IOMMU=y -CONFIG_AMD_IOMMU_V2=y # Enable CET Shadow Stack for userspace. CONFIG_X86_USER_SHADOW_STACK=y
Commit 5a0b11a180a9 ("iommu/amd: Remove iommu_v2 module") removes the config AMD_IOMMU_V2. Remove the reference to this config in the x86 architecture-specific hardening config fragment as well. Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com> --- Joerg, please pick this patch on top of the commit above. Thanks. arch/x86/configs/hardening.config | 1 - 1 file changed, 1 deletion(-)