From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F0F84C43603 for ; Fri, 20 Dec 2019 14:38:17 +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 C593E222C2 for ; Fri, 20 Dec 2019 14:38:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="yJWcNXqm" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C593E222C2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none 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 1iiJPq-0006hd-VJ; Fri, 20 Dec 2019 14:38:06 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iiJPp-0006gk-53 for xen-devel@lists.xenproject.org; Fri, 20 Dec 2019 14:38:05 +0000 X-Inumbo-ID: 54bdfd50-2336-11ea-88e7-bc764e2007e4 Received: from mail.kernel.org (unknown [198.145.29.99]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 54bdfd50-2336-11ea-88e7-bc764e2007e4; Fri, 20 Dec 2019 14:38:04 +0000 (UTC) Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8D31424687; Fri, 20 Dec 2019 14:38:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576852684; bh=adaLURxApglgsLOtk86MPjGKplHMQiooho1DTqM7f8M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yJWcNXqm9lZP5BRS7I5XTzSEQpzH2u+biDhkH6H20/uJIv6YaCusPk3LcWkzp4Rlk L3vIhtZfNrMbHATNGY1FZO/xom1bEHqQlHyiS0WPgxHh9fVLXs/uLCbBAcsStJKHZ3 hXSdGpZ8SfEgUPoDLv1stefHc3PH5/fRDGc/fTvg= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Date: Fri, 20 Dec 2019 09:37:39 -0500 Message-Id: <20191220143741.10220-18-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191220143741.10220-1-sashal@kernel.org> References: <20191220143741.10220-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Subject: [Xen-devel] [PATCH AUTOSEL 4.14 18/19] xen/balloon: fix ballooned page accounting without hotplug enabled 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: Juergen Gross , Sasha Levin , Boris Ostrovsky , xen-devel@lists.xenproject.org, Nicholas Tsirakis Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" RnJvbTogSnVlcmdlbiBHcm9zcyA8amdyb3NzQHN1c2UuY29tPgoKWyBVcHN0cmVhbSBjb21taXQg YzY3M2VjNjFhZGU4OWJmMmY0MTc5NjBmOTg2YmMyNTY3MTc2MmVmYiBdCgpXaGVuIENPTkZJR19Y RU5fQkFMTE9PTl9NRU1PUllfSE9UUExVRyBpcyBub3QgZGVmaW5lZApyZXNlcnZlX2FkZGl0aW9u YWxfbWVtb3J5KCkgd2lsbCBzZXQgYmFsbG9vbl9zdGF0cy50YXJnZXRfcGFnZXMgdG8gYQp3cm9u ZyB2YWx1ZSBpbiBjYXNlIHRoZXJlIGFyZSBzdGlsbCBzb21lIGJhbGxvb25lZCBwYWdlcyBhbGxv Y2F0ZWQgdmlhCmFsbG9jX3hlbmJhbGxvb25lZF9wYWdlcygpLgoKVGhpcyB3aWxsIHJlc3VsdCBp biBiYWxsb29uX3Byb2Nlc3MoKSBubyBsb25nZXIgYmUgdHJpZ2dlcmVkIHdoZW4KYmFsbG9vbmVk IHBhZ2VzIGFyZSBmcmVlZCBpbiBiYXRjaGVzLgoKUmVwb3J0ZWQtYnk6IE5pY2hvbGFzIFRzaXJh a2lzIDxuaWtvLnRzaXJha2lzQGdtYWlsLmNvbT4KU2lnbmVkLW9mZi1ieTogSnVlcmdlbiBHcm9z cyA8amdyb3NzQHN1c2UuY29tPgpSZXZpZXdlZC1ieTogQm9yaXMgT3N0cm92c2t5IDxib3Jpcy5v c3Ryb3Zza3lAb3JhY2xlLmNvbT4KU2lnbmVkLW9mZi1ieTogSnVlcmdlbiBHcm9zcyA8amdyb3Nz QHN1c2UuY29tPgpTaWduZWQtb2ZmLWJ5OiBTYXNoYSBMZXZpbiA8c2FzaGFsQGtlcm5lbC5vcmc+ Ci0tLQogZHJpdmVycy94ZW4vYmFsbG9vbi5jIHwgMyArKy0KIDEgZmlsZSBjaGFuZ2VkLCAyIGlu c2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL3hlbi9iYWxs b29uLmMgYi9kcml2ZXJzL3hlbi9iYWxsb29uLmMKaW5kZXggNzFhNmRlZWI0ZTcxNC4uM2Y5MjYw YWY3MDFmMCAxMDA2NDQKLS0tIGEvZHJpdmVycy94ZW4vYmFsbG9vbi5jCisrKyBiL2RyaXZlcnMv eGVuL2JhbGxvb24uYwpAQCAtNDAxLDcgKzQwMSw4IEBAIHN0YXRpYyBzdHJ1Y3Qgbm90aWZpZXJf YmxvY2sgeGVuX21lbW9yeV9uYiA9IHsKICNlbHNlCiBzdGF0aWMgZW51bSBicF9zdGF0ZSByZXNl cnZlX2FkZGl0aW9uYWxfbWVtb3J5KHZvaWQpCiB7Ci0JYmFsbG9vbl9zdGF0cy50YXJnZXRfcGFn ZXMgPSBiYWxsb29uX3N0YXRzLmN1cnJlbnRfcGFnZXM7CisJYmFsbG9vbl9zdGF0cy50YXJnZXRf cGFnZXMgPSBiYWxsb29uX3N0YXRzLmN1cnJlbnRfcGFnZXMgKworCQkJCSAgICAgYmFsbG9vbl9z dGF0cy50YXJnZXRfdW5wb3B1bGF0ZWQ7CiAJcmV0dXJuIEJQX0VDQU5DRUxFRDsKIH0KICNlbmRp ZiAvKiBDT05GSUdfWEVOX0JBTExPT05fTUVNT1JZX0hPVFBMVUcgKi8KLS0gCjIuMjAuMQoKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBt YWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMu eGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 025F1C43603 for ; Fri, 20 Dec 2019 14:38:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C3606222C2 for ; Fri, 20 Dec 2019 14:38:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576852693; bh=adaLURxApglgsLOtk86MPjGKplHMQiooho1DTqM7f8M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=CjYUke0JD5qG7/8IijAEh6dsRy5LTqIXKzOEtrplLOBbJ+OtDHoGTzR7GmtY+0hMH HYPZG6MhJ3MycWhKPVL7g6QIRCIALX72RNC6YLGMDi1kxgguan0Z21pgj92I3+PxfY 4F8IXDPtsK5/9r/g6o+y/kXW/ff3WTfN/z0xw//4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728442AbfLTOiI (ORCPT ); Fri, 20 Dec 2019 09:38:08 -0500 Received: from mail.kernel.org ([198.145.29.99]:42248 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728400AbfLTOiE (ORCPT ); Fri, 20 Dec 2019 09:38:04 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8D31424687; Fri, 20 Dec 2019 14:38:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576852684; bh=adaLURxApglgsLOtk86MPjGKplHMQiooho1DTqM7f8M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yJWcNXqm9lZP5BRS7I5XTzSEQpzH2u+biDhkH6H20/uJIv6YaCusPk3LcWkzp4Rlk L3vIhtZfNrMbHATNGY1FZO/xom1bEHqQlHyiS0WPgxHh9fVLXs/uLCbBAcsStJKHZ3 hXSdGpZ8SfEgUPoDLv1stefHc3PH5/fRDGc/fTvg= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Juergen Gross , Nicholas Tsirakis , Boris Ostrovsky , Sasha Levin , xen-devel@lists.xenproject.org Subject: [PATCH AUTOSEL 4.14 18/19] xen/balloon: fix ballooned page accounting without hotplug enabled Date: Fri, 20 Dec 2019 09:37:39 -0500 Message-Id: <20191220143741.10220-18-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191220143741.10220-1-sashal@kernel.org> References: <20191220143741.10220-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Juergen Gross [ Upstream commit c673ec61ade89bf2f417960f986bc25671762efb ] When CONFIG_XEN_BALLOON_MEMORY_HOTPLUG is not defined reserve_additional_memory() will set balloon_stats.target_pages to a wrong value in case there are still some ballooned pages allocated via alloc_xenballooned_pages(). This will result in balloon_process() no longer be triggered when ballooned pages are freed in batches. Reported-by: Nicholas Tsirakis Signed-off-by: Juergen Gross Reviewed-by: Boris Ostrovsky Signed-off-by: Juergen Gross Signed-off-by: Sasha Levin --- drivers/xen/balloon.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c index 71a6deeb4e714..3f9260af701f0 100644 --- a/drivers/xen/balloon.c +++ b/drivers/xen/balloon.c @@ -401,7 +401,8 @@ static struct notifier_block xen_memory_nb = { #else static enum bp_state reserve_additional_memory(void) { - balloon_stats.target_pages = balloon_stats.current_pages; + balloon_stats.target_pages = balloon_stats.current_pages + + balloon_stats.target_unpopulated; return BP_ECANCELED; } #endif /* CONFIG_XEN_BALLOON_MEMORY_HOTPLUG */ -- 2.20.1