From patchwork Sat Jan 11 09:49:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 234225 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=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable 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 BEA48C33CA5 for ; Sat, 11 Jan 2020 09:50:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 88B732082E for ; Sat, 11 Jan 2020 09:50:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578736259; bh=sgPoZuyrC/wmdnNYYIwRy3WGKs/xJNs/D6IS6/65TD0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=f6eFyJ/sIASS9QwzLVVU6GH4iVotXM8LTK8laViKdcAeUUYyZz8dBk2nCmk+huExf Gzq4swqPykuuavGxQmcr+nrjtWFYD0J3/YRN/dL8hm11suLolwWRGkBnuppL+fHbmC ipQhuZplUTuSsfLKAjP+poEA1dscOzDqMfvAfX7k= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728864AbgAKJuw (ORCPT ); Sat, 11 Jan 2020 04:50:52 -0500 Received: from mail.kernel.org ([198.145.29.99]:32964 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728789AbgAKJuv (ORCPT ); Sat, 11 Jan 2020 04:50:51 -0500 Received: from localhost (unknown [62.119.166.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4CF0A2082E; Sat, 11 Jan 2020 09:50:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578736251; bh=sgPoZuyrC/wmdnNYYIwRy3WGKs/xJNs/D6IS6/65TD0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=edULj/COvbgb5Tn892k/ZA6QqZZ+VgY18N9A1k3MWm0aVdYBy6+6Cta/xWdlDB+41 +lIySgc3+buy7O3vNOk+NdWt0IfAHuzDRE/uKU+e8d/4jDAgSeofp/Dutyof0kDsMH G8gbAZDdNqY5xch2wYTkvYAOpk/bJt7ynpUdp3Sk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nicholas Tsirakis , Juergen Gross , Boris Ostrovsky , Sasha Levin Subject: [PATCH 4.4 11/59] xen/balloon: fix ballooned page accounting without hotplug enabled Date: Sat, 11 Jan 2020 10:49:20 +0100 Message-Id: <20200111094839.923105101@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200111094835.417654274@linuxfoundation.org> References: <20200111094835.417654274@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 cfab1d24e4bc..1c789056e7e8 100644 --- a/drivers/xen/balloon.c +++ b/drivers/xen/balloon.c @@ -392,7 +392,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 */