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=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 D9B80C433DF for ; Mon, 17 Aug 2020 17:20:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B7269206FA for ; Mon, 17 Aug 2020 17:20:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597684818; bh=5GDMueqNpv673QiI73sCw3/yXTsCns+lReg0nfYIfr0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=pgcpCyvgMsaC3uhrECX2W1Uxi1cFICYSvimxsSCgMjJMnpae4/7bf6PbpHK12p+mR TJhliRxdzdW3NJv6fuQeCkyEaNXk2E3AQeF3AcKwrM2I1yz7I4fsxEV8Ab/n4GSSWp RDbb6dai/D5bG/OZSe+IDRzfGyGIgY2USz7mwXzw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731442AbgHQRUR (ORCPT ); Mon, 17 Aug 2020 13:20:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:55382 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730516AbgHQQSJ (ORCPT ); Mon, 17 Aug 2020 12:18:09 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 15A7C20748; Mon, 17 Aug 2020 16:18:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597681082; bh=5GDMueqNpv673QiI73sCw3/yXTsCns+lReg0nfYIfr0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eqXWVdPskUXwJZeF6kteYFPrziS4rx3lrXdE+up9qeQF8lN1OuCzjdojRnqbn4OCj 6IU7cSsCyxdmesskzGsSya1HK3EjGy+WKUDOFmfRK1+1XtFf3iO7XXCZ5WR0W7Xl+H PdaWjDSu+kPYgD9XOUutZ7qLxRZ1J0RuADXesHK8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Juergen Gross Subject: [PATCH 4.19 167/168] xen/balloon: make the balloon wait interruptible Date: Mon, 17 Aug 2020 17:18:18 +0200 Message-Id: <20200817143742.005274869@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143733.692105228@linuxfoundation.org> References: <20200817143733.692105228@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Roger Pau Monne commit 88a479ff6ef8af7f07e11593d58befc644244ff7 upstream. So it can be killed, or else processes can get hung indefinitely waiting for balloon pages. Signed-off-by: Roger Pau Monné Reviewed-by: Juergen Gross Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20200727091342.52325-3-roger.pau@citrix.com Signed-off-by: Juergen Gross Signed-off-by: Greg Kroah-Hartman --- drivers/xen/balloon.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/drivers/xen/balloon.c +++ b/drivers/xen/balloon.c @@ -570,11 +570,13 @@ static int add_ballooned_pages(int nr_pa if (xen_hotplug_unpopulated) { st = reserve_additional_memory(); if (st != BP_ECANCELED) { + int rc; + mutex_unlock(&balloon_mutex); - wait_event(balloon_wq, + rc = wait_event_interruptible(balloon_wq, !list_empty(&ballooned_pages)); mutex_lock(&balloon_mutex); - return 0; + return rc ? -ENOMEM : 0; } }