From patchwork Mon Feb 13 10:34:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremi Piotrowski X-Patchwork-Id: 56180 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2274914wrn; Mon, 13 Feb 2023 02:44:43 -0800 (PST) X-Google-Smtp-Source: AK7set/6mVKQ3E+fS7oJUfLFLarQqz96yOqL4S6QYq1XsjqnpvojDJ1Se+LI/MyA9HuP4fOJ+apV X-Received: by 2002:a50:d54d:0:b0:4ac:cbb4:ed9f with SMTP id f13-20020a50d54d000000b004accbb4ed9fmr1771864edj.32.1676285083010; Mon, 13 Feb 2023 02:44:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676285082; cv=none; d=google.com; s=arc-20160816; b=P2SnI0IKT017Rnn7Jp0erGx0FA8Ec11oW/6TiD5/C3z1nd2F/F/ZFHvnkGBSsPnm7J s+y9XtDAVDIH+NRZUlFkSjki8MzYDrfrNZh6JvON9JxyZQCQNsAvzZXeyZuZVaa/I84C Osi44CTqWr+n27oE4g7ruvk+JN6tCEliUZFxOGOaj0F3YCxfKJr8hIJJzL+LbeMqIZZi 351qCM/I5iIraflUnWgcD3ZC+/WIOa+kGKnZZrlvGH6l99hgaynu2TzDGT/GvhYbrHVT /Ffb+8SiEVcJvQrQxaME5UHaJHMVMu54iJ3+iFu0y2m2roLBTsjr98GI395ayvFeXYLD WsSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=seVPAjNfSiYKxnX2j0YblQLtaiY/QQf1dxqHVHTN/Zc=; b=KBZdq7OW+LmFKfPn2wepPLmkxabDCsIC4sQYe7FUiCK7OTHoqjkGhSmKDMhyaRuTdx scEJnnu2zreqAbq7NgMxDBY5Us83sRl8KY0sb8INwRbatPv+3oIPNJoinhdlGE65N4rK fx4S5bvR3El37bCXe7MAZYEmmQ073HzbIFitjLwP3poTp8mwMWDlQRzKgvOQsMFQ5pOz 6ks8PKSqiw3ie9ZFQDwe3SisigOLKaK+nUJGYkrNUg/I1haXXRMW/f7wiQfGLb4cZtNA jjQTG0+dfEyn2YRymllBpYiXOGckZSaoZ5jRR4vrM47pb6PfEcGYDegi9skVmejW+8xM EgKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b="YQaKS8/t"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h6-20020aa7c606000000b004acc0bdcdf6si4864675edq.216.2023.02.13.02.44.19; Mon, 13 Feb 2023 02:44:42 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b="YQaKS8/t"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229930AbjBMKez (ORCPT + 99 others); Mon, 13 Feb 2023 05:34:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41194 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230356AbjBMKem (ORCPT ); Mon, 13 Feb 2023 05:34:42 -0500 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 17166144A1; Mon, 13 Feb 2023 02:34:39 -0800 (PST) Received: from vm02.corp.microsoft.com (unknown [167.220.196.155]) by linux.microsoft.com (Postfix) with ESMTPSA id 3A2B320C8B73; Mon, 13 Feb 2023 02:34:36 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 3A2B320C8B73 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1676284478; bh=seVPAjNfSiYKxnX2j0YblQLtaiY/QQf1dxqHVHTN/Zc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YQaKS8/tWGPsg/vr+lv3W7e7ETHFnqAEdaZn7cwscr/pRpUtFeY5yo4n4AFouND64 QvKhy7BXBALbt13SRO9CASzhjkwKrgJgvBepCJ9MK6xl3KloUl2x6WuXb0cb6qIY2k 2F98P3q2k92KEl2+UF5tE+nrqNorqi8OJIFvgbo0= From: Jeremi Piotrowski To: linux-kernel@vger.kernel.org Cc: Jeremi Piotrowski , Wei Liu , Dexuan Cui , Tianyu Lan , Michael Kelley , linux-hyperv@vger.kernel.org, Brijesh Singh , Michael Roth , Ashish Kalra , Tom Lendacky , Joerg Roedel , Suravee Suthikulpanit , iommu@lists.linux.dev Subject: [RFC PATCH v2 5/7] iommu/amd: Don't fail snp_enable when running virtualized Date: Mon, 13 Feb 2023 10:34:00 +0000 Message-Id: <20230213103402.1189285-6-jpiotrowski@linux.microsoft.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230213103402.1189285-1-jpiotrowski@linux.microsoft.com> References: <20230213103402.1189285-1-jpiotrowski@linux.microsoft.com> MIME-Version: 1.0 X-Spam-Status: No, score=-19.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_PASS,USER_IN_DEF_DKIM_WL,USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757712307265427549?= X-GMAIL-MSGID: =?utf-8?q?1757712307265427549?= Hyper-V VMs do not have access to an IOMMU but can support hosting SNP VMs. amd_iommu_snp_enable() is on the SNP init path and should not fail in that case. Signed-off-by: Jeremi Piotrowski --- drivers/iommu/amd/init.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c index d1270e3c5baf..8049dbe78a27 100644 --- a/drivers/iommu/amd/init.c +++ b/drivers/iommu/amd/init.c @@ -3619,6 +3619,12 @@ int amd_iommu_pc_set_reg(struct amd_iommu *iommu, u8 bank, u8 cntr, u8 fxn, u64 #ifdef CONFIG_AMD_MEM_ENCRYPT int amd_iommu_snp_enable(void) { + /* + * If we're running virtualized there doesn't have to be an IOMMU for SNP to work. + */ + if (init_state == IOMMU_NOT_FOUND && boot_cpu_has(X86_FEATURE_HYPERVISOR)) + return 0; + /* * The SNP support requires that IOMMU must be enabled, and is * not configured in the passthrough mode.