From patchwork Fri Oct 6 13:00:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 13411447 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 E1FE9E81DF5 for ; Fri, 6 Oct 2023 13:02:14 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.613595.954220 (Exim 4.92) (envelope-from ) id 1qokSr-0007aC-Fb; Fri, 06 Oct 2023 13:01:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 613595.954220; Fri, 06 Oct 2023 13:01:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qokSr-0007ZY-BZ; Fri, 06 Oct 2023 13:01:57 +0000 Received: by outflank-mailman (input) for mailman id 613595; Fri, 06 Oct 2023 13:01:55 +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 1qokSp-0007X6-T5 for xen-devel@lists.xenproject.org; Fri, 06 Oct 2023 13:01:55 +0000 Received: from esa1.hc3370-68.iphmx.com (esa1.hc3370-68.iphmx.com [216.71.145.142]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 83c65d31-6448-11ee-9b0d-b553b5be7939; Fri, 06 Oct 2023 15:01:52 +0200 (CEST) Received: from mail-bn8nam11lp2169.outbound.protection.outlook.com (HELO NAM11-BN8-obe.outbound.protection.outlook.com) ([104.47.58.169]) by ob1.hc3370-68.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 06 Oct 2023 09:01:49 -0400 Received: from SJ0PR03MB6423.namprd03.prod.outlook.com (2603:10b6:a03:38d::21) by BL1PR03MB6024.namprd03.prod.outlook.com (2603:10b6:208:316::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.39; Fri, 6 Oct 2023 13:01:47 +0000 Received: from SJ0PR03MB6423.namprd03.prod.outlook.com ([fe80::66ca:3a42:baeb:9ecf]) by SJ0PR03MB6423.namprd03.prod.outlook.com ([fe80::66ca:3a42:baeb:9ecf%6]) with mapi id 15.20.6838.030; Fri, 6 Oct 2023 13:01: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: 83c65d31-6448-11ee-9b0d-b553b5be7939 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1696597312; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=YjeDujQhkCSuotTmusn7paGxFGmyKhPrDHPA33kBIm4=; b=BAe215+o82Di3fEQwSUMDhbsRoz/oYiuGWFo9vEU35BiDMVsgtWTihvx s+mKhXffeTHNQ38ANjtYRc/7OQvRpapI2vmX8jpL4ZvTdFNYPgmBIo0J6 JmAYUhLZM+qCb9ZPA49uNUBuplsFs2qEp9SqZ4DadKO7xd2QD5TCeBx3M g=; X-CSE-ConnectionGUID: Bv6MBkPWTUaSQC83zpI/Xw== X-CSE-MsgGUID: AHSINDi/TGKhUBe7OGi3kw== X-IronPort-RemoteIP: 104.47.58.169 X-IronPort-MID: 125254119 X-IronPort-Reputation: None X-IronPort-Listener: OutboundMail X-IronPort-SenderGroup: RELAY_O365 X-IronPort-MailFlowPolicy: $RELAYED X-ThreatScanner-Verdict: Negative IronPort-Data: A9a23:jGq7zq7kU4eKT5he9G4WvQxRtOLGchMFZxGqfqrLsTDasY5as4F+v mEYXW+Ha/6CMzH0LYt+adyyp0MPvsOHztdnGgJtqytmHi5G8cbLO4+Ufxz6V8+wwm8vb2o8t plDNYOQRCwQZiWBzvt4GuG59RGQ7YnRG/ykTraCY3gtLeNdYH9JoQp5nOIkiZJfj9G8Agec0 fv/uMSaM1K+s9JOGjt8B5mr9lU355wehBtC5gZlPKgT4geH/5UoJMl3yZ+ZfiOQrrZ8RoZWd 86bpJml82XQ+QsaC9/Nut4XpWVTH9Y+lSDX4pZnc/DKbipq/0Te4Y5iXBYoUm9Fii3hojxE4 I4lWapc6+seFvakdOw1C3G0GszlVEFM0OevzXOX6aR/w6BaGpdFLjoH4EweZOUlFuhL7W5m3 +JGDRoOVi+/uuuN+ZnrEft0p4MTM5y+VG8fkikIITDxK98DGMmGaYOaoNhS0XE3m9xEGuvYa 4wBcz1zYR/cYhpJfFAKFJY5m+TujX76G9FagAvN+exrvC6OnEoojumF3Nn9I7RmQe1PmUmVv CTe9nnRCRAGLt2PjzGC9xpAg8eWx36hBd5LTezQGvhCqX2o50o/CVoqeni7nNO01WmRWolcN BlBksYphe1onKCxdfHtUhv9rHOasxo0X9tLD/Z8+AyL0rDT4QuSGi4DVDEpQPwrstUnAwMj0 FChlsnsQzdotdW9S3iQ67OVpjOaIjUOICkJYipsZQkY59jupqkjgxSJScxseIaulcH8Ezz0x zGMrQA9iq8VgMpN0L+0lXjYhxq8q56PSRQ6jjg7RUqg5wJ9IYSjN4qh7AGC6e4addjICF6co HIDhs6SqvgUCo2AnzCMR+NLG6y14/GCM3vXhlsH84QdyglBMkWLJeh4iAyS7m8wWirYUVcFu HPuhD4= IronPort-HdrOrdr: A9a23:YLL766k8auY2aYM1r6K4Arf0GUvpDfIi3DAbv31ZSRFFG/Fw9v rDoB1/73TJYVkqN03I9ervBEDjexPhHO9OgLX5VI3KNGOKhILCFvAA0WKN+UyEJwTOssJbyK d8Y+xfJbTLfDxHZB/BkWuFL+o= X-Talos-CUID: 9a23:8GjBYmMOc11BFO5Dcjc50WQXIv8ZT3Tm9VyAeF2gKCFZV+jA X-Talos-MUID: 9a23:tltEJg70T3HFeMQHZKaipBrixoxBw5+PLmwM1qkpmMm5HyEvHBic1zeoF9o= X-IronPort-AV: E=Sophos;i="6.03,204,1694750400"; d="scan'208";a="125254119" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YnMzNDRQq8o8TcWWguHw07fZkaPcaLuvv+zoCKL8D+ornZfO6eD9VmXRUUmD0P/2yomvWK1FyItNvvMdM9xINv0QNeLk3aLEEh5z/9jaCsL1I5e0RC2PY11HFqtMvPUR+eojs1F+s0v3v2vR4gIh7wl8wskKlX6K6U0yFwE3GuVaRrbQDzDWkXcyfllhk9gJuaKa9hKOoqu2wW0RSNKBNKtMd8lXDbA8bTkDSM92xAg/Odnn2Qj7pJuW1PqdIWcue3a1/PkZbosJ7fFx/5FTC4jnHdBSB6lBi1S1bMRpfgx4IGNZZo1vMEOF3ixXmvLx43VZZCejZcCSn1a+HFwbCg== 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=thBVzZHE25HD5UvaIrP9q3ANVbkmnqpnKglf4PdZI5g=; b=O/NGxsXNcSyi481lwWl1aPdP4ZZpPK38mbI8SJpVNc7fJzcsZaDRdTfKLPAxS35WYSeRHY684+ubNrrAyJatDIEBuK2PcM5xSy3bgf+hW5u8NvEFJOOk5tUyZBvg0OWJ2L9Geoc32numoBWhRrcsQYYctbLC5Iumm5FbIotdu7EbieNYjjHdfrjeifRAlpF8xhwy6NJUGmXPO1e+7W9Ede517zr2var5p8eF6p6ZPo71QPAJ8egAN6cBzuFUIjdqYkwi3dWw18fkmMlbQSelLyFw6EpWePlJ2Cdouhw2Lp9wXzUjXku6BhCJ+qscqdy2fmEmdfforODYk3V9akbdRQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.onmicrosoft.com; s=selector2-citrix-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=thBVzZHE25HD5UvaIrP9q3ANVbkmnqpnKglf4PdZI5g=; b=jvTh7cv7p/TSLw/YuO/0kZ+G9yHeS107kBSvNbs5YSq0uu9U+EoQPLefl2KUfV/CssV07blNPdcrUv2PaQ60u8yHW7Q1qJjAzxliHsr8D4LQ+DNOZdZkPh3ku8QKyF4wqoGVncMsYKFbVhoKagWwKc8MIOVQkvYVMS2wwC0kLxw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com; From: Roger Pau Monne To: xen-devel@lists.xenproject.org Cc: Henry Wang , Roger Pau Monne , Andrew Cooper , George Dunlap , Jan Beulich , Julien Grall , Stefano Stabellini , Wei Liu Subject: [PATCH v2 1/2] domain: fix misaligned unmap address in {,un}map_guest_area() Date: Fri, 6 Oct 2023 15:00:58 +0200 Message-ID: <20231006130059.97700-2-roger.pau@citrix.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231006130059.97700-1-roger.pau@citrix.com> References: <20231006130059.97700-1-roger.pau@citrix.com> X-ClientProxiedBy: LO4P123CA0324.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:197::23) To SJ0PR03MB6423.namprd03.prod.outlook.com (2603:10b6:a03:38d::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR03MB6423:EE_|BL1PR03MB6024:EE_ X-MS-Office365-Filtering-Correlation-Id: 99255386-b674-4109-6966-08dbc66c65d1 X-LD-Processed: 335836de-42ef-43a2-b145-348c2ee9ca5b,ExtAddr,ExtFwd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GyqUK8a882Z4hYNiTVVbpqW+6BqtwGKgS5WgBCITGd5shvPy2XalVQLu92H4H1+1KWccteCTwknHZcfuDFkPV2ZCbtE8wMsJh907QutxVQT8TAxdCB/G3Cu3VQfnKjBLiQwOXMlLxH1Yx0UZCiV1HJGrHUykgkr3xStUpmA2Dvb0rnq7R19KQI3NFz1beFB0aLM7xD8OF7r25vXq1ZxpFYd3uINdqoC2FNNEZInpJkGXKg3aBvgMwHVATCfTAiJftGPtbjcKhu6B1r6yLrUOlRYewV++/Yy+LJCL6BX016mNiJqogc7VrXhyBH458lzPVO+LY4HCK0E8bXv0F6b3c/G1hfPaB+Sd452iaEcQin6NM1f+jeJvA2UXzhlc2fDzeajqjrQ5UpbyFvyExHtl5bd5Z+Xfji0+/AHvzuISkxOhT3f68/dW8qCH8PFndypMwJijhqXYZTua/d+I9mLpB+gbgYMTiPW9c1kTt7M7BWeyM1ijrSi2TevCiUyi80Be2V3NTS0bZVf1AhZbEnq1JsDb+OTXtkCjjUKJuCW/bU7dA2qdk/ANV+CWzDju9bDB X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR03MB6423.namprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(346002)(396003)(366004)(376002)(136003)(39860400002)(230922051799003)(451199024)(1800799009)(186009)(64100799003)(83380400001)(6512007)(6506007)(6666004)(478600001)(6486002)(86362001)(82960400001)(38100700002)(2906002)(1076003)(26005)(2616005)(36756003)(316002)(66556008)(66476007)(54906003)(66946007)(5660300002)(6916009)(41300700001)(4326008)(8936002)(8676002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?SFAs/ASv8I54HUUsXmhghgCa5LQa?= =?utf-8?q?rQ2ZdsTqPWmYsqayoSV+4QUDBtNqbfy/zg7hI8vKRXdkyO4VMwECePkLlV+d3/rHd?= =?utf-8?q?RmFg4Xf2IYFIBCnu+We1cv3m//v/QCnG1xXtT0xCe9OiNMmqUREmHZN9V8DbFK0kt?= =?utf-8?q?Wcy8PDn1xAbLMIBBJTy40HgZf+5aBIXQ2k/3IF4H7PZ64n386VOhYgGAgExSmQ67r?= =?utf-8?q?/jg9x54oLyw6orgp3FcYVdIsGqzRcYziH59KkYf/lQucaaWUCc04KOJKVmqSO7ubg?= =?utf-8?q?bHW/m482JggxJO1nkyuZtDvDmoSUgq1KQvI3ioC0Y1VM/YGDfdhPBfg1+04564GPw?= =?utf-8?q?cQlgr5FJylX1sVJ9+vo9918amdHIC25xy4+1cX6zcHMqlUeoQSKtm3YOYVuhPz9m2?= =?utf-8?q?OCoD03G4olcW5n+5z917WwONe20gyuy5ptSRnQCP6WeWwXBye5kpav5PWOg+sIZ1G?= =?utf-8?q?VVddHju/hAggngev6gNrplghGzpf0IU0kqgyLcZqLz5ywD7i6xbZ0/hFoaHnhw1Ne?= =?utf-8?q?XUPIj9CiIXLzhAnaWxbzcATAjXa2hUsOy9H38YoSW0rVpPmvh7SpJ3w3V6rNpTany?= =?utf-8?q?k7f5VGSXRK/3VNlGGO6uw0ygOVTFvk3M5qi2996wAe4kZ9z8wPrZMaO95dAdRHgkP?= =?utf-8?q?N6EviKEZruiUzduDFFC9FgKYTF4ujkx1vDRYGzYkgBBv+Rb90EKbNZkvGeMVtH3Lz?= =?utf-8?q?8BOINlHHQMY07LGfch0HBuF+Va5/n7ql2T/F2Il7kj2bFG/cqyG5cXvUvPxcq2ZYM?= =?utf-8?q?PheKXbQr6JdgnsukgdeqbmwRqNf/szBj0VJu6V8+b6frTFqSviJzaU3zkRE5e4lDX?= =?utf-8?q?VxfgTlBMtSA0oKH7bR24Z85L9OIG89RHr1eSC7Ro7RnCUHuEHjlDRyX7B9bMzxWMx?= =?utf-8?q?8/Og+UOYYSDwqFu5bnttDGCXrxSx/8ZvvYfsrVQSPaOWis4ZxVb9H7b4gnE1HiIyF?= =?utf-8?q?Xmtgy5VHp+UJxP8VdU1EYCyVIBBouGcM2X7RQyxl7z44f7e/dcyD2rs01DJNkeoHv?= =?utf-8?q?LxX6hfd9BPNFxv06Ph/WSSGf0yvh21VpB6wJu5QZ4kcGthC6OXaLkimqULSLSFCUv?= =?utf-8?q?Dwj1RF59u1+yd5YLbBgIuiuz1+wfaaKYFknsbX8rgqVK9Ma8r5IdMODuBGq6JV853?= =?utf-8?q?PZQQ1YPOt2MFt9jw/CFbF7uZNSCNf3xrWeF3Mpzsz1+xl6FQJHZQfVy/VFXTKwrtg?= =?utf-8?q?rnSmzY8BYM7cYXCJa4Reqkvpg+Czs37j148ocMU3kI1bCYlfxLDEGaK77jXI2vNZv?= =?utf-8?q?SaU8qlGng8cRWcZf5mynkB2Lqc1q6/4LahHr1WPLC9Fi0Ys+I04vgLj1JMaZ1FkKq?= =?utf-8?q?w9zpc8iFjMdaHx+hmwyV4QsvpV27Y2scd1JC/gQb6ToCUPynuhRE2tAI5UUxdUJWt?= =?utf-8?q?vR09AoS3y6+E3zMXu3eMvPk92nCXmIT89r4VZtAcgpuyz+O++pQrvyeotKmY2Jj0y?= =?utf-8?q?yuu2fZ5rAyiRAvr0kCBgQxKJp/Yb5DVgwwZlzlrpb0ODtQ2uRfH3GKQWjBfJvALrE?= =?utf-8?q?S581adYDc7jI14XoOzyo+3VGHrxonVd5oA=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: WxTWDjgMzwZOV+DMCnzTgPR3AZL6hIbcH89lwR6ZwsA24Y9WTgLl6orLaamhg4uxuLN3MLdwyWhlrscgKiApYTjDKKS0O38S6PrhD+/MmxVXDOJYZozH7rSGyNOiFCtz7gPwaLw0wzRIWthENg+xAyMAwTvwZ9pQSgeLAklwEdFEzm/or+eFO/GPkksciecsBv3RkS3391UDu+w6vNesipZiMXEGbNS+vP0mWkBsoRTWUPV/LF2DPHLoWaIKtrZiy6ADwJGTc36QsbFVRXk5fhFgf8vT9bQL3IguRSBIi59bSMUa0Xpc7chjj+XoEjrZ28Ta0VQF/PzJ2wkCbv9jj3QnNY/YjRErD5oPJ1VOk2niLdEU/dWM3OhX57w6RPUhBud9wroj3cp3S6HleyYT/ND82TNJ7SlQFWwOWv86R/gKcywF1xPercGdpx74zt+p/BGm/AW1XQo1f3jTG7oq63qfx2OllXUTAa+qdEQTzu6/jnsrDRkVLLs9DBO87ZlaYlE1KZTY0r9g1OLWBKa6ARXr450fKl1sIPHco+lBmOAMn0xP/Na9fMTTsS0AnU2cHBolVfw11KcASTzEfsEw7hx7tJU5sbcaDHcEtgEGwUM9dTJ+mx9Dec+sQh2BYLgMFHgLb5Qsuvl7tY9pgotLAq/3J/VZUPE+4ZmbZ5OgWNzX9eiMUP2BVBPmHOTxpx7I0fEGzztY5/XGRhsTCgldHG9yrOQD64XL+GJ+Gc219CZ23HzceXAJX+IcbJSiSLWTtd3iO+Ylp9EuVmPU3l6b1Z1yuleteYP9VOskGPZpbshKme36AAIYxfLluxMjPbr9KHh17yRAVcfom+QxAoHto1DB3IaWkECKOVBzUq8L0uJMXwO63BVUiJgR/hGhCpNT X-OriginatorOrg: citrix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 99255386-b674-4109-6966-08dbc66c65d1 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR03MB6423.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Oct 2023 13:01:47.2479 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335836de-42ef-43a2-b145-348c2ee9ca5b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: MN5H1GtDzUNrxPub1u25HtNOLAMQCQgI8JV1XL4WYX4lTkhH0E1SNLbJ3lsJnTEAsY1nzwo8WsobJiqDwtJPlQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR03MB6024 unmap_domain_page_global() expects the provided address to be page aligned, or else some of the called functions will trigger assertions, like modify_xen_mappings() on x86 or destroy_xen_mappings() on Arm. The following assert has been reported by osstest arm 32bit tests: (XEN) Assertion 'IS_ALIGNED(s, PAGE_SIZE)' failed at arch/arm/mm.c:1243 (XEN) ----[ Xen-4.18-rc arm32 debug=y Not tainted ]---- (XEN) CPU: 0 (XEN) PC: 00271a38 destroy_xen_mappings+0x50/0x5c [...] (XEN) Xen call trace: (XEN) [<00271a38>] destroy_xen_mappings+0x50/0x5c (PC) (XEN) [<00235aa8>] vunmap+0x30/0x1a0 (LR) (XEN) [<0026ad88>] unmap_domain_page_global+0x10/0x20 (XEN) [<00208e38>] unmap_guest_area+0x90/0xec (XEN) [<00208f98>] domain_kill+0x104/0x180 (XEN) [<00239e3c>] do_domctl+0x8ac/0x14fc (XEN) [<0027ae34>] do_trap_guest_sync+0x570/0x66c (XEN) [<002019f0>] arch/arm/arm32/entry.o#return_from_trap+0/0x4 Fixes: eadc288cbb0d ('domain: map/unmap GADDR based shared guest areas') Signed-off-by: Roger Pau Monné Reviewed-by: Julien Grall --- Changes since v1: - Also page-align the address in map_guest_area(). --- xen/common/domain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index b8281d7cff9d..1468638ade8b 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -1601,7 +1601,7 @@ int map_guest_area(struct vcpu *v, paddr_t gaddr, unsigned int size, unmap: if ( pg ) { - unmap_domain_page_global(map); + unmap_domain_page_global((void *)((unsigned long)map & PAGE_MASK)); put_page_and_type(pg); } @@ -1634,7 +1634,7 @@ void unmap_guest_area(struct vcpu *v, struct guest_area *area) if ( pg ) { - unmap_domain_page_global(map); + unmap_domain_page_global((void *)((unsigned long)map & PAGE_MASK)); put_page_and_type(pg); } }