From nobody Sun May 5 05:41:51 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; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1623672967; cv=none; d=zohomail.com; s=zohoarc; b=kwGNNuk63m3OLDjfpxBDBGJvGAvmlotizKPMcflxM8CV6jy6O2EpIEQIzxD0EHsLugYzcgfnAx2xNiR8/2AfuLgk4Nh5r9YwTDZuV6SAA/ZysUYpO/8wqc5A9VDvBtRapm4T9qfBFCx/75ORFDAe6Olv/XL9MGNJ1j4WtsFzec0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623672967; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=elzLLQaqzlfR2T6/kM01JMbhSI9GLF0Dqtml7Q+JSkU=; b=UjBqY09N8MXWRnG6HByhrySCnHxE+cFGDfglhcBVy++QWBLiEwxpqczsujE+tFpcQPybgVXVZ4vynfgUWBTgfnP4YUEomTBD+IR9YMB4H1KsWC0gALLzADzFWG6HtmK11bxIoQPzR/Xdnk6nefa7ZrWmf2Eo0Ruvw8Wmn2FzC40= ARC-Authentication-Results: i=1; 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; 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 1623672967030498.3010933564551; Mon, 14 Jun 2021 05:16:07 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.141390.261171 (Exim 4.92) (envelope-from ) id 1lslVF-00013F-OB; Mon, 14 Jun 2021 12:15:41 +0000 Received: by outflank-mailman (output) from mailman id 141390.261171; Mon, 14 Jun 2021 12:15:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lslVF-000138-LH; Mon, 14 Jun 2021 12:15:41 +0000 Received: by outflank-mailman (input) for mailman id 141390; Mon, 14 Jun 2021 12:15:40 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lslVE-000132-MG for xen-devel@lists.xenproject.org; Mon, 14 Jun 2021 12:15:40 +0000 Received: from smtp-out1.suse.de (unknown [195.135.220.28]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id dd206d09-1a52-4b1f-a65a-d6a7e8ae601f; Mon, 14 Jun 2021 12:15:39 +0000 (UTC) Received: from imap.suse.de (imap-alt.suse-dmz.suse.de [192.168.254.47]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id C0C7B2196B; Mon, 14 Jun 2021 12:15:38 +0000 (UTC) Received: from imap3-int (imap-alt.suse-dmz.suse.de [192.168.254.47]) by imap.suse.de (Postfix) with ESMTP id 8E8D9118DD; Mon, 14 Jun 2021 12:15:38 +0000 (UTC) Received: from director2.suse.de ([192.168.254.72]) by imap3-int with ESMTPSA id 8DmmIWpIx2CULgAALh3uQQ (envelope-from ); Mon, 14 Jun 2021 12:15:38 +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: dd206d09-1a52-4b1f-a65a-d6a7e8ae601f DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1623672938; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=elzLLQaqzlfR2T6/kM01JMbhSI9GLF0Dqtml7Q+JSkU=; b=ZPvvGamiD8C6r2JotsvBU2enNZy+9TTIYPHpP+ShmHu6ZrKP163mfavFF1osDd3/gyl8yL AbiRCqXheHaKZ9cS3wQYQKtvOH2R9PPnCCiMXcXxeKdUEOruz5GJiMIv9dLwKppWXO+r7g XQg/v6NogF+2wCrDL1HisopYxAI6Dv8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1623672938; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=elzLLQaqzlfR2T6/kM01JMbhSI9GLF0Dqtml7Q+JSkU=; b=ZPvvGamiD8C6r2JotsvBU2enNZy+9TTIYPHpP+ShmHu6ZrKP163mfavFF1osDd3/gyl8yL AbiRCqXheHaKZ9cS3wQYQKtvOH2R9PPnCCiMXcXxeKdUEOruz5GJiMIv9dLwKppWXO+r7g XQg/v6NogF+2wCrDL1HisopYxAI6Dv8= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Ian Jackson , Wei Liu Subject: [PATCH] tools/libs/guest: revert fix max_pfn setting in map_p2m() Date: Mon, 14 Jun 2021 14:15:36 +0200 Message-Id: <20210614121536.5288-1-jgross@suse.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) Content-Type: text/plain; charset="utf-8" The reasoning for commit 7bd8989ab77b6a ("tools/libs/guest: fix max_pfn setting in map_p2m()") was wrong. The max_pfn field in shared_info is misnamed, it has the semantics of num_pfns, which is hidden at least partially in Linux, as the kernel is (wrongly) treating it like the highest used pfn in some places. So revert above commit. Fixes: 7bd8989ab77b6a ("tools/libs/guest: fix max_pfn setting in map_p2m()") Signed-off-by: Juergen Gross --- tools/libs/guest/xg_sr_save_x86_pv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libs/guest/xg_sr_save_x86_pv.c b/tools/libs/guest/xg_sr_= save_x86_pv.c index dae7f2817f..4964f1f7b8 100644 --- a/tools/libs/guest/xg_sr_save_x86_pv.c +++ b/tools/libs/guest/xg_sr_save_x86_pv.c @@ -468,7 +468,7 @@ static int map_p2m(struct xc_sr_context *ctx) =20 ctx->x86.pv.p2m_generation =3D ~0ULL; ctx->x86.pv.max_pfn =3D GET_FIELD(ctx->x86.pv.shinfo, arch.max_pfn, - ctx->x86.pv.width); + ctx->x86.pv.width) - 1; p2m_cr3 =3D GET_FIELD(ctx->x86.pv.shinfo, arch.p2m_cr3, ctx->x86.pv.wi= dth); =20 return p2m_cr3 ? map_p2m_list(ctx, p2m_cr3) : map_p2m_tree(ctx); --=20 2.26.2