Received-SPF: pass (google.com: domain of linux-kernel+bounces-59752-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Message-ID: <5e4670e5-acc8-adf3-2a3d-eb02db7ed990@amd.com>
Date: Fri, 9 Feb 2024 11:51:37 -0600
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.15.1
Subject: Re: [PATCH] crypto: ccp - Have it depend on AMD_IOMMU
Content-Language: en-US
To: Borislav Petkov <bp@alien8.de>, Ashish Kalra <ashish.kalra@amd.com>,
 Michael Roth <michael.roth@amd.com>
Cc: LKML <linux-kernel@vger.kernel.org>
References: <20240207204721.6189-1-bp@alien8.de>
From: Tom Lendacky <thomas.lendacky@amd.com>
In-Reply-To: <20240207204721.6189-1-bp@alien8.de>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?QVYrSGVjRTRxa3N0akJhNGVjYnVWbi85N2E5djVWczNCU1lwWWhNN3JNTDBL?=
 =?utf-8?B?ZytIUnBTY2ZlU0kzNmZOSGhkcTlJb1hienVkODBndTZ5OCtHUENrNlZ6cGZM?=
 =?utf-8?B?RGVOVHJ2UEFhMTBhQnJ3eUEwazRXMG41K1J1Uld6SUNxTnBoeFMxaENqKy9a?=
 =?utf-8?B?cjZJNHlHWnRJWnRNdTNJVUxaNSttZzYyZjlDM0lPQ0N2cGVNMVd5dEFNNVdO?=
 =?utf-8?B?R0daWUY1eC9SK01tQVp5NnQ3UFVRWDV1VlAySWtYVkxQTXF0SCtseEpqTzBl?=
 =?utf-8?B?czhXRnQ4d1RZRHp4T3dtN054U1lOTDQ0TWVLTE92aFE2Y1hqMlNzdC9GWkFU?=
 =?utf-8?B?OGgzeGhqZ29veGFSaUo3NEVvcUNqSDI0SE8xQU1ET0NnYWc4MXhhWGNmMWFI?=
 =?utf-8?B?a2hKdTlWNzBLbmtpeDA1d1ZxbkJkNVhtTFBLSlhVaVI0NDFKRWdxZ2JIZ2VI?=
 =?utf-8?B?KzZjUThWL0JDZThhUXU0cUs3Rzk4M1UzMC91RmRoeDJtbzNCSjRySFNRVGJh?=
 =?utf-8?B?VGlUemU0aFFaQUZGYzRwOTNnUnFueWErMXBKbmhabmFpS2tGUDl4d3BEWW42?=
 =?utf-8?B?QXNBQXF5MHN6d2V6OWd3YVREQUR0S24rcytQMHlHUHhNQ0s4TFFtWThqcjRt?=
 =?utf-8?B?Q2U5bzE1RjVJSm1lTDFWNTJMZnZVYjB4VU56aXFXWUVoWXI4QmVsNENKZ2h5?=
 =?utf-8?B?Q2NGR0RRQ0g5U3ZUL3hCS2Nka3dQd2gvVnNxY3NQVW90N21iTWI4QzFhK3B1?=
 =?utf-8?B?SUFMQVBzN0l2SHhwNUp0QVBCWklqTkVOc0pxMi84dEo5UklNaUp6eEUxQ09q?=
 =?utf-8?B?dGhCbWJ2YXo2c2oxMUlNeW9XOFJzNC9sUzE1Y3IzdjkxWHNOZFpNKzV0OWpm?=
 =?utf-8?B?VEFpUWpxOVRta1VPTCtrMUlWU2RSdWdXNGttajd2VUNURDROTEE5STNxVkRT?=
 =?utf-8?B?MC9KSEVuU2luU1BHYjdrajJoQ1VMRTNOQXBvbTNiTGRXV2NrR0MzMG1yK0Ur?=
 =?utf-8?B?c0JNRlFrNk0xeERuWTNkYjBCS2Y0b2RvUWVMTElpSFRwREJzMWtyUDRvN2x5?=
 =?utf-8?B?TDN1UVc5MVVvWjg4a0hGYXdqSTIzay9yUm1pRnc0VS8xdzdjM0ZiOTEza0xz?=
 =?utf-8?B?cnkzUCs2RzJTSUhtcDZXVmF3UEJMK0JrK24vbmF3cHBPU2ZNOUdDVTh5eTlX?=
 =?utf-8?B?MHMxUWRrd2RqVi9PTWpCVHVmZHVCZi9UMVFsOFM5UWdHcWtBaTR3c3gvamVh?=
 =?utf-8?B?SDFQbXhuOURYK1M4ekZMaTZUakduQ21FS0N6dEExQzJ6ZmRDd3IrQWU1ajlJ?=
 =?utf-8?B?WUowRi9UajFZdFU5U1BDa0ZBMzUzZThWRHVIU0tMMUFZYTdCL1JPeHh3eUpD?=
 =?utf-8?B?b1A0cDRWQkNpWG9iWWJRM0RKSmdDQnRPU1QvSi9aa1VHMmxPUUN6VHpFZVBv?=
 =?utf-8?B?blJwbmJEdm4zbVByblo2dVNoaVhTcWN5UDVubHlTM3lXM3IvQXNJM21INFVk?=
 =?utf-8?B?SjlsVWphOC9sRzNBaDgwRlF0U1d3OTVFUXBCak5iU2VtVXd4TzA2VExyb1E4?=
 =?utf-8?B?WHZ0THV3MStXWGplYTRLbEg1elN4YXJhU3puVFZPL2o0bjc0TCs5Q1M4b1JG?=
 =?utf-8?B?N3E0cG1KSktLdW9uVHgxbk14MTFKZmZwZllNWnFnLzFpT3JRb1hYRHZzdnVw?=
 =?utf-8?B?Y0IzVGdFUW1pZWh1emdPZ2FrRHJOWHN1NVRhRHVSMDNDZ2l5dGV1ZHkxd0tv?=
 =?utf-8?B?ZHBMMUJaNDhpeTBTVWFkRDBTV2lxRTFqL0ROT0hLK3YrZ0ljNUR0Wi9YYmZE?=
 =?utf-8?B?cVczMTd2NDFDdkFsR2VWU0R0NHFZcEY0cW1qS0l0ZUxPNUhHOUUrUTNhQTJR?=
 =?utf-8?B?VU1nclNsbDZqUWk5N1B5Q21kQnFIRUo2bzNBUUJjR2c1R2ZuWXpnaEZadHhz?=
 =?utf-8?B?cHhxYzNoVVVIZTNwc1RsN0IzalB6dmo3aGprS21iK1VqQWFia0oxNmpTTllN?=
 =?utf-8?B?bVRGdlVUSlRBVWUyQ3Z0MVdlMlI1a0ordzBtVU52UmM5NVBoUS8xbmgxNHNt?=
 =?utf-8?B?ZnMxQ3BXZlpUWEFQay81NkYzMm9TcytkNmMxblJNMzdGQkdlZUt2V29hT0h3?=
 =?utf-8?Q?o1vK7mBzbaUyb9YUleGBqGOHv?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f2f4fc7b-2bc6-4505-34ba-08dc2997c4a4
X-MS-Exchange-CrossTenant-AuthSource: BL1PR12MB5732.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2024 17:51:39.6973
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: aFtsg3/VQ7OpWJ4Yk6NZirNH8D3OcfEG1B+FM/17U5LfS7LdGhTY51a8CTj0/cfWYQHMsUw8c4MExAdPnB4xUQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW5PR12MB5597

On 2/7/24 14:47, Borislav Petkov wrote:
> From: "Borislav Petkov (AMD)" <bp@alien8.de>
> 
> sev-dev.c calls code in the AMD IOMMU now but that can't really work if
> latter is not enabled in Kconfig:
> 
>    ld: vmlinux.o: in function `__sev_firmware_shutdown.isra.0':
>    sev-dev.c:(.text+0x2501f0e): undefined reference to `amd_iommu_snp_disable'
>    ld: vmlinux.o: in function `snp_rmptable_init':
>    sev.c:(.init.text+0x26260): undefined reference to `amd_iommu_snp_en'
>    make[2]: *** [scripts/Makefile.vmlinux:37: vmlinux] Error 1
>    make: *** [Makefile:240: __sub-make] Error 2
> 
> Fix those deps.
> 
> Fixes: f366a8dac1b8 ("iommu/amd: Clean up RMP entries for IOMMU pages during SNP shutdown")
> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
> ---
>   drivers/crypto/ccp/Kconfig | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/crypto/ccp/Kconfig b/drivers/crypto/ccp/Kconfig
> index 32268e239bf1..f394e45e11ab 100644
> --- a/drivers/crypto/ccp/Kconfig
> +++ b/drivers/crypto/ccp/Kconfig
> @@ -38,7 +38,7 @@ config CRYPTO_DEV_CCP_CRYPTO
>   config CRYPTO_DEV_SP_PSP
>   	bool "Platform Security Processor (PSP) device"
>   	default y
> -	depends on CRYPTO_DEV_CCP_DD && X86_64
> +	depends on CRYPTO_DEV_CCP_DD && X86_64 && AMD_IOMMU

Or should the ifdef around amd_iommu_snp_disable() in 
include/linux/amd-iommu.h instead be:

#if defined(CONFIG_AMD_IOMMU) && defined(CONFIG_KVM_AMD_SEV)

and amd_iommu_snp_en be protected in arch/x86/include/asm/iommu.h as:

#ifdef CONFIG_AMD_IOMMU
extern bool amd_iommu_snp_en;
#else
#define amd_iommu_snp_en false
#endif

I think this would be better in case these should be referenced elsewhere 
in the future.

Thanks,
Tom

>   	help
>   	 Provide support for the AMD Platform Security Processor (PSP).
>   	 The PSP is a dedicated processor that provides support for key