From patchwork Tue Jul 5 12:43:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12906547 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 lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 55235C43334 for ; Tue, 5 Jul 2022 12:43:36 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.361131.590453 (Exim 4.92) (envelope-from ) id 1o8htl-0001na-8V; Tue, 05 Jul 2022 12:43:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 361131.590453; Tue, 05 Jul 2022 12:43:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o8htl-0001nT-5Q; Tue, 05 Jul 2022 12:43:25 +0000 Received: by outflank-mailman (input) for mailman id 361131; Tue, 05 Jul 2022 12:43:24 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o8htk-0001nN-11 for xen-devel@lists.xenproject.org; Tue, 05 Jul 2022 12:43:24 +0000 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2045.outbound.protection.outlook.com [40.107.104.45]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 0e0b6f54-fc60-11ec-bd2d-47488cf2e6aa; Tue, 05 Jul 2022 14:43:22 +0200 (CEST) Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by AM0PR04MB6065.eurprd04.prod.outlook.com (2603:10a6:208:139::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.21; Tue, 5 Jul 2022 12:43:20 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::dfa:a64a:432f:e26b]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::dfa:a64a:432f:e26b%7]) with mapi id 15.20.5395.021; Tue, 5 Jul 2022 12:43:20 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 0e0b6f54-fc60-11ec-bd2d-47488cf2e6aa ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CENuYn1a5CC1/0q4tYgDbKb06/+uiip/Y6wq2RvaO2/k9cBa6wv5MX7NF4TebW01LZqLqpicjY1qGo9oBTPUs+hb5dMV5vCeVKVYgfuw81ZEQx5dbYdE8Q8UNrkiU8JynwvvtrpHrDSv/QzPHTEQuh8x6be6rPE3FDDZi3dEU/LKTgfhj21dnmlrI0R0yaFP/Oq8WbLGjgdkVWFG7+XfpZMnROC9x0CHO4euE9isac4JXsUbnafqXM1r1Te2rpA+p6qmDXssBJ7LM81Eg3xY57hMwOO5QYn8w6eN16/vACpQp1Fa1n885M5/tJd/+0F4K4vVhoNbOjZyqC+GoYXbZQ== 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=2kE9tF4OKVANrzWwJZfuQmt3GkZdJOPqWNjkumzgidE=; b=d3o3+cS+3VPOBjMM1d7m/NxT8OYuKC3u9lPtmdqA6NIXD7WwIJFRt4HHBkrz5UopNrhp982exh57LL2dz10d+oheM3Y9P9XOywTfUadZu9s3D23ouhVkfp/+pjZhSxjf67QbcVlIVMv8LKoIwEJxVmPcHuGMaayn4/pz1cqwoNGHGDSOX377rGGg0dFeS7qjoclVMknaVT0JBYrrfnZGR5yIRuVCl1FZAxEsR7x957ga+iYO4e50hD7xI8JKdTDTlEyaFgnxsGmlpI7dq7zf46tHVflK3mrKx/4Z8Mc8XyOOyecRcxjBcfdHBIKQGO85NzOtdBT6lHSzztIGbTx4gQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2kE9tF4OKVANrzWwJZfuQmt3GkZdJOPqWNjkumzgidE=; b=rBDHCdjcB6JYTPGOa2yEaV2bDkVAEfjzQ2kFcJbCemD2hFTWDx1U4bGBPHLchpR0Ep/elR6oIf0MM1SrJIe2gBfQQ4ZK3Y8Py/cJbREy1JY0wHzuZoYXVUY03LizI42B4uZt0EV5EFIlvkCX/sW285Qp+Ki8rBB7ehrP2egR3aOn8a0wygY8kUd9BHdSug6EjVi/HEOujZiQxwrxaKSzGT4FGuVG/ZJz1KLJXH0kDMSEaqfXGoxA+UMwj03esoXi2Ci30mcHyRGxV7W+gYIfTFgv8Q0ApvR+5pmkEN/2VYkrvDLy4JW2I5viqveDrR8T4DUAQBAMkbSJuL5YWuC6zw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <3b3e1a15-f358-3095-87fc-c47843eff94a@suse.com> Date: Tue, 5 Jul 2022 14:43:19 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: [PATCH v7 01/14] iommu: add preemption support to iommu_{un,}map() Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Paul Durrant , =?utf-8?q?Roger_Pau_Monn=C3=A9?= References: <4c9d4b32-d4db-3a4f-fe92-6022e63c3f82@suse.com> In-Reply-To: <4c9d4b32-d4db-3a4f-fe92-6022e63c3f82@suse.com> X-ClientProxiedBy: FR3P281CA0083.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1f::21) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b6880204-5e4c-49e7-7585-08da5e83f11b X-MS-TrafficTypeDiagnostic: AM0PR04MB6065:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HvIA4oCjHZlVzsisnh7zCVojYSJaehvDZLGu/30RYv3t5W6O7B5h1RyrmdDgZgBO8FSMQS2RaR+3g9OXIuthQ0BcLb0FIVE6ok7W7keI2yJUG+FOKEgwguIVpROEqpfneHgGDVto2vVmuLdcE+82AGor7d9AsSag9F76N9o4PCi2pvDUZ+mmRgOrzd37NStDjiPgQ6FFNAwTP7Zgm74Q/zHtEn7zyN4hGX6Br5/mQ/7fBH4CPsM2EPnVFSMMxVLujrFfHQhw7FgSvLCnUlvXP/3jiBQLXZ4V7vN8xPwkROMTN60DX+NPzc8u7knuqsFMPBZFPFIhvCtt/xXPlzVGeJKo7DcuqmhcAhvzRDtuJTHGmaaIAYz7aVTPkuX89RxsETK428p2bXPjXIbCq5D7rraWYYZ3vJiWF9rrTiiAwZ4GhDgXQOZrTJLb/J6kldPzSGA+ggv3I+oNx1QCDTDQa2EelyBn0QwnZL/kWzgQHye8WUfb44KKmSNmkjRDseBj9kvKCmXUxcJGdoQmD8dPMmcWbBpVi0GZjMHgWguFDKpLR0HHR3aKLsgGtiM+4L0AimnFqOwRuVOxIssTm5uNtEywxFX7k0JCDOrEEI4pmgUc9kNouk1b+wTGa537dL9cBQB4996jsSeceT5ogu4RrtzxrR772xJyLHBiCgJME7ILnJnCysL7vwi2hyzuHnLvYz45RtU2iU+5J/3tAbahD2Nh9wsYKoYJ9XiVlvk/raFJPSX9+r/6JajpQpWnFPWB0bf2SiSiGMlK4Q6NMNkqKgDVfXHUhQrrw0WemZExu32cM/XSDmOL1mmTcT8IbW/Vm4dBfcfQJMZwiALHnm3Irq3ubkhvnkU4v14neBfHfmA= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR04MB6560.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(396003)(136003)(376002)(39860400002)(346002)(366004)(83380400001)(31686004)(6506007)(36756003)(6486002)(478600001)(26005)(186003)(2616005)(6512007)(41300700001)(2906002)(31696002)(86362001)(54906003)(6916009)(4326008)(316002)(38100700002)(66476007)(66556008)(66946007)(8676002)(5660300002)(8936002)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?OQG/9fCJxDYkQ5uUiN0li9yy4sJt?= =?utf-8?q?6tZMF/uc5zwXHH3LlN6Whk/evNKQf+DLpxwgL6dgwZdlCHNkXHvQo/HaTthPGM+bN?= =?utf-8?q?vNlvbOeHfkHuEXhXmjDcAooOSMOOLIOFQEaU6xQLhQPuJto3RwFvnCoiEpZDIA1uM?= =?utf-8?q?nadS6qCZPVP3niRe8TwfA2SdqYPIoKPkDn7Llymxh0WgBJClWQKqj9WQuWQhxYsah?= =?utf-8?q?hj2JsQIFTaBTYfYlHzIiNp0tlhruzSpXbrbhSFgZH3bhg5DP5BLBNbsCREUBDaayc?= =?utf-8?q?kOtaXFHUQ/4EmI/zdX3u2Bu7mZitEqbKhF1vTGaS3N6nhHh2efj9/453RTX7SNAAx?= =?utf-8?q?ZwiF52M7w0T7vkI2vftixtAp7YNM2MoZv/qxfVd4xhAfEi3wC4sLkETLYi5WIOQeS?= =?utf-8?q?ae0reTU4jg1p83jSUBaz/J1aRBn4WdG6UVijHt3N9kCAnkm97yjo7nzyoRrDIDz+R?= =?utf-8?q?M5I6PIrATnESsqSYKX5HkuI/TXlzq6D89iGFofMTZq7ehsmH/E+hecsIcPfHdq5Gl?= =?utf-8?q?kMHApYh/JtNN6Oaapv4rBGcB9FwXDrmhFeu1BHo5Q0hUx7XrJA5JnKTb68jwPF3HB?= =?utf-8?q?kzvZzWPe0ULa4Ln9v7X+5DK/sIdQmBWsgeWw5wkUy6sL1tmFD97WhiL3c0XtBR+8b?= =?utf-8?q?GRWtblZyTwwXWnIetToSUUBa2WJFnGOeIAcosBfZ4tq/nlnBMu5O3/xZH/aRZ6i8I?= =?utf-8?q?xglPBtM5wfYgtq1exQFPU57o2GNff/7JhCw3g0q1MykVr6fNdugPJdLgXWBVshY7C?= =?utf-8?q?fzL8CJ/+YgNYABKLtq8ns4BRYEtlz/gFvWz7Mg5HBqtj3QD1EqL5ZOfAjw5e82oKq?= =?utf-8?q?xZb9D22AGIFHaSiRsqDvQU2HlYhGf2+r3GKuZzUqeNTRYhZPnnoOJJplHzJwoqsnH?= =?utf-8?q?l2Zv1IcU+0+17Qk0XV5ZUx88Dr3AEoBxqt3EMX2b2Sqcev/5+6hpjr/1GTTjT6lR7?= =?utf-8?q?7Jipm00W5GPjFU6ejV4t6eF0Bx7bJH2m6GjLMzubQlsQtNPNhXoDhExZi49Ql9c5S?= =?utf-8?q?SnZ17MCDrViTiTTk+Y4flhsp3uu660uNaEl5k40RhOO4OTEbOy3Vrgj+In/qHO3H5?= =?utf-8?q?thrhaKCuc7f4lzJ7+NAEuzQ9gRAeCGGK0XgfapaOefzBCfccjHLOZ6N9zt+0uqdj7?= =?utf-8?q?SyqGNI2OGybVOSYDKEik8lY8Jr5XOKVAfVM2EGWnoUuenEB79isbSVBMyqJLS/oGQ?= =?utf-8?q?XUhOd9r64kpatR8ikmcvPwwFGVz7Z3rpZgoXtlGX+xjAkK9Z6/7A7/Hv3VZbraYJy?= =?utf-8?q?XLku6TleYJpSz3HnhhIsSH5tV/3vlDBeMxmBvk97+nIb78NS6E20/TEq3u64+O03l?= =?utf-8?q?EVWN3c77wwN9ELDup1VWillbTbcYKzALi9s4u34SOjUG+NhPGW9jfEpjkm8lrlvUZ?= =?utf-8?q?O4Kyc5GhU93mXkJaQb1gboNuvbDucGiXLpzZ17gBgMP0UMwJsXTiQjZ1IlTxCaUJz?= =?utf-8?q?s9CEZi8GgOnBQWti6QrY+SQsyk4I0pLfklfmnC0kSpI2CrN8lCRK2QaL110ZMU0RM?= =?utf-8?q?4Zj6Nhrgt0yA?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: b6880204-5e4c-49e7-7585-08da5e83f11b X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2022 12:43:20.6744 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 2l5S1V2py9wA3Enx4OlAGjgscuxKtgyiWXGYKe8uOidRvXDKGWm0HF8LqEIKnbbAcFF0POEtq+gNXA1NmtU6gQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6065 From: Roger Pau Monné The loop in iommu_{,un}map() can be arbitrary large, and as such it needs to handle preemption. Introduce a new flag that signals whether the function should do preemption checks, returning the number of pages that have been processed in case a need for preemption was actually found. Note that the cleanup done in iommu_map() can now be incomplete if preemption has happened, and hence callers would need to take care of unmapping the whole range (ie: ranges already mapped by previously preempted calls). So far none of the callers care about having those ranges unmapped, so error handling in arch_iommu_hwdom_init() can be kept as-is. Note that iommu_legacy_{un,}map() are left without preemption handling: callers of those interfaces aren't going to modified to pass bigger chunks, and hence the functions won't be modified as they are legacy and uses should be replaced with iommu_{un,}map() instead if preemption is required. Signed-off-by: Roger Pau Monné Signed-off-by: Jan Beulich Reviewed-by: Paul Durrant --- v7: Integrate into series, with quite a few adjustments (beyond mere re- basing). --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -308,13 +308,13 @@ static unsigned int mapping_order(const return order; } -int iommu_map(struct domain *d, dfn_t dfn0, mfn_t mfn0, - unsigned long page_count, unsigned int flags, - unsigned int *flush_flags) +long iommu_map(struct domain *d, dfn_t dfn0, mfn_t mfn0, + unsigned long page_count, unsigned int flags, + unsigned int *flush_flags) { const struct domain_iommu *hd = dom_iommu(d); unsigned long i; - unsigned int order; + unsigned int order, j = 0; int rc = 0; if ( !is_iommu_enabled(d) ) @@ -329,6 +329,11 @@ int iommu_map(struct domain *d, dfn_t df order = mapping_order(hd, dfn, mfn, page_count - i); + if ( (flags & IOMMUF_preempt) && + ((!(++j & 0xfff) && general_preempt_check()) || + i > LONG_MAX - (1UL << order)) ) + return i; + rc = iommu_call(hd->platform_ops, map_page, d, dfn, mfn, flags | IOMMUF_order(order), flush_flags); @@ -341,7 +346,7 @@ int iommu_map(struct domain *d, dfn_t df d->domain_id, dfn_x(dfn), mfn_x(mfn), rc); /* while statement to satisfy __must_check */ - while ( iommu_unmap(d, dfn0, i, flush_flags) ) + while ( iommu_unmap(d, dfn0, i, 0, flush_flags) ) break; if ( !is_hardware_domain(d) ) @@ -365,7 +370,10 @@ int iommu_legacy_map(struct domain *d, d unsigned long page_count, unsigned int flags) { unsigned int flush_flags = 0; - int rc = iommu_map(d, dfn, mfn, page_count, flags, &flush_flags); + int rc; + + ASSERT(!(flags & IOMMUF_preempt)); + rc = iommu_map(d, dfn, mfn, page_count, flags, &flush_flags); if ( !this_cpu(iommu_dont_flush_iotlb) && !rc ) rc = iommu_iotlb_flush(d, dfn, page_count, flush_flags); @@ -373,25 +381,33 @@ int iommu_legacy_map(struct domain *d, d return rc; } -int iommu_unmap(struct domain *d, dfn_t dfn0, unsigned long page_count, - unsigned int *flush_flags) +long iommu_unmap(struct domain *d, dfn_t dfn0, unsigned long page_count, + unsigned int flags, unsigned int *flush_flags) { const struct domain_iommu *hd = dom_iommu(d); unsigned long i; - unsigned int order; + unsigned int order, j = 0; int rc = 0; if ( !is_iommu_enabled(d) ) return 0; + ASSERT(!(flags & ~IOMMUF_preempt)); + for ( i = 0; i < page_count; i += 1UL << order ) { dfn_t dfn = dfn_add(dfn0, i); int err; order = mapping_order(hd, dfn, _mfn(0), page_count - i); + + if ( (flags & IOMMUF_preempt) && + ((!(++j & 0xfff) && general_preempt_check()) || + i > LONG_MAX - (1UL << order)) ) + return i; + err = iommu_call(hd->platform_ops, unmap_page, d, dfn, - order, flush_flags); + flags | IOMMUF_order(order), flush_flags); if ( likely(!err) ) continue; @@ -425,7 +441,7 @@ int iommu_unmap(struct domain *d, dfn_t int iommu_legacy_unmap(struct domain *d, dfn_t dfn, unsigned long page_count) { unsigned int flush_flags = 0; - int rc = iommu_unmap(d, dfn, page_count, &flush_flags); + int rc = iommu_unmap(d, dfn, page_count, 0, &flush_flags); if ( !this_cpu(iommu_dont_flush_iotlb) && !rc ) rc = iommu_iotlb_flush(d, dfn, page_count, flush_flags); --- a/xen/include/xen/iommu.h +++ b/xen/include/xen/iommu.h @@ -124,14 +124,15 @@ void arch_iommu_check_autotranslated_hwd void arch_iommu_hwdom_init(struct domain *d); /* - * The following flags are passed to map operations and passed by lookup - * operations. + * The following flags are passed to map (applicable ones also to unmap) + * operations, while some are passed back by lookup operations. */ #define IOMMUF_order(n) ((n) & 0x3f) #define _IOMMUF_readable 6 #define IOMMUF_readable (1u<<_IOMMUF_readable) #define _IOMMUF_writable 7 #define IOMMUF_writable (1u<<_IOMMUF_writable) +#define IOMMUF_preempt (1u << 8) /* * flush_flags: @@ -153,12 +154,18 @@ enum #define IOMMU_FLUSHF_modified (1u << _IOMMU_FLUSHF_modified) #define IOMMU_FLUSHF_all (1u << _IOMMU_FLUSHF_all) -int __must_check iommu_map(struct domain *d, dfn_t dfn, mfn_t mfn, - unsigned long page_count, unsigned int flags, - unsigned int *flush_flags); -int __must_check iommu_unmap(struct domain *d, dfn_t dfn, - unsigned long page_count, - unsigned int *flush_flags); +/* + * For both of these: Negative return values are error indicators. Zero + * indicates full successful completion of the request, while positive + * values indicate partial completion, which is possible only with + * IOMMUF_preempt passed in. + */ +long __must_check iommu_map(struct domain *d, dfn_t dfn, mfn_t mfn, + unsigned long page_count, unsigned int flags, + unsigned int *flush_flags); +long __must_check iommu_unmap(struct domain *d, dfn_t dfn, + unsigned long page_count, unsigned int flags, + unsigned int *flush_flags); int __must_check iommu_legacy_map(struct domain *d, dfn_t dfn, mfn_t mfn, unsigned long page_count, From patchwork Tue Jul 5 12:44:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12906548 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 lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A5EC0C433EF for ; Tue, 5 Jul 2022 12:44:18 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.361136.590464 (Exim 4.92) (envelope-from ) id 1o8huQ-0002Ky-Iz; Tue, 05 Jul 2022 12:44:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 361136.590464; Tue, 05 Jul 2022 12:44:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o8huQ-0002Kr-FD; Tue, 05 Jul 2022 12:44:06 +0000 Received: by outflank-mailman (input) for mailman id 361136; Tue, 05 Jul 2022 12:44:05 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o8huO-0002H7-Os for xen-devel@lists.xenproject.org; Tue, 05 Jul 2022 12:44:05 +0000 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60075.outbound.protection.outlook.com [40.107.6.75]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 26652464-fc60-11ec-a8e4-439420d8e422; Tue, 05 Jul 2022 14:44:03 +0200 (CEST) Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by DB6PR0401MB2613.eurprd04.prod.outlook.com (2603:10a6:4:37::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.21; Tue, 5 Jul 2022 12:44:01 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::dfa:a64a:432f:e26b]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::dfa:a64a:432f:e26b%7]) with mapi id 15.20.5395.021; Tue, 5 Jul 2022 12:44:01 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 26652464-fc60-11ec-a8e4-439420d8e422 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DP0e7rZrhRCpGDdGkPUcMJm7//LFvtq00xoN67ERTD4+sm7HwqgrbJPnhJC1mzWleHdffkaZ4ukpWF200fzOBrSVBO5NCUdHQiwsGetu4ixQuqQOPNFO1DXbtS6MKrw6YX74e4iasejJfxL481ezOspmElto8KYAm9n2AzMBEgELn8ufGVjLYH2NAEl/ooge0cwq8nLoADzdiMZ3h5dr2QYVIpEufzUOrdgMXmLeTfAa0RDd92JsDgXcKEzEsgde265jS6EyEaZWozXlhpVpfof3px9dYkjWgU3T6t4g39fo4M1JqU3VtskSd8I/oEULai41z9kBW/P1GwYpLM4Epw== 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=7AowG0vv4ZZNfRrLvkMOzyPPLjiwpxv5SlEjEedcSkM=; b=cwRHCCpn2g+GY22eSdl1KDoeWZlth3nwEn9lOSW1i8cacyeUtHt03FF19sfQXup/6IVbDFUDQY1pw4CPTJlGNkilBIScpfj/MgfugVszK8HK+Ad3Cs741Qbc02E4+e4kLUyYezgGXwzomB75QuxHTM0ajnwoPK+hIXlE8qyIKivdn+qo7q/bBDizcc7eg/qEXwL71BpTs45vOQdaUV/rYiK/XAKlKMtedjQ1OPV9vJiEprk3Hi8yi/a2uHW5IRTTPDarpjvIMFPT/+cNllIEN65rtvjgyr3hSMXxVjbUZVPGEd1jQDaMlIdfIjyKfNn6iHdT2C6/YxOEHhHWbmWa8g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7AowG0vv4ZZNfRrLvkMOzyPPLjiwpxv5SlEjEedcSkM=; b=xPwpKA9I/3/V44DMvfkXIV1u+SX+PRqoxwidIKRqYdz55093yvSqcZ0X6jV2Gua2Rt/NvzPndNirqLHTzK25UqT2oLeNenPCK9zpunc5ZdA3t3yzVbbLJxyp3ltpyEJQWzHSjPuUSRyY1YnQe3aqOAbP4pRagtVxsGI26y3KMTYkvsWE8fUT/Z3Nvh1Rn1BlIPhSKP4JL4Q5CGwP9Ltbw+cCe7iEeP5+R+rA7Z0IMGrr1tRF+ZAFdijddQDU3ORbbGV+u33XS+lrTryQCztrbZQj+fq4cxCcv+VCR/9kbTzfXU3jiWNGNPyYDcFS51qFWclYDXpbPbqV6jqhCPXt+w== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <1adca369-c911-e126-6b94-b26859a01e5f@suse.com> Date: Tue, 5 Jul 2022 14:44:00 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: [PATCH v7 02/14] IOMMU/x86: perform PV Dom0 mappings in batches Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Paul Durrant , =?utf-8?q?Roger_Pau_Monn=C3=A9?= References: <4c9d4b32-d4db-3a4f-fe92-6022e63c3f82@suse.com> In-Reply-To: <4c9d4b32-d4db-3a4f-fe92-6022e63c3f82@suse.com> X-ClientProxiedBy: FR3P281CA0085.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1f::22) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 546c4a98-d0a3-4d4c-fd25-08da5e8409a2 X-MS-TrafficTypeDiagnostic: DB6PR0401MB2613:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fJzdYLGHY22wgJ3efnWaCWf0Uj3YR6IHvO6AY2nsugIXj1/cUBaQ94sw68P2LCUqvi2B9c3LQcfs5huFhoZ4AkY+59Z/bMexlan6WzUqfvymeTdStKM3vBCNisnTz2fkhiAjipSUSgeFXOM5+fUM7iImttQN6NYNheA2pfVNRBJgIs9p9O9VCzZ7UopTHPLl8uhYKdu+qNRxSPKyM1ZmAu9egcuR+X0S1MT8WwuhWvGjWBArtJcxna1sP9xOJdUwxfLhIusKS9f9v9HRTf6tjQ1LUJvp84ZUvMRlGI7ohnRrv/h4w9lMlyzX0orZUAcLcwk7Qy90h1kDkJYCZyKgn8x+MuLPvC/ciJ9TDDqNMwWUOyl4vyPokUSCdWkW7mvN2uDlGierYtZNr4vDqA4WaYgpzyWYooDOkjaxezs0LbJGyIHdW5ys3Lm2p90pw+ir15kzSXfa30XPzBFX356ZpOOKrXZRPjz3gOhDL0UcOJ0bGT+P0IA5YPR6v1qstDPZzB+TMl78uq7RzMGEV0pBdX+4iW+pRi63ArmkW6OATMEgNGbkSUISvkO7troBbbn3wXHi8Jy8nDpnAoMb1UImfxSNAxMdfkXoMDDAhPRcK2eA1GIfSvJWLN3XTb5Ds43yCOiNJLWaoM51a5tj3879WuvPmFFL12CLCzcRX1V2KvI2dkAl/ZhPH1MTqZnwT9VqBifsLz1IRkGRP3/3DkmgkeAPImF1YMbONuqjY2kJZ4gIIFCmI0VwVUqYRuydPtLZh3+4N98Jpy1lw8Y95UxZXEpqY2QYD3SDpumpZQGeKhKClNdftIRKZcxyYDYO6x1mZPzZg4GfX7/1a74bAudVeQ8NH4fkD//oKPWXvhXs5t0= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR04MB6560.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(136003)(376002)(396003)(366004)(39860400002)(346002)(8936002)(31696002)(38100700002)(6486002)(478600001)(86362001)(66946007)(4326008)(6512007)(8676002)(66476007)(30864003)(66556008)(5660300002)(2616005)(26005)(186003)(36756003)(316002)(6916009)(31686004)(54906003)(6506007)(41300700001)(83380400001)(2906002)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?U/JH/tqTOFYWdlqKLMM8uJZzVoy2?= =?utf-8?q?YIv/9dSR/mMXtiSpxn7xJO+oUv/QzbiCXSbyvd2NkRsBof55PwttWOnqd9F7nJnLT?= =?utf-8?q?zffnSx8uYtKHzgLfcV2vCtIck6ZJudhQshgPchIZR9sErhaGhyzjPlO25U4kUtNln?= =?utf-8?q?0sZGOJqs72UsbF+b0UaRA7B8xLX+V0A56IgmCLLf5bxN52oV1xHlbTx1TLLfGyVFh?= =?utf-8?q?cSgr7GLSNKv17W8nv1cL7DR+BC+0R47Gw2r8L4tI/K+4fB9M04/UIoDluzvJj1LHK?= =?utf-8?q?3eaxTKgw0cKBR+lkn4jky6ti027udZM2xnIBorcbjOwaSyTS6N4O2mXoPGhaO1MqA?= =?utf-8?q?K8mTp6U78U1/WzdA376DVLDNLDcsrBAIZ1nuWM9ThqL59QnC3LRL/liIE0FchdY1p?= =?utf-8?q?F3N0cSb+DGkAMPYKfTL4LepWQLyDU2UaqXUoK75+Vb1rvbtfpkT9LTIXWeoUMHqra?= =?utf-8?q?hJGdBF+xvkY+Kqmmy2uTSz30GEKNLmf5GwmTIkZRVsKyzciiVq9Mz0OBSiMvqZpwU?= =?utf-8?q?cW/UUWHsUe148jf3fGLjTKqi8PvbJDu15uJC0NGrJF4TT7v2glP2lycqonpHJ8YzZ?= =?utf-8?q?Wc03NKCBXyaroC8/9q5YKM/CnRSo4CBBratnFepAVc/Fm9NG9xjruAuV4Caj0v2MX?= =?utf-8?q?mf7z7ukwgIBX8+LnUiQsEtbfMy3mtuo+6RS89n+nEySaHfRcac22WjU3M4eDuczwW?= =?utf-8?q?X6WNMryLUrGziDkBadBKHzxPblbUPIiqemXL0CsicRR7Hy4fzc2G+S2987+QpZela?= =?utf-8?q?ZcgLdTYPuFTyjo8YIup9s9uh+J36IuxQt9V3R0XI1QIy4XToqmBhh7wiGJOmK71Gy?= =?utf-8?q?puWh1v8B+e1bX2mSGT3rcMhewyFhQZ1rPhferRmDZlKM0FSyB/+1mImPd0IRFQMFc?= =?utf-8?q?RXxWZi5BZlgjmhZ3/YI1Od6HzO5X2w/mKRYzBEmFgbkqIFtRe0IZhMgNcwcpCn7T4?= =?utf-8?q?WWvJbXlUOlfD9v1KQIn8fGvUCQuyE35JNZwXwo/ExWhQ3AX8sILN8ETmHKfoTFRLk?= =?utf-8?q?6MqFU/uSrhQsp8Pv95xijhwVW+ChKFA8jQHt96GJ7fw6+gwh1rwxM3exbjC9aPid4?= =?utf-8?q?tgkOApxgCgvwT/2EEWeSbOELgiSg84No9JH2kBxUsHnN37UOQMZMgobHeBIDj6ohA?= =?utf-8?q?BOAuWfyfda1GRh0ZXPTAqeFzBRv0vgJkCadEnIMmP3mf6Q+M+Pp8WyMKVl02OJ4vw?= =?utf-8?q?zdchLc746Gq2+wAVMos+VJHIfjz0utP26PhDM1Tmzc+5kM7qDOImzCi86uppnMpzn?= =?utf-8?q?9BLq36ONv0KG379YhM7G959nrRJI8+UFMa1l3ZVLdUx4n7tysIPhhrYnR5GrWpBwb?= =?utf-8?q?Ufee65cLGljzK1vb95c6JS9/z/nGHQezSAUtUh7PpiqHkmEl4UyHhvOz83SH4+MQQ?= =?utf-8?q?G60qCxBCA4oNsdkxfuc0N/gzXjZxvGu6KXgVAOqrp5WyYCPW/sO374IOdfwrqThoC?= =?utf-8?q?Z9JkUKGKy2oLnTjWBdQ0frUGrtvuUqAKFbx76irhDzJlvxistVe+FmstIF5GipGjH?= =?utf-8?q?A+s/Y0FG8J/o?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 546c4a98-d0a3-4d4c-fd25-08da5e8409a2 X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2022 12:44:01.7967 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Sdn3wX+chzf50tOWYiG8qt9PdG0wIbEkUfMg9YIjzyrExDYincqxARlo06dVzmyQWdc61CNVuBwxX3EKRZD3/Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0401MB2613 For large page mappings to be easily usable (i.e. in particular without un-shattering of smaller page mappings) and for mapping operations to then also be more efficient, pass batches of Dom0 memory to iommu_map(). In dom0_construct_pv() and its helpers (covering strict mode) this additionally requires establishing the type of those pages (albeit with zero type references). The earlier establishing of PGT_writable_page | PGT_validated requires the existing places where this gets done (through get_page_and_type()) to be updated: For pages which actually have a mapping, the type refcount needs to be 1. There is actually a related bug that gets fixed here as a side effect: Typically the last L1 table would get marked as such only after get_page_and_type(..., PGT_writable_page). While this is fine as far as refcounting goes, the page did remain mapped in the IOMMU in this case (when "iommu=dom0-strict"). Signed-off-by: Jan Beulich Reviewed-by: Paul Durrant --- Subsequently p2m_add_identity_entry() may want to also gain an order parameter, for arch_iommu_hwdom_init() to use. While this only affects non-RAM regions, systems typically have 2-16Mb of reserved space immediately below 4Gb, which hence could be mapped more efficiently. Eventually we may want to overhaul this logic to use a rangeset based approach instead, punching holes into originally uniformly large-page- mapped regions. Doing so right here would first and foremost be yet more of a change. The installing of zero-ref writable types has in fact shown (observed while putting together the change) that despite the intention by the XSA-288 changes (affecting DomU-s only) for Dom0 a number of sufficiently ordinary pages (at the very least initrd and P2M ones as well as pages that are part of the initial allocation but not part of the initial mapping) still have been starting out as PGT_none, meaning that they would have gained IOMMU mappings only the first time these pages would get mapped writably. Consequently an open question is whether iommu_memory_setup() should set the pages to PGT_writable_page independent of need_iommu_pt_sync(). I didn't think I need to address the bug mentioned in the description in a separate (prereq) patch, but if others disagree I could certainly break out that part (needing to first use iommu_legacy_unmap() then). Note that 4k P2M pages don't get (pre-)mapped in setup_pv_physmap(): They'll end up mapped via the later get_page_and_type(). As to the way these refs get installed: I've chosen to avoid the more expensive {get,put}_page_and_type(), favoring to put in place the intended type directly. I guess I could be convinced to avoid this bypassing of the actual logic; I merely think it's unnecessarily expensive. Note also that strictly speaking the iommu_iotlb_flush_all() here (as well as the pre-existing one in arch_iommu_hwdom_init()) shouldn't be needed: Actual hooking up (AMD) or enabling of translation (VT-d) occurs only afterwards anyway, so nothing can have made it into TLBs just yet. --- v7: Restore after the prior verson having been reverted. Use preemption when calling iommu_map(). Correct log message in arch_iommu_hwdom_init(). v3: Fold iommu_map() into (the now renamed) iommu_memory_setup(). Move iommu_unmap() into mark_pv_pt_pages_rdonly(). Adjust (split) log message in arch_iommu_hwdom_init(). --- a/xen/arch/x86/pv/dom0_build.c +++ b/xen/arch/x86/pv/dom0_build.c @@ -46,7 +46,8 @@ void __init dom0_update_physmap(bool com static __init void mark_pv_pt_pages_rdonly(struct domain *d, l4_pgentry_t *l4start, unsigned long vpt_start, - unsigned long nr_pt_pages) + unsigned long nr_pt_pages, + unsigned int *flush_flags) { unsigned long count; struct page_info *page; @@ -71,6 +72,14 @@ static __init void mark_pv_pt_pages_rdon ASSERT((page->u.inuse.type_info & PGT_type_mask) <= PGT_root_page_table); ASSERT(!(page->u.inuse.type_info & ~(PGT_type_mask | PGT_pae_xen_l2))); + /* + * Page table pages need to be removed from the IOMMU again in case + * iommu_memory_setup() ended up mapping them. + */ + if ( need_iommu_pt_sync(d) && + iommu_unmap(d, _dfn(mfn_x(page_to_mfn(page))), 1, 0, flush_flags) ) + BUG(); + /* Read-only mapping + PGC_allocated + page-table page. */ page->count_info = PGC_allocated | 3; page->u.inuse.type_info |= PGT_validated | 1; @@ -107,11 +116,56 @@ static __init void mark_pv_pt_pages_rdon unmap_domain_page(pl3e); } +static void __init iommu_memory_setup(struct domain *d, const char *what, + struct page_info *page, unsigned long nr, + unsigned int *flush_flags) +{ + long rc; + mfn_t mfn = page_to_mfn(page); + + if ( !need_iommu_pt_sync(d) ) + return; + + while ( (rc = iommu_map(d, _dfn(mfn_x(mfn)), mfn, nr, + IOMMUF_readable | IOMMUF_writable | IOMMUF_preempt, + flush_flags)) > 0 ) + { + mfn_add(mfn, rc); + nr -= rc; + /* See comment below. */ + for ( ; rc--; ++page ) + { + ASSERT(!page->u.inuse.type_info); + page->u.inuse.type_info = PGT_writable_page | PGT_validated; + } + process_pending_softirqs(); + } + if ( rc ) + { + printk(XENLOG_ERR + "pre-mapping %s MFN [%lx,%lx) into IOMMU failed: %ld\n", + what, mfn_x(mfn), mfn_x(mfn) + nr, rc); + return; + } + + /* + * For successfully established IOMMU mappings the type of the page(s) + * needs to match (for _get_page_type() to unmap upon type change). Set + * the page(s) to writable with no type ref. + */ + for ( ; nr--; ++page ) + { + ASSERT(!page->u.inuse.type_info); + page->u.inuse.type_info = PGT_writable_page | PGT_validated; + } +} + static __init void setup_pv_physmap(struct domain *d, unsigned long pgtbl_pfn, unsigned long v_start, unsigned long v_end, unsigned long vphysmap_start, unsigned long vphysmap_end, - unsigned long nr_pages) + unsigned long nr_pages, + unsigned int *flush_flags) { struct page_info *page = NULL; l4_pgentry_t *pl4e, *l4start = map_domain_page(_mfn(pgtbl_pfn)); @@ -177,6 +231,10 @@ static __init void setup_pv_physmap(stru L3_PAGETABLE_SHIFT - PAGE_SHIFT, MEMF_no_scrub)) != NULL ) { + iommu_memory_setup(d, "P2M 1G", page, + SUPERPAGE_PAGES * SUPERPAGE_PAGES, + flush_flags); + *pl3e = l3e_from_page(page, L1_PROT|_PAGE_DIRTY|_PAGE_PSE); vphysmap_start += 1UL << L3_PAGETABLE_SHIFT; continue; @@ -203,6 +261,9 @@ static __init void setup_pv_physmap(stru L2_PAGETABLE_SHIFT - PAGE_SHIFT, MEMF_no_scrub)) != NULL ) { + iommu_memory_setup(d, "P2M 2M", page, SUPERPAGE_PAGES, + flush_flags); + *pl2e = l2e_from_page(page, L1_PROT|_PAGE_DIRTY|_PAGE_PSE); vphysmap_start += 1UL << L2_PAGETABLE_SHIFT; continue; @@ -311,6 +372,7 @@ int __init dom0_construct_pv(struct doma unsigned long initrd_pfn = -1, initrd_mfn = 0; unsigned long count; struct page_info *page = NULL; + unsigned int flush_flags = 0; start_info_t *si; struct vcpu *v = d->vcpu[0]; void *image_base = bootstrap_map(image); @@ -573,6 +635,9 @@ int __init dom0_construct_pv(struct doma BUG(); } initrd->mod_end = 0; + + iommu_memory_setup(d, "initrd", mfn_to_page(_mfn(initrd_mfn)), + PFN_UP(initrd_len), &flush_flags); } printk("PHYSICAL MEMORY ARRANGEMENT:\n" @@ -606,6 +671,13 @@ int __init dom0_construct_pv(struct doma process_pending_softirqs(); + /* + * Map the full range here and then punch holes for page tables + * alongside marking them as such in mark_pv_pt_pages_rdonly(). + */ + iommu_memory_setup(d, "init-alloc", mfn_to_page(_mfn(alloc_spfn)), + alloc_epfn - alloc_spfn, &flush_flags); + mpt_alloc = (vpt_start - v_start) + pfn_to_paddr(alloc_spfn); if ( vinitrd_start ) mpt_alloc -= PAGE_ALIGN(initrd_len); @@ -690,7 +762,8 @@ int __init dom0_construct_pv(struct doma l1tab++; page = mfn_to_page(_mfn(mfn)); - if ( !page->u.inuse.type_info && + if ( (!page->u.inuse.type_info || + page->u.inuse.type_info == (PGT_writable_page | PGT_validated)) && !get_page_and_type(page, d, PGT_writable_page) ) BUG(); } @@ -719,7 +792,7 @@ int __init dom0_construct_pv(struct doma } /* Pages that are part of page tables must be read only. */ - mark_pv_pt_pages_rdonly(d, l4start, vpt_start, nr_pt_pages); + mark_pv_pt_pages_rdonly(d, l4start, vpt_start, nr_pt_pages, &flush_flags); /* Mask all upcalls... */ for ( i = 0; i < XEN_LEGACY_MAX_VCPUS; i++ ) @@ -794,7 +867,7 @@ int __init dom0_construct_pv(struct doma { pfn = pagetable_get_pfn(v->arch.guest_table); setup_pv_physmap(d, pfn, v_start, v_end, vphysmap_start, vphysmap_end, - nr_pages); + nr_pages, &flush_flags); } /* Write the phys->machine and machine->phys table entries. */ @@ -825,7 +898,9 @@ int __init dom0_construct_pv(struct doma if ( get_gpfn_from_mfn(mfn) >= count ) { BUG_ON(compat); - if ( !page->u.inuse.type_info && + if ( (!page->u.inuse.type_info || + page->u.inuse.type_info == (PGT_writable_page | + PGT_validated)) && !get_page_and_type(page, d, PGT_writable_page) ) BUG(); @@ -841,8 +916,12 @@ int __init dom0_construct_pv(struct doma #endif while ( pfn < nr_pages ) { - if ( (page = alloc_chunk(d, nr_pages - domain_tot_pages(d))) == NULL ) + count = domain_tot_pages(d); + if ( (page = alloc_chunk(d, nr_pages - count)) == NULL ) panic("Not enough RAM for DOM0 reservation\n"); + + iommu_memory_setup(d, "chunk", page, domain_tot_pages(d) - count, + &flush_flags); while ( pfn < domain_tot_pages(d) ) { mfn = mfn_x(page_to_mfn(page)); @@ -857,6 +936,10 @@ int __init dom0_construct_pv(struct doma } } + /* Use while() to avoid compiler warning. */ + while ( iommu_iotlb_flush_all(d, flush_flags) ) + break; + if ( initrd_len != 0 ) { si->mod_start = vinitrd_start ?: initrd_pfn; --- a/xen/drivers/passthrough/x86/iommu.c +++ b/xen/drivers/passthrough/x86/iommu.c @@ -348,8 +348,8 @@ static unsigned int __hwdom_init hwdom_i void __hwdom_init arch_iommu_hwdom_init(struct domain *d) { - unsigned long i, top, max_pfn; - unsigned int flush_flags = 0; + unsigned long i, top, max_pfn, start, count; + unsigned int flush_flags = 0, start_perms = 0; BUG_ON(!is_hardware_domain(d)); @@ -380,31 +380,57 @@ void __hwdom_init arch_iommu_hwdom_init( * First Mb will get mapped in one go by pvh_populate_p2m(). Avoid * setting up potentially conflicting mappings here. */ - i = paging_mode_translate(d) ? PFN_DOWN(MB(1)) : 0; + start = paging_mode_translate(d) ? PFN_DOWN(MB(1)) : 0; - for ( ; i < top; i++ ) + for ( i = start, count = 0; i < top; ) { unsigned long pfn = pdx_to_pfn(i); unsigned int perms = hwdom_iommu_map(d, pfn, max_pfn); - int rc; if ( !perms ) - rc = 0; + /* nothing */; else if ( paging_mode_translate(d) ) + { + int rc; + rc = p2m_add_identity_entry(d, pfn, perms & IOMMUF_writable ? p2m_access_rw : p2m_access_r, 0); - else - rc = iommu_map(d, _dfn(pfn), _mfn(pfn), 1ul << PAGE_ORDER_4K, - perms, &flush_flags); + if ( rc ) + printk(XENLOG_WARNING + "%pd: identity mapping of %lx failed: %d\n", + d, pfn, rc); + } + else if ( pfn != start + count || perms != start_perms ) + { + long rc; - if ( rc ) - printk(XENLOG_WARNING "%pd: identity %smapping of %lx failed: %d\n", - d, !paging_mode_translate(d) ? "IOMMU " : "", pfn, rc); + commit: + while ( (rc = iommu_map(d, _dfn(start), _mfn(start), count, + start_perms | IOMMUF_preempt, + &flush_flags)) > 0 ) + { + start += rc; + count -= rc; + process_pending_softirqs(); + } + if ( rc ) + printk(XENLOG_WARNING + "%pd: IOMMU identity mapping of [%lx,%lx) failed: %ld\n", + d, start, start + count, rc); + start = pfn; + count = 1; + start_perms = perms; + } + else + ++count; - if (!(i & 0xfffff)) + if ( !(++i & 0xfffff) ) process_pending_softirqs(); + + if ( i == top && count ) + goto commit; } /* Use if to avoid compiler warning */ From patchwork Tue Jul 5 12:44:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12906549 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 lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7D8E7C433EF for ; Tue, 5 Jul 2022 12:44:45 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.361139.590475 (Exim 4.92) (envelope-from ) id 1o8huq-0002s2-Vj; Tue, 05 Jul 2022 12:44:32 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 361139.590475; Tue, 05 Jul 2022 12:44:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o8huq-0002rt-St; Tue, 05 Jul 2022 12:44:32 +0000 Received: by outflank-mailman (input) for mailman id 361139; Tue, 05 Jul 2022 12:44:30 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o8huo-0002H7-LV for xen-devel@lists.xenproject.org; Tue, 05 Jul 2022 12:44:30 +0000 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-eopbgr140058.outbound.protection.outlook.com [40.107.14.58]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 35fa6309-fc60-11ec-a8e4-439420d8e422; Tue, 05 Jul 2022 14:44:29 +0200 (CEST) Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by DB6PR0401MB2613.eurprd04.prod.outlook.com (2603:10a6:4:37::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.21; Tue, 5 Jul 2022 12:44:28 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::dfa:a64a:432f:e26b]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::dfa:a64a:432f:e26b%7]) with mapi id 15.20.5395.021; Tue, 5 Jul 2022 12:44:28 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 35fa6309-fc60-11ec-a8e4-439420d8e422 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kL8LBiaAEBvf7qLD6agVUNSxaTLmrvXLZaej+LJWW3qFbNMkgF9h36ISRbMYC4iif0KhHR6B8pESs39SbVa7du3+EAAgpA+devYBut8AfLQzhVmkh15NijePUi7dPLzYjs5EZApaGrlkb/J9x7Hf4SBL3WEmlIT1LyHv+HtTywPkI4AqPyKk19X0yy0v6HyIGYwVEXjw7NTW4F6KswyAreCIoaZoKgRUArupkdT/s91xqNm+9iHs+sM1wBT15NbIA+qjBVVJHMp6W+BaklMXc/Q0IclL8f9RRe9uubm1ZfI8cm/RBMe1CfNkNmH5uaJniPDM7Lnu/255Uk2ktI+LRA== 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=tz6ozk9S/AhujlkpGh0jwCZXiL+OVP402DUlNiNYn5k=; b=RtJiwQGL9MCjvyeyUHPnBI6SCug4Vvpc6W0yvPQWdG4oIjgjkzxLsFf22Lu7v517BFqAPi0I1LOy+EbazHfkX6YvsAzBudz8Em4MQZpHgaiA5kbr5I7cac4Di9R52jGy+6S3S/966rOvpRPHd4kPuH+xn0x7hcFJR2OL0QuQBpMoQECHAW37TMp62CGway32WsRIvO9d8+ThX3goe7cS4t/xJjz0jTfnd6sibhKopAPjWmdAs/DTJsRNUg5oM3jY2qiSbFJvDZ9zzvp1pBmNRwSAmWlApBAYGwUuqmZ6b87enQeBlw5TC07BZiXo0tQifS9KPVGkv71qKa0VvUXS3A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tz6ozk9S/AhujlkpGh0jwCZXiL+OVP402DUlNiNYn5k=; b=FeIksqwS0FJlZsZx6jYdT7bMGr/qfRUWBYrjmngzaUI5d9Sx3McvBbVqh/wF2Km1imrisK8fCKYcIQrOGXOajUzJ+wk6JTtF/W841tbeQud+R2TYpeDhSgSoEHGdGowl1YQNYEFPFmePQ5sBxsBKR+YLqSRIaxGUBnv9vIAORCzYpExK9Ewzz/y7hUdaG7yZyP0wSFp8JTnbobImr8p3qV71uCn2wea924xGVltovkM9SNmNmUvFwIcCt5kBqwl/7P5WXfneD2h8Q+L8H3hFXO9z2OQkkK0ncAuKqQKCrIdVdkHY78bhCNN+nZ6pl3wx4p1vQGSq2jkmcXP9kkvC4Q== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: Date: Tue, 5 Jul 2022 14:44:26 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: [PATCH v7 03/14] IOMMU/x86: support freeing of pagetables Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Paul Durrant , =?utf-8?q?Roger_Pau_Monn=C3=A9?= References: <4c9d4b32-d4db-3a4f-fe92-6022e63c3f82@suse.com> In-Reply-To: <4c9d4b32-d4db-3a4f-fe92-6022e63c3f82@suse.com> X-ClientProxiedBy: AS8PR07CA0058.eurprd07.prod.outlook.com (2603:10a6:20b:459::15) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 45afa46d-ca31-40b4-164e-08da5e841954 X-MS-TrafficTypeDiagnostic: DB6PR0401MB2613:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YBgGshiM5C7vrHVxGj9SyG2zYY46XA2p++bdqO5mwSmRLOgTJUOhm3BVCxOv2O+45ezR/2kNGwkQuWyp40Z3LogBx3JdS8MxkRWL+FHRS6BxIdcMxZKnBwkq7jVW7hctPKh43dCmkF1vDymp/p93pRXZpZBXJQ4rMRXBiheM4IWiT2ZqVxEh4VkmVFXB58ywAAXioFt+xM5c88YRT/i9dpiyDaqu3e7jxOyF3rJ+KkNOBtnGd+nka15V/BQ+E8xu41gsQBqvWiTcouWwbiryXVCA93fWelaMVENUOA27y8rESqCg9QurSD5gcgIOQchT+6rAZJ7xv7HnhOSSGXJ11w+ryIzfoy7fUAgs/ejXHxUG6nxqkS8eQ7W9GmNznmTSVmHFcnPpnRLAAdPPaclqHeaP7duv51KzS+IKg7wKUJppd4p9GbhII8w76LMjvBmZ9aPP0GGU0q9el44jwfHH9A0yjOu5TaOLdGb5guUJbj1ZTlm3YytSzEqNj5l6/tCTdUndHMPc5B8kIJBnQHFnNMyXPTRPEd+ljDWIsppx0FlXwh/DpXc5FLO5O4fOKdwfMQ3rYTo+lsN0eeHRQiARbErZ/4xI67i/lierYdOGRC67tyaGWZiEs6OM0rE0qRpqwrA/lWaLsyIILw/a6+0KThwQGFsX1wfvxDGPu2Cqv0F3tYtf2exNHGlkdgUM1ilq/9CxZ/K8khbcV3rtpfuKmpH/yCriJk8osif/YW6YPHPbscNtFPIN/lXfIFOu54htv/ATwWMm4a69CVddt5JPQVr7weyRks302g01fdhvbsMaBdyjsJXDFfgl38MrzueiQ+jjcPB3MU+lH/uIBfF/rdpZXyAj7ych1mMFauHPwrEDTSGNWaPFnoWTpp5HsLnp X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR04MB6560.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(136003)(376002)(396003)(366004)(39860400002)(346002)(8936002)(31696002)(38100700002)(6486002)(478600001)(86362001)(66946007)(4326008)(6512007)(8676002)(66476007)(66556008)(5660300002)(2616005)(26005)(186003)(36756003)(316002)(6916009)(31686004)(54906003)(6506007)(41300700001)(83380400001)(2906002)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?8GzijYfJLGHKCmhElvGtp9Tf/TGb?= =?utf-8?q?HM0ft3MfGBSh9NLOrgPdhwbeJJnWaFgHDU6u5i/4XKKAnMtFLMUvzS9AVlpSbSrdQ?= =?utf-8?q?Gs9lfbhkT693Mwmsl5/yFqbYGQLCYg3rXK6cQB0zppIdmQd3kmjj3fYraLew0UeBv?= =?utf-8?q?JRTWM82OxDvo9iG1m0+B0cRQC2P6urb/a+0cXygcJAbqaGDMHOKyHdwV7Pg1zzhRp?= =?utf-8?q?UAiUDczsm+ZAxVI4Rd8qW5+kheyQj0GqB2/w+KXhnyW7q1MZV6GMBJwCJQ8O0/NY6?= =?utf-8?q?RzdCLZxdsMc5dwBrRQDZNSZBCBj20wm+t4uCWmmsdHo6ZyDKTByjK30uv0OIykWRw?= =?utf-8?q?0viu3oEhYdAbqCk0V2nZWjCqkMoAyLMbM/N7NdEEv0nfUhGra0MZJTo/a/N3XlZG/?= =?utf-8?q?EHyC9A0EzhzVrUMqRV9rUj/ip2hDqqcmnPBAlo1liRYRJeeelm9egj+i0Bue/5CVv?= =?utf-8?q?kDbxZKdd/0bRe1cor2Qg1fe84gzxKGk/aT9pFhhIwR3gplKIucpYfKWM9kcXJ0Oz1?= =?utf-8?q?ML8QHzx7rLbsdFLf5p6VCypt977fzQmmbVttCQiOqtxMEUkymi2KRCt6oBzVstXWK?= =?utf-8?q?AQp9a6u6pehCGV7C/jI0o25zkJY+QmHZLZmzpnTjzCnSqMcdk0PjEfNoU22bSqBwn?= =?utf-8?q?OJ6Ip1ZPxbmWgTdkyJMW8C5iq4XzOcOAHhKJCHBGeC8UL6raKUfuTwpFCxT6hPvvs?= =?utf-8?q?XK9TKQNjdW40OVyOGSEhAO1zgjGFTlq465if/gPNuhfsTLMKjn52y7duyptVuGa1Z?= =?utf-8?q?VbD2Ullpa/f2O8ZkiX4hMyFe8RuJiMLLFQVAHK+wWB8KA40VeNgFOce/iFlWSO2oR?= =?utf-8?q?jc9s0IisinfvLfidtjRJS67wwigAyIyFNzQGz3ZcYixXoNjEVkIXwsahcEoGMD6qu?= =?utf-8?q?OwWZXTVayarEwU7mOyeUHJl4HDg4szSuZ1CWgwl6dVC3NCImBSRkurF16Iw8GcyNW?= =?utf-8?q?Jbhs5jHSPVFjkqJLNggnGfv5ynLYFN5ElOmKTirTNb6NI9CJKrumokkrFZtSuZcq7?= =?utf-8?q?7kmiUFP4qooI/v1OG5aoDi9KJysMeD8DefydUaInls/BYQyUwlOl8XtooPyt+iciw?= =?utf-8?q?s2l2y2HKB7FUHSozVZQcWjopP8cTUrhN9JaBSPPyqo8nYzfxNmWMxO78uqGIdSsed?= =?utf-8?q?hZH//ai78hin2sYPA2I8zwajMKdhfbSN8lcOui8wusfOYHrB3ry2oCX/YsCep6Ql6?= =?utf-8?q?jjBovc6BNAwmkGpSRiri8Q2V5pwMlSBlV1wyCRXzC+hS8M4Bqhsj1AZDlnvdHlFlD?= =?utf-8?q?9rZLsUiVGj1+LUWsVnICSA9j3I6rCBbpvP4Fb+aeoqtksnP2plo8xTlETebjKLy3U?= =?utf-8?q?/Pj8I76PjbveFdNcx4sKiABcVLnam7380rCWSJpV/jfyfDAjZMzvm775RWXsXfbqf?= =?utf-8?q?b4xevWFHSTgBE5HigUu7u07PIpir67Yt4DWtigF3bDAwDI11Fy7CBPIGQNpybpal6?= =?utf-8?q?WJy758u15RjPxreklH+jePLM3/4L8TBogJS1UDyp5iyZoydh/m5GCLE9jaeTHOQZY?= =?utf-8?q?m/6HK0Aeov2q?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 45afa46d-ca31-40b4-164e-08da5e841954 X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2022 12:44:28.1387 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: yED7xdMjgOAjActLXaU6gROgDvYZs4R4SKA/m5jVvFlV8sD5B1WBxM5n1mcrSqNA0MwgyoY22v+OvtKweJ7W6A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0401MB2613 For vendor specific code to support superpages we need to be able to deal with a superpage mapping replacing an intermediate page table (or hierarchy thereof). Consequently an iommu_alloc_pgtable() counterpart is needed to free individual page tables while a domain is still alive. Since the freeing needs to be deferred until after a suitable IOTLB flush was performed, released page tables get queued for processing by a tasklet. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Reviewed-by: Paul Durrant --- I was considering whether to use a softirq-tasklet instead. This would have the benefit of avoiding extra scheduling operations, but come with the risk of the freeing happening prematurely because of a process_pending_softirqs() somewhere. --- v7: Add cf_check to free_queued_pgtables(). Add ASSERT(). v6: Extend comment on the use of process_pending_softirqs(). v5: Fix CPU_UP_PREPARE for BIGMEM. Schedule tasklet in CPU_DOWN_FAILED when list is not empty. Skip all processing in CPU_DEAD when list is empty. v4: Change type of iommu_queue_free_pgtable()'s 1st parameter. Re-base. v3: Call process_pending_softirqs() from free_queued_pgtables(). --- a/xen/arch/x86/include/asm/iommu.h +++ b/xen/arch/x86/include/asm/iommu.h @@ -147,6 +147,7 @@ void iommu_free_domid(domid_t domid, uns int __must_check iommu_free_pgtables(struct domain *d); struct domain_iommu; struct page_info *__must_check iommu_alloc_pgtable(struct domain_iommu *hd); +void iommu_queue_free_pgtable(struct domain_iommu *hd, struct page_info *pg); #endif /* !__ARCH_X86_IOMMU_H__ */ /* --- a/xen/drivers/passthrough/x86/iommu.c +++ b/xen/drivers/passthrough/x86/iommu.c @@ -12,6 +12,7 @@ * this program; If not, see . */ +#include #include #include #include @@ -556,6 +557,105 @@ struct page_info *iommu_alloc_pgtable(st return pg; } +/* + * Intermediate page tables which get replaced by large pages may only be + * freed after a suitable IOTLB flush. Hence such pages get queued on a + * per-CPU list, with a per-CPU tasklet processing the list on the assumption + * that the necessary IOTLB flush will have occurred by the time tasklets get + * to run. (List and tasklet being per-CPU has the benefit of accesses not + * requiring any locking.) + */ +static DEFINE_PER_CPU(struct page_list_head, free_pgt_list); +static DEFINE_PER_CPU(struct tasklet, free_pgt_tasklet); + +static void cf_check free_queued_pgtables(void *arg) +{ + struct page_list_head *list = arg; + struct page_info *pg; + unsigned int done = 0; + + ASSERT(list == &this_cpu(free_pgt_list)); + + while ( (pg = page_list_remove_head(list)) ) + { + free_domheap_page(pg); + + /* + * Just to be on the safe side, check for processing softirqs every + * once in a while. Generally it is expected that parties queuing + * pages for freeing will find a need for preemption before too many + * pages can be queued. Granularity of checking is somewhat arbitrary. + */ + if ( !(++done & 0x1ff) ) + process_pending_softirqs(); + } +} + +void iommu_queue_free_pgtable(struct domain_iommu *hd, struct page_info *pg) +{ + unsigned int cpu = smp_processor_id(); + + spin_lock(&hd->arch.pgtables.lock); + page_list_del(pg, &hd->arch.pgtables.list); + spin_unlock(&hd->arch.pgtables.lock); + + page_list_add_tail(pg, &per_cpu(free_pgt_list, cpu)); + + tasklet_schedule(&per_cpu(free_pgt_tasklet, cpu)); +} + +static int cf_check cpu_callback( + struct notifier_block *nfb, unsigned long action, void *hcpu) +{ + unsigned int cpu = (unsigned long)hcpu; + struct page_list_head *list = &per_cpu(free_pgt_list, cpu); + struct tasklet *tasklet = &per_cpu(free_pgt_tasklet, cpu); + + switch ( action ) + { + case CPU_DOWN_PREPARE: + tasklet_kill(tasklet); + break; + + case CPU_DEAD: + if ( !page_list_empty(list) ) + { + page_list_splice(list, &this_cpu(free_pgt_list)); + INIT_PAGE_LIST_HEAD(list); + tasklet_schedule(&this_cpu(free_pgt_tasklet)); + } + break; + + case CPU_UP_PREPARE: + INIT_PAGE_LIST_HEAD(list); + fallthrough; + case CPU_DOWN_FAILED: + tasklet_init(tasklet, free_queued_pgtables, list); + if ( !page_list_empty(list) ) + tasklet_schedule(tasklet); + break; + } + + return NOTIFY_DONE; +} + +static struct notifier_block cpu_nfb = { + .notifier_call = cpu_callback, +}; + +static int __init cf_check bsp_init(void) +{ + if ( iommu_enabled ) + { + cpu_callback(&cpu_nfb, CPU_UP_PREPARE, + (void *)(unsigned long)smp_processor_id()); + register_cpu_notifier(&cpu_nfb); + } + + return 0; +} +presmp_initcall(bsp_init); + bool arch_iommu_use_permitted(const struct domain *d) { /* From patchwork Tue Jul 5 12:45:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12906550 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 lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 72AE1C43334 for ; Tue, 5 Jul 2022 12:45:16 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.361147.590486 (Exim 4.92) (envelope-from ) id 1o8hvO-0003VE-9o; Tue, 05 Jul 2022 12:45:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 361147.590486; Tue, 05 Jul 2022 12:45:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o8hvO-0003V7-6I; Tue, 05 Jul 2022 12:45:06 +0000 Received: by outflank-mailman (input) for mailman id 361147; Tue, 05 Jul 2022 12:45:05 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o8hvN-0002rI-4N for xen-devel@lists.xenproject.org; Tue, 05 Jul 2022 12:45:05 +0000 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-eopbgr140057.outbound.protection.outlook.com [40.107.14.57]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 4a6feb3c-fc60-11ec-bd2d-47488cf2e6aa; Tue, 05 Jul 2022 14:45:04 +0200 (CEST) Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by DB6PR0401MB2613.eurprd04.prod.outlook.com (2603:10a6:4:37::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.21; Tue, 5 Jul 2022 12:45:03 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::dfa:a64a:432f:e26b]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::dfa:a64a:432f:e26b%7]) with mapi id 15.20.5395.021; Tue, 5 Jul 2022 12:45:03 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 4a6feb3c-fc60-11ec-bd2d-47488cf2e6aa ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bVAY5ZcpXdbPPEtp+phcfYumjdSpjlHqfCbjXyTvpgAsmlujic20tdYE6YIp1prwAR1YWz+RRZp+GMJVJ5MFAtWPci3/B3cLisLz663yvKiZ4Q5aCSVeScAY4xCRkSJ54cBtHY2KmkMsOoz4x/HaIVGR1u6vp+OLjfraWTqK+kzcUqde/q/+snn7FHsYqGmvFg91u8YTeskDPRuZOnPacDC9Y9lr9aK0ah+LPODjl6Km8SALdehy8SpLlSOByqO0YoNU6JAGEEFUZV5UpnGHYug8qxSQtuR3Zaa2+04GPTb0ak3zzQR39AOUzfcWg7g0ThD+/yOqjcUg+N8/6DfuJw== 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=Z+8FHLsqYkAJd4jPM1gdjv6XWwzyRFyA3mYZWklG6gc=; b=enkUyvtvFsiD+1XepDyQncEmDiuk8lnJH68rKcrIoiRPhVi6IhsYjN8lzGkyzp7uDVzxdDp4iHaK/f4IqvYgjp26q+OUlg5IVYL7FSsbZmgdTON93qFNx+2T5I2GqU4eSjE4+DELRKfzBIzgaDHABODAiv4PNnWMqm7DY8hHdWk10QZlql4cR4FwO1l4LuUPGf4GsLX6uDal9QqDS6m7PfrIWNupCVeGhIbCNvPNipnmcrLT19oS9RC1nscUvz1TLJkqcr7zg5sOtK3XKMOlQxOmEUGKWpavKiGby+mvTUrk2D0RySMmyK7d8Hw/IxA47Zxpgzfk8VSsx/Qn5cOLVA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Z+8FHLsqYkAJd4jPM1gdjv6XWwzyRFyA3mYZWklG6gc=; b=dCn1XpUHKLEvS5irwb7E1cgU0K0fzfZoLm+3GhuxmjmnJQnDLp1Ifc5pXCUgH/v77MgKlt20hA7yjRUioXd2d76FytV4ZX2ZkrxWGNkkLwDP+dVYnn6eu4jspxTzKgZbkZ4svTb3k1J4r+KhoILC3KMsuXs5PIxsvxDXpFEiu8v+Bm1Q07Fgy5Nm75ExJ//xoK8V5Szd9tLPP184JlcS83L/6AoOhj4OF8szMmJB3OeXXytTRfgDOcxOsn3JAbyqVViwVxgUgUfwo7q+I8hD5MTaVOQDwN3uyg4iP2+0G2ZLU1aHI6Jjmjv/24x/1TTzVmBpMuzvSQbXRfIGZw9Tvg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <7e587d78-43bf-70e5-b629-b7fbed0ae0fc@suse.com> Date: Tue, 5 Jul 2022 14:45:01 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: [PATCH v7 04/14] IOMMU/x86: new command line option to suppress use of superpage mappings Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Paul Durrant , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Kevin Tian References: <4c9d4b32-d4db-3a4f-fe92-6022e63c3f82@suse.com> In-Reply-To: <4c9d4b32-d4db-3a4f-fe92-6022e63c3f82@suse.com> X-ClientProxiedBy: AM6P192CA0041.EURP192.PROD.OUTLOOK.COM (2603:10a6:209:82::18) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7ad5b290-cfbf-4ce1-fc55-08da5e842e0e X-MS-TrafficTypeDiagnostic: DB6PR0401MB2613:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5f7ttoFzyfMxf2hmb+Za23zGEMHXbcIhET+33YWrCKU2DnS0UCyIndaqaMmmhhXL2K+fFGKBk3qJ8Em+oalMW/rVmR5+RwHi4c1PvVKZT96lkTxmZzsq9i7o6fFhQyxcNvuB7ZNO0tDiVVFxS/kT8W8njh9A5OUVM1gTDMTc7il5LAWNZiBd31v8dXs6cdeyCeAWhib1PY3BoqVer8sCKfbyR6Lq2iNDCgdp5yYWS3hxZX4mW/ump9JpVjSQ2t/F8W6TvKzGDQpV3sox8rBXbDf0JscjNEEOj73X1ZsjKSEnUGrpiAdUK8RR4fXFK/pUgxcX6YzR0u27oNQ81S3bQczzYGZwTpyWHP2LBdfTMMhOP1sbpi2UH5jODW1F2pP34LYHc/fK/5C7ScywXueRiGeyq+bc20lsLAG1ofS33pdqTKBz461k6WMielQVN1Ct37UjMgSykjW8Ll09cl/WlhN6tYSEbUzaXvqs8hz77jdPi0/rdQavArT1mrx6Me9vj2t+z76fH2sH7gwbAXyBiV9exXpTu5kCUXiKgfnwW9/EqDkT9qk/SmqgAM9fFYROpu3I8/COFJg5J/OhnTay11WLxqPB1CFTwJANv2mTNQ5ZP1RON5Vl9JFqDAq4Rt6ZtymeEP4H97Ti4m+D93W0KGy5r8b6HUVqIrGafnJEGtjTwd9/AodptQhHiCHzBTbPkrW69RkqThWSbZsZpbt7duByv6J0eMXnhOj0XeBkR1Mo6/dt+36K6OXs0vUmPNpdPv7pxZfuqgWBxdsPV7zfhrRG0ODRABrz+iWBT0SqC52gjs3WXfLDVeh86bBdJqyfN1dbBMYqYgDXnMqQF4o8JJJDZiu/SQQ0Jn24uVW4lac= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR04MB6560.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(136003)(376002)(396003)(366004)(39860400002)(346002)(8936002)(31696002)(38100700002)(6486002)(478600001)(86362001)(66946007)(4326008)(6512007)(8676002)(66476007)(66556008)(5660300002)(2616005)(26005)(186003)(36756003)(316002)(6916009)(31686004)(54906003)(6506007)(41300700001)(83380400001)(2906002)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?jsHPhfBwFzqP3XEVFcvZbGzoS1q4?= =?utf-8?q?OCCsoU59P42Bz96K8EHNWRdbaXqEVJlNXSzOJLlKWzr20rdspDnhgNL01+gTqgytM?= =?utf-8?q?Gav+ko1uTefgj9gkva9wI4FoKE0yVJJOUwKHZd/5aeB/MnQgMUCTzkNTT+iAdzXxT?= =?utf-8?q?V4o83MzJm7jiXpEHZ+HccoQBzq2sbwVS4iSNVMfTcizILj878a7I5Ic+LJNFeKpuP?= =?utf-8?q?ignLt06UbTwkHD1IiS3dEUkJwEWMl8dpr5Bw14wuCSBvzogJudxCwF2Pf4VbcInVY?= =?utf-8?q?WTKTJxtHQSb+XZdfRhc4XJQxFy+yA8G7/5GLXiOPdWoK2IBNBNe6wi8ni+Zn2zrWU?= =?utf-8?q?44fkF0+5XoLROiSC4XO/KdZb8f9j3GZhohPG7YmqlHbLX+hYy/m9tlJjnc3i9i3od?= =?utf-8?q?676gR4KOS7Fbj4OFnb2xTkEP3rIsKik2COA557hcW0PRAMp22waNFzoLnC7V4Ktwn?= =?utf-8?q?snp0vZiIEAJ/vYeIdFXddtmRnh5gEC3+tbKNWmR628g2LrT5PZA5/bvvG+w42rnnw?= =?utf-8?q?UY1t6d8qjSrUjfn8+RSxNLACRAxrxvnaGTZQbkGXLJoItEdCYpG+u21VLT3wMJ9lM?= =?utf-8?q?EVf3RakSfRKI0tMgQ1e0MBiur0DSVcb6tHZHuuupnTrelkCiLQTrj23AE/2kUPDei?= =?utf-8?q?huT2ehwgh5FH1fs01xB4RzStttSNduSGgMFsvR0I3tXlAgdbYutlFMS71zgWUEpaL?= =?utf-8?q?ZLPAHUHK9YzS7LdKVOpU4CIhjXn3N64xqevrxx5UoxtKgeBrK7RkFmlInbsVUyqaL?= =?utf-8?q?DeaJLcV67RJQmbcEb7ueJbUyokv9GUTyVi6GGqkOqTbo/QXNR2XxI557/rMhSKmQf?= =?utf-8?q?obsO8oqkOFn0r+S1SXhz6Dp1rPCIyhjyXICfUa6Nlm+aAuqBmnSgC2ViiT5BNqC2T?= =?utf-8?q?gG6yY+QDO/G4LM2ij3BRWHuBj8ec1NhvKBW1HfQqtgw3zUCQOMInd5K8ocXzmFLn7?= =?utf-8?q?uUSe2CRoJ7IKvn3ZaXgaU2yV4z2aUhi+oXAwM8DYBz5GzcUoEUFxkqI9X9fi2YMdE?= =?utf-8?q?NSYq0IjWEigJNhvMiGZPj71h71B35m38GSKWa9HaXjexCs1mx/n1LqCUyC8Q6wNRT?= =?utf-8?q?gLEgUgcsKQHDNNQK0CWdGhF7lIoasqtbMMpfo4pTi79t0CHfpbT2qOMs483qEtNZK?= =?utf-8?q?KrgPzk19aL7Cqbm9FtjM5trmXcsAL+p95925CJBz+t6cT8Retok180qYnO2YKIzyi?= =?utf-8?q?9DXuaun6n4TLq45IbxE5T+FFlF6DIzDiZ/Aqcx9YAYIQ1Qk1I5fJopbwcj1JU0Z8D?= =?utf-8?q?FolzoRetTjIsr30iifKubwAEn5vlvaO16+CBr+9p7ooxjyhEXwGTX4D0Oyu6UEQWw?= =?utf-8?q?2I8d17WHcDTFohQf8OuNRJNJqnDGUrD8aiF8dx6SSyuwaKPgwVIdudewPUOzDyOlu?= =?utf-8?q?wmO6mWkF2Y2gO/CkjG46tTTOozUfphzMhpcfhOOImSySWjRqTVzKlbnjKmfrnrxEb?= =?utf-8?q?5+iuuOtXkhjw5Pch84QOcoAGAR9czkrqiPV8VMQz2LK5LCXy886xQJii36vYgQS0d?= =?utf-8?q?v8ORi7o4jCaB?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7ad5b290-cfbf-4ce1-fc55-08da5e842e0e X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2022 12:45:02.9336 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: k8tstxAtPRIwVdAZ2a1peAGpE6ZI1P/IzSPBh2BQsCyjm3Gjxq/2FYl24NGzQ3NnSlY/GH9xL9PW4sWE6hXm9g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0401MB2613 Before actually enabling their use, provide a means to suppress it in case of problems. Note that using the option can also affect the sharing of page tables in the VT-d / EPT combination: If EPT would use large page mappings but the option is in effect, page table sharing would be suppressed (to properly fulfill the admin request). Requested-by: Roger Pau Monné Signed-off-by: Jan Beulich Reviewed-by: Kevin Tian Reviewed-by: Paul Durrant --- v7: Fix condition in vtd_ept_page_compatible(). v6: New. --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -1405,7 +1405,7 @@ detection of systems known to misbehave ### iommu = List of [ , verbose, debug, force, required, quarantine[=scratch-page], - sharept, intremap, intpost, crash-disable, + sharept, superpages, intremap, intpost, crash-disable, snoop, qinval, igfx, amd-iommu-perdev-intremap, dom0-{passthrough,strict} ] @@ -1481,6 +1481,12 @@ boolean (e.g. `iommu=no`) can override t This option is ignored on ARM, and the pagetables are always shared. +* The `superpages` boolean controls whether superpage mappings may be used + in IOMMU page tables. If using this option is necessary to fix an issue, + please report a bug. + + This option is only valid on x86. + * The `intremap` boolean controls the Interrupt Remapping sub-feature, and is active by default on compatible hardware. On x86 systems, the first generation of IOMMUs only supported DMA remapping, and Interrupt Remapping --- a/xen/arch/x86/include/asm/iommu.h +++ b/xen/arch/x86/include/asm/iommu.h @@ -132,7 +132,7 @@ extern bool untrusted_msi; int pi_update_irte(const struct pi_desc *pi_desc, const struct pirq *pirq, const uint8_t gvec); -extern bool iommu_non_coherent; +extern bool iommu_non_coherent, iommu_superpages; static inline void iommu_sync_cache(const void *addr, unsigned int size) { --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -88,6 +88,8 @@ static int __init cf_check parse_iommu_p iommu_igfx = val; else if ( (val = parse_boolean("qinval", s, ss)) >= 0 ) iommu_qinval = val; + else if ( (val = parse_boolean("superpages", s, ss)) >= 0 ) + iommu_superpages = val; #endif else if ( (val = parse_boolean("verbose", s, ss)) >= 0 ) iommu_verbose = val; --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -2213,8 +2213,10 @@ static bool __init vtd_ept_page_compatib if ( rdmsr_safe(MSR_IA32_VMX_EPT_VPID_CAP, ept_cap) != 0 ) return false; - return (ept_has_2mb(ept_cap) && opt_hap_2mb) <= cap_sps_2mb(vtd_cap) && - (ept_has_1gb(ept_cap) && opt_hap_1gb) <= cap_sps_1gb(vtd_cap); + return (ept_has_2mb(ept_cap) && opt_hap_2mb) <= + (cap_sps_2mb(vtd_cap) && iommu_superpages) && + (ept_has_1gb(ept_cap) && opt_hap_1gb) <= + (cap_sps_1gb(vtd_cap) && iommu_superpages); } static int cf_check intel_iommu_add_device(u8 devfn, struct pci_dev *pdev) --- a/xen/drivers/passthrough/x86/iommu.c +++ b/xen/drivers/passthrough/x86/iommu.c @@ -31,6 +31,7 @@ const struct iommu_init_ops *__initdata iommu_init_ops; struct iommu_ops __ro_after_init iommu_ops; bool __read_mostly iommu_non_coherent; +bool __initdata iommu_superpages = true; enum iommu_intremap __read_mostly iommu_intremap = iommu_intremap_full; @@ -104,8 +105,13 @@ int __init iommu_hardware_setup(void) mask_IO_APIC_setup(ioapic_entries); } + if ( !iommu_superpages ) + iommu_ops.page_sizes &= PAGE_SIZE_4K; + rc = iommu_init_ops->setup(); + ASSERT(iommu_superpages || iommu_ops.page_sizes == PAGE_SIZE_4K); + if ( ioapic_entries ) { restore_IO_APIC_setup(ioapic_entries, rc); From patchwork Tue Jul 5 12:45:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12906551 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 lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 89682C43334 for ; Tue, 5 Jul 2022 12:46:17 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.361153.590497 (Exim 4.92) (envelope-from ) id 1o8hwL-00047e-Mu; Tue, 05 Jul 2022 12:46:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 361153.590497; Tue, 05 Jul 2022 12:46:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o8hwL-00047X-JK; Tue, 05 Jul 2022 12:46:05 +0000 Received: by outflank-mailman (input) for mailman id 361153; Tue, 05 Jul 2022 12:46:04 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o8hwK-0002H7-JC for xen-devel@lists.xenproject.org; Tue, 05 Jul 2022 12:46:04 +0000 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-eopbgr140053.outbound.protection.outlook.com [40.107.14.53]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 6dfd3854-fc60-11ec-a8e4-439420d8e422; Tue, 05 Jul 2022 14:46:03 +0200 (CEST) Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by DB6PR0401MB2613.eurprd04.prod.outlook.com (2603:10a6:4:37::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.21; Tue, 5 Jul 2022 12:46:02 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::dfa:a64a:432f:e26b]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::dfa:a64a:432f:e26b%7]) with mapi id 15.20.5395.021; Tue, 5 Jul 2022 12:46:02 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 6dfd3854-fc60-11ec-a8e4-439420d8e422 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TeVZo6k2vo3HxUd61skklc3XW1YHRFA1fOxgL2y9K7gF3S7qWETxCDm6buR8rkgHZm3ZRtc1DQqltw78OFvGL4oSpmuQTOIZQyAZujSxVoz3XL6K3TJVYlITUiN3xJGuvmCcoKBRDSaBG8FkKPIpt0B0/7pe0QOiXwaj4fp1TeMhvgfanuF3vqSWvTUaP6hrD6jSQoYNKx1A0RKGXywJeiE2Te56qSp8lEOWxpNPfW98Qgl8yi2m3LjyY/veQf0Y7s+AwTDcwtDaZEWmkW/GQZ1BKtjDyso/apZv9cIA7NepiCkXBuPtKtj3/My1NBfK7djW2ej4MfHB23CuYkjq6w== 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=AxiRfgvA8ZTM896+3sr+fZ7fI2k/BkIKHoJCeGpTy2A=; b=SYYUiUPmOzbBNJ8XGGYzRh5+ninbFOY8YzF1rZTPWfaDH+gagyiK+H+Cdf2aAnw/QRsjY1vXqO8slONz9v7STFUl3T73yk12mM1XFZeHG3Pc12y3FKbxoKrwkb0IFQYs6NMu4TJn5fqulCOFNNO2CZqPiayOcscFmAx9NQBXgnfMhH8Vw7MEDhbiez55PoYOM2LRxcACdZEoVoWasRxwy85DxRWGlnFNJBAnk9dBEEvP6IfAKM33dEVAzSvfwbeQdt3NBr4ys78/dOrpCLqMjUtb9jTfSbYaWEJwgxUhob1wWRy2bVjs8TNzA+ZTrHx9AzrZQe20n9kllEAvpRzCRA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=AxiRfgvA8ZTM896+3sr+fZ7fI2k/BkIKHoJCeGpTy2A=; b=NaL8Twi3TlfKCL8nQeZ8ROXCnfc9Su4o1N1I3/u1WFg17c33+pZNiZAxnmap2jBQNAzI8wpBHOHvNsAO+5VUOrCD2QN8MNera4WqRY0hBz0we1FwMq+gyC5OyjOa50jcWiDS4/zD8fqkvbIRIOMOw1X5HoygLU/lnwQQCbWilqb+t/yPDCRd2DTfmZX0nHJJ0De+lLfuT+I4JXzYUeiYgBkzfz+Rr6XETE3Fhi2zmonOwEPbyeGMQLD4HLyPQd3xgQ0nIDp8od/v0QONBagTNMtsylrtF5Oc43UBa84RL3wue/VmXGLJnvSVpfkBINvzJ1oR9nbMtCMjpsVQX1ZEZQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: Date: Tue, 5 Jul 2022 14:45:59 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: [PATCH v7 05/14] AMD/IOMMU: allow use of superpage mappings Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Paul Durrant , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Andrew Cooper , George Dunlap , Julien Grall , Stefano Stabellini , Wei Liu References: <4c9d4b32-d4db-3a4f-fe92-6022e63c3f82@suse.com> In-Reply-To: <4c9d4b32-d4db-3a4f-fe92-6022e63c3f82@suse.com> X-ClientProxiedBy: AM6P191CA0004.EURP191.PROD.OUTLOOK.COM (2603:10a6:209:8b::17) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 922945e6-f728-4313-9b10-08da5e84514e X-MS-TrafficTypeDiagnostic: DB6PR0401MB2613:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Am3lb050fsu1JpFh+dv896fE0Gef1NCKRuC9V50G3oUnQAXCj9III8IvjBqtLLxQ+8Qw8FfqCctj2yLVjRmA6gR21RqS8pQO5LvjXt9CpABke6ON/VQCSDHvX/sM5RSH8et8iv2Z2PoOYPUv3n/dWWAYdwQT6RVY45LOrJpJNTC81Tn9z4nxwMJOllCBEZt16NkTpDsZW5A6bhGxVQe5tSvLhQL51quv/d5D93jr6zdyxhJNIoGoLZ/zWj0lfKRc9zgSy9XUlDU73b3NEWFDkzllsxbULOzFhcBcckPwqLgtD6yKGQhE/lVMoC1Q1vF2pPNZ0Xe1nUgrYH706drhEKrrJcLdnyZIxEp9LMVdR39b7rXva86x7On5GTN8+sOIS60sJIQRbjMAAVzuAnGnih4MCc1YUMJZl7cPs3KvYh/4WxlJcfAvmytneh/u03vsgIFJW0bgvPYMZFRshsMS/CbzLYz3kFHJ9PeLXPPiWNrXmrcBuqMjEw8cIzu98+2dgDsz/AN7cdrF8IN3UsBQaNacO01sAVuDmTL7XbIac2j9ZmjSX74p8XKf/9l2Jl+cKZKVUf9ihODj+JOJ68b4RHVHC0cJU8dLrET3g0/EXsbDFJvv7ExAFQhFNs/LR74Jgl8ThAYjQ5GUH6dPIfo+WzZMlAY7uhlZfTu6ZSMPpD1EPSEuYfX6beUZ/OHT92DmAllSvCh1fTrhRSXZqd49q+q/VE34ZnZB7n867JF6gGa9vSYoMj2ifnEVw35pPPpbWcMmSJbHDysWn0ecJrlJCORV102tr15egk22qmj2JuoBXN9cVPmyEgxS8cZtOUlrOk5iajA9n7Cvc29YOBF19uGsG7YhOOZQkxpgKus2Qec= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR04MB6560.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(136003)(376002)(396003)(366004)(39860400002)(346002)(8936002)(31696002)(38100700002)(6486002)(478600001)(86362001)(66946007)(4326008)(6512007)(8676002)(66476007)(66556008)(5660300002)(2616005)(26005)(186003)(36756003)(316002)(6916009)(31686004)(54906003)(6506007)(41300700001)(83380400001)(2906002)(6666004)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?JFArZ+Nk2mTTZDldyGT9uHaWRjlx?= =?utf-8?q?uA4HkLrvgE3dTc1UFiBgp7P39t3g7KGbzZJMnAj/6qEFa0CbKEmXC3zF7IHgWegzS?= =?utf-8?q?EDyJkXftygaNqfO2oa/AXzNF8E6z6+EmGQKMdZeHdpos7CwXSaW4TR+9FBHI7EtZB?= =?utf-8?q?H0f8GAaRY0bimS0mXAjrhoosceSXdCpgBHLFgn9KIPHwbUzUQweN9Y+jWvjJzXtA2?= =?utf-8?q?FTG+bU+4kuMO37GQ9ZsqerD8/QTJd7pXEuqhCYE0OnSUa4Wo4Azhd++vidGpTwOo8?= =?utf-8?q?s3xlGI7wmyix6tnatsh8wwym+gzNJtV33TzwNR5Id4jx8Dxu2SqW3VhBYxccTsOxk?= =?utf-8?q?KX6ejtewATIaqzrAMIFaQBKV6yNfXzgRvozLCfF/9uZe9MTAp4paZXnoMcSb6NIxq?= =?utf-8?q?Co+j0K2+BKLlWpZ3QRhpyVAx9Y15BRvGntTnT3XCaR4vukkYxY6+qvOu/PzioKvYT?= =?utf-8?q?GhnV6ncVDOOS5p34xk1qmt8JGXqtC/V/hkDJDfSjSA6pJHyAhk/nzu+lZ610djoI9?= =?utf-8?q?FTqCUvgvGidcIvkQvaWUYPtI30hxWN2C9dXNgqDcx90G9cE1+ksIt9dbYCuy+8NlV?= =?utf-8?q?e6vs/4mUi72OJze24PwAw8FleVIUe+hrrTIDA5jyGSL+tQ6vphE1lzp6F4gcu4tby?= =?utf-8?q?6PQL8Kr96FCHnBLDzLY+ibqSa0jLQopd1Qqx68MTAwWIY/2KcaMljy9yoeu00cIXp?= =?utf-8?q?dIhmJPusst8EkDOcXc/FNG/t7KIuix/DwTOaUcCHoBnxWt2enIJgFD1oY8UHycO0w?= =?utf-8?q?rYSGWk/+c7IdcsrsmiDiyN5aOEeLoTyrlHsTdAoM5aFWyyCAIDhdCOxeZ28r0au/o?= =?utf-8?q?+Ks7P9VdVrtpNGi4Oke6N9papDnEijhpBHDOGNOJMyYS4Wx/hrfB+/d5MRoHlRANf?= =?utf-8?q?M5CwDpageLYwoCmr6DUViS/qqKOdWvoh5028yAwdG1BRta06ZZg2D65OuG2UiKyIQ?= =?utf-8?q?PVYxx2/6+FjEwe+KIkhKC/lw2/oq/DJQnAApyHe2CqpLdQcb3quuQDOZCk+Rm6+Xs?= =?utf-8?q?Ig3NMHBjqCT8YUx9iwh4D6WNF3F3hXqkhxMymEbzQ81kEJ3Ng2j1x7a+ho6eRjqoI?= =?utf-8?q?ANdw82A7alYin7eMK9zIVEQrYDq19NqBOvb9xZRGDp5dv4w8Z57hIVSvgKEX4tf9t?= =?utf-8?q?AeNBCtx4y2bSqI48zRjwj4agOnwUEzDesIqHBDZLS9TCyuVViC/X3v6Lil1iJFhEH?= =?utf-8?q?GNU1tivUG7uRkYB0kii8U3gr+jtTTAZumXEtSS7SKJnVtivaq7dMxmu6Iysw3jzBv?= =?utf-8?q?chpg51pvwu7yCAtDbL/2j4t1CGRDjz7LWPvx22XMDXLDmOmT9vtjbvGlW1fP83Xqb?= =?utf-8?q?9C9Flzy079QH1d0vQD6A3VDo8ZMqgQzHl5kAgivg1CfxwfEHluc5qtAaQ9nt30E31?= =?utf-8?q?5E7dfG8KAEt+q75iXYwI8XxL5SzuFa9E6MzuLihXibY1xW/P2SBzFKcISd8PIOVeD?= =?utf-8?q?WP3Q0aO8ozLwYit767SU00kwJxbX/Pfo2OYvFJpw3SwrkJWfjJtiQa0v3MKeNIzmE?= =?utf-8?q?zJ1ciRJ7/KTA?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 922945e6-f728-4313-9b10-08da5e84514e X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2022 12:46:02.0552 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: uAJnnFQfaygK3hPi9A5etlsjBj8Qs3K8361xn82YY1ZJooaM8ThWK9P8GLqTAUQ2DnuMNO5mHQhIEpJOmxtqMA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0401MB2613 No separate feature flags exist which would control availability of these; the only restriction is HATS (establishing the maximum number of page table levels in general), and even that has a lower bound of 4. Thus we can unconditionally announce 2M and 1G mappings. (Via non- default page sizes the implementation in principle permits arbitrary size mappings, but these require multiple identical leaf PTEs to be written, which isn't all that different from having to write multiple consecutive PTEs with increasing frame numbers. IMO that's therefore beneficial only on hardware where suitable TLBs exist; I'm unaware of such hardware.) Note that in principle 512G and 256T mappings could also be supported right away, but the freeing of page tables (to be introduced in subsequent patches) when replacing a sufficiently populated tree with a single huge page would need suitable preemption, which will require extra work. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Reviewed-by: Paul Durrant --- v5: Drop PAGE_SIZE_512G. In amd_iommu_{,un}map_page() assert page order is supported. v4: Change type of queue_free_pt()'s 1st parameter. Re-base. v3: Rename queue_free_pt()'s last parameter. Replace "level > 1" checks where possible. --- a/xen/drivers/passthrough/amd/iommu_map.c +++ b/xen/drivers/passthrough/amd/iommu_map.c @@ -32,12 +32,13 @@ static unsigned int pfn_to_pde_idx(unsig } static union amd_iommu_pte clear_iommu_pte_present(unsigned long l1_mfn, - unsigned long dfn) + unsigned long dfn, + unsigned int level) { union amd_iommu_pte *table, *pte, old; table = map_domain_page(_mfn(l1_mfn)); - pte = &table[pfn_to_pde_idx(dfn, 1)]; + pte = &table[pfn_to_pde_idx(dfn, level)]; old = *pte; write_atomic(&pte->raw, 0); @@ -351,15 +352,39 @@ static int iommu_pde_from_dfn(struct dom return 0; } +static void queue_free_pt(struct domain_iommu *hd, mfn_t mfn, unsigned int level) +{ + if ( level > 1 ) + { + union amd_iommu_pte *pt = map_domain_page(mfn); + unsigned int i; + + for ( i = 0; i < PTE_PER_TABLE_SIZE; ++i ) + if ( pt[i].pr && pt[i].next_level ) + { + ASSERT(pt[i].next_level < level); + queue_free_pt(hd, _mfn(pt[i].mfn), pt[i].next_level); + } + + unmap_domain_page(pt); + } + + iommu_queue_free_pgtable(hd, mfn_to_page(mfn)); +} + int cf_check amd_iommu_map_page( struct domain *d, dfn_t dfn, mfn_t mfn, unsigned int flags, unsigned int *flush_flags) { struct domain_iommu *hd = dom_iommu(d); + unsigned int level = (IOMMUF_order(flags) / PTE_PER_TABLE_SHIFT) + 1; int rc; unsigned long pt_mfn = 0; union amd_iommu_pte old; + ASSERT((hd->platform_ops->page_sizes >> IOMMUF_order(flags)) & + PAGE_SIZE_4K); + spin_lock(&hd->arch.mapping_lock); /* @@ -384,7 +409,7 @@ int cf_check amd_iommu_map_page( return rc; } - if ( iommu_pde_from_dfn(d, dfn_x(dfn), 1, &pt_mfn, flush_flags, true) || + if ( iommu_pde_from_dfn(d, dfn_x(dfn), level, &pt_mfn, flush_flags, true) || !pt_mfn ) { spin_unlock(&hd->arch.mapping_lock); @@ -394,8 +419,8 @@ int cf_check amd_iommu_map_page( return -EFAULT; } - /* Install 4k mapping */ - old = set_iommu_pte_present(pt_mfn, dfn_x(dfn), mfn_x(mfn), 1, + /* Install mapping */ + old = set_iommu_pte_present(pt_mfn, dfn_x(dfn), mfn_x(mfn), level, (flags & IOMMUF_writable), (flags & IOMMUF_readable)); @@ -403,8 +428,13 @@ int cf_check amd_iommu_map_page( *flush_flags |= IOMMU_FLUSHF_added; if ( old.pr ) + { *flush_flags |= IOMMU_FLUSHF_modified; + if ( IOMMUF_order(flags) && old.next_level ) + queue_free_pt(hd, _mfn(old.mfn), old.next_level); + } + return 0; } @@ -413,8 +443,15 @@ int cf_check amd_iommu_unmap_page( { unsigned long pt_mfn = 0; struct domain_iommu *hd = dom_iommu(d); + unsigned int level = (order / PTE_PER_TABLE_SHIFT) + 1; union amd_iommu_pte old = {}; + /* + * While really we could unmap at any granularity, for now we assume unmaps + * are issued by common code only at the same granularity as maps. + */ + ASSERT((hd->platform_ops->page_sizes >> order) & PAGE_SIZE_4K); + spin_lock(&hd->arch.mapping_lock); if ( !hd->arch.amd.root_table ) @@ -423,7 +460,7 @@ int cf_check amd_iommu_unmap_page( return 0; } - if ( iommu_pde_from_dfn(d, dfn_x(dfn), 1, &pt_mfn, flush_flags, false) ) + if ( iommu_pde_from_dfn(d, dfn_x(dfn), level, &pt_mfn, flush_flags, false) ) { spin_unlock(&hd->arch.mapping_lock); AMD_IOMMU_ERROR("invalid IO pagetable entry dfn = %"PRI_dfn"\n", @@ -435,14 +472,19 @@ int cf_check amd_iommu_unmap_page( if ( pt_mfn ) { /* Mark PTE as 'page not present'. */ - old = clear_iommu_pte_present(pt_mfn, dfn_x(dfn)); + old = clear_iommu_pte_present(pt_mfn, dfn_x(dfn), level); } spin_unlock(&hd->arch.mapping_lock); if ( old.pr ) + { *flush_flags |= IOMMU_FLUSHF_modified; + if ( order && old.next_level ) + queue_free_pt(hd, _mfn(old.mfn), old.next_level); + } + return 0; } --- a/xen/drivers/passthrough/amd/pci_amd_iommu.c +++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c @@ -747,7 +747,7 @@ static void cf_check amd_dump_page_table } static const struct iommu_ops __initconst_cf_clobber _iommu_ops = { - .page_sizes = PAGE_SIZE_4K, + .page_sizes = PAGE_SIZE_4K | PAGE_SIZE_2M | PAGE_SIZE_1G, .init = amd_iommu_domain_init, .hwdom_init = amd_iommu_hwdom_init, .quarantine_init = amd_iommu_quarantine_init, --- a/xen/include/xen/page-defs.h +++ b/xen/include/xen/page-defs.h @@ -21,4 +21,14 @@ #define PAGE_MASK_64K PAGE_MASK_GRAN(64K) #define PAGE_ALIGN_64K(addr) PAGE_ALIGN_GRAN(64K, addr) +#define PAGE_SHIFT_2M 21 +#define PAGE_SIZE_2M PAGE_SIZE_GRAN(2M) +#define PAGE_MASK_2M PAGE_MASK_GRAN(2M) +#define PAGE_ALIGN_2M(addr) PAGE_ALIGN_GRAN(2M, addr) + +#define PAGE_SHIFT_1G 30 +#define PAGE_SIZE_1G PAGE_SIZE_GRAN(1G) +#define PAGE_MASK_1G PAGE_MASK_GRAN(1G) +#define PAGE_ALIGN_1G(addr) PAGE_ALIGN_GRAN(1G, addr) + #endif /* __XEN_PAGE_DEFS_H__ */ From patchwork Tue Jul 5 12:46:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12906555 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 lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 05A6FC43334 for ; Tue, 5 Jul 2022 12:48:28 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.361164.590541 (Exim 4.92) (envelope-from ) id 1o8hyS-0005tm-A8; Tue, 05 Jul 2022 12:48:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 361164.590541; Tue, 05 Jul 2022 12:48:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o8hyS-0005td-6z; Tue, 05 Jul 2022 12:48:16 +0000 Received: by outflank-mailman (input) for mailman id 361164; Tue, 05 Jul 2022 12:48:14 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o8hwr-0002H7-4s for xen-devel@lists.xenproject.org; Tue, 05 Jul 2022 12:46:37 +0000 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2052.outbound.protection.outlook.com [40.107.104.52]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 818efadb-fc60-11ec-a8e4-439420d8e422; Tue, 05 Jul 2022 14:46:36 +0200 (CEST) Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by AM0PR04MB6065.eurprd04.prod.outlook.com (2603:10a6:208:139::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.21; Tue, 5 Jul 2022 12:46:34 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::dfa:a64a:432f:e26b]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::dfa:a64a:432f:e26b%7]) with mapi id 15.20.5395.021; Tue, 5 Jul 2022 12:46:34 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 818efadb-fc60-11ec-a8e4-439420d8e422 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iwLfJM6XjWiHI5Mb/VNr/+4IM6o8NlBY4BuKhUpLzjtKn7RtTTCCYb8hUoZgf2HypT3ymJdEZlKnYhVVSJhHNboLKpS87kJtV0SxKgHrDRP7eupEDQlIXtgrZ4eXSowj5yt3YDHmkbMcQB2nL+kfiWLaM8zJM4hjf7Ee5U/2DFKKFc6aV0AQOyilUhAtQ6t6ko0vVJ4M9V/+8pFp/fy4dVN5P6VV+nmHFvgV3bBvNQSPErYAwSAlMXTHgOOOnRTCU6nuetmE0v7tPs2BLD/tfe/Tyn1BW1t1roCACz8nHAagyZFxAle9E6erA2K9ZnvjBEZbn63LZPOyq0MhtRlzOQ== 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=r9TbBkHolhWw357aMMMhJeh7vv8iPQuKs2+KWYhw3tU=; b=Jhy7PtBpO4/IbzKKwebjPIIvYBWG0jMo6k6/pyVrzJzknog1PRZZQwK1rIeVwfuiTsEAUtF70k9WYVLSl+lqYmf3n44zQtVzbUj8mN+DFGQlnlE99atepZZ/8KnQOWHY6zTkzGZ/SXvrVYxotknfK2Qc5DH7NiyFHYHvIcwoksdDqaWRSKYNfh3ZyYx6lkSIM5HaV8QOf1KhSWxnEGrqJJe3bZKOSJLW+dh6zD7g7ss8BbGDYvgNTDMqx0nZ1yyvMU5CpeAZnQ462+dWO7RCNZeUu+ewR9Dg9k9MZuKu4KyfCF5m8MuvLvrC4z3p9XORL84Nf/mDGzuanDu36Tejxw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=r9TbBkHolhWw357aMMMhJeh7vv8iPQuKs2+KWYhw3tU=; b=30F6K3uBwjJUuRu93fYxfi9eZ4lzhQOWT2Ss5hs/0HkMrssJjpLLrdYjkaFSuoLqaS4TSvSoRhoLhM1HstUmZTASaf9IbcZxiqK8jJ78J6xjYnwrp7dCeVn4EgLQ0zsdOFLDbo8piuOt3sg0a5IME7cwyseZmK93E5NV8cuHJiRMnaAyzdeXFy+1OrnAiTrHP7fB5Ow1lzc74P1yd7VI6D3Sfpb5f55JF55oNp8hcG+UKhSLnyzVyWeSJUAokgo8yP5bqWLnDU5wgkYzhAiGkjHDwZcfwUV8Iy+hHIbmjT9NMQruEGczC0XYFfZU09KPxRehir8KJ/bxIDNCEl9lmg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <629e7e8a-b846-14cd-08eb-75433c8c3369@suse.com> Date: Tue, 5 Jul 2022 14:46:33 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: [PATCH v7 06/14] VT-d: allow use of superpage mappings Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Paul Durrant , =?utf-8?q?Roger_Pau_Monn=C3=A9?= References: <4c9d4b32-d4db-3a4f-fe92-6022e63c3f82@suse.com> In-Reply-To: <4c9d4b32-d4db-3a4f-fe92-6022e63c3f82@suse.com> X-ClientProxiedBy: AS9PR06CA0087.eurprd06.prod.outlook.com (2603:10a6:20b:464::8) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e0d20481-ace4-43af-cb40-08da5e8464ce X-MS-TrafficTypeDiagnostic: AM0PR04MB6065:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UVnmM27Nhwn7EPjuVI9rcbxI5SVaANOlv6d5HbDhFucy07l/duo3635renKb810yapyrLuuJXAhllUGD+WqEqOmnI+n/jUsQFc3FkyS4hfdMYSaAWfVhYtefF4IkBEXFqOQv7o/3EtjJYOOhFN5BQXUpXB2y8zIxkasGTi8jaL/qU/jhBt3AmAHRv4M3zKpP6TdvCQyFAk3AC+FdtjT9KGD62D9XA+jdHt+H7HzmzWsBSVMnw3KXaCybUsy7oqAm4ma3CAYjWHZcnOYIGBMkb6wYwualo0g50wGy/LpoF2H8qM7QNdnf969jrVgY56h3JONdF3V941MXfxZbCyJeurVlo3hBghfUC9xi3RTeoRHNmdVMj+k61QIa01EDMRjP4HsOiaKYNLjRXrBajvI4xKiTILmoDHFx2ibCB8LO+8d9k9kS9AcB7uIIsO0nBtS352jneJIqQO66bd7e1pAyMGifhidRVm7/r2CD56rwN7KwNG2m/9BXqkHaDRk+VAfVvmHsuBDlIwlzWVfXNDOfkRbaV2smjcuaDxQvxNErG8E5zxBNiart1MbbLjQKrlC0rPj62zmzW2e9AsnSCg3HUqyjis+/43sIZbhbv0LnX+yyra3nqUtirOLznWHtz81BKjcEAecpjbbFjw/X76z0x14eN8CF+XAybSAEI9RrWbKjBNwAAWbCq7Ti26ISqf+hyjr0Wygcg5X3xxt3iKRGhqI9uMly2O6U6L8UHdDbWFFdjYsE0KCbENO5HTGOqm37YzWdd6oMJXGuetmT9eEYGFk1C85gRutx5p0SRZNp2JtVoL0EbxmABlKfyTo4TzXhHWdiemAKalT/k4c6dvFTdukqjSEWeJPunfMzXQ/WgEc= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR04MB6560.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(396003)(136003)(376002)(39860400002)(346002)(366004)(83380400001)(31686004)(6506007)(36756003)(6486002)(478600001)(26005)(186003)(2616005)(6512007)(41300700001)(2906002)(31696002)(86362001)(54906003)(6916009)(4326008)(316002)(38100700002)(66476007)(66556008)(66946007)(8676002)(5660300002)(8936002)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?8D4/BSWz9ftRyzi2Z4z9W6VeGORt?= =?utf-8?q?qgU5NtGJpai8gsjKD7nRuseM6yOzcSzRMApuVR8T3xyNrQc74o5w+3yaHbh/2vcm8?= =?utf-8?q?9Q0FEk+IEnJMmsngvJrxWFt0t+ZGTQNlCT69PwKcm/Chxp02/agq7fx5LA1xpMZzX?= =?utf-8?q?qd0e7uIGdM++R398xpMq8v/ve3VWUO2FzXM0Pfk6Oid1fctZQfBiC43r3q6GvW7ti?= =?utf-8?q?AkeGDudYDNjyeMeYTOlbi4kDncc2iGZG97X3VbxqkvYGYs8i3ewN1g7GLryZEz3eb?= =?utf-8?q?CVkJ3IkIP176D0xgqYczeXP4HtIRRg7K8WfkQ4Mn8bjhOMY3M+AZ1E3BqwY3kGQcX?= =?utf-8?q?z1qRs2wuipiUb0Pf9YGKSQra5k8w3za+ZyHKqG2JN1tRu0TOmvQNpx/P4kZaZjHaO?= =?utf-8?q?OOEGrGdAux7bQJLR9zCFesWVL3C5vS88aRnx6dsD23DVVAjDOhM6z0TwRytgbgJex?= =?utf-8?q?97USZleo0x5nGCFFbhcXWpuXNQi4kL5LgZkuLIytTZRUVXKMuf0Gk6tQLqi+nKFjq?= =?utf-8?q?yXECitwUIh6gdpnXSV5P1jXhwtCvbHUPH9udDanIlm4Pi4k3EyLvMCNQ9jZSGpxKB?= =?utf-8?q?B4ERqcZuUf1APYB1QnTDmzzbl1SjlqIdg80wesiNmn6EN1b52/i0AdxuDf9cAcYPk?= =?utf-8?q?p3Sfx0d+ol9L1wu0pNqEkjTAOdIa25v+6Wld0t2d5rjjYaj8KRg6ECBDbEALO8xj8?= =?utf-8?q?J7CMx9miTPu/KQ8f7hbPxwBkr+DYQXKXtPt9h1KLa/tj8BmDM2ewLOuCGEEMhaDxC?= =?utf-8?q?XsuaImvp1g6hZrpIZOQiNBnzWIL/iDyLllwGOjdSzc0Yqo9Dh74FXEw7zUaZqlNmC?= =?utf-8?q?eFGmC0yS6Zb0bmLo9i6uJP+8n5LXWTy63bbyMLCWUyTJMYLC3K9ygfPkeAYIVfBVV?= =?utf-8?q?ZhGqwnfnpbxzElJNmw4FmPsdsTvssuCGJDvnB/QsBRv7HJwx8nafiT9OGnHULjR0C?= =?utf-8?q?qiPwZ/ArDYwVmm3PRbQmDvwiPZ18Abb31+H/huh2NLgEI+WG1MGcXRl7oBc6/m3ZG?= =?utf-8?q?X3HkPKU+NjroMV3a+zOqAFGyS5gTeOGb82PB/7DnhSP6Ud3wwqVv3xsSk52fZus9P?= =?utf-8?q?6N7UgBVUDN9LEmskEViKEpP1Q9Frn4ewXT4feb1xaqI22hFPP6A2gZg02KbttUZlH?= =?utf-8?q?Ith6PsJOpiCoieKqu7ya5gmvjG/3pE/zKjuBZ+XbiwPpA1euPWGCAC0nugljDuRpp?= =?utf-8?q?MuX4S1kxU0KhrQsPEsUx0JfQG/cao5HBGcxPzAJuyuCY6Q9WvYHsQCZK3aEZ1fvbV?= =?utf-8?q?Oq91vJ4xA+YPAJnRmXHXGF5Q/aHphzT5Mc5nZc2gtV6YFVfZ3rkko3vFK7goyt078?= =?utf-8?q?IUzkT3awDBt7o4dWcqaNJTghmFs3N+m+A6Ip5AwJ0JpWDlXtLuQfPC97tThulYvVD?= =?utf-8?q?bxi1t/vmgz08x+Z72mRDgy89JNvRBW0R5LFzhu1IyowjyyVpOCmXy74FOAvGqtmUf?= =?utf-8?q?oH2fXmeJDk1eYQVFxolHbh+qLhEntw5ih/ikRqH/W4LW+dYKY0mSsQcNZKWlgKwcH?= =?utf-8?q?4AjwG+UFBk5s?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e0d20481-ace4-43af-cb40-08da5e8464ce X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2022 12:46:34.8189 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: pyEXXP1xKVZZJ3W7dFCoixVirL0irMd9YCEB6KbF1N/3OnMYREpnlRv50q22D1mF7UkuDl6UF/ucAJS9xgdY5A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6065 ... depending on feature availability (and absence of quirks). Also make the page table dumping function aware of superpages. Signed-off-by: Jan Beulich Reviewed-by: Kevin Tian Reviewed-by: Roger Pau Monné Reviewed-by: Paul Durrant --- v6: Re-base over addition of "iommu=no-superpages" command line option. v5: In intel_iommu_{,un}map_page() assert page order is supported. v4: Change type of queue_free_pt()'s 1st parameter. Re-base. v3: Rename queue_free_pt()'s last parameter. Replace "level > 1" checks where possible. Tighten assertion. --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -779,18 +779,37 @@ static int __must_check cf_check iommu_f return ret; } +static void queue_free_pt(struct domain_iommu *hd, mfn_t mfn, unsigned int level) +{ + if ( level > 1 ) + { + struct dma_pte *pt = map_domain_page(mfn); + unsigned int i; + + for ( i = 0; i < PTE_NUM; ++i ) + if ( dma_pte_present(pt[i]) && !dma_pte_superpage(pt[i]) ) + queue_free_pt(hd, maddr_to_mfn(dma_pte_addr(pt[i])), + level - 1); + + unmap_domain_page(pt); + } + + iommu_queue_free_pgtable(hd, mfn_to_page(mfn)); +} + /* clear one page's page table */ static int dma_pte_clear_one(struct domain *domain, daddr_t addr, unsigned int order, unsigned int *flush_flags) { struct domain_iommu *hd = dom_iommu(domain); - struct dma_pte *page = NULL, *pte = NULL; + struct dma_pte *page = NULL, *pte = NULL, old; u64 pg_maddr; + unsigned int level = (order / LEVEL_STRIDE) + 1; spin_lock(&hd->arch.mapping_lock); - /* get last level pte */ - pg_maddr = addr_to_dma_page_maddr(domain, addr, 1, flush_flags, false); + /* get target level pte */ + pg_maddr = addr_to_dma_page_maddr(domain, addr, level, flush_flags, false); if ( pg_maddr < PAGE_SIZE ) { spin_unlock(&hd->arch.mapping_lock); @@ -798,7 +817,7 @@ static int dma_pte_clear_one(struct doma } page = (struct dma_pte *)map_vtd_domain_page(pg_maddr); - pte = page + address_level_offset(addr, 1); + pte = &page[address_level_offset(addr, level)]; if ( !dma_pte_present(*pte) ) { @@ -807,14 +826,20 @@ static int dma_pte_clear_one(struct doma return 0; } + old = *pte; dma_clear_pte(*pte); - *flush_flags |= IOMMU_FLUSHF_modified; spin_unlock(&hd->arch.mapping_lock); iommu_sync_cache(pte, sizeof(struct dma_pte)); unmap_vtd_domain_page(page); + *flush_flags |= IOMMU_FLUSHF_modified; + + if ( order && !dma_pte_superpage(old) ) + queue_free_pt(hd, maddr_to_mfn(dma_pte_addr(old)), + order / LEVEL_STRIDE); + return 0; } @@ -2092,8 +2117,12 @@ static int __must_check cf_check intel_i struct domain_iommu *hd = dom_iommu(d); struct dma_pte *page, *pte, old, new = {}; u64 pg_maddr; + unsigned int level = (IOMMUF_order(flags) / LEVEL_STRIDE) + 1; int rc = 0; + ASSERT((hd->platform_ops->page_sizes >> IOMMUF_order(flags)) & + PAGE_SIZE_4K); + /* Do nothing if VT-d shares EPT page table */ if ( iommu_use_hap_pt(d) ) return 0; @@ -2116,7 +2145,7 @@ static int __must_check cf_check intel_i return 0; } - pg_maddr = addr_to_dma_page_maddr(d, dfn_to_daddr(dfn), 1, flush_flags, + pg_maddr = addr_to_dma_page_maddr(d, dfn_to_daddr(dfn), level, flush_flags, true); if ( pg_maddr < PAGE_SIZE ) { @@ -2125,13 +2154,15 @@ static int __must_check cf_check intel_i } page = (struct dma_pte *)map_vtd_domain_page(pg_maddr); - pte = &page[dfn_x(dfn) & LEVEL_MASK]; + pte = &page[address_level_offset(dfn_to_daddr(dfn), level)]; old = *pte; dma_set_pte_addr(new, mfn_to_maddr(mfn)); dma_set_pte_prot(new, ((flags & IOMMUF_readable) ? DMA_PTE_READ : 0) | ((flags & IOMMUF_writable) ? DMA_PTE_WRITE : 0)); + if ( IOMMUF_order(flags) ) + dma_set_pte_superpage(new); /* Set the SNP on leaf page table if Snoop Control available */ if ( iommu_snoop ) @@ -2152,14 +2183,26 @@ static int __must_check cf_check intel_i *flush_flags |= IOMMU_FLUSHF_added; if ( dma_pte_present(old) ) + { *flush_flags |= IOMMU_FLUSHF_modified; + if ( IOMMUF_order(flags) && !dma_pte_superpage(old) ) + queue_free_pt(hd, maddr_to_mfn(dma_pte_addr(old)), + IOMMUF_order(flags) / LEVEL_STRIDE); + } + return rc; } static int __must_check cf_check intel_iommu_unmap_page( struct domain *d, dfn_t dfn, unsigned int order, unsigned int *flush_flags) { + /* + * While really we could unmap at any granularity, for now we assume unmaps + * are issued by common code only at the same granularity as maps. + */ + ASSERT((dom_iommu(d)->platform_ops->page_sizes >> order) & PAGE_SIZE_4K); + /* Do nothing if VT-d shares EPT page table */ if ( iommu_use_hap_pt(d) ) return 0; @@ -2516,6 +2559,7 @@ static int __init cf_check vtd_setup(voi { struct acpi_drhd_unit *drhd; struct vtd_iommu *iommu; + unsigned int large_sizes = iommu_superpages ? PAGE_SIZE_2M | PAGE_SIZE_1G : 0; int ret; bool reg_inval_supported = true; @@ -2558,6 +2602,11 @@ static int __init cf_check vtd_setup(voi cap_sps_2mb(iommu->cap) ? ", 2MB" : "", cap_sps_1gb(iommu->cap) ? ", 1GB" : ""); + if ( !cap_sps_2mb(iommu->cap) ) + large_sizes &= ~PAGE_SIZE_2M; + if ( !cap_sps_1gb(iommu->cap) ) + large_sizes &= ~PAGE_SIZE_1G; + #ifndef iommu_snoop if ( iommu_snoop && !ecap_snp_ctl(iommu->ecap) ) iommu_snoop = false; @@ -2629,6 +2678,9 @@ static int __init cf_check vtd_setup(voi if ( ret ) goto error; + ASSERT(iommu_ops.page_sizes == PAGE_SIZE_4K); + iommu_ops.page_sizes |= large_sizes; + register_keyhandler('V', vtd_dump_iommu_info, "dump iommu info", 1); return 0; @@ -2961,7 +3013,7 @@ static void vtd_dump_page_table_level(pa continue; address = gpa + offset_level_address(i, level); - if ( next_level >= 1 ) + if ( next_level && !dma_pte_superpage(*pte) ) vtd_dump_page_table_level(dma_pte_addr(*pte), next_level, address, indent + 1); else From patchwork Tue Jul 5 12:47:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12906552 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 lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 64680C43334 for ; Tue, 5 Jul 2022 12:48:17 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.361160.590507 (Exim 4.92) (envelope-from ) id 1o8hyG-0004rI-7h; Tue, 05 Jul 2022 12:48:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 361160.590507; Tue, 05 Jul 2022 12:48:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o8hyG-0004rB-4g; Tue, 05 Jul 2022 12:48:04 +0000 Received: by outflank-mailman (input) for mailman id 361160; Tue, 05 Jul 2022 12:48:02 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o8hyE-0004qq-9c for xen-devel@lists.xenproject.org; Tue, 05 Jul 2022 12:48:02 +0000 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70041.outbound.protection.outlook.com [40.107.7.41]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id b3f9e874-fc60-11ec-a8e4-439420d8e422; Tue, 05 Jul 2022 14:48:01 +0200 (CEST) Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by AM5PR04MB3089.eurprd04.prod.outlook.com (2603:10a6:206:b::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.22; Tue, 5 Jul 2022 12:47:05 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::dfa:a64a:432f:e26b]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::dfa:a64a:432f:e26b%7]) with mapi id 15.20.5395.021; Tue, 5 Jul 2022 12:47:05 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: b3f9e874-fc60-11ec-a8e4-439420d8e422 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IifTTQEATJ5rsOs+0MYWRNiVeYOl4HmRLv/0qT4Q1/S7hNiCjoOTbtXdaxOAEtRqxx8f5CXdV1E4Z4QcrI356jNZ/BWyBVfYvqelaj+K6GYoeAdE0ANeHfUtmsL6gRVE0p41sAW3FOAPWUkDxBETeFaAtIn87TNoEznJ+zEdyMbiqJQiPV9Z4c4T4g7raW3n0QtgGojmXaW9OOlYjgmd5/NgnNREqjZJYlmxwsNVZXw80eYWsg7/WdrO3b44mQAkK33aYHzIiOxPiAu+acFZTgg6eMOn2fFCGqrjbQq2eHuER5pH0pvRoYDgU0B6Quwsvgbl79rCDrIOl5vNrqce4g== 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=nzH6EFMW+e3+Xs7xettJZg30tav9rjlAdUzEqGTjlFU=; b=eNuEDpnJGvKgefB/KMfXzNBxiCUJB5nU/VNiWl+aHiG5xI+WxDOtlJbg+9zOdw6xU6nsjS5xuYnCVxf50oVlSMbJqjGJiSQDUChwjcTEteWZ+hu6fWLqUKrww5vgS9yggj1Jyj40XndtoxgnFARiUECqD6BbI2d5XelcZ0OtuZpVg7A6yc1boX70L58LBfOebaix1w2mu4xzHx4Bwdh6nHiqgrPQXnN+iQLdx6cRz4b9fVAlRFohrBTyastvOAiYofnXE0Vsz/6G7gTsT0G35sJ1/hmC6Sq7iuGBr03lUKE7wQLfjpNK7pw0LGEiFHloOv1UEFjdH8gSNF7RvxV41w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=nzH6EFMW+e3+Xs7xettJZg30tav9rjlAdUzEqGTjlFU=; b=vZrmrFR22i1aPqYekL2ea2xnPgR619OXDSqa6tUwtORrSK6F/h9v2zLzmGevDHSs7Sf9TmRfWAyzosXSqY1tSA5z3hfobEoLXi3+L5VHyDOufS+0E4IKEj3NBy+DQAomK8qRA5Iv+ITd3cxCMNXxEoeFas6aj5ud9r7jYoQ6w/tDj8ndREyafbRXV04X1Q/u4H9SgAcoekVJRlm4YNSfBQZ/S+nmK1cFUy7b3ea1WfaZuww+Y0C7x+/Aa26iC9pwh58t4E4fuVh2mxy1pM659z+eiGXwmsrNTOKdsUOkLHW8qum5VRS94tgwLmbEv7GI7F3zg09F6C3nGf/WB7jHBg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <1ff53db0-088e-ec08-b757-b03639c09432@suse.com> Date: Tue, 5 Jul 2022 14:47:04 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: [PATCH v7 07/14] x86: introduce helper for recording degree of contiguity in page tables Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Paul Durrant , =?utf-8?q?Roger_Pau_Monn=C3=A9?= References: <4c9d4b32-d4db-3a4f-fe92-6022e63c3f82@suse.com> In-Reply-To: <4c9d4b32-d4db-3a4f-fe92-6022e63c3f82@suse.com> X-ClientProxiedBy: FR0P281CA0102.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a9::18) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f4e76a39-2084-4ed2-6ff9-08da5e84771b X-MS-TrafficTypeDiagnostic: AM5PR04MB3089:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KHX2nzvOmr4qFPnYicQka8unMweegtMNmAcJzW2JQRf4PSnFPmvUIrzPD/cyuolqQCn89da4Cjai+6/GaPpt8MbH3mwlZsyrErAgc0zH0N8ELDpGIHNuvuL6Sci5E3CzpEEMgy4/XVRj+dTMZEyqoGAZh7K9wettedRRHfTs/qvJssmkMDbm7Yj7HadSLcU5rfqTQN/T/WTceeUTjKJREqPQbwNW4od5JHrvP4xkvZQRPdy4auDjNv4bYF4NVvNRW+xr6EYPTG9fV48jL3oLyJQT6lxACLw0REaCO3PqLGQlUCjIpR+bUVx841AK0ONCq6Sj+OtyhBD9cJFnWreu+IsBa8zgQHCvgTdh6f9CCmYTVdWcbclPJDWlgndjoAQZDu2VrlLLt/GJ65sGTTh1t7owJPN/0uwWYMmR8vGsvP0Ji1HQEA7Gdn5sjp6rqTG0SPy/KPT5R4KvFd6VtffZiuygA3wcoIoELV5Y+KjKUVoeVwIFMGm+8QhjFLWX6x+wKlMaSDPAG8BRzu3LZiGtjhvbxKRJASyWDhBmT1CTgOmOb0fsNFIrPp1lfBHZNcyCf1AzrFUBv319o2rTolGsqGJvZBLeBwYvBnAOviYooIn5D3eHpLkPey7x2FIAI2lX1ut3gHBzA6NqmlPmAfF06CQmh+SbdKeUK6BGA3qVXEAypLHKsXjVpg75tzPBeMQNAhvQDhHEqTMBVvnPCQwuc72DzGDx5NJQuWt18n6Cm7cHgF7RoYwrJvvZ8Fsps/C5W/pMiq1nMtE3gOTEg2Fiv2oezf8kNTZ8ACs7INk97K5gRQN0WOhSMuIsbzAgQzsDA1Ge3Ulyqacw9EUlAAqW/TjsUIqEH0zfTcTEBP+D4FE= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR04MB6560.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(366004)(396003)(39860400002)(376002)(136003)(346002)(478600001)(8936002)(5660300002)(6486002)(86362001)(31696002)(2906002)(6916009)(54906003)(316002)(41300700001)(2616005)(66476007)(66556008)(66946007)(186003)(83380400001)(6506007)(31686004)(38100700002)(36756003)(4326008)(8676002)(26005)(6512007)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?JvYodMl2o/JoFMmlaV7Y1q3BIDQR?= =?utf-8?q?Ba60yJUR/gCDzoFBPl8Er5HyEmmJ/a+FQI4TNvdWrYPqNIZcYbIkiEx31mRS7zYeR?= =?utf-8?q?RF5bcAyyQ2Dp5dWPonNVBakC+5nfyRofVhz0VILPia7B4YOhSej98okyGvMOX9fPV?= =?utf-8?q?1eayYKN4TEfa66C1rcyB/hRLzbHho0FzvBKnoXeWx3hsIAAx3eLBaJu3OYc8jzNAi?= =?utf-8?q?TupaT/Qn2v1nDBrITx+gjsJDkPG30BwZty/srXN25Capndb+NpWkce5maFC2S4v7D?= =?utf-8?q?Rl2emU86k1fTS4/qEKMyvEWM2+QHNtlZm3CY5181qXFLC4CsXV0KM0d1taOjA59Km?= =?utf-8?q?LHWxv2eGYDfwBxGQ70xaKQ/P31HLzUI5jbV+g021spS9iiuVZHjwbj8LMbJbzgT7n?= =?utf-8?q?AmMn7jgu8KtmB7GU/LAtqkKpuAEYp6Eh8G+LmpteSnWxFwNZFMkhAAizrd7MV/wH6?= =?utf-8?q?tYLwngOjiyrFsxv1PEaTPCkRc1HTKz/9bkIXfF9EA6KUCQzo8m9t9h7z4ITYWZFuS?= =?utf-8?q?1p+/4/ol7vkSHXaoxhkNMEHDtLYWBB+sBH1Va+sS2r0k7C94C+CrkAKX/zw34ZCv1?= =?utf-8?q?tUZWr8IM+1IZWz/ZdKmu0lQYb0+lTE6u3qBIcKYJnHT05XYLwHhX1mgsD17Zlw5J8?= =?utf-8?q?9MLYlof9He1mtZi7KbmnBjtQmK1m5Ro9DPyS6wcADgVi8Pn456lvz+hcfCleJfZKf?= =?utf-8?q?VjVejqCaWS+fLd3M/H0EXsEp5kDl2MNvxdcBDjngtKqfy9GsfVXDMTMo7ZCdhoiZs?= =?utf-8?q?2o+81b5KUheAM6KCgOOZl+3wI1poH4gEBOzZzbpGxt1Q9UjwK9sDRM2guQSVVXH8N?= =?utf-8?q?1mi8uQ7TRsDXlLMEgMcMt1aQzbxmdTqs4OHwlskHQqSkBwAoCqvWPiLte8pPoxF5v?= =?utf-8?q?rysOT48EEsV54+b0VKNACw65rHP0bfrEXy2sHwviwd0lbENuEEY+xM72hZG5QicDS?= =?utf-8?q?nxqFnchdzgvdluBh3rxmqzLqPyKLg36qfipTj/VmuS/z4zOVP8t0HmXYMA86N0Nfa?= =?utf-8?q?ccF4sp1IPHYvAyZPkY5bHegKl8PIT4pswJuW0IIVbZiGVCVBK1VoHon6tnBEgx4aT?= =?utf-8?q?07iAaGbr07wIXX+dqI75we0sMHDwsGb+XJuPZjFEY5bslfgBeKeyvuJ0cnGz6kacf?= =?utf-8?q?tViSJPEmQEmx7RaByHShG+wNOdO8Ib/JygvQtkFH9nVNBPPHcIf1PzspUotzNXR8M?= =?utf-8?q?Vu8LQaTpREjC1stZMjudoA+awCJbBrZzEVqE4zy4UXKXw3Um6GEv+dJJQL7RaVCub?= =?utf-8?q?Bd6SueNLttBwO4r5kIGFmvcd1t6WE1hv7ZhOX1RIj6SFpn65fLbC6xcJ06/2Ooae/?= =?utf-8?q?t+fPSxoOSKvsKVUZBMvDaRnHI4hrvkZao48pVDCWkAFLpAEPxr/giVsHesnaLVDoO?= =?utf-8?q?twOnMl0rwHubrPCAZ5zCNbvWweAcAhs5BTQGGFch5c7t26OGD37LJP5M0Pi0kXq2x?= =?utf-8?q?FR1iNQJNEt0QJaheU16iWSCiqq9HnVPykavw6eLW6RacruHydExXwpmLAXj/2vIJc?= =?utf-8?q?zfiESL3XTyU1?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: f4e76a39-2084-4ed2-6ff9-08da5e84771b X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2022 12:47:05.4733 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 6E6aurzClZBOFWPGA7ImmFoHM3ea5vP1JrKR/Exhzt3El9FL9kHTqJorPmT0LOf/WCUMXKTmurzr5NYFOKbg+w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR04MB3089 This is a re-usable helper (kind of a template) which gets introduced without users so that the individual subsequent patches introducing such users can get committed independently of one another. See the comment at the top of the new file. To demonstrate the effect, if a page table had just 16 entries, this would be the set of markers for a page table with fully contiguous mappings: index 0 1 2 3 4 5 6 7 8 9 A B C D E F marker 4 0 1 0 2 0 1 0 3 0 1 0 2 0 1 0 "Contiguous" here means not only present entries with successively increasing MFNs, each one suitably aligned for its slot, but also a respective number of all non-present entries. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Reviewed-by: Paul Durrant --- v5: Bail early from step 1 if possible. Arrange for consumers who are just after CONTIG_{LEVEL_SHIFT,NR}. Extend comment. v3: Rename function and header. Introduce IS_CONTIG(). v2: New. --- /dev/null +++ b/xen/arch/x86/include/asm/pt-contig-markers.h @@ -0,0 +1,110 @@ +#ifndef __ASM_X86_PT_CONTIG_MARKERS_H +#define __ASM_X86_PT_CONTIG_MARKERS_H + +/* + * Short of having function templates in C, the function defined below is + * intended to be used by multiple parties interested in recording the + * degree of contiguity in mappings by a single page table. + * + * Scheme: Every entry records the order of contiguous successive entries, + * up to the maximum order covered by that entry (which is the number of + * clear low bits in its index, with entry 0 being the exception using + * the base-2 logarithm of the number of entries in a single page table). + * While a few entries need touching upon update, knowing whether the + * table is fully contiguous (and can hence be replaced by a higher level + * leaf entry) is then possible by simply looking at entry 0's marker. + * + * Prereqs: + * - CONTIG_MASK needs to be #define-d, to a value having at least 4 + * contiguous bits (ignored by hardware), before including this file (or + * else only CONTIG_LEVEL_SHIFT and CONTIG_NR will become available), + * - page tables to be passed to the helper need to be initialized with + * correct markers, + * - not-present entries need to be entirely clear except for the marker. + */ + +/* This is the same for all anticipated users, so doesn't need passing in. */ +#define CONTIG_LEVEL_SHIFT 9 +#define CONTIG_NR (1 << CONTIG_LEVEL_SHIFT) + +#ifdef CONTIG_MASK + +#include +#include +#include + +#define GET_MARKER(e) MASK_EXTR(e, CONTIG_MASK) +#define SET_MARKER(e, m) \ + ((void)((e) = ((e) & ~CONTIG_MASK) | MASK_INSR(m, CONTIG_MASK))) + +#define IS_CONTIG(kind, pt, i, idx, shift, b) \ + ((kind) == PTE_kind_leaf \ + ? (((pt)[i] ^ (pt)[idx]) & ~CONTIG_MASK) == (1ULL << ((b) + (shift))) \ + : !((pt)[i] & ~CONTIG_MASK)) + +enum PTE_kind { + PTE_kind_null, + PTE_kind_leaf, + PTE_kind_table, +}; + +static bool pt_update_contig_markers(uint64_t *pt, unsigned int idx, + unsigned int level, enum PTE_kind kind) +{ + unsigned int b, i = idx; + unsigned int shift = (level - 1) * CONTIG_LEVEL_SHIFT + PAGE_SHIFT; + + ASSERT(idx < CONTIG_NR); + ASSERT(!(pt[idx] & CONTIG_MASK)); + + /* Step 1: Reduce markers in lower numbered entries. */ + while ( i ) + { + b = find_first_set_bit(i); + i &= ~(1U << b); + if ( GET_MARKER(pt[i]) <= b ) + break; + SET_MARKER(pt[i], b); + } + + /* An intermediate table is never contiguous with anything. */ + if ( kind == PTE_kind_table ) + return false; + + /* + * Present entries need in-sync index and address to be a candidate + * for being contiguous: What we're after is whether ultimately the + * intermediate table can be replaced by a superpage. + */ + if ( kind != PTE_kind_null && + idx != ((pt[idx] >> shift) & (CONTIG_NR - 1)) ) + return false; + + /* Step 2: Check higher numbered entries for contiguity. */ + for ( b = 0; b < CONTIG_LEVEL_SHIFT && !(idx & (1U << b)); ++b ) + { + i = idx | (1U << b); + if ( !IS_CONTIG(kind, pt, i, idx, shift, b) || GET_MARKER(pt[i]) != b ) + break; + } + + /* Step 3: Update markers in this and lower numbered entries. */ + for ( ; SET_MARKER(pt[idx], b), b < CONTIG_LEVEL_SHIFT; ++b ) + { + i = idx ^ (1U << b); + if ( !IS_CONTIG(kind, pt, i, idx, shift, b) || GET_MARKER(pt[i]) != b ) + break; + idx &= ~(1U << b); + } + + return b == CONTIG_LEVEL_SHIFT; +} + +#undef IS_CONTIG +#undef SET_MARKER +#undef GET_MARKER +#undef CONTIG_MASK + +#endif /* CONTIG_MASK */ + +#endif /* __ASM_X86_PT_CONTIG_MARKERS_H */ From patchwork Tue Jul 5 12:47:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12906553 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 lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 80720C433EF for ; Tue, 5 Jul 2022 12:48:18 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.361163.590524 (Exim 4.92) (envelope-from ) id 1o8hyH-00059y-RN; Tue, 05 Jul 2022 12:48:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 361163.590524; Tue, 05 Jul 2022 12:48:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o8hyH-00059G-LZ; Tue, 05 Jul 2022 12:48:05 +0000 Received: by outflank-mailman (input) for mailman id 361163; Tue, 05 Jul 2022 12:48:04 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o8hyG-0004qy-83 for xen-devel@lists.xenproject.org; Tue, 05 Jul 2022 12:48:04 +0000 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2067.outbound.protection.outlook.com [40.107.22.67]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id b52bc30f-fc60-11ec-bd2d-47488cf2e6aa; Tue, 05 Jul 2022 14:48:02 +0200 (CEST) Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by AM0PR04MB5252.eurprd04.prod.outlook.com (2603:10a6:208:cf::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.21; Tue, 5 Jul 2022 12:48:00 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::dfa:a64a:432f:e26b]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::dfa:a64a:432f:e26b%7]) with mapi id 15.20.5395.021; Tue, 5 Jul 2022 12:47:59 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: b52bc30f-fc60-11ec-bd2d-47488cf2e6aa ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=J2Y4SB0nt/+lGPUEXk+04nHq25JN1bmQhQJKeBvQdchFcpy7WU3QQ/29NEX1WxyTdtIJGFqG8SRRZ6YBK0yLB4/szPnjIEua7mnFpenh3qAJP1H/nlHpsd+Dmu2Mf8js4wJVtiA5I9eFxWXIXISiWmZrA6Ie1X0w97JKbRYB+Cwusd8v6jWH5E48cQcC5nYdHr96OG9bzO90/OmZ+1RF9KxUmgVracsmskXuzbN8woOTeKoCcm29LdG0nXwoJKEKEDQZY389bc78jgCoybm1bEj3rTGOalXMkiByGfqlqhZbJqO6FUvz3NaNnlLjhF2OKE05G4ieWUQjvjhVLw0AEw== 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=hBJ+nA86CUu4Iegk0a8bS6g3MTobVKpnG0RqAIWkZLM=; b=Ah2E6qAOLtnhMC2A3W/hR2Uo447DNGk1JBmsklLLI/58x75ojhd/wkxlswJ63XbBqbwZEinSa94E7WXcTutEeKYP8Zjls2H84f4RK3xTT9S1Dl41/McIJ3gw5wWIuGmCNN2c+gCmxe1o1p/Q7wTZ8HW0M257Xl6T2Fl7GsCTkD3xkp2SlE8psvIZvzjI0hh79wKEX8TjLbzwpsmaAGYbcMAh1ZscmJw4mlGrZ4mw0C5AcCF3zarpgDAkCp6Nhi/K1/AIwp4VmMpMXJu5rnnvUpKLcI4Bn148jCDUs8lMs39NRdcqmjh9Lm/dqSVqbhQwt8kGKnO46vptNhGDFKmctQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hBJ+nA86CUu4Iegk0a8bS6g3MTobVKpnG0RqAIWkZLM=; b=QTwJWf3JfT2vsx/VyLm8Y8fKgpO6VBInY6R3CIKk0JQmNskOXSqZO0YXExSGw9caRRelqRuLj3AoKaK93QeLRXggqL2F9u8YzD2b9BXBJMIQpnmNhPuc7/+B9gwEIJpZfDAjnNShO6hO3aBpx1NCrmrZNGRrw6hzUyEXpRRpvoCowtEihg/AJZbpKmAt4A9fvdS3a2Qt69ON06BSt5AustmVY0ZwBuGqcKun5xvfdwBGnE6jErxCDUdHzIpdwYDHNMIgsS65U/8X75sxB9BZYCRXJuFjoMKqNQk7oCB/R3yfl2MztDiCFbg4pSbEPvKXjyN2J7kGQyxBlS9exNhgoQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: Date: Tue, 5 Jul 2022 14:47:26 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: [PATCH v7 08/14] IOMMU/x86: prefill newly allocate page tables Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Paul Durrant , =?utf-8?q?Roger_Pau_Monn=C3=A9?= References: <4c9d4b32-d4db-3a4f-fe92-6022e63c3f82@suse.com> In-Reply-To: <4c9d4b32-d4db-3a4f-fe92-6022e63c3f82@suse.com> X-ClientProxiedBy: AS9PR06CA0411.eurprd06.prod.outlook.com (2603:10a6:20b:461::25) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bc706466-9186-450b-fc37-08da5e8484ac X-MS-TrafficTypeDiagnostic: AM0PR04MB5252:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WAgGNLApFgpHZ7E0CNKvsAGRtRDK0qzaoR4DwfDZWDvGYI8diwHm1dpg3pZ2KPKVA7zLIlj0ILQW/otE1Bxll0Joi16mQhJMmw00L+kmx+Ml3wxP49+ttKgyptOxi3xxN0JGgvMG+6zMXmqpAMp4iD5n+ok73tJ1p9VA6ZZWS+iQvavm1cvcIBvZ99m5tC6JLnTxqQa54j9a/GFcFLTiXF6mlhyJLRnpLM/waDceFk14sVytW1Q+roIzpJRG0/00hdZtlaEfi9U9RB+siE/sh8RQ56+1UiCpNxA/gY+Dd1VYSjf8UhWpcOAjRjyGFFNQUuDaYQohG5JVCXJlCVsC8Rt47XAQEDphkqRL1WDZmhIEO2APzD3mpY8x9foLsYE3F74W3VMpSSrPPFylO0GHGfkxV20pyNRSaVbebpTVGldH+7HT9bkJfZi4SXx8gkKE604BQWLV8ph8F6zt71plwXixvsjoKBE4BeKfFbXpU/cgzgCnmeCehMMcAi/R6Tw3gmMHyGM6OkPaYiLQtJkQfzsAqdExERr28y97eOl5hvMp+EJ+BllxRbEqXCVxbSZHKYlmO1bRE+gEobcWhn61RTfUmtb9BygEJIXLs7zjzlHKdDYFaOUiCn+pM+yKufbRt0EK7nzzgHJ0UtsUoMhV34T7MLNYlyNR94UU1CSsUKOsZKigEHyxW7DZaxoBtgaLbsV41WyiOpgwF7//qk+SyKRaZx0cwUJnEXez4QONj29neRL7pYGP6H8Wi4SP6OezusZu6P5OSwU96kKrQ/5Ss8sm86d2zejt011TXa8olzHMTk2Oani5kEU2vPb19rCSsM6I8RimxlLV7cSgjRHr8WgubbWbBhv1sWHR6IIX7O0= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR04MB6560.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(136003)(346002)(376002)(396003)(366004)(39860400002)(478600001)(5660300002)(8936002)(6916009)(54906003)(316002)(86362001)(31696002)(6486002)(66946007)(4326008)(66476007)(8676002)(66556008)(31686004)(2906002)(83380400001)(2616005)(186003)(6512007)(26005)(38100700002)(41300700001)(6506007)(6666004)(36756003)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?fUvksxUQl2auYj2xsnwRxIbzRJ7j?= =?utf-8?q?AA+2HIfNC2n30QO9arHbC+PUEzuv1fyaT3s5SpjeNR2615knRI68L9ldKTTaFq/sj?= =?utf-8?q?K8T+9hXTjsw2mtsiV/FBfb8xmt3ayddLEmVx9Dzps1vzrsDGVR14JgKk9Zz8oEyog?= =?utf-8?q?Hryij1PnULDCBn20iW+8Ug7zoIJEtI69rf7GAQEIHXrhasUI9DMmynZzc9pnVslF0?= =?utf-8?q?jL2HTaPyoHO5H4O/0iDqCqTMSwFw68nOP896+QaF9erdeNv30+A70nftGq3ezJ/31?= =?utf-8?q?2ZDTP8HFq8e9Dzr+FAtAGMYEEG2RfCv7TV2+0izXv+fl1s/xncgoQwdgfVaK/Aiab?= =?utf-8?q?NFwlysnAR7HOTVaerl84RF/dMmlJctC+I6WCG3F2BsLopv+qsqYn68b6c6E/0YG8Q?= =?utf-8?q?EkGq1spcHcNrkExY2p1v3Dw/TBVaucLXVzArMRXjOCILWlMAFnYxXJa8IW5tTaQY3?= =?utf-8?q?jBlKT/I50Q15EuynMfn4SAB43QwJ0UXgd5m3PsQYw6S5pou3EG/FjUMZk2KQF/k6Q?= =?utf-8?q?vhLw/kVDU7hS8lgDvKAIiZz2S9VpWdrLfX5xB+zPTGFNPaiPiFsiTvmhPB/0DErFT?= =?utf-8?q?kyLkTkg0b2GAA3JIcLeQJ3xIYmjY8D5M4TMA51EqaRa0DK9gP143j/MWDTJKwdoOS?= =?utf-8?q?q8zc47VPp2iCc+/r87suVC7EtCW6Xk8QgC35VSrJQNBEtLkR/NwNpbiASvPexLbO0?= =?utf-8?q?es/h9L82bwKZ97CX4QKej+FSa+uTjLvEUOMTr21HkzsVg3Z75x2U0D4AgP4Wy6GwV?= =?utf-8?q?al6iE3f9/9U2qku4cm/zmZzxGnDwPENBZzlvk3qvA++zMirARgsv2qkm/Ia9weFp1?= =?utf-8?q?YOVkg5TlH9D9jGDqAdPoWOqz2UHAywjwZkeepueYuemaQNqhaS3y5Bg14GZcZdpIS?= =?utf-8?q?ypCfxQvir33QGZ2IGf+ZM6VWClxWOqWR2A7+eAfCaeKspLcE6zNJT4VExUV5JNi7S?= =?utf-8?q?SlOFyCEeoBAi109AvI/QyJuI0/O5ul93j+1f9SNXUyCyA7UZAkYDJyUQ1bboOGv73?= =?utf-8?q?cpp3sVl7JJJlniTfzvwXYuq1mn4cDgC1GU+gAIeQ6r2MonMN3OLwnRxbPbsg0EgPu?= =?utf-8?q?h2fw/pD7Y0BkLiIbEJwekA/f3RyzmbToHCbGoqVHyEYG3cRYI/1eiehASdNN4j2c/?= =?utf-8?q?IX56M8D4b+Ub4Lj5rj+S4vBZXqfP5aNxR9wDjQR2HUPs88h3ms9dCZzYU5yeW+2uF?= =?utf-8?q?gOvnVTEqrI1ULDY+oKUdnR9Fhi15vUVQQnRelLxPKvSQ8/TUjz4H4w2MNbhWF2q3K?= =?utf-8?q?qAZTxTkdM7HzmQKguEjsnY/T96lS42s7I13L90Dkm456zAXFExyQGYWVPvpGuyZoz?= =?utf-8?q?35UF2Ty0mU2X2fmgLID0dk/cVwGma7ayNXY3nNU0WikywQY8H60Ftqh9Fc5loxCba?= =?utf-8?q?6Txm+nb+P/wwwzooIDT2Dwh/CG7YaenFPRv3Ijeirp0u1qTZVS7thw3nxuhtN0s5f?= =?utf-8?q?MITop47+LOI12nFgSB/Ex9MPb6f954F/CpPbVpIkoiG4wUzQguXb5U2ZfWKka91rD?= =?utf-8?q?bw3HQ2LDTa2x?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: bc706466-9186-450b-fc37-08da5e8484ac X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2022 12:47:28.2219 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Zp3FlZr+YQqzyLOvBTWxJvy9+ynixkOvZP3gTA37sqUbvEekJBbK7dQzM0eTev2ggDO/x62/F8S5tzEhcURXDg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5252 Page tables are used for two purposes after allocation: They either start out all empty, or they are filled to replace a superpage. Subsequently, to replace all empty or fully contiguous page tables, contiguous sub-regions will be recorded within individual page tables. Install the initial set of markers immediately after allocation. Make sure to retain these markers when further populating a page table in preparation for it to replace a superpage. The markers are simply 4-bit fields holding the order value of contiguous entries. To demonstrate this, if a page table had just 16 entries, this would be the initial (fully contiguous) set of markers: index 0 1 2 3 4 5 6 7 8 9 A B C D E F marker 4 0 1 0 2 0 1 0 3 0 1 0 2 0 1 0 "Contiguous" here means not only present entries with successively increasing MFNs, each one suitably aligned for its slot, and identical attributes, but also a respective number of all non-present (zero except for the markers) entries. Signed-off-by: Jan Beulich Reviewed-by: Kevin Tian Reviewed-by: Roger Pau Monné Reviewed-by: Paul Durrant --- An alternative to the ASSERT()s added to set_iommu_ptes_present() would be to make the function less general-purpose; it's used in a single place only after all (i.e. it might as well be folded into its only caller). While in VT-d's comment ahead of struct dma_pte I'm adjusting the description of the high bits, I'd like to note that the description of some of the lower bits isn't correct either. Yet I don't think adjusting that belongs here. --- v6: Use sizeof(). v5: Assert next_mfn is suitably aligned in set_iommu_ptes_present(). Use CONTIG_LEVEL_SHIFT in favor of PAGE_SHIFT-3. v4: Add another comment referring to pt-contig-markers.h. Re-base. v3: Add comments. Re-base. v2: New. --- a/xen/arch/x86/include/asm/iommu.h +++ b/xen/arch/x86/include/asm/iommu.h @@ -146,7 +146,8 @@ void iommu_free_domid(domid_t domid, uns int __must_check iommu_free_pgtables(struct domain *d); struct domain_iommu; -struct page_info *__must_check iommu_alloc_pgtable(struct domain_iommu *hd); +struct page_info *__must_check iommu_alloc_pgtable(struct domain_iommu *hd, + uint64_t contig_mask); void iommu_queue_free_pgtable(struct domain_iommu *hd, struct page_info *pg); #endif /* !__ARCH_X86_IOMMU_H__ */ --- a/xen/drivers/passthrough/amd/iommu-defs.h +++ b/xen/drivers/passthrough/amd/iommu-defs.h @@ -446,11 +446,13 @@ union amd_iommu_x2apic_control { #define IOMMU_PAGE_TABLE_U32_PER_ENTRY (IOMMU_PAGE_TABLE_ENTRY_SIZE / 4) #define IOMMU_PAGE_TABLE_ALIGNMENT 4096 +#define IOMMU_PTE_CONTIG_MASK 0x1e /* The ign0 field below. */ + union amd_iommu_pte { uint64_t raw; struct { bool pr:1; - unsigned int ign0:4; + unsigned int ign0:4; /* Covered by IOMMU_PTE_CONTIG_MASK. */ bool a:1; bool d:1; unsigned int ign1:2; --- a/xen/drivers/passthrough/amd/iommu_map.c +++ b/xen/drivers/passthrough/amd/iommu_map.c @@ -21,6 +21,8 @@ #include "iommu.h" +#include + /* Given pfn and page table level, return pde index */ static unsigned int pfn_to_pde_idx(unsigned long pfn, unsigned int level) { @@ -113,9 +115,23 @@ static void set_iommu_ptes_present(unsig return; } + ASSERT(!(next_mfn & (page_sz - 1))); + while ( nr_ptes-- ) { - set_iommu_pde_present(pde, next_mfn, 0, iw, ir); + ASSERT(!pde->next_level); + ASSERT(!pde->u); + + if ( pde > table ) + ASSERT(pde->ign0 == find_first_set_bit(pde - table)); + else + ASSERT(pde->ign0 == CONTIG_LEVEL_SHIFT); + + pde->iw = iw; + pde->ir = ir; + pde->fc = true; /* See set_iommu_pde_present(). */ + pde->mfn = next_mfn; + pde->pr = true; ++pde; next_mfn += page_sz; @@ -295,7 +311,7 @@ static int iommu_pde_from_dfn(struct dom mfn = next_table_mfn; /* allocate lower level page table */ - table = iommu_alloc_pgtable(hd); + table = iommu_alloc_pgtable(hd, IOMMU_PTE_CONTIG_MASK); if ( table == NULL ) { AMD_IOMMU_ERROR("cannot allocate I/O page table\n"); @@ -325,7 +341,7 @@ static int iommu_pde_from_dfn(struct dom if ( next_table_mfn == 0 ) { - table = iommu_alloc_pgtable(hd); + table = iommu_alloc_pgtable(hd, IOMMU_PTE_CONTIG_MASK); if ( table == NULL ) { AMD_IOMMU_ERROR("cannot allocate I/O page table\n"); @@ -726,7 +742,7 @@ static int fill_qpt(union amd_iommu_pte * page table pages, and the resulting allocations are always * zeroed. */ - pgs[level] = iommu_alloc_pgtable(hd); + pgs[level] = iommu_alloc_pgtable(hd, 0); if ( !pgs[level] ) { rc = -ENOMEM; @@ -784,7 +800,7 @@ int cf_check amd_iommu_quarantine_init(s return 0; } - pdev->arch.amd.root_table = iommu_alloc_pgtable(hd); + pdev->arch.amd.root_table = iommu_alloc_pgtable(hd, 0); if ( !pdev->arch.amd.root_table ) return -ENOMEM; --- a/xen/drivers/passthrough/amd/pci_amd_iommu.c +++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c @@ -342,7 +342,7 @@ int amd_iommu_alloc_root(struct domain * if ( unlikely(!hd->arch.amd.root_table) && d != dom_io ) { - hd->arch.amd.root_table = iommu_alloc_pgtable(hd); + hd->arch.amd.root_table = iommu_alloc_pgtable(hd, 0); if ( !hd->arch.amd.root_table ) return -ENOMEM; } --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -334,7 +334,7 @@ static uint64_t addr_to_dma_page_maddr(s goto out; pte_maddr = level; - if ( !(pg = iommu_alloc_pgtable(hd)) ) + if ( !(pg = iommu_alloc_pgtable(hd, 0)) ) goto out; hd->arch.vtd.pgd_maddr = page_to_maddr(pg); @@ -376,7 +376,7 @@ static uint64_t addr_to_dma_page_maddr(s } pte_maddr = level - 1; - pg = iommu_alloc_pgtable(hd); + pg = iommu_alloc_pgtable(hd, DMA_PTE_CONTIG_MASK); if ( !pg ) break; @@ -388,12 +388,13 @@ static uint64_t addr_to_dma_page_maddr(s struct dma_pte *split = map_vtd_domain_page(pte_maddr); unsigned long inc = 1UL << level_to_offset_bits(level - 1); - split[0].val = pte->val; + split[0].val |= pte->val & ~DMA_PTE_CONTIG_MASK; if ( inc == PAGE_SIZE ) split[0].val &= ~DMA_PTE_SP; for ( offset = 1; offset < PTE_NUM; ++offset ) - split[offset].val = split[offset - 1].val + inc; + split[offset].val |= + (split[offset - 1].val & ~DMA_PTE_CONTIG_MASK) + inc; iommu_sync_cache(split, PAGE_SIZE); unmap_vtd_domain_page(split); @@ -2168,7 +2169,7 @@ static int __must_check cf_check intel_i if ( iommu_snoop ) dma_set_pte_snp(new); - if ( old.val == new.val ) + if ( !((old.val ^ new.val) & ~DMA_PTE_CONTIG_MASK) ) { spin_unlock(&hd->arch.mapping_lock); unmap_vtd_domain_page(page); @@ -3058,7 +3059,7 @@ static int fill_qpt(struct dma_pte *this * page table pages, and the resulting allocations are always * zeroed. */ - pgs[level] = iommu_alloc_pgtable(hd); + pgs[level] = iommu_alloc_pgtable(hd, 0); if ( !pgs[level] ) { rc = -ENOMEM; @@ -3115,7 +3116,7 @@ static int cf_check intel_iommu_quaranti if ( !drhd ) return -ENODEV; - pg = iommu_alloc_pgtable(hd); + pg = iommu_alloc_pgtable(hd, 0); if ( !pg ) return -ENOMEM; --- a/xen/drivers/passthrough/vtd/iommu.h +++ b/xen/drivers/passthrough/vtd/iommu.h @@ -253,7 +253,10 @@ struct context_entry { * 2-6: reserved * 7: super page * 8-11: available - * 12-63: Host physcial address + * 12-51: Host physcial address + * 52-61: available (52-55 used for DMA_PTE_CONTIG_MASK) + * 62: reserved + * 63: available */ struct dma_pte { u64 val; @@ -263,6 +266,7 @@ struct dma_pte { #define DMA_PTE_PROT (DMA_PTE_READ | DMA_PTE_WRITE) #define DMA_PTE_SP (1 << 7) #define DMA_PTE_SNP (1 << 11) +#define DMA_PTE_CONTIG_MASK (0xfull << PADDR_BITS) #define dma_clear_pte(p) do {(p).val = 0;} while(0) #define dma_set_pte_readable(p) do {(p).val |= DMA_PTE_READ;} while(0) #define dma_set_pte_writable(p) do {(p).val |= DMA_PTE_WRITE;} while(0) @@ -276,7 +280,7 @@ struct dma_pte { #define dma_pte_write(p) (dma_pte_prot(p) & DMA_PTE_WRITE) #define dma_pte_addr(p) ((p).val & PADDR_MASK & PAGE_MASK_4K) #define dma_set_pte_addr(p, addr) do {\ - (p).val |= ((addr) & PAGE_MASK_4K); } while (0) + (p).val |= ((addr) & PADDR_MASK & PAGE_MASK_4K); } while (0) #define dma_pte_present(p) (((p).val & DMA_PTE_PROT) != 0) #define dma_pte_superpage(p) (((p).val & DMA_PTE_SP) != 0) --- a/xen/drivers/passthrough/x86/iommu.c +++ b/xen/drivers/passthrough/x86/iommu.c @@ -26,6 +26,7 @@ #include #include #include +#include #include const struct iommu_init_ops *__initdata iommu_init_ops; @@ -534,11 +535,12 @@ int iommu_free_pgtables(struct domain *d return 0; } -struct page_info *iommu_alloc_pgtable(struct domain_iommu *hd) +struct page_info *iommu_alloc_pgtable(struct domain_iommu *hd, + uint64_t contig_mask) { unsigned int memflags = 0; struct page_info *pg; - void *p; + uint64_t *p; #ifdef CONFIG_NUMA if ( hd->node != NUMA_NO_NODE ) @@ -550,7 +552,29 @@ struct page_info *iommu_alloc_pgtable(st return NULL; p = __map_domain_page(pg); - clear_page(p); + + if ( contig_mask ) + { + /* See pt-contig-markers.h for a description of the marker scheme. */ + unsigned int i, shift = find_first_set_bit(contig_mask); + + ASSERT((CONTIG_LEVEL_SHIFT & (contig_mask >> shift)) == CONTIG_LEVEL_SHIFT); + + p[0] = (CONTIG_LEVEL_SHIFT + 0ull) << shift; + p[1] = 0; + p[2] = 1ull << shift; + p[3] = 0; + + for ( i = 4; i < PAGE_SIZE / sizeof(*p); i += 4 ) + { + p[i + 0] = (find_first_set_bit(i) + 0ull) << shift; + p[i + 1] = 0; + p[i + 2] = 1ull << shift; + p[i + 3] = 0; + } + } + else + clear_page(p); iommu_sync_cache(p, PAGE_SIZE); From patchwork Tue Jul 5 12:47:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12906554 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 lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B21A3CCA47B for ; Tue, 5 Jul 2022 12:48:18 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.361161.590519 (Exim 4.92) (envelope-from ) id 1o8hyH-00056r-G2; Tue, 05 Jul 2022 12:48:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 361161.590519; Tue, 05 Jul 2022 12:48:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o8hyH-00056c-CB; Tue, 05 Jul 2022 12:48:05 +0000 Received: by outflank-mailman (input) for mailman id 361161; Tue, 05 Jul 2022 12:48:03 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o8hyF-0004qy-Fs for xen-devel@lists.xenproject.org; Tue, 05 Jul 2022 12:48:03 +0000 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2067.outbound.protection.outlook.com [40.107.22.67]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id b4afddd3-fc60-11ec-bd2d-47488cf2e6aa; Tue, 05 Jul 2022 14:48:02 +0200 (CEST) Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by AM0PR04MB5252.eurprd04.prod.outlook.com (2603:10a6:208:cf::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.21; Tue, 5 Jul 2022 12:48:00 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::dfa:a64a:432f:e26b]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::dfa:a64a:432f:e26b%7]) with mapi id 15.20.5395.021; Tue, 5 Jul 2022 12:48:00 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: b4afddd3-fc60-11ec-bd2d-47488cf2e6aa ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nm3IJ4XilEA5dQuHiLq0ypPMUDrcfS9yHJVrPCwgx/BxjECU73yZOWB0pkDlB4HmBcmklt1Lz6cT0f7a9adZCr07nYvRsrhVFDAhKst2mSclsuzq417yXvmnt4NHnbVC5PO6ZBQZa5UeGdP70CNTsyqDoRhn2CWLuBLkuWKXg14xKKBeQNBhtI25ReJZqJaK71yeGBTF3fXia6xlvN3CUKN/c5k2d23Qk0fjlcuV88T3grPQBKX2/nWxv8/pRGfP4atzrjnlS/WfqJ4EqgDoPhh88BeE70m6QtME5NLvRuGOjQpm//1Zdq0XAYiN+vzhsL0G3SVOH0Fi5XayEjL5Ug== 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=i1SRbMZ5vtUn4A75NysmPVCeWEjl1KBkL8Pu3NNkQeY=; b=cCRCT5sbnFJsYYp/dLCVIAyMhqlinWAfrijRae1CyliIsgVnvotXTiOl46e+vGa94jPqCoLoPofOjdue15L4lHDeC+o0Pxnxk0o08RNoiBvgXO2YkzreuCNzBBkyjvg0NUHWhqGmA9xM+injsqCHpk/pOaEzMoHQQnzdMgpG7OqW7XreG8xydMgZDTiaJ9wkcr5h3gFNOXA0R9s+Ln9josbXelelbaWRcgFWfEfcpXfvSFv9DPG6okiV6iuE59OFiLCQ1m2oqNodIjO1vPAWnfQMyKXr1NuTwObtw68N/8XO7/TnP916waTb9u9SxKW4jRt/rrgxfSOAKnXOHB6Omw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=i1SRbMZ5vtUn4A75NysmPVCeWEjl1KBkL8Pu3NNkQeY=; b=OWe7mQQ1XegK+LkJ7EX8uhxjrh6da1L0UQKlZmnJYy5aTHCEzU8AiqM6hOY3kB7NdBLtsQV7QZkTnHfDeOAcg8MjcCbAvzmJjRIPbpOlpVO+6hys6sBfaEgLkCxBaYPk9rYhmr1oaAq9PINmln2uJeemGWiHrGitEMAJX01AoDq81a5/fzxqIs3yBoA0bZhgjOQWffWxG51S3GGAJEkb5H3Ax2vwuk1NCr7R8KmN2VHml7UMBDe1o53ORAu3G3ijN00Tsj57fZZUu1VuzhaFu6Ti/+056VMa94XrXqvvAFniARRHvloZ9+SS2aicbMBU5J+TKKGV1ZiFpR86wrUQUQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <8b375834-5f36-c1d5-f13d-dc9bb7b53134@suse.com> Date: Tue, 5 Jul 2022 14:47:46 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: [PATCH v7 09/14] AMD/IOMMU: free all-empty page tables Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Paul Durrant , =?utf-8?q?Roger_Pau_Monn=C3=A9?= References: <4c9d4b32-d4db-3a4f-fe92-6022e63c3f82@suse.com> In-Reply-To: <4c9d4b32-d4db-3a4f-fe92-6022e63c3f82@suse.com> X-ClientProxiedBy: FR3P281CA0011.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1d::17) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dfc798b1-66fb-4430-4631-08da5e84902d X-MS-TrafficTypeDiagnostic: AM0PR04MB5252:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: i8eYTngNIfSMExO9QXmyQkMhACZnADrE7jxudhD9cU6ElmI2uQZsPamZWb71zdKjHpZRAFM7xF+sYCbFyjsPqRyAqQjD7cIQDLq4hKJwDidchauKEZFUATwggkmswHXPYkgTQxnpVc3kW1B6vKwRifA2PpFEf/X7byRFjoVfXDcXGMCI5E7KemKVbLwR8+/SrgRW6okOgLPYZn9GnTH6Zxb2eVNjyaHSRQZDzZw+iLn+8PRFG46Z+cefEmTOy4neEAWynrtryRx3KTr/6IYWCLz+JN8g2200JzNRTZgM/v7EnuSUmVWYctW9QYGX2BICOYHNqjzN8rdztoBceeLKSVS70eRirsi35RiY3e5aRMPZf8de2FYu9C8VamK34Ruo1R0TpPFi4x0VZLEBIErsD6x0r034tLWJjF+w+RdcpxQj2uEcz8B4vc/g16nlONz7/DI6ZUkTSQBpb3LbNAGgKPg7vpU8pmMLKQtIAIOlmkc7b75enoo8ubrr+5tzxF9KVhqyfpdq0nIS5pTbQR59I2jSus+BzZBSa9CJnOc/pbnUaDJb1HIJTQd8LKQZpbIay/WlvrNT/Z5hr1gQRZPykt8BCEuOBMtV8IZrLquEnsW3dtHj6qMajyFRnBI7menEKqmEZNC7PUXgdcMHK6TvEMFDJU+Z9IT2lxpsXKHj/SuTvYR1IpIdvVUVB6YPBjRSog/lXsjlv1fHgjY9UOZmj3D1D0G3fmQuFE7+4PqmQKIgg/p+qI84NIym9i373gPL8WPuOgAHJ+EMOQ1A0MqEP5ozqqCJhC3mTzxvWCjCnxP5HGmMRcGbjfdFqxikCAtKssu8p3Nwu9TOGQW/c16wIg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR04MB6560.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(136003)(346002)(376002)(396003)(366004)(39860400002)(478600001)(5660300002)(8936002)(6916009)(54906003)(316002)(86362001)(31696002)(6486002)(66946007)(4326008)(66476007)(8676002)(66556008)(31686004)(2906002)(83380400001)(2616005)(186003)(6512007)(26005)(38100700002)(41300700001)(6506007)(6666004)(36756003)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?jKepwc6qPVDbDX4+BpWwDZsJq32O?= =?utf-8?q?1S3VIU86qNADMu9WlPEyflyRgilcJDym2thcqNVKw6wZpkDpcLkLfceoiuCW3OhtN?= =?utf-8?q?913Xh/lf1p9/eXtrU45crYOEEWW4kI5bDzXR8XXQfpGZgQp26glNt6xlE4y5LXPzR?= =?utf-8?q?T5vKUonHbat8KQDee0WSOVLnFf7Q4qydq+Xgrc45sX5XsMIenL8e3WrUIeia5AN46?= =?utf-8?q?dKmguvnsxCYgHIP+9X8OebGrMsONnATySo54/E6NqQUcizZ1XQzgnxVyBZETJJESr?= =?utf-8?q?aR0zKMVuu4UsHTCwmIrIg+nVsFPu/p3NdfsZXZKc4p7h3c7MNx7Fj9WM83YZHbikO?= =?utf-8?q?2ywUTYOnNG4HkBlN1UQOUYBH5oQ4L1zkoip08/LAATmztwK32s6TKGcFZxJGAWwH2?= =?utf-8?q?lmie8kxqtIrTjn+59wBnhDqj2yRCIrGMPCJoSubh35eRShbArJ7266xkGkADVj5yx?= =?utf-8?q?XTzPTgBHjqzZd+qjvUGfPRc1j0yj2a0higkd2689J5UR4hvK0x+fZEmfh7jMsFFH3?= =?utf-8?q?LTPEPTrOpRhs25RP3eSHEmSjw3k6gqvxs4iY2AvCRZWvpxjiLH7sTjh+Fo2yvq9DM?= =?utf-8?q?Le3JHsWC4w65inAPT2RixEkLSY/ka2plX0i7Y1LZMLblN2cHK984ggWgbjfcMZelc?= =?utf-8?q?uQ23rstQHbVmY8aq86VVZZiYO/RvnD0ksXKLCd+TFM1h7vn6DBogDP6/Ntw5dEWDN?= =?utf-8?q?jFt2OfGEdxpLktfvjDdhcEP5hsWj1J4tRN0ImAjlHscFbAijw+0M1Hevk5cZiMzC6?= =?utf-8?q?Ud7tZnEtooYQ5uWTthEdxjaWs0E1YwyBNXOgFv1vJPb7AVCTzXy5WFJeSKhQyLwR1?= =?utf-8?q?1QsMBPOdPndST1b0pZ54IOD+aTIBZ+d5na1ZCYSs7oLuRo6G9Sf+6GjVcHUtzoQJw?= =?utf-8?q?+8/rs+20SuqQfUQx+/IIK3qoKsxqam8JIw/pYpurTgE1BePlmCKu8TEXkVcMY/GHR?= =?utf-8?q?aIQIoR+uIApQWg5EJejlA1RFC2cgveiUNFokWyehOVMeI5TavNYqIrMBxd8sxb0SC?= =?utf-8?q?wAVCUtG3cFOfMC3Yf7D3z/1YwyEgSIvJItRCbS6GPYWKtqwdhyxHE3mpgqREaqA+9?= =?utf-8?q?ywedChUsRt7ULXYpcgFF7PZiR9lTDKaxUwrmC2Ap8MMyGMRRTUXbafVOqYH68btvt?= =?utf-8?q?SknzjqTl15IjTMY5vf8lPAcNPmjit8+FWE/6PbX2hCVqO/oZTFGFvLQwvBFPJ/Czn?= =?utf-8?q?b+rbBoOiFCllKCGnF/futurtzJwnMulEqvsdrcngZ026kQTcUbPxEFDT7bBZlHcp7?= =?utf-8?q?ri/Yv/lD4RldWtBBjgEfTMmv21XTpIH/zx+wGZ5moZdJ1lOmr1CEwvckZpBjsQ5vh?= =?utf-8?q?h5+HXf2TFgNiVTu1ueC2CDk8sBMb/X31cptIKOxeU+Nwm5vFI7wUImN9zvjFrwWF1?= =?utf-8?q?q0mCtBrpZHrXYteABvXsw3HPcSdllP3DJ0mBqxNm5PXK/WIogB82f09V5zD98Y2p7?= =?utf-8?q?oODYCEbMq+ZRoPGMNphNHcoVpOPtSGm8rq0pjuCENucrDS6VB/y5lQvyHCC0xHjfM?= =?utf-8?q?n6s8VsclPvO1?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: dfc798b1-66fb-4430-4631-08da5e84902d X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2022 12:47:47.5176 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: HhKj/Gwz7LR4mr+KHf6MrEZD2xZXCne6zeiyd/uhEbtlkwfQrzu3fB+UwA3tvgZrKBMJmrR7RyvL0vOmCFVmkA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5252 When a page table ends up with no present entries left, it can be replaced by a non-present entry at the next higher level. The page table itself can then be scheduled for freeing. Note that while its output isn't used there yet, pt_update_contig_markers() right away needs to be called in all places where entries get updated, not just the one where entries get cleared. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Reviewed-by: Paul Durrant --- v5: Re-base over changes earlier in the series. v4: Re-base over changes earlier in the series. v3: Re-base over changes earlier in the series. v2: New. --- a/xen/drivers/passthrough/amd/iommu_map.c +++ b/xen/drivers/passthrough/amd/iommu_map.c @@ -21,6 +21,7 @@ #include "iommu.h" +#define CONTIG_MASK IOMMU_PTE_CONTIG_MASK #include /* Given pfn and page table level, return pde index */ @@ -35,16 +36,20 @@ static unsigned int pfn_to_pde_idx(unsig static union amd_iommu_pte clear_iommu_pte_present(unsigned long l1_mfn, unsigned long dfn, - unsigned int level) + unsigned int level, + bool *free) { union amd_iommu_pte *table, *pte, old; + unsigned int idx = pfn_to_pde_idx(dfn, level); table = map_domain_page(_mfn(l1_mfn)); - pte = &table[pfn_to_pde_idx(dfn, level)]; + pte = &table[idx]; old = *pte; write_atomic(&pte->raw, 0); + *free = pt_update_contig_markers(&table->raw, idx, level, PTE_kind_null); + unmap_domain_page(table); return old; @@ -87,7 +92,11 @@ static union amd_iommu_pte set_iommu_pte if ( !old.pr || old.next_level || old.mfn != next_mfn || old.iw != iw || old.ir != ir ) + { set_iommu_pde_present(pde, next_mfn, 0, iw, ir); + pt_update_contig_markers(&table->raw, pfn_to_pde_idx(dfn, level), + level, PTE_kind_leaf); + } else old.pr = false; /* signal "no change" to the caller */ @@ -326,6 +335,9 @@ static int iommu_pde_from_dfn(struct dom smp_wmb(); set_iommu_pde_present(pde, next_table_mfn, next_level, true, true); + pt_update_contig_markers(&next_table_vaddr->raw, + pfn_to_pde_idx(dfn, level), + level, PTE_kind_table); *flush_flags |= IOMMU_FLUSHF_modified; } @@ -351,6 +363,9 @@ static int iommu_pde_from_dfn(struct dom next_table_mfn = mfn_x(page_to_mfn(table)); set_iommu_pde_present(pde, next_table_mfn, next_level, true, true); + pt_update_contig_markers(&next_table_vaddr->raw, + pfn_to_pde_idx(dfn, level), + level, PTE_kind_table); } else /* should never reach here */ { @@ -487,8 +502,24 @@ int cf_check amd_iommu_unmap_page( if ( pt_mfn ) { + bool free; + /* Mark PTE as 'page not present'. */ - old = clear_iommu_pte_present(pt_mfn, dfn_x(dfn), level); + old = clear_iommu_pte_present(pt_mfn, dfn_x(dfn), level, &free); + + while ( unlikely(free) && ++level < hd->arch.amd.paging_mode ) + { + struct page_info *pg = mfn_to_page(_mfn(pt_mfn)); + + if ( iommu_pde_from_dfn(d, dfn_x(dfn), level, &pt_mfn, + flush_flags, false) ) + BUG(); + BUG_ON(!pt_mfn); + + clear_iommu_pte_present(pt_mfn, dfn_x(dfn), level, &free); + *flush_flags |= IOMMU_FLUSHF_all; + iommu_queue_free_pgtable(hd, pg); + } } spin_unlock(&hd->arch.mapping_lock); From patchwork Tue Jul 5 12:48:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12906556 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 lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 25568C43334 for ; Tue, 5 Jul 2022 12:48:30 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.361166.590552 (Exim 4.92) (envelope-from ) id 1o8hyU-0006DC-LZ; Tue, 05 Jul 2022 12:48:18 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 361166.590552; Tue, 05 Jul 2022 12:48:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o8hyU-0006D1-HK; Tue, 05 Jul 2022 12:48:18 +0000 Received: by outflank-mailman (input) for mailman id 361166; Tue, 05 Jul 2022 12:48:16 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o8hyS-0004qy-N6 for xen-devel@lists.xenproject.org; Tue, 05 Jul 2022 12:48:16 +0000 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2089.outbound.protection.outlook.com [40.107.22.89]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id bcbe9998-fc60-11ec-bd2d-47488cf2e6aa; Tue, 05 Jul 2022 14:48:15 +0200 (CEST) Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by AM0PR04MB5252.eurprd04.prod.outlook.com (2603:10a6:208:cf::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.21; Tue, 5 Jul 2022 12:48:14 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::dfa:a64a:432f:e26b]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::dfa:a64a:432f:e26b%7]) with mapi id 15.20.5395.021; Tue, 5 Jul 2022 12:48:14 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: bcbe9998-fc60-11ec-bd2d-47488cf2e6aa ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P6ie8G5VVPknGrhLe9djxcfGEJRRYM9iZiKZCAMGJj7Ag0NUeCykw6PD7IyKifMFPGGd/w4NZXu65bOPjh4/AxCZhRV+je3qb3+ETeFiSgLc8pLW2EFnXus90tbicZ4ijMMC/BmRc7uOC7dWYYwvXsMq5KihDuz9AV4MBl8Ao40eBxC2mjbDXS1CSLzeMfDkQD9L6sq8eb5qYLZZJUukn08EyV1edNvj4cqdTY13yq1coioebNQOOmNPXMqCK4JMBJNJzBdf6RnQqFWpsQe7+Ny3YaKvSoHVJeJfzmXvKpk01JXny047wSn+LeJbehX6mCgrdRiUD6JwXEafBXLaeA== 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=8x0wNvPPnwdgiVsTXX9OqkK4ScAeymQhxLWbmrRAFA4=; b=XVBkvQgQ43gaCj9u7r/gzAkCvB3QH04QGUqeF9hRZvYvxoh63aOq1XM3D3bC0Vq873NKZItqzMAD8AQW/5ODIkuUTXIQjurQbv11+dba7/9vEnhjwY409JO9iUmFRhJQN6u0U7BsMhq3XkP95SnfNsZLG2mQpyyE1L6GkFnYwnQTiREEjLDFxA4ebNVcFOuQ6ZHaxU3mMWbmxevtb9pEj+QXSIqXaKkNq0enBoXUTjVyLTXIFVD6jKUN6nUG14PfC8aXv50Ld+ZdfEQlNqU5JMWECy6gqw3TmNtLSbkR/I6yU5EBXsA2K2OMce/YLUmWeaQ85Jjl6IDEoVYxDXFdig== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8x0wNvPPnwdgiVsTXX9OqkK4ScAeymQhxLWbmrRAFA4=; b=AbsNOTCnCf5G35oceswlwWWiN1KlP5WNsXMELoE+neIB+pA9jLg4Gtd8LZzRR4S0LcSW9aPWhRssfYXKbEvKcVqWoAMMxLBVvWCFC4uOzcx5IUe8RVqRf9r8OEXI5uQVUwlLZnP/b/Gs8fMtRBkuRLHQhP2agpMu450iOMNoRd/s3vclpu5dttHI50b1bNaKzE/FZIg3rL2p4MWS3fsaZ4B3uZS6Al9E/fkDq816CACuncZ9AwINkdG1KjE3zMLoc4cjNA5WmCbjjW8u/uv5HYsXMIBDAoAtmjUl9EZcMTIHWirWSynk90FUvhbn0ufyKJTvNCtNEMkxTdQ7E14BqQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <28b6c824-683c-6a15-d891-651f79d99300@suse.com> Date: Tue, 5 Jul 2022 14:48:12 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: [PATCH v7 10/14] VT-d: free all-empty page tables Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Paul Durrant , =?utf-8?q?Roger_Pau_Monn=C3=A9?= References: <4c9d4b32-d4db-3a4f-fe92-6022e63c3f82@suse.com> In-Reply-To: <4c9d4b32-d4db-3a4f-fe92-6022e63c3f82@suse.com> X-ClientProxiedBy: AM6P194CA0096.EURP194.PROD.OUTLOOK.COM (2603:10a6:209:8f::37) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b0879887-653e-4e6e-e4be-08da5e84a044 X-MS-TrafficTypeDiagnostic: AM0PR04MB5252:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: y22/CE7Zis4myGsIV8tMvlIm3Nw/Eg0AYhEaYBLvnqrdarKonAk/NwKDFHd8S2Tyx/x71fYgrT0vRaPEJfOfxBptpjuzvhbE2T6K4L1WMcBPGWeuZX+hj2YwuqjikXDylEuAhu1YDO7/jdoS19HIK1tNBIuMBGPuZNSe4vPMNrwD6yz3r39HrIExRBOITKcUcfxfOAJSGYf1g427ADHfAeNwj0shdyIIe+O6jQzwHHRlH8ssQFOOBRS/2JRCyv8buW0Xxy69JxGGuFtYvg4WX1tkleUyFXAb5yfr7pWdKr+kdsJj8qdLi7m7+Tg8aHLltD5l5hcCyAiOwdV1vVLpybmc1/SAwFkPPfHn/rYU9vsCpYmE/GfWRxW72MnBHjhqyAqoVuTmfq2luPN1T3cjph4P8CEY4IKFHdFUl80mr8+zvCy7YaixVpxibATwAMYtjOwjqP0LCaB9SbQnf8LQ1UaNAxXLZLvRyruytRaKrsEW5QAEc7Nb/2iDqkz72nOv6wtIVcemdwkOdEAYe5YFSb4ykl6HWV7YfNJv9VQDFKP/fWaRelZK+L8yOKHxu2qKuz75HlIcb8QXtwvlFRk470j5Y7RTMePmyrqTajmdH8Zg/BAqvQ50DiIyPlv6yoafG0JQoYK0KrS9H4Pf6ewXsv/1mAfW2RyX7M4E4IEsdGP/V5N6Vgih0nIfxW9lkeO78nv+kXGyCJAR4PSROXT9j+8oyrBwiMGrCSpMwn4FWcRDfuzpCSCcW/wwANcGCZfCRgUhXrNyXHBafEY+2hUzlYn2cLk3EqVPThO6XIB3kgnb69N6X4oMSe7gIi/U6CIda8PsZVruwp78pduvJQaSfGny5MwqPRYiDQcyKR+KjjQ= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR04MB6560.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(136003)(346002)(376002)(396003)(366004)(39860400002)(478600001)(5660300002)(8936002)(6916009)(54906003)(316002)(86362001)(31696002)(6486002)(66946007)(4326008)(66476007)(8676002)(66556008)(31686004)(2906002)(83380400001)(2616005)(186003)(6512007)(26005)(38100700002)(41300700001)(6506007)(36756003)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?Z4XNvR9pOyHW39uuk2GZl4p8xWbL?= =?utf-8?q?418GIGWTmMDACMHpuG1e6uBfVu8I1FMIv1LCNPtfYWIXhk5J9+m2PZdeFE+m/y6Ch?= =?utf-8?q?GDMGEupOEa0VAO+QMXyuitxe5iyJFi+wfP28E+0XJ7NXohvBHcndHLdREingm/VhO?= =?utf-8?q?jjaWJCFGJy/B66K0kE5bo1l5mr/3pmnn1oA7WpTTFfcTgtfrdBUzVbiHnOJYxGYVQ?= =?utf-8?q?TED0Dq+/N2wcvjTzjIykRyfH1Hqw56G/yVlQvTjBybCjv6QUcchfLoPpbLGidDZLH?= =?utf-8?q?RXNHVV2/HgPqo85JruKngYVfsZg/nsmH1jU5bF3ylHRjB1HzuCmEYGvL8BTHJIR/U?= =?utf-8?q?3Qs+PgVeP0Yir4vmy/xA3L2X8PAm2QURsLaj9PJcXhxpjVZ9nBZit9+7M2+XAojyZ?= =?utf-8?q?TJ6zU84oDZ7ATyW/4qYoIL3KYCROnl2cUFKG5JW3rhC1B0tLbmfeTJVmi7CY5dSgx?= =?utf-8?q?iniUsVXWk4LmCimuR3MmEJIneIGuyvOyLZUCI5zYPEi/8nRwehI+Ii9J/VzXJgM2V?= =?utf-8?q?P9X/eAwxwPH69BOr7IaN91XNRHfPwiWazz0blADXHU+fNAd01HvsV3VB9a7Eh6mpU?= =?utf-8?q?7BfMv1Vw5FKe9w2W2mi8Ix8GGtNX/tl7dpBxcSF6zrjmMEsAygaeH9x1DeLClI7AA?= =?utf-8?q?x1hfl61FF+OCgmisvE2Ft7opCPZ0bu1pGnrViwiJzeiFe8GbkZ3glo6ydiT3RHb3i?= =?utf-8?q?xnLeWtOj7H52FQOnH259QMIbbRsFDAeRiFmO06lEaH/GZCLVoO9FZHT98g0HjZcuA?= =?utf-8?q?J/5PspAPwkX2+ivgTaDqSMrThPT4C0bL+tF/qlWIBtLLz2qmsPqUC1qHzrU1R9oC1?= =?utf-8?q?z0YNebxa0Oofx80pKv+X3G25Urjt82BwBDEPnLCwtdsMcu+yV838uFgZcBfgonhIG?= =?utf-8?q?NzNGOZijyvaD3V9BjB54c4Z9+UgqlSKKpFlY7ogpfBc+Ol397OZf1XA24OGFjJCDd?= =?utf-8?q?1Gt3JAyMqCKn2Hg6FG3ghMZwPvE87ozIxc5VlxwChsbGAx1xxucbcY7fFh0hfxhtz?= =?utf-8?q?REfvrp/7GxxiOcHLcKCAbsFJ6Czq4y+I83k//S6ZDPkgzgAlhqf+QHyw8Ync4hVUW?= =?utf-8?q?MRNxuHLOWMULM2tku9D8xMt1X8YxClM8v0pVc/zuciOE4R109Zpc9avEynosx539t?= =?utf-8?q?WtO4Jict8JafDqfQ44vfonhFiMkfMvSqQv/81kV3ye9q8+dC4cXeMZk32P+d4fgQZ?= =?utf-8?q?MeiA/11NIKzFIQ3g6zDAb3FR76Fztg5F5egrdrgWIkRrKJRnXanmWlRv/WHoGNN9T?= =?utf-8?q?qHIbeov/Fzx/il5bCiRbrNGkicHa6CfbfxMusnHW9SQkViX9HLboT07FX5OzwMDmq?= =?utf-8?q?ciLqA2NyMjmxi0WUYJcofa0kWY5KA57/Qcyqgr2qkwqP6dUcsCysv9Gw+om/gbp7H?= =?utf-8?q?MX2BU3dU3NAfXQigQl4ta/mJ3eUqscu7dgPPotDF2tMh2oHETYbFvZP29KmouSMVt?= =?utf-8?q?vj+sUoFm40+/3XQ/Ynbl/hsHbxwMQadwhUaNPoeuLWtKOMHEbKq/zhxoiylgVZ7yR?= =?utf-8?q?De0wuXZ8LoBt?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: b0879887-653e-4e6e-e4be-08da5e84a044 X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2022 12:48:14.5159 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: kBcfg54tH01mvknuD7gps5K58vlo/jgTF8N2NPdrS1+AI/P54PgACJciVGOrzLAmFg5CC6KJBkGLmecDFvIqQA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5252 When a page table ends up with no present entries left, it can be replaced by a non-present entry at the next higher level. The page table itself can then be scheduled for freeing. Note that while its output isn't used there yet, pt_update_contig_markers() right away needs to be called in all places where entries get updated, not just the one where entries get cleared. Note further that while pt_update_contig_markers() updates perhaps several PTEs within the table, since these are changes to "avail" bits only I do not think that cache flushing would be needed afterwards. Such cache flushing (of entire pages, unless adding yet more logic to me more selective) would be quite noticable performance-wise (very prominent during Dom0 boot). Also note that cache sync-ing is likely more strict than necessary. This is both to be on the safe side as well as to maintain the pattern of all updates of (potentially) live tables being accompanied by a flush (if so needed). Signed-off-by: Jan Beulich Reviewed-by: Kevin Tian Reviewed-by: Roger Pau Monné Reviewed-by: Paul Durrant --- v4: Re-base over changes earlier in the series. v3: Properly bound loop. Re-base over changes earlier in the series. v2: New. --- The hang during boot on my Latitude E6410 (see the respective code comment) was pretty close after iommu_enable_translation(). No errors, no watchdog would kick in, just sometimes the first few pixel lines of the next log message's (XEN) prefix would have made it out to the screen (and there's no serial there). It's been a lot of experimenting until I figured the workaround (which I consider ugly, but halfway acceptable). I've been trying hard to make sure the workaround wouldn't be masking a real issue, yet I'm still wary of it possibly doing so ... My best guess at this point is that on these old IOMMUs the ignored bits 52...61 aren't really ignored for present entries, but also aren't "reserved" enough to trigger faults. This guess is from having tried to set other bits in this range (unconditionally, and with the workaround here in place), which yielded the same behavior. --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -43,6 +43,9 @@ #include "vtd.h" #include "../ats.h" +#define CONTIG_MASK DMA_PTE_CONTIG_MASK +#include + /* dom_io is used as a sentinel for quarantined devices */ #define QUARANTINE_SKIP(d, pgd_maddr) ((d) == dom_io && !(pgd_maddr)) #define DEVICE_DOMID(d, pdev) ((d) != dom_io ? (d)->domain_id \ @@ -405,6 +408,9 @@ static uint64_t addr_to_dma_page_maddr(s write_atomic(&pte->val, new_pte.val); iommu_sync_cache(pte, sizeof(struct dma_pte)); + pt_update_contig_markers(&parent->val, + address_level_offset(addr, level), + level, PTE_kind_table); } if ( --level == target ) @@ -829,9 +835,31 @@ static int dma_pte_clear_one(struct doma old = *pte; dma_clear_pte(*pte); + iommu_sync_cache(pte, sizeof(*pte)); + + while ( pt_update_contig_markers(&page->val, + address_level_offset(addr, level), + level, PTE_kind_null) && + ++level < min_pt_levels ) + { + struct page_info *pg = maddr_to_page(pg_maddr); + + unmap_vtd_domain_page(page); + + pg_maddr = addr_to_dma_page_maddr(domain, addr, level, flush_flags, + false); + BUG_ON(pg_maddr < PAGE_SIZE); + + page = map_vtd_domain_page(pg_maddr); + pte = &page[address_level_offset(addr, level)]; + dma_clear_pte(*pte); + iommu_sync_cache(pte, sizeof(*pte)); + + *flush_flags |= IOMMU_FLUSHF_all; + iommu_queue_free_pgtable(hd, pg); + } spin_unlock(&hd->arch.mapping_lock); - iommu_sync_cache(pte, sizeof(struct dma_pte)); unmap_vtd_domain_page(page); @@ -2177,8 +2205,21 @@ static int __must_check cf_check intel_i } *pte = new; - iommu_sync_cache(pte, sizeof(struct dma_pte)); + + /* + * While the (ab)use of PTE_kind_table here allows to save some work in + * the function, the main motivation for it is that it avoids a so far + * unexplained hang during boot (while preparing Dom0) on a Westmere + * based laptop. + */ + pt_update_contig_markers(&page->val, + address_level_offset(dfn_to_daddr(dfn), level), + level, + (hd->platform_ops->page_sizes & + (1UL << level_to_offset_bits(level + 1)) + ? PTE_kind_leaf : PTE_kind_table)); + spin_unlock(&hd->arch.mapping_lock); unmap_vtd_domain_page(page); From patchwork Tue Jul 5 12:48:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12906561 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 lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E0B1DC43334 for ; Tue, 5 Jul 2022 13:01:07 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.361227.590622 (Exim 4.92) (envelope-from ) id 1o8iAO-0004NT-Dq; Tue, 05 Jul 2022 13:00:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 361227.590622; Tue, 05 Jul 2022 13:00:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o8iAO-0004NM-9b; Tue, 05 Jul 2022 13:00:36 +0000 Received: by outflank-mailman (input) for mailman id 361227; Tue, 05 Jul 2022 13:00:35 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o8hyn-0004qy-Ur for xen-devel@lists.xenproject.org; Tue, 05 Jul 2022 12:48:38 +0000 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2063.outbound.protection.outlook.com [40.107.22.63]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id c96e42c6-fc60-11ec-bd2d-47488cf2e6aa; Tue, 05 Jul 2022 14:48:37 +0200 (CEST) Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by AM0PR04MB5252.eurprd04.prod.outlook.com (2603:10a6:208:cf::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.21; Tue, 5 Jul 2022 12:48:35 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::dfa:a64a:432f:e26b]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::dfa:a64a:432f:e26b%7]) with mapi id 15.20.5395.021; Tue, 5 Jul 2022 12:48:35 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: c96e42c6-fc60-11ec-bd2d-47488cf2e6aa ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ajwuKEErqwOf+V2F7YvoAcykl8DqtjgQifohKABtslu2USb/UFNflYPkcQQkRj74jiZU5XEIa4DdXRiLIpcYeNFOBZVZ35JUOy1MXshtJym74vRM6Ad70fupGr9ZECSyrWYNTsexW4iUmRa3rAM8sX543gJkCUhiH48E8fJygmFSXDrpSuSlQ/vYAAkKxHMmB+v9Xk+trO81WOMMRRt5fJ6TOBpmYX/sf1JpqeiOdF5ztLLvDuTCkf/Lma/t27G5nh5K78lhBcq8J3zh8Avp5j4Ng1Uu/+c/J+PM3t8WXUv9VtQPHHdK9ni5/NdwR9kFkaJP4jmaFFYWFBbWW052Xg== 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=XpBKX8iKhA8N8952sSDbijOunJ7uuUUiGIDbjZy4Htk=; b=funM8mhIJ2zr5xlbGL9FNPtmj1BQ2C23JG9GiMQhiuSz486SAf3oaM7vfYC/OYO1HEnFvZU5ivNwM0ySdbN3IEGkCHdtJ68BckWgbUZfwftwXGPYM2Ew7CEVBZqEeL0eorp7tJ5Tc6w3uhfFtd5pFjXcLC5tVIbLmSce6/p3QoHy5Y83F8ZV0PlykP2IpzqTOWZPjzKNydvepQ1UHowqJrrvNEMLg9+g3U38UP1N0m6PtwR7Ni6/pbf/44R3S8Jg/p4FBBSZuUiyEmfWWDATqzz9MwTi+R4LLTNcmrjO7QHqHY4lr8pAvLGTM9b52AMPwSSyEAwSvMndY7fv9OwayA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XpBKX8iKhA8N8952sSDbijOunJ7uuUUiGIDbjZy4Htk=; b=B49s2NSJ+fJWQjplxkhKpCQ79poQQU7FuVM7AFFA49ELi7diiJ/ZB4xx6001tRAgXb1KpRlJ7aeLf4ENFbu0pIN3MHV0ct/jdeswnQQiSbFEttue0OUYYiGlbjhSuGA3RdcOGtoz52Nhul2KMuK72C5Apmo9LIxmXW3wDPG835CukJ57tN60fB4c9woZ+iwUtroeA/lmBgauZ/d8BnakqicDNLYjTqMRn4PPQEq87v2tG0U1nnikG5iMG5BO/QfBDDNaeuNHd7Sftd4H4oC2Ii7MDdNH+9D2kQOQgrKZkaa8Y7FuNSh1lxEmcIAhbzoNwsk2RO8wUUKbjKhXBnZT0Q== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <718906a5-8c18-530a-89f5-02e2a2efb211@suse.com> Date: Tue, 5 Jul 2022 14:48:34 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: [PATCH v7 11/14] AMD/IOMMU: replace all-contiguous page tables by superpage mappings Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Paul Durrant , =?utf-8?q?Roger_Pau_Monn=C3=A9?= References: <4c9d4b32-d4db-3a4f-fe92-6022e63c3f82@suse.com> In-Reply-To: <4c9d4b32-d4db-3a4f-fe92-6022e63c3f82@suse.com> X-ClientProxiedBy: AS9PR06CA0088.eurprd06.prod.outlook.com (2603:10a6:20b:464::33) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8f85225a-3cf5-43fe-6ab7-08da5e84acea X-MS-TrafficTypeDiagnostic: AM0PR04MB5252:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uxDCH4822zfGqegMWWKTfmt9Df5EsE8dBIA0oU6ou9sJTEFON6vx83cwdpFMVv5QCW8H0PetM6mJZXNZa4IZuuQ3cG7ichVMN4AomUjFxvKbO8qr2p9ZwUaeUXx6kuss8NzWRQ0EOyze5RO/wJ5UWphZQPnZKnZbceHWmzZ2qQ/PpiO8guKtBAzT25zyg8Y4KH+UM0kBUX31s6YTwJl1Jfj1k2HJ2D0LqB2SApHC0W1HvinmWR/hnGY3GsBzxT1n5ZrRaLpBAM7L59REf7PMCfn0qFTIzBUjCvJiP0YIn/zu31CcJxSiW0qGx2zs0e5gfUhdpuoIEG+4swUa7i/94lcesp5kuEVo6kAwBYCt+PLgM07lhRKDOS+fRfV/Wf8J9I3RZiwhgnEj6870TUJ0qfZRtKkxmwQxPaQviUj5bOtln7joNN1vLmXMg7RdBJvisXllvzfVsA6Cgrq/PNj7myoJ1fBEdvS1SwmLCe2Vcz9n+EIhbX/nfVk9902huRGq0fQSO5R8Cht2aFX+mA4g/gFBRc9M1VY2sCwn0TS2RRHzH3Grxr0J1EU+/Cyd7bljYr51RYh/cd/flIqaIXmvmkJHVy1feTPufo9r/1TBJUbMNOkVUYj+wUieJ94GS6XxYzEG9xWyjdP3eiPEXI82aVPBeEIk31OeXgJxxT6lR2tQvzgH2np0+qja94m5A66BolG6SXkwqCBiI5GX8g6PDdO2+G8Epj1h/lBprf8tOppzQwkTd08PVqBvP7XXMvjJGUxcsQ77+iW1Ju4mWbEXKuMjNxvsvPG0afaWRw+yi4oXI5pF+KngAXyDIVKDS8AVcFUUyG3KV6YH/Ydyb592wkJ5ApyEJTGR4xh/yF7jfsc= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR04MB6560.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(136003)(346002)(376002)(396003)(366004)(39860400002)(478600001)(5660300002)(8936002)(6916009)(54906003)(316002)(86362001)(31696002)(6486002)(66946007)(4326008)(66476007)(8676002)(66556008)(31686004)(2906002)(83380400001)(2616005)(186003)(6512007)(26005)(38100700002)(41300700001)(6506007)(36756003)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?WkuIAXPX8MCrAf42uMYRPMhM5jPz?= =?utf-8?q?2BvGs7FJXowIaNcQqK97443Q8a4FsB6xidjD2+B7Pdxp8F7KvCkl3bkZ6deHBMTsO?= =?utf-8?q?sAkz7cHkiKYQSFet8jlHagfSsYY0XCm7CeD2HZ/Li+r3Q9YPTdJOzLBsPC4ihHsRI?= =?utf-8?q?tkqH/K7jaFmvWtJYvp0DVINvybMZRPeCd9Szv4uaGQU4fjJlBgCkZuuiiPkcZSB6h?= =?utf-8?q?CbOc4J5k1Hi/oQZlfUpZeWIhdabNBG8Rx+p73zMt3jBwCW1ZmKvYI71baM2qObZAi?= =?utf-8?q?BpKSrsV66e+8Z5sdi3gDtkyXDLfdtK++xshxpY62QnJfURtsXg/PaCkJs8LmLgkiq?= =?utf-8?q?ub+Nhp86UY98rgfUR7BgUeqL7dOroq6cvuz6ZK9h0Z7Wyq7mmIl+4j/zcdbmYPyPD?= =?utf-8?q?5xs0bsQTCmkJveMMAOUH12NZbNpPo9ITuwL4CAN9N/NiSkEaa1xgWwkV39zxy809P?= =?utf-8?q?MOuOg7iWVe6MN8yZeGNG8FhgzQFQAKGHLT+XGYG+wr3QPEFYUI4j6EPZzcHIDoKHW?= =?utf-8?q?+S5I7600H8Cha+lAwqBkKScq2TSBFClIXZSdzBJ+sQ6Iq+j8G+XwSS8n5h4r0dgQQ?= =?utf-8?q?QJRQx0sHZ2fviz9v8njq0Kd536KpMJhE9gQOSBWorlcKdNfTRfVk0gixLva3lkd9Y?= =?utf-8?q?3CpFkdPzgOYQWJljXSLJeJ9Sp+rh6IF6Syqcuh0fvEB+w55Gos3FLObsmhwTf8PPT?= =?utf-8?q?1W+4OOnGk3i8930xy6glGTTtYFi9M5No42/JLvfkvYkfMMbpt9W9+wWK9JRvy3VxS?= =?utf-8?q?lthHOIDc1i+wQL0U++XX818F1NtBMas4Ry/KWik5ugdoMUoNWwVQqMnlqzpxQdp4L?= =?utf-8?q?dWPQGbtm8EqtFmtkLKsTVsGAcWSWx38haVB3R/RGZH1lUYLkbwQ1cdgfNPCEda8Yb?= =?utf-8?q?73ak8G3iI4R1QPaxPEmDg5EnzNbAoxQM0avbeRHMB1zCsYkfbkjpvDTWHTGA6r/K8?= =?utf-8?q?hGKCoKndUy+R9ddl16s1OxVfOpr+fesib3EWLvLcvDM1uVl1cTP4Y6rDc1IZrmsAm?= =?utf-8?q?AwRP5+lPEbiAhrhOCQHWwxddNPFRzOKwdWG4xPCoSJeLl1BpsRlxjpIgdb8qdefKn?= =?utf-8?q?qdSM/g7O0oD+2xqD4Eg4vA74VwCZhYVFd8i2qE6p6ww9hzC9bP6ryys8IfUgsCQmP?= =?utf-8?q?kwkkn4kDArh84lK9UMpWd4iX6eIGk3T3p2c2JEgK+Mx9W7EPRxwxP+MI28ELN/8Zy?= =?utf-8?q?cQvUHGTK4Ki5xAvnLKASoy+JHjgo+wY0ExkSb175sbWcQFe58D9MNb7s01F40JHyD?= =?utf-8?q?bXPdzkTxOWFM+7ibUex1vDnt1j5Fyi+CQesl6jsE1DAuQ4iy/Gm3jfO69Lo564D+L?= =?utf-8?q?XlriuAipFSSPd+TIw1E9Z1ksBJVhRBLqClCy8U4fvjSmcjdoe02pXs9JFzcGWI6qs?= =?utf-8?q?ZlTWXyJ5UFi7372mm9sXm/x2PgaMxxSRqu/g6mL6OSnaZ4Edetz/KTubFAcEwwpWN?= =?utf-8?q?nJgvNZ9AYaP60qnI9ocddHh0HxpgnGo5M19e1MBxR9vBV5YLueeha2e8V2BMHpBaZ?= =?utf-8?q?oxPsCb8IqNH9?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8f85225a-3cf5-43fe-6ab7-08da5e84acea X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2022 12:48:35.7646 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: KQeUTZTONFt65igDhM9wTsdtbm77WfCIlCF2SJ5qPlvHvKhq+pH9fDp7QlyKyh4+yjH/H6P4zO/CPrm5hf53+w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5252 When a page table ends up with all contiguous entries (including all identical attributes), it can be replaced by a superpage entry at the next higher level. The page table itself can then be scheduled for freeing. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Reviewed-by: Paul Durrant --- Unlike the freeing of all-empty page tables, this causes quite a bit of back and forth for PV domains, due to their mapping/unmapping of pages when they get converted to/from being page tables. It may therefore be worth considering to delay re-coalescing a little, to avoid doing so when the superpage would otherwise get split again pretty soon. But I think this would better be the subject of a separate change anyway. Of course this could also be helped by more "aware" kernel side behavior: They could avoid immediately mapping freed page tables writable again, in anticipation of re-using that same page for another page table elsewhere. --- v4: Re-base over changes earlier in the series. v3: New. --- a/xen/drivers/passthrough/amd/iommu_map.c +++ b/xen/drivers/passthrough/amd/iommu_map.c @@ -81,7 +81,8 @@ static union amd_iommu_pte set_iommu_pte unsigned long dfn, unsigned long next_mfn, unsigned int level, - bool iw, bool ir) + bool iw, bool ir, + bool *contig) { union amd_iommu_pte *table, *pde, old; @@ -94,11 +95,15 @@ static union amd_iommu_pte set_iommu_pte old.iw != iw || old.ir != ir ) { set_iommu_pde_present(pde, next_mfn, 0, iw, ir); - pt_update_contig_markers(&table->raw, pfn_to_pde_idx(dfn, level), - level, PTE_kind_leaf); + *contig = pt_update_contig_markers(&table->raw, + pfn_to_pde_idx(dfn, level), + level, PTE_kind_leaf); } else + { old.pr = false; /* signal "no change" to the caller */ + *contig = false; + } unmap_domain_page(table); @@ -409,6 +414,7 @@ int cf_check amd_iommu_map_page( { struct domain_iommu *hd = dom_iommu(d); unsigned int level = (IOMMUF_order(flags) / PTE_PER_TABLE_SHIFT) + 1; + bool contig; int rc; unsigned long pt_mfn = 0; union amd_iommu_pte old; @@ -452,8 +458,26 @@ int cf_check amd_iommu_map_page( /* Install mapping */ old = set_iommu_pte_present(pt_mfn, dfn_x(dfn), mfn_x(mfn), level, - (flags & IOMMUF_writable), - (flags & IOMMUF_readable)); + flags & IOMMUF_writable, + flags & IOMMUF_readable, &contig); + + while ( unlikely(contig) && ++level < hd->arch.amd.paging_mode ) + { + struct page_info *pg = mfn_to_page(_mfn(pt_mfn)); + unsigned long next_mfn; + + if ( iommu_pde_from_dfn(d, dfn_x(dfn), level, &pt_mfn, flush_flags, + false) ) + BUG(); + BUG_ON(!pt_mfn); + + next_mfn = mfn_x(mfn) & (~0UL << (PTE_PER_TABLE_SHIFT * (level - 1))); + set_iommu_pte_present(pt_mfn, dfn_x(dfn), next_mfn, level, + flags & IOMMUF_writable, + flags & IOMMUF_readable, &contig); + *flush_flags |= IOMMU_FLUSHF_modified | IOMMU_FLUSHF_all; + iommu_queue_free_pgtable(hd, pg); + } spin_unlock(&hd->arch.mapping_lock); From patchwork Tue Jul 5 12:48:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12906557 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 lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 30E09C433EF for ; Tue, 5 Jul 2022 12:49:20 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.361185.590563 (Exim 4.92) (envelope-from ) id 1o8hzI-0007lC-6x; Tue, 05 Jul 2022 12:49:08 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 361185.590563; Tue, 05 Jul 2022 12:49:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o8hzI-0007l5-3l; Tue, 05 Jul 2022 12:49:08 +0000 Received: by outflank-mailman (input) for mailman id 361185; Tue, 05 Jul 2022 12:49:07 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o8hzG-0004qq-UW for xen-devel@lists.xenproject.org; Tue, 05 Jul 2022 12:49:07 +0000 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70048.outbound.protection.outlook.com [40.107.7.48]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id dac05ebd-fc60-11ec-a8e4-439420d8e422; Tue, 05 Jul 2022 14:49:06 +0200 (CEST) Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by AM5PR04MB3089.eurprd04.prod.outlook.com (2603:10a6:206:b::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.22; Tue, 5 Jul 2022 12:48:58 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::dfa:a64a:432f:e26b]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::dfa:a64a:432f:e26b%7]) with mapi id 15.20.5395.021; Tue, 5 Jul 2022 12:48:58 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: dac05ebd-fc60-11ec-a8e4-439420d8e422 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lNyE7v3chRcGj64NGPKufaH6CbJF34KKW+tHF9qxH/GQY0eL6Xsl3ouu90sTOqw5lf/l4jpgPtM94i+WKLoEyq7gLNYq92kywDmW/eFyLa91b4G38VkKbX5l5eT12NdWsQ4CIzLAz/ze4uEPkfZOWS1PQHKUK55lc95qE5gz5pO6cQ1WvTJdamWtzku5ZxBfd2YHdKOEQJP+yl0HEcklSYejXnMexrQmYHlZTu5LIndN0emerwzHkDQL79aMT0tRz5hCSolmxqJkOljp/80G4cL6VGg/GS4aq4yjwiPAoRm1aJ9aGcOZWnIFp3/B33eyZeiubDkAsG/FdKLiFyOMhg== 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=DfKw4w4lT3delgxvxQXi2BzPNtcGD1oKtqm/W3kaSWA=; b=c2X8o/Sekjzrf0stbeZ7jI9m5Nuk5spR2KsJzzoKGvXerUBy9MmzJ4ADzHXzKGCAJzMBhLVB4hO1uyJa32RbXgDD2/MmJbATAiNXllgPF6QT8X97apQqIYcA6yFJW4nL+r/soP8JSlP5Cd1dsnz5BQi7cFUZDoO53NIeVyL91LOTHEtVrI3hoNYURr9y2FnOr2Vlo9pbfSRfyFY0v0g77+Ou+ZcSa/1C1EqAvExBjMlay5LgTxtjK3QPZjCrVfCyqR5N4I73bTwA0yREMuB9DJ1j901eSs/J9NrNt7x3T+QDFtzHe+YVAQ+Xchtle4qU4nYWStBKQO30fR6C9wikRQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DfKw4w4lT3delgxvxQXi2BzPNtcGD1oKtqm/W3kaSWA=; b=a2GQY/tJQZQ15VYjci3kY95TaZtoH7PWhwSHnyrgSGSq9zZnwy3ahcRQ42IzporjuYDtdSK9M3f3zqWyMMOZiqllaVpB4O0Fn2/fRK5Sza5uh795I3OvlC69wsSo5aT/+yyxhc+A3zJIya9Zw39/J2gv5qUPjwyfAOx92cja2H3TAzcyeLvgFot106l+BaVU4Hucqt/k/e1OHx+9b4OGdceprDRY1grxkvjZGghIh/S74QckCyyVLvf0xWziWwkSHkXuXCd58eUNZXHpeV1GnfffSMgDVfKjsLtCnZV/WkoiE1kTo2qQ5gKBr4TK/SqXTcwpG3PfWq0rfqV0rKz28Q== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <9ccc854e-9a8b-ffed-cd68-d26e5b3347ec@suse.com> Date: Tue, 5 Jul 2022 14:48:56 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: [PATCH v7 12/14] VT-d: replace all-contiguous page tables by superpage mappings Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Paul Durrant , =?utf-8?q?Roger_Pau_Monn=C3=A9?= References: <4c9d4b32-d4db-3a4f-fe92-6022e63c3f82@suse.com> In-Reply-To: <4c9d4b32-d4db-3a4f-fe92-6022e63c3f82@suse.com> X-ClientProxiedBy: AS8PR07CA0002.eurprd07.prod.outlook.com (2603:10a6:20b:451::31) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5e55dbdf-6b89-4732-8292-08da5e84ba47 X-MS-TrafficTypeDiagnostic: AM5PR04MB3089:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: A4lGjZNC1UAdRi7/Lz8b8r3tDeahl14AN8+1m4EZTeKVh6bKcxgEt0NK/Zl9f79oIGsyVNBbPLS+mX96zzB/jypTZKgu5VAg9s/bukjCzq/7f42g1sCoAnBMlJ/l9fx9vI6woYHkmV+3bI4wH5+gxcmB2L5oRrbt9zMBbt4lU8dPS2lwrWyUv8Q4eNy+q7TwyixfOsJcd2dsHXUkC5CElNUj10w6q0Jflr8KsUr8oLle6RfOHamd6jNZLmwg85HRacfG3uDTq5XddeNyKqoV5qYBmjZh1AiI7QhoMa7dcpu0EydTzOJdOHI1JSwhhuigmsgIOqPFNbFCGN+Fu8RkVr9Hd1UJbaxhYD13yD3VrsibABhx/h4tH6iwcg01CyOhrZu/ovviS4+pr5BiLWT6cTNK5FeDJWsO2h1hNVsPu0aXW47pAB4up/N5qawLkxReP7DDOaylVjcIkNoDJwYoMITI43gnv+qjqHadw87Lcr+L4IqXjBiGTRuqpRYc8bA3N49ej84ivV8r6Yz8/0DeZ2HpAFhZq0G/qC6HLaeOiUPGglKcO83npesczTmXKf5RpyMKPT2iMFkUSPJDRTNkWVIwnNKBszZsPb0rpNwaFZMEGcYiWLoakHZy3zZgMIX+uamFnsyRddyKBxE6COXkcR8Ovkiac2jSdsWV9sI9NFEIEfjDlLEzfZp5oMgeUSNo9KMPNFNk6xIrsvESbl2cQpd8YcAROH1iQk3XqYuWY7ov41qz0shTFfny5vyEP0/14PcbIGjkCqm/Dwjq7n40mRZ+Yor12QEhh6QCb128xb9gYffnyLna8PVmsIfUJ0r71pKPY9edcOw+fdFLCfqxCpRsDSAa8abCqHrwQ3bWbjs= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR04MB6560.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(366004)(396003)(39860400002)(376002)(136003)(346002)(478600001)(8936002)(5660300002)(6486002)(86362001)(31696002)(2906002)(6916009)(54906003)(316002)(41300700001)(2616005)(66476007)(66556008)(66946007)(186003)(83380400001)(6506007)(31686004)(38100700002)(36756003)(4326008)(8676002)(26005)(6512007)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?bV8SZiBr+UqzOBm4bk/7H3KLbKPf?= =?utf-8?q?1L0NS12qS17bwqmFx+UKdcPgsBiteDDZIs6/PUuXnt3upd4xaobXnZHPbqcWi9zD7?= =?utf-8?q?1BH1dkClSwfo+FqQs8o+kdymVoukoyiMacC+4CtboQwizq74GgDWSCiaPtKGDJp4r?= =?utf-8?q?MXZYRIWZ6qsiUZo5wZ51f5j0r2flHXRDwk/Tvv1FnT49zvHDvFpIqgUARO7iCMiNg?= =?utf-8?q?z3w8KeUHA/DXV1JSngDojklsFAyqQD0bs5DsXOihUm54v9cMlrIooJWQl7Gf+bzca?= =?utf-8?q?ODYeD2/gi2OzSy7ZsMDuo9VnE6shWmwTEkhK3aD/EB4KPIgTW46KAH+9HsnlRTGBm?= =?utf-8?q?ncD4b0uJt5/92afywT1plSKTM4r6vHy2wpFyDuJ2vgbTttiPcbvTpRNMDgT/qnb3d?= =?utf-8?q?17aRA0mD4M78aESX1ic5QKOZRxgpx8hWmxqz4PitwYIEEyTvo9iBqZyFCvwBzQXEo?= =?utf-8?q?cUllHVLBLdzwLXfWGxEcLxh9XCiV9miiygs32ez5Zlkj9n79NxDR5Uxq8DZnR1+hf?= =?utf-8?q?ApI/EfOwKcsNymWdQJQQwYstFIYuanczK6Njet9Ro+CkdB3BmFGKfSsjp+DCGAInZ?= =?utf-8?q?7D5OiRoozDNS70WhbC5OA4uME9CAyZyAob1s034hf9p8omyEegbmIeZeb+IUgmR+0?= =?utf-8?q?Khp4qjZ6+4MvOnbfIxbYFhqsxEVsVAVMXi/Tn1IYX5lDEsZXpZxee+H3XpLUrx6gQ?= =?utf-8?q?RDiADr7kEPw8sBXuhoY+lFMtddEV2WB0HnbpRQRgnh2uaH7rKUosmlLLWO4xxy7m9?= =?utf-8?q?3iVs5DRyZGwm24FJAT0lLGvPjDiZ3nvHZQy+9mS3O7k3JOvvxV6BDXkHHykcjLLoM?= =?utf-8?q?XSWs14czpXcUTnYnEVUyCN4WxjhBWPButqhIvVgx4vge/KenpvthVAh5ORyjXsHSG?= =?utf-8?q?pPjzAfqJkYnvap3xM2wjm+zb9VzhP6inXmhUHkCLM/MTBAPhe42WO56Op5tcd5zK2?= =?utf-8?q?vtsblH85JXeItkvKFTGEwuRjTdqSoD8w/5V6BSuRpUiIlCMh3LNatpYP7N+dOs2n2?= =?utf-8?q?kyT84g4z2noWoKkl/uO5bpVyiOCkWnq3DQeSIwNZgNsoHxSJkojqeXZUJAkPcVCka?= =?utf-8?q?Xbbc016/KMRJKrj0kY8iIvk8CWSOSvxWRrgN1hAdCbXVY+3HOH6HaSNPek40Kbgf+?= =?utf-8?q?oxQEl7msfPSnZbTX95BxkL4oS/tXFjfXKONdgOFKfaQLzfOvlbJurEqF/83hmYNYt?= =?utf-8?q?H1goNwK4nUcILucMOlTJrQLNsQCyyqtmXNcg+yRNf3LiNjnlwbc5qeSZXkaKwRtWM?= =?utf-8?q?b1Ap24P7h8LtLCBCTw9MyOV5c6lFlnMtI4If1Q+zYvTGpX6oxljwEiYpDc2e5pTiA?= =?utf-8?q?SFn7LBPGPZYGrtEp63LBrFo70765tQ6mlk6AR30j8EGCZlFqm5QehZ5Ap9705+Kz4?= =?utf-8?q?dwLwXk4Ow81quGuPWXzF8xk9mTUI2POA5R7Va5Ke0VGtnRWIwS1G3IHEXJIInlrZy?= =?utf-8?q?ukXbf0b+kl5AI2cKKB0DLotHZWVuHTauzGuDZ5G8K1966Ca2cgNxgxJfPliNkOCHb?= =?utf-8?q?PMmPnJRklMuQ?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5e55dbdf-6b89-4732-8292-08da5e84ba47 X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2022 12:48:58.1695 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: a/P730t/Ty3wWI2HCtYrrhIqfjqs9HJdxxrVBRxIk6Ikt+HNBTKaSGyNtk42DFhjvsHF6aeIwRQ8vlIabuAeOw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR04MB3089 When a page table ends up with all contiguous entries (including all identical attributes), it can be replaced by a superpage entry at the next higher level. The page table itself can then be scheduled for freeing. The adjustment to LEVEL_MASK is merely to avoid leaving a latent trap for whenever we (and obviously hardware) start supporting 512G mappings. Note that cache sync-ing is likely more strict than necessary. This is both to be on the safe side as well as to maintain the pattern of all updates of (potentially) live tables being accompanied by a flush (if so needed). Signed-off-by: Jan Beulich Reviewed-by: Kevin Tian Reviewed-by: Roger Pau Monné Reviewed-by: Paul Durrant --- Unlike the freeing of all-empty page tables, this causes quite a bit of back and forth for PV domains, due to their mapping/unmapping of pages when they get converted to/from being page tables. It may therefore be worth considering to delay re-coalescing a little, to avoid doing so when the superpage would otherwise get split again pretty soon. But I think this would better be the subject of a separate change anyway. Of course this could also be helped by more "aware" kernel side behavior: They could avoid immediately mapping freed page tables writable again, in anticipation of re-using that same page for another page table elsewhere. --- v4: Re-base over changes earlier in the series. v3: New. --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -2211,14 +2211,35 @@ static int __must_check cf_check intel_i * While the (ab)use of PTE_kind_table here allows to save some work in * the function, the main motivation for it is that it avoids a so far * unexplained hang during boot (while preparing Dom0) on a Westmere - * based laptop. + * based laptop. This also has the intended effect of terminating the + * loop when super pages aren't supported anymore at the next level. */ - pt_update_contig_markers(&page->val, - address_level_offset(dfn_to_daddr(dfn), level), - level, - (hd->platform_ops->page_sizes & - (1UL << level_to_offset_bits(level + 1)) - ? PTE_kind_leaf : PTE_kind_table)); + while ( pt_update_contig_markers(&page->val, + address_level_offset(dfn_to_daddr(dfn), level), + level, + (hd->platform_ops->page_sizes & + (1UL << level_to_offset_bits(level + 1)) + ? PTE_kind_leaf : PTE_kind_table)) ) + { + struct page_info *pg = maddr_to_page(pg_maddr); + + unmap_vtd_domain_page(page); + + new.val &= ~(LEVEL_MASK << level_to_offset_bits(level)); + dma_set_pte_superpage(new); + + pg_maddr = addr_to_dma_page_maddr(d, dfn_to_daddr(dfn), ++level, + flush_flags, false); + BUG_ON(pg_maddr < PAGE_SIZE); + + page = map_vtd_domain_page(pg_maddr); + pte = &page[address_level_offset(dfn_to_daddr(dfn), level)]; + *pte = new; + iommu_sync_cache(pte, sizeof(*pte)); + + *flush_flags |= IOMMU_FLUSHF_modified | IOMMU_FLUSHF_all; + iommu_queue_free_pgtable(hd, pg); + } spin_unlock(&hd->arch.mapping_lock); unmap_vtd_domain_page(page); --- a/xen/drivers/passthrough/vtd/iommu.h +++ b/xen/drivers/passthrough/vtd/iommu.h @@ -232,7 +232,7 @@ struct context_entry { /* page table handling */ #define LEVEL_STRIDE (9) -#define LEVEL_MASK ((1 << LEVEL_STRIDE) - 1) +#define LEVEL_MASK (PTE_NUM - 1UL) #define PTE_NUM (1 << LEVEL_STRIDE) #define level_to_agaw(val) ((val) - 2) #define agaw_to_level(val) ((val) + 2) From patchwork Tue Jul 5 12:49:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12906558 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 lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BBEAFC433EF for ; Tue, 5 Jul 2022 12:49:34 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.361188.590574 (Exim 4.92) (envelope-from ) id 1o8hzZ-0008Em-Eq; Tue, 05 Jul 2022 12:49:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 361188.590574; Tue, 05 Jul 2022 12:49:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o8hzZ-0008Ef-C4; Tue, 05 Jul 2022 12:49:25 +0000 Received: by outflank-mailman (input) for mailman id 361188; Tue, 05 Jul 2022 12:49:24 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o8hzY-0008Ch-4s for xen-devel@lists.xenproject.org; Tue, 05 Jul 2022 12:49:24 +0000 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2083.outbound.protection.outlook.com [40.107.22.83]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id e4de258d-fc60-11ec-bd2d-47488cf2e6aa; Tue, 05 Jul 2022 14:49:23 +0200 (CEST) Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by AM0PR04MB5252.eurprd04.prod.outlook.com (2603:10a6:208:cf::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.21; Tue, 5 Jul 2022 12:49:22 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::dfa:a64a:432f:e26b]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::dfa:a64a:432f:e26b%7]) with mapi id 15.20.5395.021; Tue, 5 Jul 2022 12:49:22 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e4de258d-fc60-11ec-bd2d-47488cf2e6aa ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kHTxO8oiTIlf3EUsEu+MSDZtWIZt7liqp3B3rF44SbRPfIFtRbLU70b6YNCBTmjAb0nDBgUvv7NUZx6i8x2gNLuIu2a67IEA8HN82+jF8inZKKweLBTOuKwlIevbGhE54NoKWX+SuPqONNFDQMzBR3A07Wk03JFtJ+eamFBMxTe13WZqaAX6j4NPnY/1brGLiV5y4/Iq1EOKCl/dqAyomwFxnVAR9pyQu8zXbNlNWCLh3f1mFCuGJcln40Vdi4VB/WZI/Uzfh0qmRMAFf6ZIGK3/43ZT9v40i7IFdjCwRL8ZXvcziEB/64aiOVSW+wBrWhN1ZyUCkVOHKZ+f5dwcPw== 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=iNSivqMUGJNXw6YV9IuRH2YBw0MQFLGrycARpWhZOTo=; b=LGFzy6lUnK0WjANKIyVvI6isM45ojcwuUEqvClC/F4+LgUss59P54pwbfNL0/F1vQ5FEXYoZYuDllW992OUZ5cKfs73x7MmkPr63ji1ggOwr4QCj+5sWwHvrl4PgIyW/kzgHrC3pCzPP7Kon3aOFkSw7gdMyL422X4T6e/y0fYaLxJkPuKMHZQOW2TIfV1eyhjTAusJtR+6oGC3PfX6wZWUUL6PkDnHd2ZsyA+EKM7MG0vfbinfCOapMiuU7hJGWtRlMT6JuxKsVEdSWLfkzDE9jbgGkB6MzBXPrlQ9poyna5YCIHKqw3tUyJyU4kzJkT1sHXCVdJx/eEttKevjIUA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=iNSivqMUGJNXw6YV9IuRH2YBw0MQFLGrycARpWhZOTo=; b=s6ipQUoUOHaut3n5ecjaui4pE5MhrkaZ5vomBt/vnuZ46bWfUzBQj8r0xxZkdoZBjKXdYo0IJbTCqKynnE/eZlF0xRe8ZMGSiEnnA5fiytvuzTIuLat8hggResZNa+bFG64aiRryDHpstlG1iBhoiZ/O71d0HovHpBczJhJ9KG11Bse6YJkNJb/y6U3aIPbW5uStbujXNLc0FoaCDd2aD850iBeQQKdMg2vO32FfYsbwF+hL83yVIE0yg0P6N0ngdP2A/S0jnzkOep3SxnjbuKMsKNEE8xw2+yXlohcJTpAT22JeajEXT0jzLPVwIlN9oP949F4AnhE7JZdeow3ilg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <1dab40d4-75f1-566c-f982-610013db72f5@suse.com> Date: Tue, 5 Jul 2022 14:49:20 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: [PATCH v7 13/14] IOMMU/x86: add perf counters for page table splitting / coalescing Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Paul Durrant , =?utf-8?q?Roger_Pau_Monn=C3=A9?= References: <4c9d4b32-d4db-3a4f-fe92-6022e63c3f82@suse.com> In-Reply-To: <4c9d4b32-d4db-3a4f-fe92-6022e63c3f82@suse.com> X-ClientProxiedBy: AS9PR06CA0056.eurprd06.prod.outlook.com (2603:10a6:20b:463::28) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 10b99f2f-b887-4222-3cca-08da5e84c88e X-MS-TrafficTypeDiagnostic: AM0PR04MB5252:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EYz5e7wS4dm/y06BLPEKKyf7a1huWjZ+0ZN7JqWcwsMXz+0h0WIzn3ETYgnSirXCiztPHW0pkCWhtn8fvkg76IsBq1MptrKTY1G2oFFqxOA/A0XdgOl7cW36VY1bJfx/u27L0RXhltR6088Hmzvu67wnwdtbJxvoHoAmoOW72+Ee6eZ95LIUjRrhZIvqjBX6U+O4uYXwENEMPhrPDYGMG56m4oU2/qjtCQH5iq0JTS7rA8gB3wku3Dk7dbCGYrare0/DU7k8GBN0Q6g5IvDRvTFTDGc+oHDTUaWVqeLxqXMCYYRYmtcIoSEMH3z/EmXnnqIRhw96dYaXfIDwnQFgpkldx3NBMKs1joZHHpcuIj0XlQ3Q8FfQyxhCDb15IVmTu64lcPQe9EZccKQfJSeSr6SwA06rRIIMrlvWfoOoeg3A0SrkRnCFZ05ZZZyzlpNQ6L6FMkQGRPO4EYey9alOcNUyDzJQKxgnIY73Ufh35W95RkYB8mg3e5ER+/Rj8X6/Bw+Aq1xlQ+5EZ+Nkib8rDwaQslljw0gzGWh+rYJtVB8UnNwwUakt8zumd03M65Ha8q2D9j63pTLR3ijDrEoRR6noqavHBtnG7DNg0hy9SZLpwwZGbNUVoKQsmywdAMC7hhcmJaYLsgPSXnUohvLq3JTa1hyUO5CTKRLgPGMm+QJSjwFurhOP9HH3VRjxQpX8IYyuSiOUP9mJ5jfkyQii6dybkqdCzKo7eIs/BG/1zxsx+vQVLFZUWsY4qyiWq5Qk+Sq1vMFF3tnvUeEeW9p6LbOYFL6frIe2qVac7+cUsE09ikxEgebZqUxsXXYbng1xOOAjpcl48yLnCLJMksNZdxh5oCoDeoG3HWfR6wh4KGc= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR04MB6560.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(136003)(346002)(376002)(396003)(366004)(39860400002)(478600001)(5660300002)(8936002)(6916009)(54906003)(316002)(86362001)(31696002)(6486002)(66946007)(4326008)(66476007)(8676002)(66556008)(31686004)(2906002)(83380400001)(2616005)(186003)(6512007)(26005)(38100700002)(41300700001)(6506007)(36756003)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?F6G38uN5l90LMsTq9BQcqZeH+m/5?= =?utf-8?q?nOx8ligmB7ZS2ZZpeURQuzMTmpJQgon6+AjxgMgJbVlegHZNUKCaZdAL6NNsFb4yG?= =?utf-8?q?MjxDBZK3TdNzHf1OshwVE5e1hDvWirV+FC0XzKWfaEfThepWxcq4Z/O5GdIcnzbYL?= =?utf-8?q?J0FuDEvCJ+eRAXthY1g+Fryp6IRpIVg+QKKlOQLuXduTT5EKZyc/NDm88+134RmUV?= =?utf-8?q?PjvKatob2LKpbgtWrUKobYH0H3iNUnopKwS7WzqzQYYgFjsE/Trn2ZuFOAJ8yvywV?= =?utf-8?q?bXa3WkSEKsrz6CyDrj0/HhKitzFFRbmgfxg+AwwGQ1wb1cYFtGWyoKpZHF7GPEBks?= =?utf-8?q?fynEkoYQxLb5dnrnVFLnBnWoJ0SiPut+Go42jmP3bKG2BstcLobxuRe9+rmGFe9bZ?= =?utf-8?q?53IvWVTePoite4OIkwQM7OIfwyKnpZXO4kHPwLm63C7puzCnMg+46kaARHB0CWlxc?= =?utf-8?q?SXt4erMiPK3FYBY9HDjlX4gq7LgfZNF9OFCcjeAoWZFS8fxvH8vsvI0NXhT8C7vWd?= =?utf-8?q?Vl5Eiz1LJ7lAFto769aeu3IzDywZT4BvtxB2TMB6CoxWND0d3jGKtZNmTlmB4cMRr?= =?utf-8?q?SGt1yaFUiS5iOrQF1c9vzKh3lZTW+nQGljX+uaChy8/IY/ze0vcST94u8L9IHcLFz?= =?utf-8?q?Yz1QsLdmS7ggTBTA8JN7ke4JrxmMl9EUXjG7l/1K9I+CqilH56GGWMEPXUdEutLGT?= =?utf-8?q?NOioqtnVQKcF0VFvskDQv8UMYWOMIS6yyK0k8ZcjiOKS6lNbgnQTGLmpwCqvlL6f7?= =?utf-8?q?v9T30xOQzNk1HeIJK1MrhhUM9zJlFaVkfzlrfgHXjvnJEmeK+9zDUxWw2Z0ogN/2c?= =?utf-8?q?iqI4afpoRA3mFgUz8r+NzVFKmiWNJ6ODw52jH2Q7QnP6BEyN6iK/vs56tRvrYqrIX?= =?utf-8?q?kL1O+28NGiLOqXKy4lMbKGXX4M2r2wvnLX8fLoWtYPmkZV6d5DxoHkz0PDV0difyT?= =?utf-8?q?o5Taevy0fnkmIjbcJUfTeljwE3Depzj3WL8B1iJBve16gcvvAZNRE3OOq99U3TcjC?= =?utf-8?q?JOPSbVmZtQ7S8fCfP8Vd+hkmK+e0uHUTGEVWK9eHHQHFVBun7Mc9XlOskRlAS9Unl?= =?utf-8?q?LsoFTJAmb5MsX0CS+7wdNnKjkhouyykUqrj9b3UXlytNOcXx8XGLBwhrt8fCMY9yR?= =?utf-8?q?uauqHwR2Ip5J0p1y9Td83m7CSasoIjQJ7FWXZt0Eo75M7DVQkC4BB+QWgGdgv7uyM?= =?utf-8?q?oZJOxNgyhE2hbO0Llj8rv1Vfp2p1AYUxbcRvlrQWIF2l5I36FmXpZJzxTgXaj7VUV?= =?utf-8?q?jxl1rJpVYz6oA4SDf16YvQxH0rodte+PrGeafCBUiFHqQL1e4gVGdRlKauT62KcLa?= =?utf-8?q?jqzfu88XCwNO4NQlsuMCynJMiLTzA9HD1319fZ0LZbfA7EtFbeVb6+Z+H9QpJdMoz?= =?utf-8?q?RDaBmJETLsuiOCUUGF2L/fe32PI+uk0ovkbNT/I3A4WZHkWdWaqqnC54BrMlwlfeh?= =?utf-8?q?jG/5ydlnd3vR5QOkVlgFrIq17J39Qie++gr4lraJpkDTAgpvqjjEvZiZuX+BsnNtQ?= =?utf-8?q?VhLndJSxip/7?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 10b99f2f-b887-4222-3cca-08da5e84c88e X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2022 12:49:22.1211 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 6Z7w6Bo4bNWlyWAU6VKAKWwdcrckDfNA2bgfq7pYiclwDdkKDqmaJQPGMPwAvftYspGa2c6Q7HYx6CIrusDEdg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5252 Signed-off-by: Jan Beulich Reviewed-by: Kevin tian Reviewed-by: Roger Pau Monné Reviewed-by: Paul Durrant --- v3: New. --- a/xen/arch/x86/include/asm/perfc_defn.h +++ b/xen/arch/x86/include/asm/perfc_defn.h @@ -125,4 +125,7 @@ PERFCOUNTER(realmode_exits, "vmexit PERFCOUNTER(pauseloop_exits, "vmexits from Pause-Loop Detection") +PERFCOUNTER(iommu_pt_shatters, "IOMMU page table shatters") +PERFCOUNTER(iommu_pt_coalesces, "IOMMU page table coalesces") + /*#endif*/ /* __XEN_PERFC_DEFN_H__ */ --- a/xen/drivers/passthrough/amd/iommu_map.c +++ b/xen/drivers/passthrough/amd/iommu_map.c @@ -345,6 +345,8 @@ static int iommu_pde_from_dfn(struct dom level, PTE_kind_table); *flush_flags |= IOMMU_FLUSHF_modified; + + perfc_incr(iommu_pt_shatters); } /* Install lower level page table for non-present entries */ @@ -477,6 +479,7 @@ int cf_check amd_iommu_map_page( flags & IOMMUF_readable, &contig); *flush_flags |= IOMMU_FLUSHF_modified | IOMMU_FLUSHF_all; iommu_queue_free_pgtable(hd, pg); + perfc_incr(iommu_pt_coalesces); } spin_unlock(&hd->arch.mapping_lock); @@ -543,6 +546,7 @@ int cf_check amd_iommu_unmap_page( clear_iommu_pte_present(pt_mfn, dfn_x(dfn), level, &free); *flush_flags |= IOMMU_FLUSHF_all; iommu_queue_free_pgtable(hd, pg); + perfc_incr(iommu_pt_coalesces); } } --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -404,6 +404,8 @@ static uint64_t addr_to_dma_page_maddr(s if ( flush_flags ) *flush_flags |= IOMMU_FLUSHF_modified; + + perfc_incr(iommu_pt_shatters); } write_atomic(&pte->val, new_pte.val); @@ -857,6 +859,7 @@ static int dma_pte_clear_one(struct doma *flush_flags |= IOMMU_FLUSHF_all; iommu_queue_free_pgtable(hd, pg); + perfc_incr(iommu_pt_coalesces); } spin_unlock(&hd->arch.mapping_lock); @@ -2239,6 +2242,7 @@ static int __must_check cf_check intel_i *flush_flags |= IOMMU_FLUSHF_modified | IOMMU_FLUSHF_all; iommu_queue_free_pgtable(hd, pg); + perfc_incr(iommu_pt_coalesces); } spin_unlock(&hd->arch.mapping_lock); From patchwork Tue Jul 5 12:49:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12906559 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 lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A79B5C433EF for ; Tue, 5 Jul 2022 12:50:11 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.361196.590584 (Exim 4.92) (envelope-from ) id 1o8i07-0000WX-P3; Tue, 05 Jul 2022 12:49:59 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 361196.590584; Tue, 05 Jul 2022 12:49:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o8i07-0000WQ-MO; Tue, 05 Jul 2022 12:49:59 +0000 Received: by outflank-mailman (input) for mailman id 361196; Tue, 05 Jul 2022 12:49:58 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o8i05-0000VQ-Qn for xen-devel@lists.xenproject.org; Tue, 05 Jul 2022 12:49:58 +0000 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70088.outbound.protection.outlook.com [40.107.7.88]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id f909813b-fc60-11ec-a8e4-439420d8e422; Tue, 05 Jul 2022 14:49:57 +0200 (CEST) Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by AM5PR04MB3089.eurprd04.prod.outlook.com (2603:10a6:206:b::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.22; Tue, 5 Jul 2022 12:49:47 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::dfa:a64a:432f:e26b]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::dfa:a64a:432f:e26b%7]) with mapi id 15.20.5395.021; Tue, 5 Jul 2022 12:49:47 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: f909813b-fc60-11ec-a8e4-439420d8e422 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KO26Cn7V0S6ZGzioixxnZR/I/ytsg17vRBX4amzpMwYzNFgj5p9M8VrHITft0qvweorL93Z03M4mG1JwsoOrIWDov1KWd1x9W4SW+EpCXyAZn2eA+poRjekciM3Q/mXzlMyxzyfRecKY5DXF0AkOLk4UUCG8yksApvcM15UJKw7NBUyS3BwR6bQU0zJU71catuFxLAMvmlkkcyOQ2V+H/KdZgW4symb2X9twjyDpeTP+4Ed2IoNdjWu/TrGv8YXat38tJqW0sfNn30Sa09uKbOWsunsRFxZM0YIxudxsWCEa+LQ9V/oVEzJhD3QRirCU766Dydao+37TZE897eJV7g== 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=aNGQdoucDFou5j3M8E7Hd4miL8kBXhKfjN3w6aHaDIs=; b=iihD0+AumewRSrE30RzfNzlvQ2lfvQRp54rH6FemnK3k+l8LyoEX6OSrKM1frAcqu0A0Z/wqYOFlsOD1zIfoxIa1O/p4hT+ja+EFQvFvAoUSPgOCMF6Iupasw3lyZClhblNMEVAPY2Iqg5XnBYqESezT2V4FUorbVuCJFdskTrXHeL0OrH11cDsNXSaLAql94YdJG/i9Ei6LnRJD3yKIn16SaZwMz2aojOfQxa4L+cTwuBGM3xdcNFa4Frz6Ye/dCY1InPcgEzclB71UXR7NNkbw7G+hvJroC3XoTrc6pbSkDdOS3DsuoG71NP7p0V5NTHRr+dP224ROcocw3E1PLw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=aNGQdoucDFou5j3M8E7Hd4miL8kBXhKfjN3w6aHaDIs=; b=0Fw/nQxsZiIk0D+cu2W4jLQwglfG7LCOWoPv4IYP3vsyOJio/YqNohwoGQanjo6TLEpyl4PXt/mO7deHswNrV2PAeTIRKk/iuAcrOIFutLVuwbOyJbZxSso4DU8L/YK7Y4g7Wa+2PEGh5RpV79vJ8VX0Aoy2qxTNSRREi0++lmDOXF0gZNY13FLa/Ewdpi0IqPyizPL/yzigc8xf3cGrvGurC3li2N2UjLfRlraSDP+uqAXaIxfVlist2j7A4VZQ+HmyDR5uMVBxbiv7V8V5RwoTNpYSshxRngJYu6NvIoTAW7X1kjivV/NyZqUzDCW4amEXLl/CDlSnAgf+BuZFog== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <20b9d343-fe6e-b5f1-1ad4-6795aaae0fcd@suse.com> Date: Tue, 5 Jul 2022 14:49:45 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: [PATCH v7 14/14] VT-d: fold dma_pte_clear_one() into its only caller Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Paul Durrant , =?utf-8?q?Roger_Pau_Monn=C3=A9?= References: <4c9d4b32-d4db-3a4f-fe92-6022e63c3f82@suse.com> In-Reply-To: <4c9d4b32-d4db-3a4f-fe92-6022e63c3f82@suse.com> X-ClientProxiedBy: FR3P281CA0076.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1f::14) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3456e26b-3aad-49cd-3cf6-08da5e84d75f X-MS-TrafficTypeDiagnostic: AM5PR04MB3089:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iF33EOjItENqFGKqIXi5TcQ83IEGIyfDsHTmB7jqBdHZ76fWJWO7I1q5bWYdvynKG2QHG1nuyhs8L+tMa87I1DwfZ6Cn+UpDk6eU/ZA91esCaV+EvQubTcyA2cHTOXN/aFhBTgTxQY4Pm6GtSu6nyJmZmEeRQIt4/stPIvY7R2u8/pcoT6fEvMO/Pf1bNcVy4aiMnqnuDzxJhgWPSSXz1C/9zSAalqRxV3un0O6t2lGu3xLgA4N4BV9fZ1vvHfWquQftA8VXQdmqvIemu8ItMHVZbUUYE93dM7P4+yf7Qv9ayAQB+X+xKFi912eHTQXNB2zv4aHiaOVR3ooYnOxwH0peqMW+lc9FNgc+KRtyKrTb+XWfCRqM20AwRc1GBa+uYILGRcnkr3mRvLx4TKc9T9o2bUIXhM+Z7doSM2cUIQ40+MFru2yzuMO27Q/wB60yiml1Fr/ATUGMUaQpxbZnlDtXx50cwoCd4hC8q5/MpiU6N60xbDscnMgV2uwPOeIOAqenXeZPubBbOeW+wcC4WpsD2unQCJVq5i75vo+NPY44RnpLj3BRfYvWlWLhBYaWqU0VTCI0vwdCiApnJm/ewzmnNdVhAWplBYLkfvKgHZdq+kQmnvsKF664kKntTVAVBimRN0V6ZoL2v0qzFEEXPNIVC6W0mNuunKWNuSJ5Rjdjqt/XTKzEJn2YTK8ZJQB2RVugWvJ6OEbG/7ydMDN37Jx+yXHeJ3fQK0ssmu1EtjkURZWh3EzYX3Gxk1nzeAhupZ85i0HqCiJmrE1VH6V8TMv1k5axCOtpF7/hrDBFJMwCSq68yCtSyeOgjTPZLCUPZVHP5Xy9k3m/4EvRv42fEA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR04MB6560.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(366004)(396003)(39860400002)(376002)(136003)(346002)(478600001)(8936002)(5660300002)(6486002)(86362001)(31696002)(2906002)(6916009)(54906003)(316002)(41300700001)(2616005)(66476007)(66556008)(66946007)(186003)(83380400001)(6506007)(31686004)(38100700002)(36756003)(4326008)(8676002)(26005)(6512007)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?1lcsHZLTkszsf5DLryxAWIA7REIb?= =?utf-8?q?89Zvhh1+T8DuwN9ZMR3LlzOmg6O+TKLxQEP12fqc5nXZh2L+IH6ORTW+VSXK0h89Z?= =?utf-8?q?e3muuqlUs0Idda3mgIl3fS4UWuIs3vBRBxSJ5fczl8H2tmhn4sLR6Zam36whfr35s?= =?utf-8?q?9c5QeFaLjmjWoYjDbXGB9J3cMw28kDMdUgZHwlytCdRP3xWVNfCIz4GmFiSOCykMs?= =?utf-8?q?AWnSRTCMIdN5xiR3ZywgXjKqB76d6NZ1AjFjXFbF9bjk4w2sfSq+V0X/zYjJnyVX1?= =?utf-8?q?rA4BV4BKYBYXiDEazLuVHA78HbFGRkPCA794Y2zSZCW5ZLc4wQM/wjLQCmfytoP1I?= =?utf-8?q?LdMXQWwGBquHccDlOwRFVobS23TcTj7KbM0WigMMQ7bPQwxbKmkpTOfBQLObC0zcb?= =?utf-8?q?XiaCIM63ewEEyQ6wEWmIdzC/1hSPG27oSYwr2Cw5kwQOtl9pOTn4aySGdmGNvxK2m?= =?utf-8?q?5UWBYEYNBMLcxU01tWR7J2HLLh8XjS5hSrIgLZMTjDD7Cw7mitxrwu2eBvzCzLG+y?= =?utf-8?q?ZuvdKouPiuiNM11txwBMXh8CMJX5cAhTs6hQwraYJ86JmkBf7bRjTtDSHKbqG/hOB?= =?utf-8?q?fUDyllgD8miRTihUGZ8ypzLwauhQGK/czTKPB1xIFYNlJ3mKcixyE0wAwFI5//9tX?= =?utf-8?q?uoMkBeGARNOo6eboMvKZITOKVOI56uqbONoyjeGsvRCG/2MNC+LyBujDibsLbCq8n?= =?utf-8?q?QsDDikyvIj28YQrBspJtTVnCvYQmt/cQdJKNPoYFKFa+Iww5hQDGxq6N7oP8Or0dG?= =?utf-8?q?S39ZLN3KeL3cyNmWRJPKK2exoubBTxZeE7tdfcZ/tJHVtedjaAQOfkItnrIjP7qrC?= =?utf-8?q?8rjPLRVj57PBW60TxxpJywgjxoSUaD/Sf2im1aoA0CjE+TzysBnER1G44022TfJl5?= =?utf-8?q?fo9y60wHFAdt2uzBAyzr1irOEQ9QqBr+jBcp6OUB66gW45NND8HOmnJiLG/lAWf0z?= =?utf-8?q?mDCVBULDOWXVVlp7YZM3jv7gLa3xEyMe2mwy7iamAN0u7MPR25CjnBA0CDaB3Pe2E?= =?utf-8?q?kBYnAabq00NAOKLTd1xAlEoR1jYyGAV6d2xNQim5s8VA/TDfEtAaKVfvse/9qWxBr?= =?utf-8?q?Xp8zN5/O4qjQGvji9/6RNaRKNK0GQshJu2VnpyobdJ0UriAIarNgmmBaNVy74W2oI?= =?utf-8?q?ycCfSZvCoZMIVB7nC8KVqUq8lYHMQYlmhQdoz5pDY2ZgPFVC/EC/pC8xrjeq4/ntT?= =?utf-8?q?EvQkxNDDx2OvLiN15xqIznl6HVKL8emFsMZQmMlq0qjtQp6Qbl6mZrjrXpMLfQFYs?= =?utf-8?q?d2DA48Oz2le9nV9O6qcKkGgeyK3Hbvv6B+l7txqVPwya+75yWyrBCGBnkzghGxgJL?= =?utf-8?q?/T9Z85hbz2/4yzmBvsMYuar46jcovNTzRE3vO489aIdIEF9D+f/0qgLdMuiqGmaHX?= =?utf-8?q?rm2nfV5fPJJ5Slif1+o4ukaBF/wayYNMQfOwrStl9mbpq2tJ9zE2KgtN7Qhubjyzo?= =?utf-8?q?JqyzbH1zGb/USrf11lPn2VK6ssZFErYuTWOcZmjpqcAsR/85DBhxfGRuhWkMfni6n?= =?utf-8?q?cXW3oGM1xESs?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3456e26b-3aad-49cd-3cf6-08da5e84d75f X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2022 12:49:46.9633 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Pw3aC+QfNz/3D79Y4nvJ0ki+itnp+r6oCrvgvudQ8Cn1w7FvhLRWHomb40pwb19AG9cpsm6b+L9+Z+wQQN/rgQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR04MB3089 This way intel_iommu_unmap_page() ends up quite a bit more similar to intel_iommu_map_page(). No functional change intended. Signed-off-by: Jan Beulich Reviewed-by: Kevin Tian Reviewed-by: Roger Pau Monné Reviewed-by: Paul Durrant --- v5: Re-base of changes earlier in the series. v4: New. --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -806,75 +806,6 @@ static void queue_free_pt(struct domain_ iommu_queue_free_pgtable(hd, mfn_to_page(mfn)); } -/* clear one page's page table */ -static int dma_pte_clear_one(struct domain *domain, daddr_t addr, - unsigned int order, - unsigned int *flush_flags) -{ - struct domain_iommu *hd = dom_iommu(domain); - struct dma_pte *page = NULL, *pte = NULL, old; - u64 pg_maddr; - unsigned int level = (order / LEVEL_STRIDE) + 1; - - spin_lock(&hd->arch.mapping_lock); - /* get target level pte */ - pg_maddr = addr_to_dma_page_maddr(domain, addr, level, flush_flags, false); - if ( pg_maddr < PAGE_SIZE ) - { - spin_unlock(&hd->arch.mapping_lock); - return pg_maddr ? -ENOMEM : 0; - } - - page = (struct dma_pte *)map_vtd_domain_page(pg_maddr); - pte = &page[address_level_offset(addr, level)]; - - if ( !dma_pte_present(*pte) ) - { - spin_unlock(&hd->arch.mapping_lock); - unmap_vtd_domain_page(page); - return 0; - } - - old = *pte; - dma_clear_pte(*pte); - iommu_sync_cache(pte, sizeof(*pte)); - - while ( pt_update_contig_markers(&page->val, - address_level_offset(addr, level), - level, PTE_kind_null) && - ++level < min_pt_levels ) - { - struct page_info *pg = maddr_to_page(pg_maddr); - - unmap_vtd_domain_page(page); - - pg_maddr = addr_to_dma_page_maddr(domain, addr, level, flush_flags, - false); - BUG_ON(pg_maddr < PAGE_SIZE); - - page = map_vtd_domain_page(pg_maddr); - pte = &page[address_level_offset(addr, level)]; - dma_clear_pte(*pte); - iommu_sync_cache(pte, sizeof(*pte)); - - *flush_flags |= IOMMU_FLUSHF_all; - iommu_queue_free_pgtable(hd, pg); - perfc_incr(iommu_pt_coalesces); - } - - spin_unlock(&hd->arch.mapping_lock); - - unmap_vtd_domain_page(page); - - *flush_flags |= IOMMU_FLUSHF_modified; - - if ( order && !dma_pte_superpage(old) ) - queue_free_pt(hd, maddr_to_mfn(dma_pte_addr(old)), - order / LEVEL_STRIDE); - - return 0; -} - static int iommu_set_root_entry(struct vtd_iommu *iommu) { u32 sts; @@ -2264,11 +2195,17 @@ static int __must_check cf_check intel_i static int __must_check cf_check intel_iommu_unmap_page( struct domain *d, dfn_t dfn, unsigned int order, unsigned int *flush_flags) { + struct domain_iommu *hd = dom_iommu(d); + daddr_t addr = dfn_to_daddr(dfn); + struct dma_pte *page = NULL, *pte = NULL, old; + uint64_t pg_maddr; + unsigned int level = (order / LEVEL_STRIDE) + 1; + /* * While really we could unmap at any granularity, for now we assume unmaps * are issued by common code only at the same granularity as maps. */ - ASSERT((dom_iommu(d)->platform_ops->page_sizes >> order) & PAGE_SIZE_4K); + ASSERT((hd->platform_ops->page_sizes >> order) & PAGE_SIZE_4K); /* Do nothing if VT-d shares EPT page table */ if ( iommu_use_hap_pt(d) ) @@ -2278,7 +2215,62 @@ static int __must_check cf_check intel_i if ( iommu_hwdom_passthrough && is_hardware_domain(d) ) return 0; - return dma_pte_clear_one(d, dfn_to_daddr(dfn), order, flush_flags); + spin_lock(&hd->arch.mapping_lock); + /* get target level pte */ + pg_maddr = addr_to_dma_page_maddr(d, addr, level, flush_flags, false); + if ( pg_maddr < PAGE_SIZE ) + { + spin_unlock(&hd->arch.mapping_lock); + return pg_maddr ? -ENOMEM : 0; + } + + page = map_vtd_domain_page(pg_maddr); + pte = &page[address_level_offset(addr, level)]; + + if ( !dma_pte_present(*pte) ) + { + spin_unlock(&hd->arch.mapping_lock); + unmap_vtd_domain_page(page); + return 0; + } + + old = *pte; + dma_clear_pte(*pte); + iommu_sync_cache(pte, sizeof(*pte)); + + while ( pt_update_contig_markers(&page->val, + address_level_offset(addr, level), + level, PTE_kind_null) && + ++level < min_pt_levels ) + { + struct page_info *pg = maddr_to_page(pg_maddr); + + unmap_vtd_domain_page(page); + + pg_maddr = addr_to_dma_page_maddr(d, addr, level, flush_flags, false); + BUG_ON(pg_maddr < PAGE_SIZE); + + page = map_vtd_domain_page(pg_maddr); + pte = &page[address_level_offset(addr, level)]; + dma_clear_pte(*pte); + iommu_sync_cache(pte, sizeof(*pte)); + + *flush_flags |= IOMMU_FLUSHF_all; + iommu_queue_free_pgtable(hd, pg); + perfc_incr(iommu_pt_coalesces); + } + + spin_unlock(&hd->arch.mapping_lock); + + unmap_vtd_domain_page(page); + + *flush_flags |= IOMMU_FLUSHF_modified; + + if ( order && !dma_pte_superpage(old) ) + queue_free_pt(hd, maddr_to_mfn(dma_pte_addr(old)), + order / LEVEL_STRIDE); + + return 0; } static int cf_check intel_iommu_lookup_page(