From patchwork Mon Mar 16 21:47:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Igor Druzhinin X-Patchwork-Id: 11441471 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3A3E0139A for ; Mon, 16 Mar 2020 22:04:28 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 1525C20658 for ; Mon, 16 Mar 2020 22:04:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="Biji4/TE" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1525C20658 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jDxos-0003NQ-5s; Mon, 16 Mar 2020 22:02:46 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jDxoq-0003NL-Rf for xen-devel@lists.xenproject.org; Mon, 16 Mar 2020 22:02:44 +0000 X-Inumbo-ID: dc4cd5fe-67d1-11ea-bec1-bc764e2007e4 Received: from esa2.hc3370-68.iphmx.com (unknown [216.71.145.153]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id dc4cd5fe-67d1-11ea-bec1-bc764e2007e4; Mon, 16 Mar 2020 22:02:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1584396164; h=from:to:cc:subject:date:message-id:mime-version; bh=jKTki/G31UgKCX3Ft68R9/5dtTW8zSw+vNR/w36mdgU=; b=Biji4/TEvlg2fCcI7mRY5Xe+y4zgHW+hFg9RBcPznuLQkc7fMelZ0pOr X1AsWo4HUrUZFZMwwtXp/JVlMNIrytlxQS/c+Dw7bfafg2q0gvYiYwq0r aHw/pYFHAjxlGmnh8XNKS3KIJAg/UvSSb/ycXxGoKa4IkDzTGVxM4Nxsh 0=; Authentication-Results: esa2.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=igor.druzhinin@citrix.com; spf=Pass smtp.mailfrom=igor.druzhinin@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa2.hc3370-68.iphmx.com: no sender authenticity information available from domain of igor.druzhinin@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa2.hc3370-68.iphmx.com; envelope-from="igor.druzhinin@citrix.com"; x-sender="igor.druzhinin@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa2.hc3370-68.iphmx.com: domain of igor.druzhinin@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa2.hc3370-68.iphmx.com; envelope-from="igor.druzhinin@citrix.com"; x-sender="igor.druzhinin@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ip4:168.245.78.127 ~all" Received-SPF: None (esa2.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa2.hc3370-68.iphmx.com; envelope-from="igor.druzhinin@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: BlFOV5vJ8qEcsLaYJOuj9ixCzxEf226coyAHx3FRCQQJ8zlqWHdiTROqBZIWgBLtA38uChzpXk lQmCa87TtMTNYVpdn3sBsU1miThd6SR1ZuuZ9wLAAg6bix+q6xSFuvTZxbiXQHaxwy3+AB04op oIyZkxafzyi/i0HCvxcszNe8LACRapVSjwmA4kRYgrwccaDAqOQSkaGwmFSditcLbzjuVEJ+nC xbfQkfRy4qCrETqJ5eXY5ZMbMLyxFfuQRjWGdnOpo5+Vd9AKbOT2Cu2Zv1suf9rZWOzDabRMHo vjw= X-SBRS: 2.7 X-MesageID: 14069301 X-Ironport-Server: esa2.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.70,561,1574139600"; d="scan'208";a="14069301" From: Igor Druzhinin To: Date: Mon, 16 Mar 2020 21:47:44 +0000 Message-ID: <1584395264-22913-1-git-send-email-igor.druzhinin@citrix.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Subject: [Xen-devel] [PATCH] x86/shim: fix ballooning up the guest X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Igor Druzhinin , sstabellini@kernel.org, julien@xen.org, wl@xen.org, andrew.cooper3@citrix.com, ian.jackson@eu.citrix.com, george.dunlap@citrix.com, jbeulich@suse.com Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" args.preempted as meaningless here and doesn't show if the hypercall was preempted before. Use start_extent instead which is correct. Signed-off-by: Igor Druzhinin Reviewed-by: Roger Pau Monné --- This fixes ballooning for 64-bit PV guests inside shim. 32-bit PV guests require a little bit more work due to compat layer being involved. --- xen/common/memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index 444c081..5fdd2a2 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -1191,7 +1191,7 @@ long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) } #ifdef CONFIG_X86 - if ( pv_shim && op != XENMEM_decrease_reservation && !args.preempted ) + if ( pv_shim && op != XENMEM_decrease_reservation && !start_extent ) /* Avoid calling pv_shim_online_memory when preempted. */ pv_shim_online_memory(args.nr_extents, args.extent_order); #endif