From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1C2C5C433F5 for ; Thu, 12 May 2022 22:20:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245292AbiELWUT (ORCPT ); Thu, 12 May 2022 18:20:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53512 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1359111AbiELWUK (ORCPT ); Thu, 12 May 2022 18:20:10 -0400 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E2D1A2802F8 for ; Thu, 12 May 2022 15:20:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1652394009; x=1683930009; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ZX9rczUcpcP69GtQzgymUOW71yf2YPyb1EbDJ5FEJsw=; b=FkVw+C1oVvykyO03E6sngUBNTvrSL7PXoU/8H/lE2W+SSfcpEwqz7WID a/oaSZga3bLwlUZ8O6n8gboVwCe0y1moldJgAOz5AmhQckzu5iC6grDIV c4YgEpyJ4xSi+O/mvTgkOe5sGZ7c3CI/BGh2MmLHo7sWCQ83qT4rMGLUv M8tgS+SjQo/LO7IDhTzpThEjhrrtC2ehla21A65ffJS+e2VaNF0XY5B4O Jyr46wBCZTiQqammAjA+7Eq5MApsY1RquiAWBmMV9VguaAYFHX1FUIXs2 dQqS2RASPoyUf5EZQQFekI7sXqi6NRrUf69kaGkMyA85WOYDC902AgnrF Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10345"; a="257694998" X-IronPort-AV: E=Sophos;i="5.91,221,1647327600"; d="scan'208";a="257694998" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 May 2022 15:20:08 -0700 X-IronPort-AV: E=Sophos;i="5.91,221,1647327600"; d="scan'208";a="594904485" Received: from skothapa-mobl.amr.corp.intel.com (HELO skuppusw-desk1.amr.corp.intel.com) ([10.209.67.107]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 May 2022 15:20:07 -0700 From: Kuppuswamy Sathyanarayanan To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org Cc: "H . Peter Anvin" , Kuppuswamy Sathyanarayanan , "Kirill A . Shutemov" , Tony Luck , Andi Kleen , Kai Huang , Wander Lairson Costa , Isaku Yamahata , marcelo.cerri@canonical.com, tim.gardner@canonical.com, khalid.elmously@canonical.com, philip.cox@canonical.com, linux-kernel@vger.kernel.org Subject: [PATCH v6 3/5] x86/mm: Make tdx_enc_status_changed() vmalloc address compatible Date: Thu, 12 May 2022 15:19:50 -0700 Message-Id: <20220512221952.3647598-4-sathyanarayanan.kuppuswamy@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220512221952.3647598-1-sathyanarayanan.kuppuswamy@linux.intel.com> References: <20220512221952.3647598-1-sathyanarayanan.kuppuswamy@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org set_memory_*crypted() APIs are used to change encryption or decryption page attributes for the given address. It also supports conversion for the vmalloc'ed memory. In TDX Guest, tdx_enc_status_changed() function is triggered by set_memory_*crypted() APIs when converting memory from/to shared or private. Internally this function uses __pa() for physical address conversion, which breaks the vmalloc address compatibility of the set_memory_*crypted() API. So add support to fix the vmalloc'ed address compatibility issue. Signed-off-by: Kuppuswamy Sathyanarayanan --- arch/x86/coco/tdx/tdx.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/arch/x86/coco/tdx/tdx.c b/arch/x86/coco/tdx/tdx.c index b49211994864..37d58675ccf1 100644 --- a/arch/x86/coco/tdx/tdx.c +++ b/arch/x86/coco/tdx/tdx.c @@ -15,6 +15,7 @@ #include #include #include +#include /* TDX module Call Leaf IDs */ #define TDX_GET_INFO 1 @@ -680,8 +681,14 @@ static bool try_accept_one(phys_addr_t *start, unsigned long len, */ static bool tdx_enc_status_changed(unsigned long vaddr, int numpages, bool enc) { - phys_addr_t start = __pa(vaddr); - phys_addr_t end = __pa(vaddr + numpages * PAGE_SIZE); + phys_addr_t start, end; + + if (is_vmalloc_addr((void *)vaddr)) + start = vmalloc_to_pfn((void *) vaddr) << PAGE_SHIFT; + else + start = __pa(vaddr); + + end = start + numpages * PAGE_SIZE; if (!enc) { /* Set the shared (decrypted) bits: */ -- 2.25.1