From patchwork Tue Jun 20 15:48:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dexuan Cui X-Patchwork-Id: 110595 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3768193vqr; Tue, 20 Jun 2023 09:01:10 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6Kc9lqBhpqMVZrvEdPmBYO9qT05tsKbkf2d+jo6dTyx4MJEEihw8WrGagN482SfD/LOumY X-Received: by 2002:a17:90b:1894:b0:25e:4c91:bc37 with SMTP id mn20-20020a17090b189400b0025e4c91bc37mr7116256pjb.10.1687276870004; Tue, 20 Jun 2023 09:01:10 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1687276869; cv=pass; d=google.com; s=arc-20160816; b=izKiDcB7cR39+QF8AAKMYd39ns0GJz+51Jv99I1Ee7Pp89EGM78nZgmFHFrQFphhKt ok9B9SM+IBFFqXp4mlYAOrDyROz4k9kT2hCd2afF7iZoASgb5VDDxFP3FEPJBKwOE/bQ /ubKoi2OIsbrcDTnLlw55LcsdRvMUgo5Z8/m9nLKrGtyoFTnkuv1zrRO8thIgRdgoMuB /UDXWGQ/Gb0TTzS41pbUdIWRr9kHTXaz5Rc0ngiqDSJkr9O/gxCxofm+l4UAoGrs5KPO kSl/GufxH37vpgWeDCyT9htgqrfjS6S0Pllkr01amFtULW22vPMXwWoRXm8n3pBhRyjK dymg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=OVr+XxLW7TIxPbTF/rIR4CSsiOeMRaOvbCn2pLWSnPA=; b=SvGbZKVdSzWoCn0mNbyOW3S4Hg6kC3GGRQNsIZLVJv7Ramnz0DWDtR57yUYUQ9rngH yCHQX8ts0hclTRi39EIYiR6UI8hWKRzMSe93wgl4OvVBrbXA19MPOSH/GzywbHcRiwtq LjbX1GjpEqQEJ7+3NoSXMuOIDs1uKUi1DnSnUEzXYMg41FG62AcWFq1YRyn4zuVN0Iun KNUeGvvsFjKsCrlCV9J8AA9sZCz+uGflZNDJY517aUQrn7m5sIm8ZZUVowHZkg76pNPn 5vN9tZQkjG2r9Vp1tdi8rFXljCf4Lk+yoiyyqw5rMY1eMJFlBBFYEADgJaRQAkNKKuqJ 13Ig== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector2 header.b=ClLusvVb; arc=pass (i=1 spf=pass spfdomain=microsoft.com dkim=pass dkdomain=microsoft.com dmarc=pass fromdomain=microsoft.com); 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=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l14-20020a17090a660e00b002527ec91a2csi2133512pjj.98.2023.06.20.09.00.53; Tue, 20 Jun 2023 09:01:09 -0700 (PDT) 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=@microsoft.com header.s=selector2 header.b=ClLusvVb; arc=pass (i=1 spf=pass spfdomain=microsoft.com dkim=pass dkdomain=microsoft.com dmarc=pass fromdomain=microsoft.com); 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=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232493AbjFTPtL (ORCPT + 99 others); Tue, 20 Jun 2023 11:49:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37728 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232273AbjFTPtH (ORCPT ); Tue, 20 Jun 2023 11:49:07 -0400 Received: from DM6FTOPR00CU001.outbound.protection.outlook.com (mail-centralusazon11020024.outbound.protection.outlook.com [52.101.61.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B9EB4E6E; Tue, 20 Jun 2023 08:49:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Cex+Vgk+ISpA8upn//2vk3TN9wUkCyxmAQAaXH1tl4u+E8hhZ/pf39YDGjeN0LZ2O8edATYksiYhtqup1Lg91zItMPKburYebOWjTkDZRqQrjYOptm4+lesJzg4yDew625UknjnIdH5pTwgFnc2kox7y/yATByI1OItMjrX1zANbXcbIXv75IcZIInLuWqkQlr8SFvHK9imzwaw05O9YwbvNxgfe8zLORm9TprGeaf4fT0eG89YYjtkMf92su3HHeCf04Z3r3nEontwVhLITHzRMyQZe0neZCVTEflYcrwCJsTgZqlbxR19uZHGjgJfQoI5hxhzSrsDp5ShrxMw7eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=OVr+XxLW7TIxPbTF/rIR4CSsiOeMRaOvbCn2pLWSnPA=; b=gxLWtxfwWl2dIjRLdr3NnVMdPgU4uXVSpuYlAS/uuJXV3Qc9st9FEivl0Gw/a0XPe0bagzbZzVRLu8vH72IpeoIMyzIxogBRNGPDo/tyAeLZttXSs/4zyXe7HGFhOMCTN0+SwK5nRt5T9zp7aEA4BqkiVCvP82ZGSuW0RxZeHquhI/B/HsEXYtOG8tbRWRclTV71Eo/wfmoMn8V/YIuuQGxtTefSIWbXIPvHCCWwJH4GKXvdu5RdEfpSbTQ6jGC1TA76A81v0HpEPVI8a8ZO4H4AVhya1pnklBio+E0s0eHNiHbl8GP25VBVuCw+0glaz89NIfX4mx1Vf7O3TP0IdA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=microsoft.com; dmarc=pass action=none header.from=microsoft.com; dkim=pass header.d=microsoft.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OVr+XxLW7TIxPbTF/rIR4CSsiOeMRaOvbCn2pLWSnPA=; b=ClLusvVbCmMqUkdv1EnCTbNPw80SiaYoUlQOzUOUBUwsKO9sSqQqO2vKwVVeZmVMQd+z1J2usm9FeJbmbzRTPvqswQo3uK+zPN8QyMMO7/UTJN1EIgMLx8U8WV3w868CoJeJ9wykqntJ6S+nloYrEOY1qw5Sp35Cdzxi4gBO5ag= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=microsoft.com; Received: from BL0PR2101MB1092.namprd21.prod.outlook.com (2603:10b6:207:30::23) by DM4PR21MB3585.namprd21.prod.outlook.com (2603:10b6:8:a3::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6544.4; Tue, 20 Jun 2023 15:49:01 +0000 Received: from BL0PR2101MB1092.namprd21.prod.outlook.com ([fe80::e673:bfeb:d3c1:7682]) by BL0PR2101MB1092.namprd21.prod.outlook.com ([fe80::e673:bfeb:d3c1:7682%3]) with mapi id 15.20.6544.006; Tue, 20 Jun 2023 15:49:01 +0000 From: Dexuan Cui To: ak@linux.intel.com, arnd@arndb.de, bp@alien8.de, brijesh.singh@amd.com, dan.j.williams@intel.com, dave.hansen@intel.com, dave.hansen@linux.intel.com, haiyangz@microsoft.com, hpa@zytor.com, jane.chu@oracle.com, kirill.shutemov@linux.intel.com, kys@microsoft.com, linux-arch@vger.kernel.org, linux-hyperv@vger.kernel.org, luto@kernel.org, mingo@redhat.com, peterz@infradead.org, rostedt@goodmis.org, sathyanarayanan.kuppuswamy@linux.intel.com, seanjc@google.com, tglx@linutronix.de, tony.luck@intel.com, wei.liu@kernel.org, x86@kernel.org, mikelley@microsoft.com Cc: linux-kernel@vger.kernel.org, Tianyu.Lan@microsoft.com, rick.p.edgecombe@intel.com, Dexuan Cui Subject: [PATCH v8 1/2] x86/tdx: Retry TDVMCALL_MAP_GPA() when needed Date: Tue, 20 Jun 2023 08:48:29 -0700 Message-Id: <20230620154830.25442-2-decui@microsoft.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230620154830.25442-1-decui@microsoft.com> References: <20230620154830.25442-1-decui@microsoft.com> X-ClientProxiedBy: MW2PR16CA0023.namprd16.prod.outlook.com (2603:10b6:907::36) To BL0PR2101MB1092.namprd21.prod.outlook.com (2603:10b6:207:30::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL0PR2101MB1092:EE_|DM4PR21MB3585:EE_ X-MS-Office365-Filtering-Correlation-Id: ae9a5705-9ac0-4220-e21d-08db71a5ddd7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GpxsfDt7YsxjzbVnnFgq70/4hhpImJ18CH44SwG4COQaHMfaEtJV7/cFxTjai1H9EsVqHdxNby10Y+r6Wyx74A9h+wqEihRMRlbv2rnYzb91tAr+Dhv6ff+uw697dWb43jsg/o+w2HUYebajrNbe+geEnWncYYuTcQUbjp1xSlIorFd1gqWlWAABWDK29aKKb9T2pIGoPCQ9IONB4OO/zQbZJhiZI0MZIh4WtXD7vE4oPP8g3qDgjPd9qrFaMy9i+o1s0Mbf+klvlPfdhiZgsDeXD5RHuwqnj5u77etnAwKE9ZwuXlDxeflO31zA/qC87e2rOxXlK5no2KUVlvhLJIJ61cdR1PYGpuQVL8CgAhUDE8VRrlejC5QE8RhGU7vFBAkJ6s52P5YNqH0vNee8bglpk0YN5giVC1aN8S2sP2FfSZnhhPLvqMmVwy4jJB66vaWIJxXmM/VbV3YYGcPJOhDXmlL+M4eKpZ7ZVLM9odeAPRNwDXgv9X7vdxXvpJHAh337FDK1/7ig/QmszRhUILyNSrmxNyWXV6ALOsUe3Wc7JneszCylmb0V01WhEKBNq30KwUy8GuFaXCn59J+Isv9B6EtvIFIMtcS9kSKiLw8o7LROg3l27OEb2eJQY4TtnrQEKS92NKRbnpjKPjGLDA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BL0PR2101MB1092.namprd21.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(346002)(136003)(366004)(376002)(39860400002)(396003)(451199021)(52116002)(186003)(478600001)(966005)(6486002)(6666004)(86362001)(1076003)(6506007)(6512007)(107886003)(10290500003)(2616005)(38100700002)(316002)(82960400001)(82950400001)(83380400001)(66556008)(6636002)(66476007)(4326008)(66946007)(921005)(8676002)(8936002)(7416002)(5660300002)(2906002)(41300700001)(36756003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dgNClseu66F3LlmewTDjjQUAxkgLBDoS+JX2rra+1owPerdd1G/78Mhf+k29ilMH36gQZmeFhKNefwtLQJD/1FguRQNJRaIFCpDvvR/HKXReGElkkNgoUEK2rJiuKzy7Mqhzxj5ftuJviXozv8jl0orIFl1s5uD0lKaEvS+CZCW+q/eJydJownszl2W+41Ehk/pqsZPXH6FCMVie7QJuWT17Y0AkFkoq+97pH4r4yA2/joIJ52Kopa02rf/B3uLkpku7DtkUIIwoFUefLLwsr1L9NwP7SbFwn/QOR9CUf8xUK18XFIXBkyJ7RFo0LS+JW8VrWMXXYMgCW9aWrpWt/g1LZ/E9M2TiiEfg8wnMwFrmIOARQ6pXezCFc4JHhKJJ6dW6DrmJMvLPz2r6vJl4HJFJikvDg+rMG7ICS0SR0DQ/ugSdO4m36Qb6PFbFwD7OGgaw+kao6RJ83G68ds+/ZVe0/lEK4NSju/mnPNvLE2u7UBSiI3RdR2vjGo+B4s5C311ezOJZSBR82imEJ728X2cnaEsLq5p70B+cgUKH6sgUDJdBZL0eW5JJYD41frR900Hhu9BPGiCNk+y5PRMnqvmqIHYnnpZ+k62rDucc4kr3oevoBv19kXbRDnUrPbA/5XkAZ92hSuQ4WbrEB589xGzZeSeN/nhnxPHzD5fe+4NE5izDk+FPgYb9zNR6J2CiThTh7glhAuAUe0d9oUbtzlx5+gZ3mVI2kxWUr0qbLAxya9NDy2WJ16WwUIj/xt363XQTn/ZG8yNuzrOsqjBnbXXxbTN7CKFd49B/EofVw/QgKbn2JZQN0/v3/WKiVRNxTGIdfDF+l81IDDM032hn9BaeOtZUiVDUbVOj/ojnGrmP1Ymny8fgh8mSVJN4i7XaqyaQdyC2oLs9jfCaSlYPZu3NrAE4IM6YqCf6cvUlpvPwvwvb4lI18NQ5ZkXmBm03nufb/Fz9Q3clXXeYOBWk9hP6jgWGar3sAT9r5DjN6foId5NJjjKeMrGZnB5WRw4hlinRBpI8beToABcimBY4TcSyrzsRKakLV33Mi1uaVz8qNtFPgy2BOs54NaAbVa9rqrChXvfspeqiUvcDtHLIJ9BMpRd+s19j+7D4ZqJvQMLpB4ssUN6NzPHhIXq6NOdHvHuP3Wcl8F0Bk5C5JOSjMCzrVW1O/ZuvYBpRuCyOkG+9Vq+tJ6gNenxnjlH7gISjGbWL8noYfVL+W79YICZ3TELTvPqG+2h46ZzjJbjjSx3fmvD/35tkmR+e4m9v1T4IJoqlnL0nokeipQ4KqXWlmLmE0RF3rSqk8J79EzCQVmvT5z95eCVzPjPFS05yV7mPe3UI8TQNV0EownPX6fiUn05X3iUt1Fmt4onHBjxW7HxncK/OB7zTQhZNQ3X6dAO5Wjj2UfFF7j/KfZZXaBu9kpilhkTN4qU7hPc5WwM1L8kOHAAJYkVGqI3W2D5m1FgOszf/WKqKv9rJNprP8A+69GL+qccaiqtT1fBhoxahMcf3cojH/sJMSXlmIHc+zHrnb20Fmn+NgBYrN6vqLZiZobDwXs0CuwZ48jPleEoqjR5spMe/Sy0OhrcjawQgDWiF09hniSSNBMqpj9oe/7yZBEfGEbO9vD1RYcJkcoASmGNcKGgWXVMaQQQY3ODQBFKU X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: ae9a5705-9ac0-4220-e21d-08db71a5ddd7 X-MS-Exchange-CrossTenant-AuthSource: BL0PR2101MB1092.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jun 2023 15:49:00.9898 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 82V3TPlc8r3FmtG3qiuRclx3NxoxqrOEP252VfA+ZKzJan2EJwlxnSIWkmdxYHp7TApK4zmZ0n2SXzL9AU8uOg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR21MB3585 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no 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?1769238030894357770?= X-GMAIL-MSGID: =?utf-8?q?1769238030894357770?= GHCI spec for TDX 1.0 says that the MapGPA call may fail with the R10 error code = TDG.VP.VMCALL_RETRY (1), and the guest must retry this operation for the pages in the region starting at the GPA specified in R11. When a fully enlightened TDX guest runs on Hyper-V, Hyper-V can return the retry error when set_memory_decrypted() is called to decrypt up to 1GB of swiotlb bounce buffers. Acked-by: Kirill A. Shutemov Reviewed-by: Michael Kelley Signed-off-by: Dexuan Cui Reviewed-by: Kuppuswamy Sathyanarayanan --- arch/x86/coco/tdx/tdx.c | 63 +++++++++++++++++++++++++------ arch/x86/include/asm/shared/tdx.h | 2 + 2 files changed, 53 insertions(+), 12 deletions(-) Changes in v2: Used __tdx_hypercall() directly in tdx_map_gpa(). Added a max_retry_cnt of 1000. Renamed a few variables, e.g., r11 -> map_fail_paddr. Changes in v3: Changed max_retry_cnt from 1000 to 3. Changes in v4: __tdx_hypercall(&args, TDX_HCALL_HAS_OUTPUT) -> __tdx_hypercall_ret() Added Kirill's Acked-by. Changes in v5: Added Michael's Reviewed-by. Changes in v6: None. Changes in v7: Addressed Dave's comments: see https://lwn.net/ml/linux-kernel/SA1PR21MB1335736123C2BCBBFD7460C3BF46A@SA1PR21MB1335.namprd21.prod.outlook.com Changes in v8: Rebased to tip.git's master branch. diff --git a/arch/x86/coco/tdx/tdx.c b/arch/x86/coco/tdx/tdx.c index 1d6b863c42b0..0c198ab73aa7 100644 --- a/arch/x86/coco/tdx/tdx.c +++ b/arch/x86/coco/tdx/tdx.c @@ -703,14 +703,16 @@ static bool tdx_cache_flush_required(void) } /* - * Inform the VMM of the guest's intent for this physical page: shared with - * the VMM or private to the guest. The VMM is expected to change its mapping - * of the page in response. + * Notify the VMM about page mapping conversion. More info about ABI + * can be found in TDX Guest-Host-Communication Interface (GHCI), + * section "TDG.VP.VMCALL". */ -static bool tdx_enc_status_changed(unsigned long vaddr, int numpages, bool enc) +static bool tdx_map_gpa(phys_addr_t start, phys_addr_t end, bool enc) { - phys_addr_t start = __pa(vaddr); - phys_addr_t end = __pa(vaddr + numpages * PAGE_SIZE); + const int max_retries_per_page = 3; + struct tdx_hypercall_args args; + u64 map_fail_paddr, ret; + int retry_count = 0; if (!enc) { /* Set the shared (decrypted) bits: */ @@ -718,12 +720,49 @@ static bool tdx_enc_status_changed(unsigned long vaddr, int numpages, bool enc) end |= cc_mkdec(0); } - /* - * Notify the VMM about page mapping conversion. More info about ABI - * can be found in TDX Guest-Host-Communication Interface (GHCI), - * section "TDG.VP.VMCALL" - */ - if (_tdx_hypercall(TDVMCALL_MAP_GPA, start, end - start, 0, 0)) + while (retry_count < max_retries_per_page) { + memset(&args, 0, sizeof(args)); + args.r10 = TDX_HYPERCALL_STANDARD; + args.r11 = TDVMCALL_MAP_GPA; + args.r12 = start; + args.r13 = end - start; + + ret = __tdx_hypercall_ret(&args); + if (ret != TDVMCALL_STATUS_RETRY) + return !ret; + /* + * The guest must retry the operation for the pages in the + * region starting at the GPA specified in R11. R11 comes + * from the untrusted VMM. Sanity check it. + */ + map_fail_paddr = args.r11; + if (map_fail_paddr < start || map_fail_paddr >= end) + return false; + + /* "Consume" a retry without forward progress */ + if (map_fail_paddr == start) { + retry_count++; + continue; + } + + start = map_fail_paddr; + retry_count = 0; + } + + return false; +} + +/* + * Inform the VMM of the guest's intent for this physical page: shared with + * the VMM or private to the guest. The VMM is expected to change its mapping + * of the page in response. + */ +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); + + if (!tdx_map_gpa(start, end, enc)) return false; /* shared->private conversion requires memory to be accepted before use */ diff --git a/arch/x86/include/asm/shared/tdx.h b/arch/x86/include/asm/shared/tdx.h index 90ea813c4b99..9db89a99ae5b 100644 --- a/arch/x86/include/asm/shared/tdx.h +++ b/arch/x86/include/asm/shared/tdx.h @@ -24,6 +24,8 @@ #define TDVMCALL_MAP_GPA 0x10001 #define TDVMCALL_REPORT_FATAL_ERROR 0x10003 +#define TDVMCALL_STATUS_RETRY 1 + #ifndef __ASSEMBLY__ /* From patchwork Tue Jun 20 15:48:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dexuan Cui X-Patchwork-Id: 110596 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3768885vqr; Tue, 20 Jun 2023 09:01:50 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7huYQAiI6Um4QV4w/6UAoSLLyF1meCcCIh0htz77FG1pWEei/t93jsMXG22IK+1um5LZ8O X-Received: by 2002:a05:6808:1a96:b0:398:1197:bbfb with SMTP id bm22-20020a0568081a9600b003981197bbfbmr12055439oib.55.1687276910055; Tue, 20 Jun 2023 09:01:50 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1687276910; cv=pass; d=google.com; s=arc-20160816; b=jQqidf8z1fuTyn2SXst+HiXcGOb3krKjk8A6IOxWENik/9carzTc0iDe02Yl44Fj6Y HVIpKgYNzYI5aQFbHmBnO7SISwcSyUVWmFr6eqCIjpjs/maOMNaY5sGF34XM0rxRZwSx 69cQw79pIclbWZTV8SrGUF+e01inREFjR7sn140JoZZzMe3uwTsE2bL1QsDcsC2PJzIl JLpxm6pZBR1jxfpS5XmyEVNF7PKPPwR/Z/1vGaCwp8kUT49cO2BivBUXJQ8YgCbZvmjy L1dEg0X8w0Oqlk8lbNO8cUrKTJ17fUlWC2zJlpirclqba20EF70XTpDH9Y7+VlOy08Tn l+gA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=YMhMHHKXXv6Xvf1JML21B4Iw5otO8hwEC5OErWhDUh8=; b=WZCRQ1gfxi2NA7h6KBa44cTReELWlG4uCtCjQ8FVvsJ9xgmSw0VpYnw9pPc0LNaQIq qeDnKkPQIxemQ7oMHi83iOasgI07bHRgtwJ352iXAs3bJyqlTmslFLHFnHxEj9ycZE5C 6iWcAbLC0uQMTOVIFGdlDeoF9bXf2+fXe38e+++H8dKtu2e4VjJ05b9gV0ldLW6yUmma d1n2mkU0vvsnAe+1HN5KPEKRgntswytHHCupM1wjGs2bFgi4w68754U+Lro57/4IKPiU 28qfonqUBLyjph2avBy6jsmVNhiW9r1iCmmV/PiBPwDhRJTXjz6KZmzxOlN57MwQzis8 WBKg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector2 header.b=iJkhA8EW; arc=pass (i=1 spf=pass spfdomain=microsoft.com dkim=pass dkdomain=microsoft.com dmarc=pass fromdomain=microsoft.com); 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=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j7-20020a17090a694700b0025e9d537637si2132634pjm.158.2023.06.20.09.01.32; Tue, 20 Jun 2023 09:01:50 -0700 (PDT) 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=@microsoft.com header.s=selector2 header.b=iJkhA8EW; arc=pass (i=1 spf=pass spfdomain=microsoft.com dkim=pass dkdomain=microsoft.com dmarc=pass fromdomain=microsoft.com); 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=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232658AbjFTPtO (ORCPT + 99 others); Tue, 20 Jun 2023 11:49:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37770 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232385AbjFTPtJ (ORCPT ); Tue, 20 Jun 2023 11:49:09 -0400 Received: from DM6FTOPR00CU001.outbound.protection.outlook.com (mail-centralusazon11020027.outbound.protection.outlook.com [52.101.61.27]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 230DCE72; Tue, 20 Jun 2023 08:49:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m6MYxDB4/EIRI4feqD14g8dl4TunB7CLMwPobFNBdnH7qJXztQtzbHMXHyemxU1GJZon/7Lt2WOTNUkJtDn2JTS6UW6VBK7lL32zMix3k4zEAUkVhwiU13lre+82JK4XXwTOJaax7PuTxJr2nb/csOvNLxJfmWi8U+8x5dDqpiHByHd0tVK1bWn9MRZwrflu1Pb2k83muvj+pKst1lcsQUyRlg9SCA9Q3RU5tmALWCGDpWv9yCKtHHUr8pLtSY3xqMR47Soa8a8S4+q8W4RFszFFPX3cU7Cww3EFF2l8Ck7vcGL7WUM5yw0I8vGIBR6r95huQUo067s1P3wyRzbT5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=YMhMHHKXXv6Xvf1JML21B4Iw5otO8hwEC5OErWhDUh8=; b=NpGBOuJvH4e1NSf1j0zVU+XwSVW32HZ45r8izodITK6e5fs5EBI7F+d7Pgr4NNwr1Rw+wjqMWpHMngA2Zm5KYrWHMEFvZGs1inq0+DBJdFywuYwAxcl+FxjX4HOXsj/v14E22sIyO12mtmqlMFqa21xN4M/UUUNVW2TfVttMMxIKeYOHZkmxKIuEfHFDDbi9m+aOiqEitlcicUCzlsCh2XhIxklN/MBAOFoDVYzldC83gYySasDngHaBFKjO5tK8GnW3SCP4tvqisIHDhKt9i1h5ik+BVHs7TbCp4ODMm5/UpYNjOjBvebCl805utmItJULrBbr/oLr5LqVwz7HxYA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=microsoft.com; dmarc=pass action=none header.from=microsoft.com; dkim=pass header.d=microsoft.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YMhMHHKXXv6Xvf1JML21B4Iw5otO8hwEC5OErWhDUh8=; b=iJkhA8EWPC2ENCVvJKJusBMLduO8wGEP5QfoWEQYHHP8w6QJu5Yt8je23jmqVFXAc6R8trkgrHRkirfr7KJSVzbCC1/sj4fDdh2JAqWvTgN5lfXlWAhl4R++vx7fBAN4cGTxPaM06/PlQWDSn8byPp1gMkm1bYgjss57Az8AG+M= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=microsoft.com; Received: from BL0PR2101MB1092.namprd21.prod.outlook.com (2603:10b6:207:30::23) by DM4PR21MB3585.namprd21.prod.outlook.com (2603:10b6:8:a3::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6544.4; Tue, 20 Jun 2023 15:49:03 +0000 Received: from BL0PR2101MB1092.namprd21.prod.outlook.com ([fe80::e673:bfeb:d3c1:7682]) by BL0PR2101MB1092.namprd21.prod.outlook.com ([fe80::e673:bfeb:d3c1:7682%3]) with mapi id 15.20.6544.006; Tue, 20 Jun 2023 15:49:03 +0000 From: Dexuan Cui To: ak@linux.intel.com, arnd@arndb.de, bp@alien8.de, brijesh.singh@amd.com, dan.j.williams@intel.com, dave.hansen@intel.com, dave.hansen@linux.intel.com, haiyangz@microsoft.com, hpa@zytor.com, jane.chu@oracle.com, kirill.shutemov@linux.intel.com, kys@microsoft.com, linux-arch@vger.kernel.org, linux-hyperv@vger.kernel.org, luto@kernel.org, mingo@redhat.com, peterz@infradead.org, rostedt@goodmis.org, sathyanarayanan.kuppuswamy@linux.intel.com, seanjc@google.com, tglx@linutronix.de, tony.luck@intel.com, wei.liu@kernel.org, x86@kernel.org, mikelley@microsoft.com Cc: linux-kernel@vger.kernel.org, Tianyu.Lan@microsoft.com, rick.p.edgecombe@intel.com, Dexuan Cui Subject: [PATCH v8 2/2] x86/tdx: Support vmalloc() for tdx_enc_status_changed() Date: Tue, 20 Jun 2023 08:48:30 -0700 Message-Id: <20230620154830.25442-3-decui@microsoft.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230620154830.25442-1-decui@microsoft.com> References: <20230620154830.25442-1-decui@microsoft.com> X-ClientProxiedBy: MW2PR16CA0023.namprd16.prod.outlook.com (2603:10b6:907::36) To BL0PR2101MB1092.namprd21.prod.outlook.com (2603:10b6:207:30::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL0PR2101MB1092:EE_|DM4PR21MB3585:EE_ X-MS-Office365-Filtering-Correlation-Id: a1399c80-6fdf-41e7-b408-08db71a5df57 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lnRjp1p8v/xpF49IJeP/Wkx+PjGlUG3/9xD9j0ve+od3FGolvvjzDNbGlw6O6Yx494/IBsXOcuz8vH/IMlsrXIVhmmmrsEzQLHP6z6hFOCYdI+6gnlyeYRbNctwsGn+IQHpBmYOub8l2IeCrp8X64cthAIP6wSFnEmSzheI+gd/Yp/qsLpvzqEYwkfBtG/zJGfuhadTwjw7Eunm07RFhI/xWWfQaxecMH4GiQzdLRmc96WLU9xvk0CLplus76epuBSqTbFgs1rDfNQqUWIb4lc1AuDjS4vGjtlzGSFW6ebOmqEuZ9xQ2UcwuE5aWaggcxV1bxUv5RVlVSimAU7euESGtvFtBpx71Bxe/2zlsGt9oWgpreyG9S5kzTkxt5Q3F1hfY1/HW4f1qX3UzCtPMni2KSFg7jnBWM6znpeaGYN43WhXJbFZZHghVBKweLD6RLW7fE+ps1W2ZE3g1TuR5TDJ867jtto+VQ2/F2jE6uyoVtUccXreY7LI/Aaedn/DpMmzXhaqBFQR1+g7SzKcVm7I0ntnIP0nZVu6Ad8NEbUPQ9KP0Ecx6/mB4Xa8gxdKeADS/R8ISU3I27RK32hS3GAHgGPZvJgoDuVs+Aem8Hpmd+EtETjrYtaMLwhfQ2JqTllXsD5snbNf04JiNlN1NjQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BL0PR2101MB1092.namprd21.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(346002)(136003)(366004)(376002)(39860400002)(396003)(451199021)(52116002)(186003)(478600001)(6486002)(6666004)(86362001)(1076003)(6506007)(6512007)(107886003)(10290500003)(2616005)(38100700002)(316002)(82960400001)(82950400001)(83380400001)(66556008)(6636002)(66476007)(4326008)(66946007)(921005)(8676002)(8936002)(7416002)(5660300002)(2906002)(41300700001)(36756003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: g7gS22lS/czTBhKI1TvG/4V2M6iEoUkUWA0LXGGSGAho0STiz3EcoI+T3Pn9ghr4OqyqG2A5I62jtPRG8rNXbryPrbQlBtFz6MHaHewGNhAXPkep65vR5C3XYNlIZHZPy+J+4gwC7qcO3BXH0pXO2zd/muzyjixtxvxQCAK3+yFixi8dBkyQwxoB1duHr1Yv2PDW2L66y3nbtk86kJcYgtnrXR00ChhfYd1l9gActKZKZtnidtjWJDrRcePOgWWebGug48GfBh2maRj6SwmSKWQ1tHqenIC+rFLWEGkZnG+MDbBbgJTUXEXiOJisUK/JhEAi2EqzTV62XACc2RaNCEKFeQ5JIrIRedl899UBjoN6dZ05iF8fuvNItkagJXL+stwUfws6N0Tpin36wKC82FUKT4gxz0SWwJo+0Yhg70ZP/Pv2nCQDLaFiOhDC7dBfS5R6E6f46HjztDC+pWWwnxMh6kKzCE196Hxhc8wsQCZGaTUKvYhqFjIdpMaLiG8Wvkva9IVTZi29TqKOMbyTW8QMkDkqHWOwhGA0r8fqCbrYAy+N4EWrYBPwWrYmyCJxd2f1LVFq8EoT6vV6zDIWDbp/foqSG819eYL5K1e9EDr+DrBHdnAO6V05ZkISyGAiipBkxSzWhaO7M9hjDYQqXbGLJK4Jz2z6qnDhr4P3BbKFndYXWIqkoZhzsnqxDWg9LLSQZkvtA50KOfMyyHmaw92cQP8J7NOHmVPwbBlP7TsD2xdwY7L5Hz4N6Aqj58pzq5/XkNv4lZFn4Gwub55cTLqmPYTOwPn7/RyGKyeZUQ4aLiTQ4JRxK1rJmXlGQj7trLdoKvj/FHWNH0K3QuiEt1KXt6XhStzy+jIYr42N4XixePkHw47t3ju5TsjfpK6Hd63Bci5WcOfDFk9O/iudVgB8xAaKE6/EaZXTlz2lD6u15OqPi5+CRiSu1Mu4hB3isnaq4fJKRUuC5ehgWAu53oWpptZQ4KpELij63hwftKgr8bOo7+4gGqTmrUTyc4wK9TacxMYX6UlKgaWD4OAxx949GaFf2ujn7sJJ8sJt7UF2W34QnSaWRsRRuCdX54H1uZDCGNVIT/I06AOY1ZChs501KE2QtYku4SM4q1rrpemJV2t9mLH++ml0dGQi0yLQCGu4LBuaQZE4ToavAnU3i7zIh7NtttyHuLk6u2r/TK3TuVwX7ul9mIUFq7g4Gl3i/vXK9MeZLD/1ntzJD6P6rT+r6F4JVM8eDElYqel/U9GHWJGJTAz3FN7zqo1L/YOEGRqpkfiyQZ44XjaOwSXP4bwAxoxwWBPGpyg1wZtHgTnyiue+Vp+vDhbYB6LX9+E89ytXzLXDxeDlGHUXnn4LkTe3OSVK8DimGW5LE0zdC/qRMeh4XsqacIVBVgn7xewNTBde95SCyu4nehbChWSTien+hrlfQXlCGd4NPb0+lsSx4f0llgTH6hiwEkqhZjn19V5cHlZc6yHH4ctZrmBHJijCxrc/TB3X5JkFm19whoTUaiFkXoKe/Qqdao8ua7hYgVFuKiLo8FQ6oJbPMZ6GMc4sBkhbjyPtuVJBtUQI5+m+WLOR+H2jGFgD+yKvVa8ixM24BNY9UIkzUfxlEFSY7te5fiT7rfPON/cQc4TAKpFxWseEnjFc7w+kUOvNhGH4 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: a1399c80-6fdf-41e7-b408-08db71a5df57 X-MS-Exchange-CrossTenant-AuthSource: BL0PR2101MB1092.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jun 2023 15:49:03.5686 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: a5x+DLxWb64xhvZ91o5FdZfAaP3LTXd76WDvP36ZsoVMwFQ79Xeh+0NdvRfgshWBgWqqRJC8ItarYZwLaIPASQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR21MB3585 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=no 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?1769238073083544890?= X-GMAIL-MSGID: =?utf-8?q?1769238073083544890?= When a TDX guest runs on Hyper-V, the hv_netvsc driver's netvsc_init_buf() allocates buffers using vzalloc(), and needs to share the buffers with the host OS by calling set_memory_decrypted(), which is not working for vmalloc() yet. Add the support by handling the pages one by one. Co-developed-by: Kirill A. Shutemov Signed-off-by: Kirill A. Shutemov Reviewed-by: Michael Kelley Signed-off-by: Dexuan Cui Reviewed-by: Kuppuswamy Sathyanarayanan --- arch/x86/coco/tdx/tdx.c | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) Changes in v2: Changed tdx_enc_status_changed() in place. Changes in v3: No change since v2. Changes in v4: Added Kirill's Co-developed-by since Kirill helped to improve the code by adding tdx_enc_status_changed_phys(). Thanks Kirill for the clarification on load_unaligned_zeropad()! Changes in v5: Added Kirill's Signed-off-by. Added Michael's Reviewed-by. Changes in v6: None. Changes in v7: None. Note: there was a race between set_memory_encrypted() and load_unaligned_zeropad(), which has been fixed by the 3 patches of Kirill in the x86/tdx branch of the tip tree. Changes in v8: Rebased to tip.git's master branch. diff --git a/arch/x86/coco/tdx/tdx.c b/arch/x86/coco/tdx/tdx.c index 0c198ab73aa7..a313d5ab42f1 100644 --- a/arch/x86/coco/tdx/tdx.c +++ b/arch/x86/coco/tdx/tdx.c @@ -8,6 +8,7 @@ #include #include +#include #include #include #include #include @@ -752,6 +753,19 @@ static bool tdx_map_gpa(phys_addr_t start, phys_addr_t end, bool enc) return false; } +static bool tdx_enc_status_changed_phys(phys_addr_t start, phys_addr_t end, + bool enc) +{ + if (!tdx_map_gpa(start, end, enc)) + return false; + + /* shared->private conversion requires memory to be accepted before use */ + if (enc) + return tdx_accept_memory(start, end); + + return true; +} + /* * Inform the VMM of the guest's intent for this physical page: shared with * the VMM or private to the guest. The VMM is expected to change its mapping @@ -759,15 +773,24 @@ static bool tdx_map_gpa(phys_addr_t start, phys_addr_t end, bool enc) */ 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); + unsigned long start = vaddr; + unsigned long end = start + numpages * PAGE_SIZE; - if (!tdx_map_gpa(start, end, enc)) + if (offset_in_page(start) != 0) return false; - /* shared->private conversion requires memory to be accepted before use */ - if (enc) - return tdx_accept_memory(start, end); + if (!is_vmalloc_addr((void *)start)) + return tdx_enc_status_changed_phys(__pa(start), __pa(end), enc); + + while (start < end) { + phys_addr_t start_pa = slow_virt_to_phys((void *)start); + phys_addr_t end_pa = start_pa + PAGE_SIZE; + + if (!tdx_enc_status_changed_phys(start_pa, end_pa, enc)) + return false; + + start += PAGE_SIZE; + } return true; }