From nobody Sat May 18 20:37:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=2; a=rsa-sha256; t=1649247907; cv=pass; d=zohomail.com; s=zohoarc; b=g0VIuTBza+5KOK/Q6bz6732JgHlP5r7uNyYs2DygUU48u+xxqLxiDGRiUiLKRqfEE6nUJfXxaudBjF6iZ44u+qMiYEs0Iy6VLmyuwcLCsl4HQE4jB0xgGNtYhep5jzWH41bRqC5U/W/3ASrm61Nbgl22bzKMfh6K7CcA0ZMqia4= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1649247907; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=D1H79nwsMeW3yxZjDR3qBFbh8QW9Tvu6xAmwomlRz84=; b=RXcoBkcRdSJ7iwEmABEKqDTIrzISnH4rDdSMEuU30v3eGUu5ZIyZU+0YwqdiY3xIgI3EEJB6X+sdTzyLUK9UMyse7UzHNFdCpsmQRWqxYbtghVoKSS4hO1uPhI6p3q76qUw1Lk+Jf/z/yrf4soPHx5+RLmPvCFlyhXpI/s0XDWQ= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1649247907111570.812656450843; Wed, 6 Apr 2022 05:25:07 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.299831.511049 (Exim 4.92) (envelope-from ) id 1nc4iG-0006rP-6r; Wed, 06 Apr 2022 12:24:40 +0000 Received: by outflank-mailman (output) from mailman id 299831.511049; Wed, 06 Apr 2022 12:24:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nc4iG-0006rI-3p; Wed, 06 Apr 2022 12:24:40 +0000 Received: by outflank-mailman (input) for mailman id 299831; Wed, 06 Apr 2022 12:24:38 +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 1nc4iE-0006rC-OJ for xen-devel@lists.xenproject.org; Wed, 06 Apr 2022 12:24:38 +0000 Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 86175df8-b5a4-11ec-a405-831a346695d4; Wed, 06 Apr 2022 14:24:37 +0200 (CEST) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04lp2053.outbound.protection.outlook.com [104.47.14.53]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-26-i0tqvcT5NP2GDc_Fn25qFA-1; Wed, 06 Apr 2022 14:24:35 +0200 Received: from DU2PR04MB8616.eurprd04.prod.outlook.com (2603:10a6:10:2db::16) by PAXPR04MB9326.eurprd04.prod.outlook.com (2603:10a6:102:2b8::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.21; Wed, 6 Apr 2022 12:24:34 +0000 Received: from DU2PR04MB8616.eurprd04.prod.outlook.com ([fe80::914d:e08d:7798:8476]) by DU2PR04MB8616.eurprd04.prod.outlook.com ([fe80::914d:e08d:7798:8476%7]) with mapi id 15.20.5123.031; Wed, 6 Apr 2022 12:24:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: 86175df8-b5a4-11ec-a405-831a346695d4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1649247877; 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=D1H79nwsMeW3yxZjDR3qBFbh8QW9Tvu6xAmwomlRz84=; b=eND6D2zGIOQcj1HJ4LRJfrDO6ycyzDO9L+zN/eMJl56UVwIoMxF0ru2P9tkzvKOG5XwkZ5 T0fH//jflxUSrCCwrHVAONWHXx+rps51uucmXVqvXbzhe6zxQJ0AdtvCKIiMJOsDcU2ITF 69en9OkBwjvoCbA/VIwCZ+yLTEEqmoc= X-MC-Unique: i0tqvcT5NP2GDc_Fn25qFA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AvGLn0QSXzHU/kbCVpRHZUVil0sBDFA3w0fdumkuRGxlDihk7b/HsbmdOMsIUtieHdAm7UUbBvNr5b71/T4H7v7agwgBxIV9tYc7slpquOvMCC5LQRJT7wLWT+takgHBa50tnnnucad6d6vhkPKb7K3cumTbJMryUy4Ve0gx/i+etIaHIz69SI7b/jZh1vN+mNCC3Or+wKRwKsaOAXnBO9+URvbbbCoucfelJD4+vWgUsk2aTnJMPK13rL1E8HAwkOuz/7fCkQPzfS6c2p5Ma923ShPPvniBvD7ihtekW4MDusetR2tOCRofnprZSTRFtc6S33B75LDRS4QgyRKUnQ== 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=D1H79nwsMeW3yxZjDR3qBFbh8QW9Tvu6xAmwomlRz84=; b=higyzMtdPQU4xDsL+aovMUgTgl6u/o4rlS5ntv4MDXjU5SbTQOeOpjJJNx6WqlK6H82gJpTJUCmrlGC8uwf/MDxnI6+/oLB/jAtQID3R1ECOevwWPtIrY2ZkS9jc9HzAXiW+gHwHnIq/1KnTS25vdZYyG76DEJqokIgduG1Nhy6cN9tibFd5bJFOXi5asiTrVcSL2NlFo6LeHgrD+f+1+TuIOkiw/7+pqWE50WFdOZ76KwM5uO48co2zKkUBJuIeJ3AeepAoOtbvrDC0DiQbMKRByhXIPLfNAWsmwb7EzC/5IkBKmib0GOFedcubmDhPJd/7mzZ0CIw84Vvu8dGhJw== 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: Wed, 6 Apr 2022 14:24:32 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Subject: [PATCH 1/2] VT-d: avoid NULL deref on domain_context_mapping_one() error paths Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= , Kevin Tian , Paul Durrant , Andrew Cooper , George Dunlap , Julien Grall , Stefano Stabellini , Wei Liu References: In-Reply-To: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR3P281CA0053.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4a::6) To DU2PR04MB8616.eurprd04.prod.outlook.com (2603:10a6:10:2db::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e67ae826-38f2-419f-bead-08da17c86881 X-MS-TrafficTypeDiagnostic: PAXPR04MB9326:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AEr2ZtqU/y3UibKYS4HcLP9S7D9zaGD2EYhJ9xKq2EZSgfdiYOrkWaB0uGnbbDv8zCqRztllXdwlpXNQKS+yuIU5ZmxOWZrv+dZmnWESbqjKmh+66GbzsWeFAoh2S8rPErFoY2slfsajUazwdM7oJqbm0x+NLWfILBmWFgHj/cZsOBou+wjEz1euwF7S6nxolcu0ZYgOx7WfcShn1hazkk9QnIInXgZjXc5cp7T0fVVvKnqSXhZTzZm6lHTetRk4dw3ecSBguMCMCPgoto3X+plPxkCGSx5D2RuGmIhtp9xykMjjkLR+97JEm1usbGFe35u/IBZs2m3UICuOMcXb5mhlqGDD4JKkBKM7oGXuIAflC/RrZuK1Y3o1UBcxBISRmNF6r/rAaR8AvI4gzw5urcwAEoTVWTyLoYGwn6cb93UktA/hLF+Jevasm1JNWj6MT5+nRn8QvEA2FfjwAqDhqEuGZlXqaHIZDYPYd3ytDZn2kduKf4+EKTpDTNmS60Od2v7vffX6B7APLCUN6Uqx44i4FySKkqIw02tPgqkznvIvkjo1THpVbS3zQCR4TJ08T0zEEi/rrqb86Qi51kn46PrwuGhY8dUyohvM9IKtgp218K9x+r/d13vguOThDuHGnt7uRCJKRH1PQa8gzZejqYuVvK4aiqWTySCkwl9vWUL7S2LCizUN7l3w11hHoW4xngFdh5vbFr7WO2/RdaMs2zVs/9oluyYXjfJ8/4Qcc+B5yUtxw590NAonZBRiG5XK X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8616.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(186003)(26005)(316002)(2616005)(6506007)(6512007)(31686004)(36756003)(6486002)(54906003)(6916009)(508600001)(2906002)(31696002)(86362001)(66476007)(8676002)(4326008)(66556008)(66946007)(38100700002)(83380400001)(5660300002)(8936002)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TEJBbnlYcVRnSzVVaFJpR3FBcVNtRFg1QmVzSVJ6M2s1ZHNFQ0VFdjJXa1Nv?= =?utf-8?B?ZDA2V2I3eHJHTWVxMzRvTEdkVDEzdkJwR2JES094TXA4Q2dMZEZNVmdqL21U?= =?utf-8?B?ejB3dEhUWWRwRXlmOW1McThMYkNVWEF5Vk10ZytOeHdpUnozczBxYUlBcEZL?= =?utf-8?B?TGRnSXFrVDY4Ri9FMGU4MG55RWErUStOTXdHNUJRNElCeHd5eEhsaGE2VkRN?= =?utf-8?B?aWI3SEQxbmgyOEZQYkgzbGNraENMeEpoZTFaKzdlakJpRDlHdnlJakZ3TzR6?= =?utf-8?B?R2E1Mk5tMDJHNzdpZ3FpcjdXdE9JaWVycFhSMWU1Yms3ZnBpV2hLc3BOQ3Y4?= =?utf-8?B?TTRja3pHUkF5QTRUc0c1eGg5bGprNWlXbVVZYUxDOXVkYTlJTFZmcWE5bVRJ?= =?utf-8?B?TjNrTHVFOWk3VDdCTUlOT2I0WDZwOWxuR21iRm1FeXhrcjVFVnpwZVBtVzk1?= =?utf-8?B?N3cxS3BlZW9PQzVLY2JVcEEwd2k3R2M3U3IvVEw3NXpUZ2xjRXNxdUxVTWwv?= =?utf-8?B?QTB2bFJMUTUraTRKU3BWc2plN0JJOWRYelJSUmJVcGgwS2NMMXRNK3VaOUpx?= =?utf-8?B?Uk9abmR6bXFoYXBhWUFGdGVlZlY2aHlySnBEekdDR1RjejZEMHJNTmpVaDBn?= =?utf-8?B?TUZjV2VMKzRadndKZUFMS09uczU0NVZ0NVVscjkwN01nOG16M1VBRnFoZXEx?= =?utf-8?B?ZGQ2TWNpcDl6WVpXWjlQRWxyRUZNVkcrTmh4U0l4aCs4Qkl2MVZ3RTRRV3M5?= =?utf-8?B?YW5pb1Y4NnVvOGZ0dXZNbG16QnFickFiWTlQQ20wZFhPMlZGZHFsMEJqYnBG?= =?utf-8?B?UGJBTWdMTkZMWmUwOWFsN045WWJacGNGSGp5eStBejhHRFNtYzhaMzlmQmFm?= =?utf-8?B?QU5pQ240KzY5REh5blJPdnRUendXOE1KNWFUQXdMaVpxWjhwVjVOQkpDbmha?= =?utf-8?B?ZG1FVnlmTDJKdzVYN2JLWW5MVGlrUFdXYkY5NmRaZytPUjhEdUVsMzdYTVp1?= =?utf-8?B?bVZnWlBzeUpybjRFYmo5Y3dPZkY2Sk9yTUpodmNUKzJuaHdCdnBOcVBFdzVE?= =?utf-8?B?ZE45c3AyeE14SVRSN2djRTlLRkY3d20xWXU5cHVaNEJtZkNUSUlseUFhYnJS?= =?utf-8?B?dXZGZXVVLzlQNWM0M3BBd2laam45bTNYbVBsNEFvb08wR2hRR1VpdW1YV0My?= =?utf-8?B?aHZUeVQ5VzRDTUhiVUFzRWRwZ1BjRFM3c2NjUkRBQUtPV29uUGZvNVJHY2pM?= =?utf-8?B?TVU1SGZST2hETkFqZlJobkxLOW96WVFWZXBRaHBHQVNGLzF0LzJ3QWlBcG9P?= =?utf-8?B?SGNjTnc0VG1LTDJ3UTEyQmdHdFhMMkdWK2FrTXBPb1orc3ptMEUrTkV5ZHZM?= =?utf-8?B?cmh3YXBmUjk3dTR1M054TnNUK09STE9meGM4QzJqbUFuN2NFWEluWHJQaVNn?= =?utf-8?B?NmY0YjVTLzFOMWh2T2tiU0RPRmxYRVBMSy9LMGsvK1VVUytWU3JGcTFQOVg3?= =?utf-8?B?MjJIK0thcU5nWU01ZW1veW1xdGpJelJvL2xuQ003YkJlQUk2dFpuOUZOamFt?= =?utf-8?B?VGJQRHFONS9yU2NGdldyQW9BVXFRZjVYMTFZQUFzdmU0MmFydkMxWDN6TTlX?= =?utf-8?B?c0N4ZnF5amJPU2dPQ0ZjY2QraHNzZjFyVGV6M1pyS3ZDa0VMSE9hbzBNS0lD?= =?utf-8?B?SzRRQ1FFbUJERC9MYlkxQ016NENqRTFGYThaS2QwMEpxbGlIc0czQUM4cFY3?= =?utf-8?B?RXhsVFNkOC9pdmVOMkJCWEZrcVJETE80Q0NuV2p2c2tYQlJUcCtsNEZwTWlI?= =?utf-8?B?SkUxOEMyTDJnSk9jRmxJUTlwOUxTajhScmdXbWN3NThLMHBYVXBqK3dMYTZ2?= =?utf-8?B?VThjUkJzTkFTNTNuZktDOUFwSGhDWDQrOHNMTDJaWklvOFFIQVVYQ0Vhc3E4?= =?utf-8?B?Vlk3SUpWUHhaVDJKc0M1MXN5bEc4N2RxUkd1cVo0a3BlYjQwRVhXYkVYSFhB?= =?utf-8?B?SXdVa29qd1dqRDd6alQ4aitxVU43NkY0b2hScGlRRlJtL3U1WThJSnZYdlIr?= =?utf-8?B?NkdGSkpiRE4wd1lQbXAvUWlRSXJ6VXoyZnZzc3ViMkk3cFQzcldxRUxnblY1?= =?utf-8?B?ZjhtSmJ4UUZuS212dElmOUdSUFdDbjRybWR5R1NiK0lMWXRDZnRhWlhKaFZE?= =?utf-8?B?djRweWVoZEkvNHlNdnJsWDNQMjExRFJqb0JZVFh4UXVKbHJpY0ZFMno0eEdI?= =?utf-8?B?Rzg5UHE4cFRkRzZnRmRJazZka1NiN1dpWDRVaVNJUFlkTEFnS1pMYm9WRGpz?= =?utf-8?B?SUNGWVZFWkJzMG9iTjlxMktBT1ZnNmZqVmh3QjFkRklvc3MrWTM3QT09?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e67ae826-38f2-419f-bead-08da17c86881 X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8616.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Apr 2022 12:24:34.2140 (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: /IfpHeMbB0sanWakkvum4kPAsxjl+46m2wxNR1Ft/hzmhXeWnBmXi3TdqkDwewdW9D0ClSmd3wvkN2ImVBxbHQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9326 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1649247907911100001 Content-Type: text/plain; charset="utf-8" First there's a printk() which actually wrongly uses pdev in the first place: We want to log the coordinates of the (perhaps fake) device acted upon, which may not be pdev. Then it was quite pointless for eb19326a328d ("VT-d: prepare for per- device quarantine page tables (part I)") to add a domid_t parameter to domain_context_unmap_one(): It's only used to pass back here via me_wifi_quirk() -> map_me_phantom_function(). Drop the parameter again. Finally there's the invocation of domain_context_mapping_one(), which needs to be passed the correct domain ID. Avoid taking that path when pdev is NULL and the quarantine state is what would need restoring to. This means we can't security-support PCI devices with RMRRs (if such exist in practice) any longer. Fixes: 8f41e481b485 ("VT-d: re-assign devices directly") Fixes: 14dd241aad8a ("IOMMU/x86: use per-device page tables for quarantinin= g") Coverity ID: 1503784 Reported-by: Andrew Cooper Signed-off-by: Jan Beulich --- a/SUPPORT.md +++ b/SUPPORT.md @@ -750,6 +750,10 @@ However, this feature can still confer s when used to remove drivers and backends from domain 0 (i.e., Driver Domains). =20 +On VT-d (Intel hardware) passing through plain PCI (or PCI-X) devices +when they have associated Reserved Memory Regions (RMRRs) +is not security supported, if such a combination exists in the first place. + ### x86/Multiple IOREQ servers =20 An IOREQ server provides emulated devices to HVM and PVH guests. --- a/xen/drivers/passthrough/vtd/extern.h +++ b/xen/drivers/passthrough/vtd/extern.h @@ -85,7 +85,7 @@ int domain_context_mapping_one(struct do const struct pci_dev *pdev, domid_t domid, paddr_t pgd_maddr, unsigned int mode); int domain_context_unmap_one(struct domain *domain, struct vtd_iommu *iomm= u, - uint8_t bus, uint8_t devfn, domid_t domid); + uint8_t bus, uint8_t devfn); int cf_check intel_iommu_get_reserved_device_memory( iommu_grdm_t *func, void *ctxt); =20 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -1533,7 +1533,7 @@ int domain_context_mapping_one( check_cleanup_domid_map(domain, pdev, iommu); printk(XENLOG_ERR "%pp: unexpected context entry %016lx_%016lx (expected = %016lx_%016lx)\n", - &PCI_SBDF3(pdev->seg, pdev->bus, devfn), + &PCI_SBDF3(seg, bus, devfn), (uint64_t)(res >> 64), (uint64_t)res, (uint64_t)(old >> 64), (uint64_t)old); rc =3D -EILSEQ; @@ -1601,9 +1601,13 @@ int domain_context_mapping_one( =20 if ( rc ) { - if ( !prev_dom ) - ret =3D domain_context_unmap_one(domain, iommu, bus, devfn, - DEVICE_DOMID(domain, pdev)); + if ( !prev_dom || + /* + * Unmapping here means PCI devices with RMRRs (if such exist) + * will cause problems if such a region was actually accessed. + */ + (prev_dom =3D=3D dom_io && !pdev) ) + ret =3D domain_context_unmap_one(domain, iommu, bus, devfn); else if ( prev_dom !=3D domain ) /* Avoid infinite recursion. */ ret =3D domain_context_mapping_one(prev_dom, iommu, bus, devfn= , pdev, DEVICE_DOMID(prev_dom, pdev), @@ -1809,7 +1813,7 @@ static int domain_context_mapping(struct int domain_context_unmap_one( struct domain *domain, struct vtd_iommu *iommu, - uint8_t bus, uint8_t devfn, domid_t domid) + uint8_t bus, uint8_t devfn) { struct context_entry *context, *context_entries; u64 maddr; @@ -1867,7 +1871,8 @@ int domain_context_unmap_one( unmap_vtd_domain_page(context_entries); =20 if ( !iommu->drhd->segment && !rc ) - rc =3D me_wifi_quirk(domain, bus, devfn, domid, 0, UNMAP_ME_PHANTO= M_FUNC); + rc =3D me_wifi_quirk(domain, bus, devfn, DOMID_INVALID, 0, + UNMAP_ME_PHANTOM_FUNC); =20 if ( rc && !is_hardware_domain(domain) && domain !=3D dom_io ) { @@ -1916,8 +1921,7 @@ static const struct acpi_drhd_unit *doma if ( iommu_debug ) printk(VTDPREFIX "%pd:PCIe: unmap %pp\n", domain, &PCI_SBDF3(seg, bus, devfn)); - ret =3D domain_context_unmap_one(domain, iommu, bus, devfn, - DEVICE_DOMID(domain, pdev)); + ret =3D domain_context_unmap_one(domain, iommu, bus, devfn); if ( !ret && devfn =3D=3D pdev->devfn && ats_device(pdev, drhd) > = 0 ) disable_ats_device(pdev); =20 @@ -1930,8 +1934,7 @@ static const struct acpi_drhd_unit *doma if ( iommu_debug ) printk(VTDPREFIX "%pd:PCI: unmap %pp\n", domain, &PCI_SBDF3(seg, bus, devfn)); - ret =3D domain_context_unmap_one(domain, iommu, bus, devfn, - DEVICE_DOMID(domain, pdev)); + ret =3D domain_context_unmap_one(domain, iommu, bus, devfn); if ( ret ) break; =20 @@ -1954,12 +1957,10 @@ static const struct acpi_drhd_unit *doma break; } =20 - ret =3D domain_context_unmap_one(domain, iommu, tmp_bus, tmp_devfn, - DEVICE_DOMID(domain, pdev)); + ret =3D domain_context_unmap_one(domain, iommu, tmp_bus, tmp_devfn= ); /* PCIe to PCI/PCIx bridge */ if ( !ret && pdev_type(seg, tmp_bus, tmp_devfn) =3D=3D DEV_TYPE_PC= Ie2PCI_BRIDGE ) - ret =3D domain_context_unmap_one(domain, iommu, secbus, 0, - DEVICE_DOMID(domain, pdev)); + ret =3D domain_context_unmap_one(domain, iommu, secbus, 0); =20 break; =20 --- a/xen/drivers/passthrough/vtd/quirks.c +++ b/xen/drivers/passthrough/vtd/quirks.c @@ -427,7 +427,7 @@ static int __must_check map_me_phantom_f domid, pgd_maddr, mode); else rc =3D domain_context_unmap_one(domain, drhd->iommu, 0, - PCI_DEVFN(dev, 7), domid); + PCI_DEVFN(dev, 7)); =20 return rc; } From nobody Sat May 18 20:37:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=2; a=rsa-sha256; t=1649247944; cv=pass; d=zohomail.com; s=zohoarc; b=ld8wjv5YApqMxENVImO81GFrZeqf9wDZJI4WAddfi60/43M8v5vlAXRjkoaWqJszJOh/tI+l51LWNPGpEBodDO5L1G1uABFEDfPcdVlMlRbKCgibXTsBJbw4oQNq920/BFN+Y6Y4Oc7HHPygfdxh8jDogrdIigbHU7/H6Sl0PYg= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1649247944; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=yucVFPGauWfslPNN5yRCj46l5cke1hJdmEdynBbWakE=; b=QAH0GnnjA1aBQUkPFCwttKBEF6kcmrolOEG4NNLt8AalaQn5Py37NAStZt5zpB/tdVIUk/JCPEe7Z9vA9yh2nkPS2LHrtVo90Bcr+MTFr7+AdKXZmf4b/yq4ZvNJ/KcWz605Um++fCnHIaLE4vG1dlDTcLWfrfq9XZRMHCaIzy8= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1649247944228582.354284664844; Wed, 6 Apr 2022 05:25:44 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.299835.511061 (Exim 4.92) (envelope-from ) id 1nc4iu-0007Pg-HL; Wed, 06 Apr 2022 12:25:20 +0000 Received: by outflank-mailman (output) from mailman id 299835.511061; Wed, 06 Apr 2022 12:25:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nc4iu-0007PZ-Ci; Wed, 06 Apr 2022 12:25:20 +0000 Received: by outflank-mailman (input) for mailman id 299835; Wed, 06 Apr 2022 12:25:19 +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 1nc4is-0006rC-Vl for xen-devel@lists.xenproject.org; Wed, 06 Apr 2022 12:25:19 +0000 Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 9e85604b-b5a4-11ec-a405-831a346695d4; Wed, 06 Apr 2022 14:25:18 +0200 (CEST) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04lp2055.outbound.protection.outlook.com [104.47.14.55]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-33-ACsCBD3NPZeQXg9i7mO7wA-1; Wed, 06 Apr 2022 14:25:16 +0200 Received: from DU2PR04MB8616.eurprd04.prod.outlook.com (2603:10a6:10:2db::16) by PAXPR04MB9326.eurprd04.prod.outlook.com (2603:10a6:102:2b8::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.21; Wed, 6 Apr 2022 12:25:15 +0000 Received: from DU2PR04MB8616.eurprd04.prod.outlook.com ([fe80::914d:e08d:7798:8476]) by DU2PR04MB8616.eurprd04.prod.outlook.com ([fe80::914d:e08d:7798:8476%7]) with mapi id 15.20.5123.031; Wed, 6 Apr 2022 12:25:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: 9e85604b-b5a4-11ec-a405-831a346695d4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1649247917; 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=yucVFPGauWfslPNN5yRCj46l5cke1hJdmEdynBbWakE=; b=fBigQ/vT3qScunklYRDtF5ewnRpPycYqGqsRAPIA8Mf2AEBs33GygPj4IYNKg6MrGE31NC /mlvDjT2hRQA/A3cUFict7XS2k61IG2naEZxbJWgSKQVsUB7V1SK5YSzsiUEhAPy2IkkL3 e+gZdbt2BTrGr2WmYUD1BCemNtoJb+0= X-MC-Unique: ACsCBD3NPZeQXg9i7mO7wA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jFv+KzQxgT2zWYy9ZiL3EvQqHJ772/EolD1dyTuK56r7UTtdQdtmrZXN2p6mnVNXt9EbJh99Q/84ozMka8nVL7eXhKTUxmFFGv/7YScWKOvp0BxeG6ea2gvc17qDPJSHx2AXS30NBZUMbvqDUHuIu6+DFyjnwFDstaHNVhcaBT6ZVBZ1kNaNMSWp9w6ByMOKCo3ayRTK3sWWxYaVoStwIhp1B0sUWPeM2sBUHr561A2ZseSMKs/wL0ckuKxPpyyCV+yiw4iKjWVb/ONv6ZZMtyBYn9lFMnSIx0RmUQZY0Aj9uuQd7oNxAs0dFBEENWeJ01uc4l4hGH0fIi9jDhDIow== 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=yucVFPGauWfslPNN5yRCj46l5cke1hJdmEdynBbWakE=; b=EYPTyFNgGSW5YNjn3w85cUAKqq7Mmob5yZelliLBaXXs+iMA8AJ1gcNjYE82EC48Yo0//5fqfEqW4GYvNS+TKmNhKtbfhDBIquZlwz91fY+qC1t1lx/APytnZOgxOzZMfksgHVtUFvp9AEIkfip5sOd8DcWoPaq4i7e58R/E0A/4DrJcmNTAoPdopFEudQhPVn73yA+Md0inYVRPXE0oa33Ob2ryNQvjnaP36fc9L67Wm02BLu0qMfFbhZFzLZWleQ+r1gSEQl/HNs+h1EEh3mT4N2it5fDhCy/i8/6gIo1tBw9TXSmd0XAxlot5qni3DrSgiE2s0EHgdX2c+Ugvog== 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: <535d1050-e5e0-6e1f-5299-f41b84350ca0@suse.com> Date: Wed, 6 Apr 2022 14:25:13 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Subject: [PATCH 2/2] VT-d: avoid infinite recursion on domain_context_mapping_one() error path Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= , Kevin Tian , Andrew Cooper , Paul Durrant References: In-Reply-To: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR3P281CA0052.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4a::23) To DU2PR04MB8616.eurprd04.prod.outlook.com (2603:10a6:10:2db::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: df827b5f-471d-4421-4501-08da17c880cc X-MS-TrafficTypeDiagnostic: PAXPR04MB9326:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ufQiu/Rmfahn2fzU4lxOg52qfJFCs2Nq/orOfSHgzXcLqLHg5B9PN9DVjRJWBH30J8JYxSxC3xvajAfOEaHB5OAjCmL/rxtUXGe1vKYBn3ppP/hkJCUjiCe0toBDfywzZM+v5BFlAI/pzFElqG1i6mp8G+S7eOyFAgehMoIyMLUboy1io3Z7ggSoIHlOeaMPpUziXVuWMKqyief1V1CdVQHt6GFsYziwmWYKbWx5REexllCahLAMM01xEqhmt7Bs95OAFxRovr5hw5xOUK+Q/dRUH/9AH4+2LCwf3cZLcjaKWXPNwbjtF869WtFjesIZOmADcSO7v5GZNJja4HXByI96zNtK7dy+iGM4S1OLJc+HvdeSCHyV1mT7IL8HtVF+4jzRcfXY5DYXqsZT5mGfzZTjbcBKZMUnsiB0/Qkzg2c1xCHHwtoTiXAW/s/k/1fiqywi6iF2vgic+r/8ahxzwDrhh0FqN1HQdmOWz+xl4B8yy8WHlb13y2glUqUpZt4XPiO4W5qvl7C5BS2nzQfMMeeN9upofU9OVbW34GiIgG47FaPkKXvygW6UeHn7obtbq7qOWnAIMGzpsy571Jq+uOZYSvGkwhXFP/ejyD0JUhvGHUXnjwPCFSv/yjllI1KKOLDMCYwFexsZQ0RNucpCYf7gGWswLIb5VHQULxYfCKmjC5Oy9t5YWAN239lrLxme/8WVHZiBhQmLB1b8tLach74sAptaXgKabPaqYgdaG/w= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8616.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(186003)(26005)(316002)(2616005)(6506007)(6512007)(31686004)(36756003)(6486002)(54906003)(6916009)(508600001)(2906002)(31696002)(86362001)(66476007)(8676002)(4326008)(66556008)(66946007)(38100700002)(83380400001)(5660300002)(8936002)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Mm5UeW1XNmZqNGlJdEFTaTYwdnN2Rm1Mb0JudVh0SGtwRmVlL3lOelNEcUxm?= =?utf-8?B?dVRKdG9ieXFQQ1gzV29hR0xiVkVEd3ZrNm5ubWMrcUdveGlKYWNwZ2RXQlZK?= =?utf-8?B?N1dXSDJRTEwwZXBDUlhvTGhkeVozcnhNR3FsbXNTNVJrWGVsajVPOElrNjR3?= =?utf-8?B?Q0U5TnNpNzFuM1FPRUVVQUhIdWhydlByazdlWFBZMlV4enBIVTlndkgrRDBq?= =?utf-8?B?TlFzYXpJdmF1Nk1YRFcyMVlaTXhGUHpGWEdUS0JKZzFHTUc0Rk94Y1F0N3lw?= =?utf-8?B?N3RjdG9MRUUzWHViRjdPVkpGQmpyQmp0VldJZ3hBeG1aWFJHSnBBb01yeFl1?= =?utf-8?B?dzJGZDZtTm5hbk1tVGVURFRtZk9sc3VBTVBJcUtFVWI3MFVkMjZZM2VKTUc0?= =?utf-8?B?aXcybDNST2E5QmxsVFFUdUtIeUhiU3E5M3ZLY1FUWExIUHhtbjRqbjY2Y3FL?= =?utf-8?B?QW5jc01ES1lsTGxMbW8xSklFaWR4MTl2cWNVQnZlY2Y5ejNSdW9FL0J2SDM3?= =?utf-8?B?M1IxQ1dGR3ZBNnU5d0tibTlxbTJNaEg1d2lKVWZPb0RFdmNYVmRiYUlxM1Jo?= =?utf-8?B?aGFJL0toZHRVTThKWkZTZzhSQ0p5bW52L3g5Y0t3ZjlUbjIwMUVreURacDlh?= =?utf-8?B?TStwNFJ4QW01ZVQvdGY2RmZmeDduREdINklvUnErUUxYRGtFY3dSWTlMY29R?= =?utf-8?B?d1dNUXlqamlJcGlrNjFWU1JIajlYczF5NXZDZWtQcWNBTWx6dmxUWVpybVhC?= =?utf-8?B?dXI2YjZFem42YUtQMDQrL2ltSjQrSUdnUUQvbGpLQU5pUXZnbnE1eVNsVUlU?= =?utf-8?B?T1d6NlN6dTV3QkpIRXNYWWlhRTJaczcxbTlmWlhid2tMM1htOU9hVVFsMkpp?= =?utf-8?B?SzZSempuaTdYLzFlLzJrbFdCZzJtOVZiTW1BZGpvTUVJTE1VN3hPK3lkSGNN?= =?utf-8?B?RDR4dDJGRUZ6RmN4SjJrZTJZU2ZCcldnZVB3MXJKRHVQL1g3SEhCSkFId1lv?= =?utf-8?B?dnB5RHNwR0JJUXl4T3F3dG15SHNqb09qcE44SGd3NzJVRmZyaFJyTmJYbmpX?= =?utf-8?B?ME4vNVR2ejVORXpPUVJKL1JILy9keXQwMlVNYXdIc3N5eFVxQlVudXdaK1JT?= =?utf-8?B?bjBndzE1YXZUeGtUdHJQUVhXYU05NDNsOHFFM3ZKd2x6YTNnOFZUT2RpY2JH?= =?utf-8?B?WjllUFJlOVJJQ3lINUgzQ2VldGhnWWs5cktuNXpIS3R0b3RlZnl5T0orLytY?= =?utf-8?B?dXBQK1I2QksvZDVDMlJkQW5nL3g1ZWxhOEhJRVB4akpVUHI5Yi95L0J4TEpv?= =?utf-8?B?cVdmeTRKb01EcDMxd1V3OUU0TGpsS0JuUFdUTDZqTmhSbU1sQTUwdnRMREdh?= =?utf-8?B?c1BCSXdnUjdhQ20zelF2UklYR1pYRFZteUFsb1VwcERZOG1NMWRvbE0xTXBh?= =?utf-8?B?S0kyL0xLZUpwazZJeVpXUmIvR1RNR2FpbTJCKzZsUjhtUURzaFF6Q1ZhZm8v?= =?utf-8?B?ejhxdVJwOXh0RDZCWmdhWDYyMHpMaVprL1RDT1RTU3pzNFg2U3pUalY1Y01v?= =?utf-8?B?Um9kbzl3UjlQZjdiU1oxQk9wMzZlcHVKT0RBTWhrWWtPLzl5TnlyN3BrMVpO?= =?utf-8?B?aW1uRWZ2L2lZcXRpR0oyWHBDOFlkQTQvR3piZTFHeGhDUTVMUyszZ2pBc3du?= =?utf-8?B?UkUxK1VQc1F5anRMRVJJOWRuVHZEZlFHK290R2RNRVpOdzBKQWZNWDVGU1ZF?= =?utf-8?B?L2MxZEhYVitiaW5FczlLbXVZQzYxSE9TNisxV045YTdTWTY4V0Mzd2dlRXJT?= =?utf-8?B?SlpPOWo1ZVhNMDJ2S1p5RTRZL1h0dUdnWkJyTGtRN0RYaWVCczhwRkpFdE5J?= =?utf-8?B?Z05abGxKZFRySklPT0FCeE94RXJEektybkJoMGtuVnI5OURSY2FQUGhzWUJR?= =?utf-8?B?SDVkZjl5OFZidGQ0bzlzMmxZZm9COXdqVytHUGhueHJTRkpVYTJTRVY3WlR2?= =?utf-8?B?d2JCQ1RXenNqeTByS0piUXFsaWJ2RHN0eUhQWnN0emNaTlJUSkkxTTRYQkVP?= =?utf-8?B?ZkJQTlo3bHNJTjFkWWVuaGcwZVpOYlQvNjVsdDFydG1KYktuUjd1OHhyYkR4?= =?utf-8?B?cENoRjdIaWRDZGw0eVRIS0k4MUtPcHJRTnBSSVV1S3NmZWJHMlhJVmJkbUFt?= =?utf-8?B?SUtKVzNBdmxtcWgrUnZoRkRUZUZPV1oveGF6MTFyMHB4SG5jT2FvRis3RXhS?= =?utf-8?B?ZlhRRmlIbldoSkRrWUt5bmdid3h3alA0TkxHOG9ydysrVVJ4UVpHaXIvTU5W?= =?utf-8?B?cmxHMTUyWHRFUnBPOGUwT1J3d3pXWThYUmZTdjJDTGczaGUzNEFFZz09?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: df827b5f-471d-4421-4501-08da17c880cc X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8616.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Apr 2022 12:25:14.9520 (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: kiiMlkMb5QFwaB+nof5EVBYYyffNxvpO7z5k5Vmjn6Yg4JdfxKjKVglODOveXgZ8S+db1UFdYE/boSbpGkR2aA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9326 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1649247945745100001 Content-Type: text/plain; charset="utf-8" Despite the comment there infinite recursion was still possible, by flip-flopping between two domains. This is because prev_dom is derived from the DID found in the context entry, which was already updated by the time error recovery is invoked. Simply introduce yet another mode flag to detect the situation and cancel further recursion attempts. Fixes: 8f41e481b485 ("VT-d: re-assign devices directly") Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monn=C3=A9 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -1608,11 +1608,13 @@ int domain_context_mapping_one( */ (prev_dom =3D=3D dom_io && !pdev) ) ret =3D domain_context_unmap_one(domain, iommu, bus, devfn); - else if ( prev_dom !=3D domain ) /* Avoid infinite recursion. */ + /* Avoid infinite recursion. */ + else if ( prev_dom !=3D domain && !(mode & MAP_ERROR_RECOVERY) ) ret =3D domain_context_mapping_one(prev_dom, iommu, bus, devfn= , pdev, DEVICE_DOMID(prev_dom, pdev), DEVICE_PGTABLE(prev_dom, pdev= ), - mode & MAP_WITH_RMRR) < 0; + (mode & MAP_WITH_RMRR) | + MAP_ERROR_RECOVERY) < 0; else ret =3D 1; =20 --- a/xen/drivers/passthrough/vtd/vtd.h +++ b/xen/drivers/passthrough/vtd/vtd.h @@ -29,7 +29,8 @@ #define MAP_WITH_RMRR (1u << 0) #define MAP_OWNER_DYING (1u << 1) #define MAP_SINGLE_DEVICE (1u << 2) -#define UNMAP_ME_PHANTOM_FUNC (1u << 3) +#define MAP_ERROR_RECOVERY (1u << 3) +#define UNMAP_ME_PHANTOM_FUNC (1u << 4) =20 /* Allow for both IOAPIC and IOSAPIC. */ #define IO_xAPIC_route_entry IO_APIC_route_entry