From patchwork Tue Nov 9 14:57:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12610795 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2A6DCC433EF for ; Tue, 9 Nov 2021 14:57:23 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id CB27960F6E for ; Tue, 9 Nov 2021 14:57:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org CB27960F6E Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.223993.387005 (Exim 4.92) (envelope-from ) id 1mkSYk-0000BK-DZ; Tue, 09 Nov 2021 14:57:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 223993.387005; Tue, 09 Nov 2021 14:57:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mkSYk-0000BD-AA; Tue, 09 Nov 2021 14:57:14 +0000 Received: by outflank-mailman (input) for mailman id 223993; Tue, 09 Nov 2021 14:57:13 +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 1mkSYj-0008Pr-78 for xen-devel@lists.xenproject.org; Tue, 09 Nov 2021 14:57:13 +0000 Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 51c91e5c-416d-11ec-a9d2-d9f7a1cc8784; Tue, 09 Nov 2021 15:57:12 +0100 (CET) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04lp2050.outbound.protection.outlook.com [104.47.13.50]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-28-7pXC94hKOiS4kHvZzMrRWA-1; Tue, 09 Nov 2021 15:57:11 +0100 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR0402MB3389.eurprd04.prod.outlook.com (2603:10a6:803:b::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.15; Tue, 9 Nov 2021 14:57:08 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::8062:d7cb:ca45:1898]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::8062:d7cb:ca45:1898%3]) with mapi id 15.20.4669.016; Tue, 9 Nov 2021 14:57:08 +0000 Received: from [10.156.60.236] (37.24.206.209) by AS9PR05CA0057.eurprd05.prod.outlook.com (2603:10a6:20b:489::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15 via Frontend Transport; Tue, 9 Nov 2021 14:57:08 +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: 51c91e5c-416d-11ec-a9d2-d9f7a1cc8784 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1636469832; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wMRh1TVmrnjdKeqysw7fuqZzraxYoHb4qRDEO2U2g34=; b=G6MUJll1eri+vbCC4CbcmSlfylo6LaG2Mjr0UExurO/7HUuMC0SXKpyxTz5ProhGTR7mfx TyqlD7Ugd5rdK2MU68J6Mnf4UJ614F4oJ25AyZCysbGF0NkKAvEngdsF+wMyr6Gn8C9xUa GWTj282bUqoZHCW8h+c0lhhD3pXvl60= X-MC-Unique: 7pXC94hKOiS4kHvZzMrRWA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=F4y2llAGDF+NN/rRbFd+U4CfA2AWmdu3KOxpp3Ai8f3xIVOoO7wO6Sv6F0cLT35uQywPIf5l4erO/KSDCqt6QYmAACxMYFu0Cop1vladohY/dcaHIpYrURfMQY/d0iefiGOwXbF2SBIv8r2ujJ/QRt2tVj/7eqSkQpbyY1D9vf93XKuGnWelWROF9tRj5Mgzo6a5yPN32OWV+RVtkUKs1Qn9CYX+MOyRuKWR3iHRwfNmIWBhku4G4cYS9JUQ0K448ml3GdCx7L17a4IoHRKVfNhpegHL/r34YWU/EkDdGi/OeEScG2kpQQyEZISedpMLlDMEssfJXqDhPps+pgrRkg== 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=wMRh1TVmrnjdKeqysw7fuqZzraxYoHb4qRDEO2U2g34=; b=RLH5MC/29ts4v1Hx/OmWDpuxpd7KzNLCyVOkTirfjXfdY2z/efqySLuyHP7sMAsH1WNMLgYXX55tSrk9wHQnro7nGjvke/UQb26Z7Q779svAyIZcUu93W5edBcLN4dut+4Npw7jM3bIsimFKPHLOhOgx1hg/yuR8kLery3f72pk2YRrmeEoBFaze/QmU+fISFgWpzwylqWkHYaHNrmHzTXZuaOFkd4aRg1M2L0EX+8mcLkI3ofrWzK2S/PTpFx5n6ZAztJIn526/2glpYhSPy1g/UYTLJ4Q/1KaqXErNlO9N+eXWZNHfurrJGLZjTL/067cAAMgHAOMN1PjYjcmp0Q== 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 Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: Date: Tue, 9 Nov 2021 15:57:07 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.3.0 Subject: [PATCH 1/3][4.16?] VT-d: per-domain IOMMU bitmap needs to have dynamic size Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Kevin Tian , Paul Durrant , Ian Jackson References: In-Reply-To: X-ClientProxiedBy: AS9PR05CA0057.eurprd05.prod.outlook.com (2603:10a6:20b:489::35) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e514dd77-bcb7-4525-da9a-08d9a39133fe X-MS-TrafficTypeDiagnostic: VI1PR0402MB3389: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1013; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: j4HN2eXbjss/OUXShVfiJHvOgSlAYpQ1syOw07uV8IyQwoxh7TmCFNSwWVLOsLJ/YTybn8xr2PqqQ2GNFdVz0rgyD+NMgb/QpBkn8D9fYIuD+xKb/3M9ruFcOuV1dr/Oe0cLCvPIvc2Sdk/n+Xde6Og1y1bSFZxP2PJDjMeYgtDDcCy6s01r7GRX8YnaHwDrdNlyRA9ebHd6sVEUwaaVHc/O5P236qGD1+su4k4I5yMu619VyDU6YDjRoQu9T+vF/2BV2GohmPBGbfckE6cdPpa0q9UFyvsKML653eValPlJyW5Rz0xAhfqDfxwZthmI16pl76iGkbUYkmGuRpkAVDd0MlTfeSz5ZZS13jAJhbYuQW6WQhAL2BOAx0MPvvdH108EpNKG7zgnfhqcEt7Ded1T6i1ejtAn4wPHUtGr3UTL7f9juTFHOdoN1RHQBTJy+QW9HTMuAlgJtM0mH638qU+jVBunQfsSaAELgXfoCYpHa7+5eVfESHFy4EYSscOTDh72wlqnlQNdwNBCEwDkBIelIla1gIznQ+f00BPu13Ku8ux8RZiI+8iHAraqGrVQJWaRoc9PDzELJI9M6IK3u3BYReWi3skq1cZDXftlDtelZH+0ufNGhzcM5gO8vsmsthaD9nCZa2hsqWk3Yn/VWkIeAWsO42Vk85eajMGz9HQqp4nb3wlKrct8iaZGfDe5fUMB03LFzryis9gl4U1USYZ3H+4jW/wF0NEACFc3U5Zhyovfii4eGU1PeONOCeOB5w19KX4ydxpq32Hw78Z9cQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5600.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(508600001)(8676002)(8936002)(16576012)(2616005)(83380400001)(6486002)(66476007)(66946007)(66556008)(31686004)(38100700002)(316002)(86362001)(2906002)(54906003)(5660300002)(186003)(6916009)(4326008)(31696002)(36756003)(26005)(956004)(45980500001)(43740500002)(309714004);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?zxAipGOvCx/ehBtmyTgu87k2z30C?= =?utf-8?q?6DXzetYRIAzOd+ilNTzut3iBY6yUaNFgqGvTWw+qBjZ8tWELAF+LqkPprlOPB3Yfi?= =?utf-8?q?JlOD4t5stt4aZc64CiXakO7+VQul+RCeiIwptS2+tTgaRiMA8WvFmlcX90CnLUXVu?= =?utf-8?q?JRjt583LS3OxAI19IpCD+Uw91zl/k72ZxqAd7GaQUW/WIW2mTN88EcA8/ZQf8fyIl?= =?utf-8?q?ixB1Z2kCne0doW0geAoFs+HpRk0BIRSZbSehTNJBysc2FFDFVT3Fwhm/IdQdZLOBV?= =?utf-8?q?VS8VQGWyu44lK9gd/T8j2tNU6/xR+f3ez440adbziLRg/pAtcvPT3OuqycbumeGrJ?= =?utf-8?q?0PY6Pvw5vnTh9x0ehTtYJHFsOWUUzl6bkJQ+85X3OC0Z8DZbMOd3vQjl5+ZKFQjVH?= =?utf-8?q?Hg8BUcHVzTo6hOoq27sgvNFrxXPDybNi+rrxkY7SO58f1dewBmxv95F59kfCrZkm3?= =?utf-8?q?cmOofJ8jMEtxv3tx5r446BB1tRuJtWrI+2ZZzRu83EMwyin7cF+KnrRrfKN5udquY?= =?utf-8?q?aQsrWgy9a9/iSZiAbLzzhTlufIKeNiGQpT+Hvv+6pEmBTwOEXjlOKQ18WYV7Tag8C?= =?utf-8?q?C3rZSxLyRdfrfaDVWjX7r//S2OPRKqGpsVfXRvtY/rSO9JhMGbfDUeINFVKuoXkEW?= =?utf-8?q?PAhIR3NZRwtLgsAx6eolGo/m4OuNlEd2owWgG0jb7pn6sfsw/deCDQjyc1M+kA8ew?= =?utf-8?q?gmN6wKKGKKEESfwnYgaqVBxmPM2bCkUCJkNTn5aqyoBLO2yW1RAQSR+UM86yw7+xv?= =?utf-8?q?TZp++65Cpw4wQcusnYqGHgjPB8bMnF4AUXqoMDieBZxCxWHKUoLeWIeYezYl9ybbY?= =?utf-8?q?TisplvibEkO20fo783TL6Q7zTot1oiQI4YEhwjzWOrO8w3v/39cVNqm6F9TnQevZS?= =?utf-8?q?r32ZE2jn2h2F8O0NoP4EM7xJ9sQTlwG/zbRzaWyfpu6GyoC1GMc5wDm9ik93KCv2V?= =?utf-8?q?PSWC15uL1uqlu4YD/xWrQf1JPlhUJx+E+hnpkn1jC4hBdomsqNZu/Navw8VxksA1C?= =?utf-8?q?k5Mw6avk2M+XwrHCf1tLa1f3AK7Ixab4VbqTOnx+cSBNHX7ps50MaK+0TgPm0szfp?= =?utf-8?q?immRMYppT06yBDszh3ow0vTVz7s1kjWxTeB5kbQSZnmSJXp078EJ/Q3Pq6W7KXHTB?= =?utf-8?q?LSYMT2QzZOyH9CAEpEPugJ3q8u7qeWHKmdSF88xytwHtNyYNhVeOD7Yw9560f2nSI?= =?utf-8?q?yncHQN76BITafR8bv4bwcNBa0of3p+J53JMwdwTeHLGDjWJJVWWL93MvuM4yYJr6T?= =?utf-8?q?UU6ijs0tQDzi0phsG1V7ucAcMlzqaSDnL6NPTF4A0aDi8sEr2icPdLAVQpeqOUYB8?= =?utf-8?q?VIJd+Z5vvTwzBe6xJwFoz1o/lbuloZ9N7aM30rNxusBmKXSlLk6OM9yzdK5nsAuId?= =?utf-8?q?AHrdZyY2PN/SFSC5nyKr8+A93RDje1t+tcDK8qDROxH4DXkvnTBwL5DQr4NySAz2v?= =?utf-8?q?hSa7GhmY8AmHfczQigSSj7PsaKGplQzlZw9/R0Ukzk51tIcXkId1dlXQZmWT/13V1?= =?utf-8?q?2GA95QlW/W9jewhcmAVoY8u2CdFBs/2/F878eKmqsZ1G9Ruj8sXpAjc=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e514dd77-bcb7-4525-da9a-08d9a39133fe X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2021 14:57:08.8810 (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: MY5+fY2Yrmg/qjL979oibLExDFOA15u9LqrJXP7D/mWe4dtXKZA0bs3JRPLOhonHLF44JoFJ7/O6jUBVdVZOhQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3389 With no upper bound (anymore) on the number of IOMMUs, a fixed-size 64-bit map may be insufficient (systems with 40 IOMMUs have already been observed). Fixes: 27713fa2aa21 ("VT-d: improve save/restore of registers across S3") Signed-off-by: Jan Beulich --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -54,7 +54,7 @@ bool __read_mostly iommu_qinval = true; bool __read_mostly iommu_snoop = true; #endif -static unsigned int __initdata nr_iommus; +static unsigned int __read_mostly nr_iommus; static struct iommu_ops vtd_ops; static struct tasklet vtd_fault_tasklet; @@ -645,7 +645,7 @@ static int __must_check iommu_flush_iotl iommu = drhd->iommu; - if ( !test_bit(iommu->index, &hd->arch.vtd.iommu_bitmap) ) + if ( !test_bit(iommu->index, hd->arch.vtd.iommu_bitmap) ) continue; flush_dev_iotlb = !!find_ats_dev_drhd(iommu); @@ -1308,6 +1308,11 @@ static int intel_iommu_domain_init(struc { struct domain_iommu *hd = dom_iommu(d); + hd->arch.vtd.iommu_bitmap = xzalloc_array(unsigned long, + BITS_TO_LONGS(nr_iommus)); + if ( !hd->arch.vtd.iommu_bitmap ) + return -ENOMEM; + hd->arch.vtd.agaw = width_to_agaw(DEFAULT_DOMAIN_ADDRESS_WIDTH); return 0; @@ -1457,7 +1462,7 @@ int domain_context_mapping_one( if ( rc > 0 ) rc = 0; - set_bit(iommu->index, &hd->arch.vtd.iommu_bitmap); + set_bit(iommu->index, hd->arch.vtd.iommu_bitmap); unmap_vtd_domain_page(context_entries); @@ -1789,7 +1794,7 @@ static int domain_context_unmap(struct d if ( !found ) { - clear_bit(iommu->index, &dom_iommu(domain)->arch.vtd.iommu_bitmap); + clear_bit(iommu->index, dom_iommu(domain)->arch.vtd.iommu_bitmap); cleanup_domid_map(domain, iommu); } @@ -1819,6 +1824,8 @@ static void iommu_domain_teardown(struct for_each_drhd_unit ( drhd ) cleanup_domid_map(d, drhd->iommu); + + XFREE(hd->arch.vtd.iommu_bitmap); } static int __must_check intel_iommu_map_page(struct domain *d, dfn_t dfn, --- a/xen/include/asm-x86/iommu.h +++ b/xen/include/asm-x86/iommu.h @@ -58,7 +58,7 @@ struct arch_iommu struct { uint64_t pgd_maddr; /* io page directory machine address */ unsigned int agaw; /* adjusted guest address width, 0 is level 2 30-bit */ - uint64_t iommu_bitmap; /* bitmap of iommu(s) that the domain uses */ + unsigned long *iommu_bitmap; /* bitmap of iommu(s) that the domain uses */ } vtd; /* AMD IOMMU */ struct { From patchwork Tue Nov 9 14:57:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12610797 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2EED9C433F5 for ; Tue, 9 Nov 2021 14:57:47 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id D5E7961051 for ; Tue, 9 Nov 2021 14:57:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org D5E7961051 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.223997.387016 (Exim 4.92) (envelope-from ) id 1mkSZ7-0000ix-Nd; Tue, 09 Nov 2021 14:57:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 223997.387016; Tue, 09 Nov 2021 14:57:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mkSZ7-0000iq-Ja; Tue, 09 Nov 2021 14:57:37 +0000 Received: by outflank-mailman (input) for mailman id 223997; Tue, 09 Nov 2021 14:57:35 +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 1mkSZ5-0008Pr-Ov for xen-devel@lists.xenproject.org; Tue, 09 Nov 2021 14:57:35 +0000 Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 5f584dec-416d-11ec-a9d2-d9f7a1cc8784; Tue, 09 Nov 2021 15:57:35 +0100 (CET) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04lp2058.outbound.protection.outlook.com [104.47.13.58]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-12-Eb4ZvnVmOR2JU3hFSdSl2w-1; Tue, 09 Nov 2021 15:57:33 +0100 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR0402MB3389.eurprd04.prod.outlook.com (2603:10a6:803:b::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.15; Tue, 9 Nov 2021 14:57:32 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::8062:d7cb:ca45:1898]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::8062:d7cb:ca45:1898%3]) with mapi id 15.20.4669.016; Tue, 9 Nov 2021 14:57:32 +0000 Received: from [10.156.60.236] (37.24.206.209) by AS9PR05CA0035.eurprd05.prod.outlook.com (2603:10a6:20b:489::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.10 via Frontend Transport; Tue, 9 Nov 2021 14:57:31 +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: 5f584dec-416d-11ec-a9d2-d9f7a1cc8784 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1636469854; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0XXmDRcbmhNSOz+3m8n+EWENufFamtBOLA4E8m778Yc=; b=G+Cb5t+/OUsXTut729WkPjpQhFcYEoCj/Aml7V7tSKoa7+PehAg0XqbMhyX+LokyGXjT6d hTvfi//NKKHq0Qr7KqYA0H2dhJb1/TTPESBpzFF/sfyGytwcdTXuDpgMCqoBce2sf4esZw I0/shVtXk1yHt8jDD1qysxpqZQS88Xs= X-MC-Unique: Eb4ZvnVmOR2JU3hFSdSl2w-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MPcW05CP4itgA8lCOnYATYYmQ2E9r1OfUgBe+QJjv53E2mNxP3tQyHsJqpGPV183zh2GyJJABGDcw/CyrDqpPPZZhc9ThjlqKGE5Zs76JeoIx1WSMNw2Je6B/rwSiaHUKqEeMda0FEZJsGWkXHLD2N6I3FZCuYmzO6JW1P0EqOiMunspll2Jg85Oj3HnuzAc8C9wPUALg/tZM621Ln/QgMYwcAfr/+ORrmK3lUXYvjgkNKnOPGL5NQA1gp+WwZxjzDwD6TYJ9u/E6j1DAzDBm6R282jVDTQAUhf4ig5Htt4QveLJVjTUS9L7QmRZBoTrecZZzOL/sNQGdrQmeeu6JA== 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=0XXmDRcbmhNSOz+3m8n+EWENufFamtBOLA4E8m778Yc=; b=W/W8BrsZsaQyCVRRzqgxM97D47wWoOf7liHvAswQ11W4Ttt+ZkUj6yiOApS81VTtdfeLIsz5mcGHn0h6VgeDNda3eDdyzoLHYF+LVi76Yvt0RsBHSg/IlS2r5442Ns4NMoChjv0y9GcWzelZNAxdeIjGITzpxOmiIRQ0YqGfrXoDPoihq07Hzjm9LZNKPZN2Y9GJlj0/ZjcUhXItlmDGV24tibL9Hk8QeyBphnD8I+46aycVpOQzsxbOApNORfSfhV3nVnug4J8lBGLo1HFCSNujgI9OSSIH7IVAWWOa18zsirSBtKfiGvUoywLMXVG7hI7BiWyjYu5ZoprH27L4Bg== 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 Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <35094014-1578-9db5-4635-c3ed45433a7b@suse.com> Date: Tue, 9 Nov 2021 15:57:30 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.3.0 Subject: [PATCH 2/3][4.16?] VT-d: fix reduced page table levels support when sharing tables Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Kevin Tian , Paul Durrant , Ian Jackson References: In-Reply-To: X-ClientProxiedBy: AS9PR05CA0035.eurprd05.prod.outlook.com (2603:10a6:20b:489::17) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3ad76bab-400d-45b4-83bd-08d9a39141ea X-MS-TrafficTypeDiagnostic: VI1PR0402MB3389: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xy100UhqOgxPHtdZ5yAB8eDzR1NFKVHa2jksCCrMNtc8W8T/06bAzt7RL4ZczR9MshcxCR9W+nYqlFklSsXxhDLLc3J2JbHsk0OLbkbBCsuGfn0oH5Q9Q/ROozstp7wwU5xTLPXEZ+c8GwQR9KNK/Ohi0f7n7E9ETF6sB89ZNGz0rR5Bbt2/kkykkoky2iNQHms5jEWYtprqIW4ghBZtJGKLE9FCr/BUgPt8iDwpVpBKbfeEfxKxUgMN+I3yF5TJwUdLSXypuyLISOrr0iO8kUAh2T5wCHD/ydUzigXxzZyJBDM8PxiwjNwVf/TKshEkDGzs9reic57Ou2rzz/NYE8oYpM6LBCenmfSfcZ4jvuidHn2/xGkGhH0+Gt/cgzfYLW1MNw3ntVD4XrPDw9gH83lVLXzMO5hAGQ4NDXTCg+kg/C08nUDtA1Kz126cp48JQKe8NzS0tnIQLu8AglPruJng/5Fl/rcIN9P0mQkX4UjNlrTSHoq20Prp7RmMLRpmydpR5ZjbfF9O3Gb5Zm/LilAHMdLT26vKhpG7qKLJtmDppu9T7gxeIfYNVj85inCsbsdyRp+8vB1SRr0paay8K19mRLo7JxkUnYDVNUn1N7EqfdqbDI6NmxlBMNG/7oC6xCCwxtlx4Yd+AX20yU9awHheixq16q+v8JIPvk3RmKPLrplxjaHRsk0jnkKd7zztiQQSejA76OjQ2JIKeWO9tXmbLp5Z5VGQ5SI1AzNivNQ= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5600.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(508600001)(8676002)(8936002)(16576012)(2616005)(6486002)(66476007)(66946007)(66556008)(31686004)(38100700002)(316002)(86362001)(2906002)(54906003)(5660300002)(186003)(6916009)(4326008)(31696002)(36756003)(26005)(956004)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?LS5ZffkRJZ8qt2oXj1juYwrq0ikk?= =?utf-8?q?b2Yj0/6UeacrGNz/A7ASCCRiLUtNt326ZrwbNuxPR2lRRmDhEtd/jGmG/AEnrG6sc?= =?utf-8?q?erzWUpe3T4uxWBZU6cJNWWJt6TFIKjMCLglp+9k6iRYjnJlgG5l9U+0gV5P6OUrwG?= =?utf-8?q?3vPwx9ukXcHPnbMdFwgxBfSX8+1Q3dmYyrOI0oIc+jMdBgwzpUlsyIlK07HDR3Ah8?= =?utf-8?q?j+M4T9IQkGNVj8IE9XqUYgpm3vjrMiZ5BPvGBS6Fnrorsrb5ABWh7MlDnmvzZjfYE?= =?utf-8?q?yWygdUwIejf6fWHSj6rp7uXmdN+g+f7s3FaiDJCYn5541zrcE4FvZFOlXrj+/xonC?= =?utf-8?q?4sBtg1eC7X0+1+kBTJgIdUy3SE2zESFIZnsRZfXFuEmLV1YJPNfzVGqO7gqXcGyWZ?= =?utf-8?q?Db64OJkboXVt8f7wpO08l9VxMbvVwgv7NKOIPkVOuyI5EWIel6sqxy9FZyq/D4p0O?= =?utf-8?q?N/+fc8SlPAabYC6L3tpkl+ZEAE9w2FukfbBELwDyJKVAtORgp3Q41wEhx/EHVZmsy?= =?utf-8?q?zfNjSaRH52F2NDhFeZGyrPdQxa+RufAtR1VvA4rpK1keo92+l2iN1Hr3cY8o698Y8?= =?utf-8?q?3T3/yWf75vnagv13YIS/Qxk/qU6PaS8mhb35F/PD7qcmQhd/RUyBZ2qA3yl1QLfdv?= =?utf-8?q?0PBelU0rOKi6mNfUdWdKPtP4x9LubysgkUD3AICjJDGiTyCVnZklWxCEA9DeTeRW7?= =?utf-8?q?U7Jd8N0r/CARmLWi85RZL4YrYZeoPCqmWpS+NBqsemmOlrlSKaN/fslMypPa6EL5u?= =?utf-8?q?R0KfW23ySX+TSWtqeJDZKWW0EppmDUUbUazr6PVPFKueRkdICv+0svFqwkHoiTBLK?= =?utf-8?q?Y34CIBK6itws56taVSVf10HJDnjWP57FvEoRwQoXIe0s7IMj65QvrlztNAxivXZ8M?= =?utf-8?q?ahuzUnLb6HgOcSXO1v/92NfiAuq6erirWUPvy7//43tVErHWALPUGsGBQdW98MfwR?= =?utf-8?q?f1zpzWljxNQf/Ci5NokfAGAwmRu7ItpsClxs1XzLrqDIa6LcLlvntZODvuLTHpoec?= =?utf-8?q?2yPK3SlQ9av6UHHKyGufwEE6wwggBkoIkXaQ8kEoBwLSmxN8C39sghS3oev93JSm1?= =?utf-8?q?IuW78gDMyeehGSpH5GEPQmwIGhuJ5kQD5LabwnHedOCjs2Sa8QPLgbN+KQLxeYqKL?= =?utf-8?q?gD/4vgXo4CTtPFKpdiCT70v3lOTRSeuVKU8c21pQoTrW+ZdgglE9Js/rlHnAo/T2I?= =?utf-8?q?AZOcIG3Srz2T4CRdDSdqTGpOgvVNqtFAdOZFpz0nWtkAakfjL7V0xmdbltmYIAcGs?= =?utf-8?q?dh4S4e417HKwaaGX8iUlfxtsz1T5/2/cwgwOLLglEqxYFiLIH1Jia3cmQT5bbn3Hz?= =?utf-8?q?RAq2nDvtG+st1dlFyDtNcYjMBtNzr04VfX5ahEfiJFz+cYv9EVgpjHVUqw4/eZTDs?= =?utf-8?q?1CeKXb9w7RZ8oJWsqjPhBTH/SNma1qRqUJsIjOte7iaxGJCc7cLetwabVUf2m+Pep?= =?utf-8?q?tXvgfRwuC4+o/6BL1weTKZin6o3EwjKMwvMDJWevAWWWo9XTNrU9MzK0n2KhMYeaF?= =?utf-8?q?1irpVzjutRUOtj0QoOZwppA7iHN4tzTSytCbpfEfE7xNA+hXB2JtH2M=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3ad76bab-400d-45b4-83bd-08d9a39141ea X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2021 14:57:32.2328 (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: JjLSOVcUG0Ln13Ie4IL63Ld/D6eWnWw/HNwTJkLE9iYcVcNhcxhMoJfCTcBMttGsVUB04stoQDvXESi+JxEptQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3389 domain_pgd_maddr() contains logic to adjust the root address to be put in the context entry in case 4-level page tables aren't supported by an IOMMU. This logic may not be bypassed when sharing page tables. Fixes: 25ccd093425c ("iommu: remove the share_p2m operation") Signed-off-by: Jan Beulich --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -340,19 +340,21 @@ static uint64_t domain_pgd_maddr(struct { pagetable_t pgt = p2m_get_pagetable(p2m_get_hostp2m(d)); - return pagetable_get_paddr(pgt); + pgd_maddr = pagetable_get_paddr(pgt); } - - if ( !hd->arch.vtd.pgd_maddr ) + else { - /* Ensure we have pagetables allocated down to leaf PTE. */ - addr_to_dma_page_maddr(d, 0, 1); - if ( !hd->arch.vtd.pgd_maddr ) - return 0; - } + { + /* Ensure we have pagetables allocated down to leaf PTE. */ + addr_to_dma_page_maddr(d, 0, 1); - pgd_maddr = hd->arch.vtd.pgd_maddr; + if ( !hd->arch.vtd.pgd_maddr ) + return 0; + } + + pgd_maddr = hd->arch.vtd.pgd_maddr; + } /* Skip top levels of page tables for 2- and 3-level DRHDs. */ for ( agaw = level_to_agaw(4); From patchwork Tue Nov 9 14:58:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12610803 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A919DC433F5 for ; Tue, 9 Nov 2021 14:58:45 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 5416D60F6E for ; Tue, 9 Nov 2021 14:58:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 5416D60F6E Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.224004.387027 (Exim 4.92) (envelope-from ) id 1mkSZs-0001MU-1Q; Tue, 09 Nov 2021 14:58:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 224004.387027; Tue, 09 Nov 2021 14:58:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mkSZr-0001MN-Tj; Tue, 09 Nov 2021 14:58:23 +0000 Received: by outflank-mailman (input) for mailman id 224004; Tue, 09 Nov 2021 14:58:22 +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 1mkSZq-0001M1-TJ for xen-devel@lists.xenproject.org; Tue, 09 Nov 2021 14:58:22 +0000 Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 7b11219e-416d-11ec-a9d2-d9f7a1cc8784; Tue, 09 Nov 2021 15:58:21 +0100 (CET) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04lp2055.outbound.protection.outlook.com [104.47.13.55]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-18-O32xj_7zOlKiRMqLa-UOfw-2; Tue, 09 Nov 2021 15:58:20 +0100 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR0402MB3389.eurprd04.prod.outlook.com (2603:10a6:803:b::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.15; Tue, 9 Nov 2021 14:58:19 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::8062:d7cb:ca45:1898]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::8062:d7cb:ca45:1898%3]) with mapi id 15.20.4669.016; Tue, 9 Nov 2021 14:58:19 +0000 Received: from [10.156.60.236] (37.24.206.209) by AM5PR04CA0010.eurprd04.prod.outlook.com (2603:10a6:206:1::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11 via Frontend Transport; Tue, 9 Nov 2021 14:58:18 +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: 7b11219e-416d-11ec-a9d2-d9f7a1cc8784 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1636469901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pI2I0oSjXvpskejeIS7I4+Eo2D0UJGIdxq3pdjMmjqA=; b=kFKX1lSKZa0uPzwEpWPzUeR/Heqxnfg0J8vPA2aJiWu4om/bia6kw8XCHE85+WClxAoY29 Qxfj0i5l7MX0age+5uWKXcTPpecne3x+4CNjD8R1CLy2vfl7PS8QVJ+vYOvH4m6hLgbIz8 3Orc2ixklKX2HqlkKaTLTrrR7qYm0iI= X-MC-Unique: O32xj_7zOlKiRMqLa-UOfw-2 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ld9ccBFHjmzCx77rMxovZKtzR2YSMOV4DyDpimUnrTR4eY8M5slkCrM7CmaB0N2InWitY5FtOKgi51FcnnEYsnkzNQRFr273N6Hq2n0XpTJfYu4iVvO5E1wwTEXo6mwXMmJx/ht9Jr4ZMTcZUsF5FL9ryciIqyz/QcE4OxW8kFXrCLOWlfYHrnHKpC9Out09JDwDW6MlVypVBEyGIEfqH1GNIwfd0LjaUoTyTqJei56nxaR2JRjw101GJo8Z/jCrTO/qxusb6AeEQO+oML/R69iCvMffx+AfaUBbP0DXtKC0XHpvTch/NKx7M240hryXd9KUK2cqrGPhXx9xtM603g== 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=pI2I0oSjXvpskejeIS7I4+Eo2D0UJGIdxq3pdjMmjqA=; b=TLrn4DBjymBTTld1gTKKWVFLDQR+yuXmyZHToeUEIQBKNWFqFlVvKqyNOy+oMF7xJSiCwnzYV+Fi9nlCj92p73oOUyfnNQvVhNtPikacDRP0Dp8JmXyJ8L/BWjDAEz1M0l/aBA3VYPvlGmY1JJFo3ZiHg5lgQSfuH5X0K8edo/tI0xjAuE2zERiGRxuH1iSwrx5K4TElvRl4rsYnM6w1eM7xUn8r/YHnbVLbmf8PWNysLAXNDpva8cU5BWybg8tg7SRr5IZrptQp0IXS7Bh1DvCZmA7wi8q2XswRgZL9BErjMG/jFeUwsrx6+hoAZqyAGsA8IKOV0nrq7Lw0PhKvHQ== 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 Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <466baa9f-38bc-99b8-6403-24e9384820b3@suse.com> Date: Tue, 9 Nov 2021 15:58:17 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.3.0 Subject: [PATCH 3/3][4.16?] VT-d: don't needlessly engage the untrusted-MSI workaround Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Kevin Tian , Paul Durrant , Ian Jackson References: In-Reply-To: X-ClientProxiedBy: AM5PR04CA0010.eurprd04.prod.outlook.com (2603:10a6:206:1::23) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 41849fab-2c3e-4f46-a5e5-08d9a3915dc5 X-MS-TrafficTypeDiagnostic: VI1PR0402MB3389: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4303; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fNr7BIyjC4Uj5m+wZH2t3uTaAf+fffFqQ2+pbpRAmIkZvXhZgBM2fKedOeK5XvUEd/JYSjDrxwyXSAJAWu4Z78uGQVP7pJqTF41TRFaaGZQP2IlbhfdkgmDbmposWmK+o6oI9COTy3nw7CBWHTuSrZtWoG9210PwoaURPCGtb9EkPgG1PFQ9TbC69YenwF8/G8Yh3rrISEl/mwUmDvG3CKZWnB8MIwjqRyu6yg1kBAnL9hn6rcm7AGE6t8vrU+ShJ7qImCLz4MnqkwJTRVEjGKj08g2tmDfdqUQhbRc/4wpWjbsDWTaR5LdUwXOPvaVHP4jIHn517pj1JfPUAIHTEOe6hxHIxxiPjoda5cT/IPGNBqVxOAxAH7pz0sirt7NV0/OspjSrN7Js+CFMAx1LjNR13Qwixe58676oWjDdTI6FA4Ytydik7PmiYYIwRJYF2tnx6kONGpeeG+VAtKUjpSi8Q0hfw93Fe2/McBaOasYccv8dznR332NoDNeLwKy/soN77UTHDAMPvE26099VBIEYm+VT9NPJnyc/M2ZVW+m9L77raLkg/Fz4JHXoTTviUYK8JOupLGONZ7gZH2j0+uYcyLJc8fEmTamf+nKEh2zEdxJCyAxM/Vz4tZCIKlZrrj5YJFQuTtYBnxBqEKxN7T1C5skS9VLQJosiULZwlQDZ5PdWwC8VzDxEOEW2So4V+0aas4OMXs8AbG+QhDciGKrZaXT9k/LSPSncbea8+XQa3xXz45rSTmunDvu4f9xE X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5600.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(508600001)(8676002)(8936002)(16576012)(2616005)(83380400001)(6486002)(66476007)(66946007)(66556008)(31686004)(38100700002)(316002)(86362001)(2906002)(54906003)(5660300002)(186003)(6916009)(4326008)(31696002)(36756003)(26005)(956004)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?DUJWnlLikh/kUIZNEtP/rbGr3QeY?= =?utf-8?q?zZbSQhv/Ml4viAnvnPc7piTx1cRm0xbNlIgmpsQlj6owkITiU+LDfkJXc4J3bTm1d?= =?utf-8?q?nSUVS9LFpJWpP3QdUGIc4xu3esqt+Hg/jBA8bOEsn65O8xU9TNVr3npKNsnX8LVoc?= =?utf-8?q?+neEYLxsrr7P+aJyERm/wbvkiXTfWZKvIOTZEfwLeN/RE/ecw950L5qdzQqBRMlXN?= =?utf-8?q?NObJLKJYVzYJ8I/mRx3WWcPwD6q+34PzsFr8Jcdvoe+UFS45ShhrrYxjtXhoxweaM?= =?utf-8?q?sggheKsJmHtH23OcwVjGJAKO6sDi2XKPtqG/Uv8mXAt2CopYsxQSxsloqceR+QE56?= =?utf-8?q?OTUYIjpKPXBKBxbZ9iIiOzaUK37dcZVoNj6krytL9tBULv4L7Av74UYR+glDkh4IC?= =?utf-8?q?W8I4vUMxXt7I/vlQgNwDXp1Jw7NMftBhfet+ryY3YxRSBGKLfpUIekVwXupcNs5/V?= =?utf-8?q?8tiNkT90cpcdH/83LBLtS9EBMNhpoqXR2KeHmn7XqpPGnQOls7AVkTZYv7BUhQBbJ?= =?utf-8?q?wbDFPYA8znJzexSvq3zRTJwrXCyzRlaKNn0S1fj9OK9tzsiFA67AczQ2ol4rpjdbi?= =?utf-8?q?Y1Op3IkQkd+stBEdE/5qA9ABZo6A9ipUG3VlRc9BPmO/q4IHc+Q8ncpWm1VNYCqYv?= =?utf-8?q?sbdrp/s/AX86W8YAnU5fUE7s/ILzayX60XEPHG9LFVQA12btnrXF/Yn8H/YW77vdo?= =?utf-8?q?aJq4F/z05H7FvycbYBwGv/DGyJsdJtqbjB7EbEJc9EH7ejWB5ZzKkALQJCBSAF23T?= =?utf-8?q?gks74Lq8sd4ghl7kG1dlCABQsDPvBA8spJEkcXt89cWVYyt6jcc9elQCXIQk6+YJc?= =?utf-8?q?CZmRRZjshiGTeunYVMjE7KzTzqWNphhUJqAdYxfRe66uiC8pIwAKebrAFY1fKbowi?= =?utf-8?q?m3hGc6e7UJEfMvpcNdsicHOR4Pakv81uAI1l+fyXt0/sOBEvEU/d0NaTuNWaTcHSU?= =?utf-8?q?V7sfdYAQMJT53En5drwHwC+giOIN8xCuSoJe27/9Nu8Kx5MbdnEVhutE5jfrDSiq8?= =?utf-8?q?wy5tojWXnavkdPE5tv/1tl1TIOwXKA1U/bAX66PWM/7FQyr7A2NOOxGM1fkQG+KbY?= =?utf-8?q?y6N4IHGgS9dzxe2vRA5Kv3KvIdeTgqrxFx5DxjZu9989onxosbVAGnR3Fd7M+of3o?= =?utf-8?q?uFhBGRhR2P/3lnWI3yTSqXj20/s/pNZmAb9YFLIqNvdHiiH64erPUMelT2qdiyPly?= =?utf-8?q?c+pm+uVqlPDn+b5eu20t47DP9csnhJ7H7hn5euBkoF7S3oMEWwchh8K/50kxkBXpU?= =?utf-8?q?J9oefmyhZzYq2TFYJtKf8pbIrjUucyWmMWFBtPMTs844UMPVlR7IIPanRx7poDsAd?= =?utf-8?q?ReJQceTxrN+vUp0axaOUR7pGvzot0uodptB25B/rekO8oHNiF13ijMBWJLqSciXUc?= =?utf-8?q?wRXAaAjSMmyaFDzlc7pKiR2P28DspRsS4CkG4bFNcPEIZG2hgtzWuSLxjGGG91P+U?= =?utf-8?q?0zoBzHHmiv4cvJ0rNepI0OLvtRmcBbUWMeoE7Dnx3gP63lMJtrh9d6iHFhJEe5w/w?= =?utf-8?q?rYmhr7JEwWd6tY9TAnU/XuVm4y3QnnckAHzR+JaTiwDmu4eclkYiypI=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 41849fab-2c3e-4f46-a5e5-08d9a3915dc5 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2021 14:58:18.9684 (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: uizStdT/mh3ugemvhO+a1TWJ34x0tm95ZOIVrWW0a0wycBjoGo4HNW0uvoxTAP45P8aNNB8jCTw7AYTZGQRkZw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3389 The quarantine domain doesn't count as a DomU, as it won't itself trigger any bad behavior. The workaround only needs enabling when an actual DomU is about to gain control of a device. This then also means enabling of the workaround can be deferred until immediately ahead of the call to domain_context_mapping(). While there also stop open-coding is_hardware_domain(). Fixes: 319f9a0ba94c ("passthrough: quarantine PCI devices") Signed-off-by: Jan Beulich --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -2404,14 +2404,6 @@ static int reassign_device_ownership( int ret; /* - * Devices assigned to untrusted domains (here assumed to be any domU) - * can attempt to send arbitrary LAPIC/MSI messages. We are unprotected - * by the root complex unless interrupt remapping is enabled. - */ - if ( (target != hardware_domain) && !iommu_intremap ) - untrusted_msi = true; - - /* * If the device belongs to the hardware domain, and it has RMRR, don't * remove it from the hardware domain, because BIOS may use RMRR at * booting time. @@ -2455,6 +2447,15 @@ static int reassign_device_ownership( if ( !has_arch_pdevs(target) ) vmx_pi_hooks_assign(target); + /* + * Devices assigned to untrusted domains (here assumed to be any domU) + * can attempt to send arbitrary LAPIC/MSI messages. We are unprotected + * by the root complex unless interrupt remapping is enabled. + */ + if ( !iommu_intremap && !is_hardware_domain(target) && + !is_system_domain(target) ) + untrusted_msi = true; + ret = domain_context_mapping(target, devfn, pdev); if ( ret ) {