From nobody Sat Aug 03 03:14:12 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WbSTw4hxWz5RncC; Sat, 03 Aug 2024 03:14:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WbSTw4BvXz4Gyx; Sat, 3 Aug 2024 03:14:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722654852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fryQEKAeRQxYSVvn0WwMGtCdBfUnJtU8SpvskTuQ4i0=; b=SkyZqMsIhphuCkR8e4sjZpJU/d10fpfn4CU53RrRbjMnPD5Msh3399leex6Sry66cF9icj X4dPmIU48Um4MfoJ7yYOf6A3PsAE5exCYDmmWCEAlyIzLFClS2OBIIHGZkJ79O+p13n6gx n+gVbOKRhpMfhybtyQtsxAb4IQcz7Q3Z+YBd+mErUiWrQDJn9JTz4jYSkoS5diQLDmjFiU K7V9k189IpC5TwE+VN8ROnCmEEagR/6RpF4tLBOehmWRGtjQya8EWxA1J/U3Q+Pe8cex3g 99L6Dy0M0LkHabvcbMYA4lTZTATKx1t9YwW4nwQHZrFj1q2ChgTUl5196DtxAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722654852; a=rsa-sha256; cv=none; b=oATzFssPfi99dyq9LU2gVYlq98VHVEF21xhO5Na3+wPj4xMCvn5BclO3df2lBYOGkmkfEd kchGF5SsW3kkcbOvn/I6yhmxyZnfc4GSScK00Ykbi9dB40JU/usNooX3trhHc8YXchie0i CmXUlmG8o53699XLOBQIzFtJmAv3u3vFSHwOqiP3JFlUInUj5bWATcEesOo5lUSknuk82g MNdBHcQ4o9J9m0kPtbg9qEWQ6Ub8fw57s4WpklVkykmNj2NHC5OrS5Vfd994/KAn8NxtEq plyAzRvCX/oXuDU/kBjCcqAbwLXVZ+d6VLjSYbFtxXMldLcOe3LONr7PlA01AQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722654852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fryQEKAeRQxYSVvn0WwMGtCdBfUnJtU8SpvskTuQ4i0=; b=hCVoJSpU06IFspNLD4TA/4S2OuhK8IVNnFOSohMWuZPytDmMJDq0LFFkxWc+X7xK6U8Pqy tZiUh9Hdzndu8BBovjjMz1TKlnQBWZayqXdTd1gk6LZVQw4RmS+uFuR/zB4lohHfq8Pm5U 8A4TfZKTChD6/uODbRfr4AJzbNkSn4WSAYFNs2f8t6b5KfpavZYMdrBZXefzQs5oHHbEUC TtNtNbFrMSXpcE/pO0QwQn2jLLoZfZ4/kGzbgRpuYa7TlcI0xCo+BHw14nTJl26gN1d9G0 IJrYzXt/+ILjiBgromot6SLooFoSWPaVrU2VUMmkZp5ahbjmJ308lqW1qgSYxg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WbSTw3jxXzvtM; Sat, 3 Aug 2024 03:14:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4733ECvQ057301; Sat, 3 Aug 2024 03:14:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4733EC22057298; Sat, 3 Aug 2024 03:14:12 GMT (envelope-from git) Date: Sat, 3 Aug 2024 03:14:12 GMT Message-Id: <202408030314.4733EC22057298@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: c1287a3bb1b7 - main - x86/xen: ignore error to fetch memory map in xen_arch_init_physmem() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c1287a3bb1b7b7ccc494d6718db52cb443bd0d38 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c1287a3bb1b7b7ccc494d6718db52cb443bd0d38 commit c1287a3bb1b7b7ccc494d6718db52cb443bd0d38 Author: Roger Pau Monné AuthorDate: 2024-08-03 03:10:38 +0000 Commit: Colin Percival CommitDate: 2024-08-03 03:12:55 +0000 x86/xen: ignore error to fetch memory map in xen_arch_init_physmem() Some implementations of Xen don't expose the XENMEM_memory_map hypercall. Shallow the error from XENMEM_memory_map in xen_arch_init_physmem() and just return 0. This will fallback to using the non-arch specific mechanism for allocating scratch space. Reported by: cperciva Reviewed by: Elliott Mitchell Fixes: 69c47485b5f9 ('x86/xen: use UNUSABLE e820 regions for external mappings') Sponsored by: Cloud Software Group Differential revision: https://reviews.freebsd.org/D46205 --- sys/x86/xen/hvm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/x86/xen/hvm.c b/sys/x86/xen/hvm.c index d2ab1c32b0a2..02e41fda1d98 100644 --- a/sys/x86/xen/hvm.c +++ b/sys/x86/xen/hvm.c @@ -563,7 +563,7 @@ xen_arch_init_physmem(device_t dev, struct rman *mem) set_xen_guest_handle(memmap.buffer, smap); error = HYPERVISOR_memory_op(XENMEM_memory_map, &memmap); if (error != 0) - return (error); + return (0); /* * Fill with UNUSABLE regions, as it's always fine to use those for