[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH v3 1/2] libelf: don't attempt to parse __xen_guest for PVH


  • To: <xen-devel@xxxxxxxxxxxxxxxxxxxx>
  • From: Roger Pau Monne <roger.pau@xxxxxxxxxx>
  • Date: Thu, 20 May 2021 14:30:11 +0200
  • 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
  • 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-SenderADCheck; bh=FX66gErbVbl+5wBpfx4Y0txO4O300Tono3Zv/ra1bB4=; b=VlavZ2t0d7r1aUz3XadaFS9t6ea6JhE3tYH6vPLmSUlvCcjR40koHFMTEXGKpwQWBPPAzSx3vvrWliIACFqVA1jiWaz1hWMfeJE4Nhe6YQoDgQV4FEJLHk1ljD5aA4ibBkHtOdc6DxmlkJP/PbkAVwZVbhEghQUSiEcCGgzIAo4CB9Vm6JiEEy9rwdhf99vqVGOte6X4IL4+uKDAFIaUBvA7+1IqOD/KmwrQFO7upolZFMkhTWm/gjwrC0yqsUoQS09z0aLBDEQtdUyGUhxaeYxlJI43o1CtVXnjCRMPcsp92V3eUCrIKMq/RYXOMkmypi8jI25PK0PoIl8UJdv3IA==
  • Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NuQJOlW44zMV0DU9DZ7GUj4KzeXKrI/FevVEzMkDv1dMHMSyIgD6dPQaSeZCXHb2CcZx3K6L1+6SaYZKNzmqeepS1vS+zLdNV72qGJU7oN4nU95yZeKtSN/Dci12bPT8kc2B/pSQZjO4WSsD87MQ1gWWmTgp84tKZemhrv7aQUr54DDRalrEcdscHVnlDyAqlp5GYadaSEjYUfAeFJgL0fko2p2fCMiymi3hhqYVB1oq+BNJvfCusNJ7r70fV6vwbzEntNOxJjwOMkpEONbggdAK37ndZ3AMF54kcLbhOZqlEBXWBPDQaZU0Cxpb3F2Lj9X1lp6QZZ5NQq4cnY8qLw==
  • Authentication-results: esa2.hc3370-68.iphmx.com; dkim=pass (signature verified) header.i=@citrix.onmicrosoft.com
  • Cc: Roger Pau Monne <roger.pau@xxxxxxxxxx>, Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, George Dunlap <george.dunlap@xxxxxxxxxx>, "Ian Jackson" <iwj@xxxxxxxxxxxxxx>, Jan Beulich <jbeulich@xxxxxxxx>, Julien Grall <julien@xxxxxxx>, Stefano Stabellini <sstabellini@xxxxxxxxxx>, Wei Liu <wl@xxxxxxx>
  • Delivery-date: Thu, 20 May 2021 12:30:45 +0000
  • Ironport-data: A9a23:N2uh5KsZttZfLkdMLd0HVZBMR+fnVEteMUV32f8akzHdYApBsoF/q tZmKT+HOanYMWPxc4x2aNvkpB4DuMeBydFmT1Nt+XpnHyxA+JbJXdiXEBz9bniYRiHhoOOLz Cm8hv3odp1coqr0/0/1WlTZhSAnk/7OHtIQMcacUsxLbVYMpBwJ1FQzwYbVvqYy2YLgW17U6 IusyyHiEATNNwBcYzp8B52r8HuDjNyq0N/PlgVjDRzjlAa2e0g9VPrzF4noR5fLatA88tqBb /TC1NmEElbxpH/BPD8HfoHTKSXmSpaKVeSHZ+E/t6KK2nCurQRquko32WZ1he66RFxlkvgoo Oihu6BcRi92M4OQk8lAeiNyCih6bZZE85vMcHWg5Jn7I03uKxMAwt1rBUAye4YZ5vx2ESdF8 vlwxDIlN07ZwbjsmfTiF7kq3J1LwMrDZevzvll6yj7UF7A+SI3rSKTW/95Imjw3g6iiGN6CO 5BANmIzNHwsZTViYVIoOc8RmNu4rXjTfR9V8kOuorUOtj27IAtZj+G2bYu9lsaxbdVYmAOUq 3zL+0z9AwoGL5qPxDyd6HWui+TT2yThV+o6FaK63u5nhkWJwW4eAwFQUkG0ydG7gEOjX9NUK 2QP5zEj66M18SSDTMT5XhC+iG6JuFgbQdU4O/Yh9AiHx67Q4gCYLmsJVDhMbJohrsBebSMu/ k+EmZXuHzMHjVGOYSvDrPHO92r0YHVFazVbDcMZcecby4bujt04o0/mdPx6Garltd/+PTqhz i/f+UDSmI4vYd43O7STpA6d2mj998mRE2bZ9S2NADv9s1oRiJqNItzwsAKKtZ6sOa7EFgHpg ZQSpySJAAni57mjkzaRCMEEAb2k/fqMNDC0bbVHRMJ6rmrFF5JOZ+ltDNBCyKVBaZxsldzBO hW7VeZtCHh7ZirCUEOPS9jtY/nGNIC5fTgfahwxUjapSsQpHDJrAQk3Oh/Kt4wTuBFzwcnTx qt3ge7zVC1HWMyLPRKdRvsH0K9D+8zN7TiKGPjGI+Cc+efONRa9FOZeWHPTP79R0U9xiFiMm zqpH5DRkEs3vSyXSnS/zLP/2nhafCBnWsiu85I/myzqClMOJVzNwsT5mNsJU4dkg75UhqHP+ HS8UVVf013xmTvMLgDiV5ypQO+HsUpXxZ7jARERAA==
  • Ironport-hdrordr: A9a23:iNbysKkbAw+YZby64nQEDs2+MavpDfMeimdD5ihNYBxZY6Wkfp +V8cjzhCWftN9OYhodcIi7SdG9qADnhOVICOgqTPyftWzd1FdAQ7sSibcKrweAJ8S6zJ8l6U 4CSdk1NDSTNykcsS+S2mDRfLgdKZu8gcaVbIzlvhRQpHRRGsRdBnBCe2Sm+yNNJDVuNN4cLt 6x98BHrz2vdTA8dcKgHEQIWODFupniiI/mSQRuPW9q1CC+yReTrJLqGRmR2RkTFxlVx605zG TDmwvloo2+rvCAzAPG3WO71eUYpDKh8KoMOCW/sLlUFtzesHfqWG2nYczBgNkBmpDv1L/tqq iIn/5vBbU215qbRBDOnfKk4Xic7N9p0Q6u9bbQuwqeneXpAD09EMZPnoRfb1/Q7Fchpsh11O ZR03uerIc/N2K3oM3R3am9a/hRrDvCnZPiq59hs5VVa/pWVFaQl/1rwKpxKuZJIMvX0vFXLA BeNrCv2B8NSyLlU5nwhBge/DWDZAVNIiu7
  • Ironport-sdr: UQ8p2LR5tn+Kk8TxP1ZzDXvXlH1AdSAjqKyRvU9kGyT0vjqa9E58tMvHvxxZZD5sny7PF0AHM2 opprexNebWA1W9KI3+xaeTu4ljwQqmpIoYBjCWbfQJyECcNmY2F0MZWaM06o3qoj+R4CNe4uw1 HnPre1+iq8FgTqYM8M1roxsDimWzPy+OeK8OEy8MpNR5ZqG2hiTjE0kKPa8WqYksK71gvnoKFA DcwuEqNmEPw2v1EOz3/eh5X6jHd9gT9jSZdDukj19EtDH3iSnJ+GE5sphsTPDZqUK1FFr4SvNf w+g=
  • List-id: Xen developer discussion <xen-devel.lists.xenproject.org>

The legacy __xen_guest section doesn't support the PHYS32_ENTRY
elfnote, so it's pointless to attempt to parse the elfnotes from that
section when called from an hvm container.

Suggested-by: Jan Beulich <jbeulich@xxxxxxxx>
Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
---
Changes since v2:
 - New in this version.
---
 xen/common/libelf/libelf-dominfo.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/xen/common/libelf/libelf-dominfo.c 
b/xen/common/libelf/libelf-dominfo.c
index 69c94b6f3bb..abea1011c18 100644
--- a/xen/common/libelf/libelf-dominfo.c
+++ b/xen/common/libelf/libelf-dominfo.c
@@ -577,10 +577,8 @@ elf_errorstatus elf_xen_parse(struct elf_binary *elf,
 
     }
 
-    /*
-     * Finally fall back to the __xen_guest section.
-     */
-    if ( xen_elfnotes == 0 )
+    /* Finally fall back to the __xen_guest section for PV guests only. */
+    if ( xen_elfnotes == 0 && !hvm )
     {
         shdr = elf_shdr_by_name(elf, "__xen_guest");
         if ( ELF_HANDLE_VALID(shdr) )
-- 
2.31.1




 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.