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 phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1D132C433EF for ; Tue, 19 Jul 2022 15:30:34 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CD310840A9; Tue, 19 Jul 2022 17:29:51 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=epam.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=epam.com header.i=@epam.com header.b="rJd2ngxx"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1776B8403E; Tue, 19 Jul 2022 10:53:06 +0200 (CEST) Received: from mx0b-0039f301.pphosted.com (mx0b-0039f301.pphosted.com [148.163.137.242]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 0A0D584013 for ; Tue, 19 Jul 2022 10:53:02 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=epam.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=prvs=9199f38a47=dmytro_firsov@epam.com Received: from pps.filterd (m0174683.ppops.net [127.0.0.1]) by mx0b-0039f301.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 26J8h01I017590; Tue, 19 Jul 2022 08:53:01 GMT Received: from eur05-db8-obe.outbound.protection.outlook.com (mail-db8eur05lp2110.outbound.protection.outlook.com [104.47.17.110]) by mx0b-0039f301.pphosted.com (PPS) with ESMTPS id 3hdackj9aa-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 19 Jul 2022 08:53:01 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aIgx6QraFVP94T3I/W6RwfWF1xCMxnTkam0iL8bDZDVF/1HImlyilr+zPo1Dt2r8ErFPJ/T+XacIIvb8ZFBO9zoE+J8flNrEjZ2+x34ZhOKmVJbYoVksp5pYx69oX2mmxheLVYGmHCmAPQsVZs2Gd/ouNv4COjSV3wDv8ATfbhC8R3wNLnh3BCC59YH/z9Cd1gxfDQANDTNfUgrkhCNPxppWvS/8NMJtoOJ/XLYVU6uFRdaVCN4uhXZuvDrqorRYsReMsptlfYVXlkFJz8WbwIxsHQZO50T3NPfShrClylwR4wIkJG6ZZX/Oe4XHZPF2/DvXEQTbUyKJ4nSAytjP2Q== 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=RE68bdYTnoLsUl2Sa1d/xQI29YRyyB8Fp7WnT4j0/tI=; b=kF3/oD9pwuAy9Zu0IMXPlqrZsOnlyDX02EkfAftyizcxkRh18JWjD/qfuj3xG+e+CFD9qj+ZiAQSUVYi5CMKaZGIMr4+ZnwE48rMwEJL/pLn3uAsDXq0R4t/ytD/+hzubSI6yXOnwBLe8NKO+Xqr2P1s0qcYuoQyW9sTSFvANOLDIEFsF0BgNsVFV+7a6FTvxk2dgRb7B2bFR9Ye4UifVeO6hEfr0J2HR5pjgFKkQQc9V7mQhO1vaZVkipaYge9ErcXt2LDvGGCQV7atTkp+piCRbiKOx0FVvC74rIEa0bJ1BbnviYIrD2UfrmeBjOx/MIXxG7RFabiNg1WVykbPRA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=epam.com; dmarc=pass action=none header.from=epam.com; dkim=pass header.d=epam.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=epam.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RE68bdYTnoLsUl2Sa1d/xQI29YRyyB8Fp7WnT4j0/tI=; b=rJd2ngxxvY1mqyeWC2uBhtaFDO7aY2+WSBRvLSq+TIb+puavAHQxLGbepckPMdUWxBWUKAq/yAuTPpU0VzlRDrXEhk5YWT0TWsO/llGyfJu165/lzn7JSdSUoK2gqbdk5AWs3ziHZ8Uhbd2i/EwuwaVptbjvyMY5d4RBrUGBZixBmF1C0vh//B8DaQe1LQoeG/JTirv//jx8OKszjczxGzt6PldbnHm4daTJKmpwTQ/yieQQ5RacP0HEHuKTZral2FRZwXWfCLuVtK/54NNiRv2Z47IQiogUQPlpP/4VRUj+iNnhyGQUYmfMqxF43ERtph0MdH1ahLDIzm/RpOk7Gg== Received: from AM9PR03MB7236.eurprd03.prod.outlook.com (2603:10a6:20b:260::7) by HE1PR0301MB2553.eurprd03.prod.outlook.com (2603:10a6:3:69::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.23; Tue, 19 Jul 2022 08:52:58 +0000 Received: from AM9PR03MB7236.eurprd03.prod.outlook.com ([fe80::497a:4182:37de:cd7f]) by AM9PR03MB7236.eurprd03.prod.outlook.com ([fe80::497a:4182:37de:cd7f%4]) with mapi id 15.20.5438.023; Tue, 19 Jul 2022 08:52:58 +0000 From: Dmytro Firsov To: "u-boot@lists.denx.de" CC: "olekstysh@gmail.com" , "vicooodin@gmail.com" , "julien@xen.org" , Dmytro Firsov Subject: [PATCH] drivers: xen: unmap Enlighten page before jumping to Linux Thread-Topic: [PATCH] drivers: xen: unmap Enlighten page before jumping to Linux Thread-Index: AQHYm0zxbQvz6sue/UOSFu/mJVPcPA== Date: Tue, 19 Jul 2022 08:52:58 +0000 Message-ID: <20220719085253.1739357-1-dmytro_firsov@epam.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: e3d450e6-4586-4557-162c-08da6964143f x-ms-traffictypediagnostic: HE1PR0301MB2553:EE_ x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: kZWw+/bz1uKs86zM1THjYzNjkrEp+q0F7+FvmNOBJYdp7+PKOkUgMWqKBKw4LKSRiZTKBR7gAgyFPF5e3x0ZwAHjxgYqhi2tpv7rnN8PFcPqxI+/WyQ2xBN38WDevRD9iP61oYiUUkqwac67kpBJisPTKck82HcRacuEo35zx97vaN0jj+PA0ciWYVxH6jK4ywq/pi0hMHwpRJcLdw7XaqJderctMgQ6dyNVXkzk+DMGnbUL9pRdGQF21YEky77+Wf/NCVOI2cIzUydci4mCM8e8g8eVBMX1LlYnuypIDbzZx+toEW9Gd7WI4KEilb56tjGTjXU+/5qJx4DyoJI0E+4xfw8ww7B6iuKBkB4nRBqj73BgEUX7K6up9bX07SpuQ5RWuurTcBr46hXbBwvMz8C1KUiz+aZWQapZ3U0xfnicJDsuuGVCPgJX2SvxM2tKfnPW7xgoRW7xAHpPgivRj7ry1fZAbPFOYOw7vcx+jvQ4YET4v1YBFjN3yMuKoeolCMMTJhWaHB2f3ljAZ+zLq8NzkFZk9pXe1Upbxuf/ydK3Q9vywVDr6+MTUpY42t0pre9+nKL6uMx255nSLAiszf6gDJrg8UOuzjp8aIpdtFyw/MzyOfqs+qNhyImIlvx/eLl5eEiLdHmmAOyzU/9u0lS6gg0cfgBqrpYvJXnTIGTPBlS7JZ1bgJ0nP0vAEF2k4QDcoPeIIOloiA9NS6uL840YxwhoL9ZsA0viSYZ7zLdaclh1TlIftvK+5AlBSnUlLwm41vJC68XXUcr82civWZWOPoTdNMtpGp9NHsrFaXkcMgEZPHrCdClZxJwF7CD6mRL4XUC3kd6BWvK7AZB+5A== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM9PR03MB7236.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(4636009)(136003)(346002)(39860400002)(366004)(396003)(376002)(91956017)(8936002)(66946007)(5660300002)(8676002)(66476007)(66556008)(64756008)(38100700002)(4326008)(66446008)(186003)(1076003)(76116006)(36756003)(38070700005)(71200400001)(6916009)(316002)(107886003)(478600001)(966005)(6486002)(86362001)(41300700001)(6506007)(122000001)(2906002)(2616005)(83380400001)(6512007)(26005)(54906003); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?aD9kKWrZkGeGgWBR9MFKL8EINcmpgeGsfZFZ4uLgYYrUt5W2FMeiYPBUjA?= =?iso-8859-1?Q?oMlhaaEGfTRVBvh9dZ6ABuI5ePTXO74vgkAXY701tRoL6UzVNKnpvlJjRP?= =?iso-8859-1?Q?LBXbiD9/O4/texZm9aLepAUW/ANzqNxVT+pNd9YOpjOabqNvCZClb4EXJw?= =?iso-8859-1?Q?H8NVKcDlSAjdGRTaaIIMOTs6aTMFvJtMfR2kVnI9Nxsz8eEz8jiDgaQDNa?= =?iso-8859-1?Q?vks1FjLSdrVWEVut/EjvDwEQXoYJ+RHQW1VMPeLGLtVNnk9cwmgT+e+nbs?= =?iso-8859-1?Q?45kKGheAIwnob7Pva5bZ88SqtZ6UfPmMrispKVVkbs6FQE6vH7uIQ0awUa?= =?iso-8859-1?Q?6naMNUPtTZeWGsq9MtoU0W3PX7nXfvIvKlEmQm5PHACaw+JDfZ4RQF5AlM?= =?iso-8859-1?Q?zY7pHm2ggKgq5fxK8UM1a/MIu6KWgs9BE2vGyk2Orl6niueg6GDc2NwbLL?= =?iso-8859-1?Q?mdwQPuDsZ+xPUY6ZhDUzlysVNnBxEJ1QSSwxSmQvtei5ZSxoIg7UTMSBSx?= =?iso-8859-1?Q?PFG790IY2V4ReH8RsSl1dJXe4dDsoSUt/r8xdVDaf5wi6URjvVXL9Jcv2f?= =?iso-8859-1?Q?Jv5OW2grmOqhij6OCXxSOJjZkle+xsZcleYVbJc4K6fJfabKXKz8F7mZPG?= =?iso-8859-1?Q?PcQ2dVBJKZO3oVxt+cApiX5D9ys38QkCRJw3ieb/BbXBOPvJhlcOF4EvQz?= =?iso-8859-1?Q?AdNbOR3dlMKnPdar9BJNOw5DNmby8TIn+GBt9iiDINidFvjSY0+c4SjNva?= =?iso-8859-1?Q?a7LVbJNvpSRnkvCGyIo0z6yXEp+3t65up93V752JGck7U3SwsGmzBuT4vX?= =?iso-8859-1?Q?c6JwN5aA5ht2SHlMfhgmX/o0G4lA8e4WiAv+D6IwMqy/Pfj94ObrDHX45R?= =?iso-8859-1?Q?Yi1h5X3qTOTcEWMsbCfn3ebI5swu9icbax7DiAOTPcKMbJrgBYfA4Bu4Ry?= =?iso-8859-1?Q?5Lt+5s2ZVy6HwUJpkCBzFA24w1RRDuXgE4oDUnkwRbyP2K8jIxgUc9YkfB?= =?iso-8859-1?Q?I53FPiSqLg+M+fSa/Z43Od4Utf30y+boABX8Rj+ALUEjo3R9/03oUsGO/i?= =?iso-8859-1?Q?rqnQIF0RCUUrohZWhRP6Th25EDnZ7qOHrtSHPg29065WNTD5KQZM4oB8J8?= =?iso-8859-1?Q?BJ2GDJ3qM3/VXi7ziZJmrLJnw+R16mPmesDLPXUg2INxAM1n0bfsaosKqj?= =?iso-8859-1?Q?UARnRcbWDT18S5bVnSBmsMOdyYFf0R/X30sXNaB/XbzXggFlrI03m2xEQx?= =?iso-8859-1?Q?06doqCdJyuK3odK0zLPEPpj5aQcZnUYj+BoEtm8n36lcMLuP21IOQc+QXQ?= =?iso-8859-1?Q?WymzvdOngVxO12gzgzI3r6dDBF07aQoJAnSpMpfZu+DY0AKaVkkP/UmcHG?= =?iso-8859-1?Q?V8mP5xUcILv6e1jQjcv0LtkNsZFqj7lwnknhaGV13iGSQP4pDF1zaGJ0z0?= =?iso-8859-1?Q?0w7JwD8LPmygn1pECP5osuB2m1q0M4gQengx26ntYUGQE0c0k1Janj6s5q?= =?iso-8859-1?Q?/z+9ORmv79Nhl8oot7mwSffww0Oy3lECsuutTseIwQj3/O279JScBmYx0U?= =?iso-8859-1?Q?AIXm8+nqC7+nSkhEcvrUHf+tDDPPKlnPwEFrZ2pDm4pV3S31bFpbzNHwuB?= =?iso-8859-1?Q?D9LzmnQxFMpCiV96z/MF6RS1xRnjAnJJRmUrppXV0S5qVm4Vp7VTacBQ?= =?iso-8859-1?Q?=3D=3D?= Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: epam.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: AM9PR03MB7236.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e3d450e6-4586-4557-162c-08da6964143f X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Jul 2022 08:52:58.3515 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b41b72d0-4e9f-4c26-8a69-f949f367c91d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: icP+gt2quELU2cP2grjmRYwnMTN+9DEulTy3klQ7mZRgDInmnErrwd0lyEwwZlR8TlKj/wvCyd63xGNbsVZvuw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0301MB2553 X-Proofpoint-GUID: mfqrHXim7VV2a3nmSVP1OewgthU-0j_K X-Proofpoint-ORIG-GUID: mfqrHXim7VV2a3nmSVP1OewgthU-0j_K X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1 definitions=2022-07-18_22,2022-07-18_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1011 lowpriorityscore=0 bulkscore=0 phishscore=0 suspectscore=0 malwarescore=0 mlxscore=0 spamscore=0 priorityscore=1501 impostorscore=0 mlxlogscore=396 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000 definitions=main-2207190038 X-Mailman-Approved-At: Tue, 19 Jul 2022 17:29:40 +0200 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This commit fixes issue with usage of Xen hypervisor shared info page. Previously U-boot did not unmap it at the end of OS boot process. It leads to repeated mapping during Enlighten initialization in Linux. Xen did not prevent guest from this, so it works but causes weird wierd issues - one memory page, that was returned by memalign in U-boot for Enlighten mapping was not returned to allocator and contained shared info values during Linux run. Also Linux mapped it to another place in memory again. Now code, that restricts repeated mapping of Enlighten page, is about to be merged to Xen: https://lore.kernel.org/xen-devel/20220716145658.4175730-2-olekstysh@gmail.= com/ So, without unmapping in U-boot, Linux will fail to start. As discussed on the xen-devel mailing list, to fix this issue the code should: 1) Unmap the page 2) Populate the area with memory using XENMEM_populate_physmap This patch adds page unmapping via XENMEM_remove_from_physmap, fills hole in address space where page was mapped via XENMEM_populate_physmap and return this address to memory allocator for freeing. Signed-off-by: Dmytro Firsov --- drivers/xen/hypervisor.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/drivers/xen/hypervisor.c b/drivers/xen/hypervisor.c index 2560894832..9ac377b618 100644 --- a/drivers/xen/hypervisor.c +++ b/drivers/xen/hypervisor.c @@ -144,6 +144,36 @@ struct shared_info *map_shared_info(void *p) return HYPERVISOR_shared_info; } =20 +void unmap_shared_info(void) +{ + xen_pfn_t shared_info_pfn =3D virt_to_pfn(HYPERVISOR_shared_info); + struct xen_remove_from_physmap xrfp; + struct xen_memory_reservation reservation; + xen_ulong_t nr_exts =3D 1; + + xrfp.domid =3D DOMID_SELF; + xrfp.gpfn =3D shared_info_pfn; + if (HYPERVISOR_memory_op(XENMEM_remove_from_physmap, &xrfp) !=3D 0) + BUG(); + + /* + * After remove from physmap there will be a hole in address space on + * HYPERVISOR_shared_info address, so to free memory allocated with + * memalign and prevent exceptions during access to this page we need to + * fill this 4KB hole with XENMEM_populate_physmap before jumping to Linu= x. + */ + reservation.domid =3D DOMID_SELF; + reservation.extent_order =3D 0; + reservation.address_bits =3D 0; + set_xen_guest_handle(reservation.extent_start, &shared_info_pfn); + reservation.nr_extents =3D nr_exts; + if (HYPERVISOR_memory_op(XENMEM_populate_physmap, &reservation) !=3D nr_e= xts) + BUG(); + + /* Now we can return this to memory allocator */ + free(HYPERVISOR_shared_info); +} + void do_hypervisor_callback(struct pt_regs *regs) { unsigned long l1, l2, l1i, l2i; @@ -251,4 +281,5 @@ void xen_fini(void) fini_gnttab(); fini_xenbus(); fini_events(); + unmap_shared_info(); } --=20 2.25.1