Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp4137557pxb; Mon, 27 Sep 2021 10:08:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx7VLOQrzAbnung1PLIV9/Zc62EM0V9M6CspmV9WPa8LWTRQb2QOJHgJY4Ei+MZ0EozdZ8Z X-Received: by 2002:a17:902:b188:b029:11b:1549:da31 with SMTP id s8-20020a170902b188b029011b1549da31mr575506plr.7.1632762536399; Mon, 27 Sep 2021 10:08:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632762536; cv=none; d=google.com; s=arc-20160816; b=P2Hs6Rpyy/YjL144OgQI2zbE7KyiFXdjvpHYjxUbombi6r57ksNoutWlIsJITGIymj WR5X9hHsvGDTmhRjMvIfgm66TUEOVKkp9Wl1wDokmYeFjwPxArV+QJobOLzyFJfZtgAA gcg1v0rO2YbglkNmKaiBuzx/AsJIA0ASSM81niA0IGuxM++UtcDot9m4mXhEIVmRRIZC jo3pmt4wBKE+2R+v/TOHgs67bKVQwouT+e0kDcz6P/CEin3seChu/ACtuncRgOAqxBLQ Zb19Iz0AK34dKvPZv1Zce1tM4NolLp2zH3t49pK6MhoggiicHfqfK9IqB/SuH33hbQtz 5scg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=DpkqWp3gx/KDHfzYeVGcyDVURXFvriqgPgKt8fu7Sxs=; b=FpWxUgzCEdkOcVoRT2Vwn3uFg2JgmLV7V7pSbLojjfV4gTwXgwKfgei2J/JSfoIs5y RKFX9ZO4PqClNLXtgznYfbEOwmllitzynCrXySaY9Xl62bvLDWy8ahWaWVkwJlUz71yy OsXBsvJlb1eLRfAULqJYXirqQW8OR6zOAbPOuS8c0nYggOLuAkEuzZhw2AfDwAXrHXyc ANxrYE6JB4eMGtX+v9uHhqT+a5cDYEsQpTgAGpx3wYbnb4ruhwTcrlOq+PwPZ4Pqau6p SmXhzUrWgmDpw7rufZbcwwtSrRekh+3esh9gLyChYLqc5YK9jwgwyux9U2wPYPR0EQ+6 gVfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=il2N1b2F; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e5si23679720plj.4.2021.09.27.10.08.44; Mon, 27 Sep 2021 10:08:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=il2N1b2F; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235739AbhI0RJi (ORCPT + 99 others); Mon, 27 Sep 2021 13:09:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:47286 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236067AbhI0RIS (ORCPT ); Mon, 27 Sep 2021 13:08:18 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E344361209; Mon, 27 Sep 2021 17:06:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1632762393; bh=Br7I8jh0vYqo0ADuAblnJBfEBhSDFyUJx+kqXOR5OJU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=il2N1b2F9BLTINv09g7OG59VqFZYkLesiiIiEgaXgAvdALdtwyD86ZqywMuoCKzMt 269nzioBiet3xodFWsiuMrNmq61Pjlv2mguED7aGTMMa7Taskk0b5xJQP6B38gm7Xe hmNo8UJfwfrns3MYYv6UYQGtcBSxaoxjiiigJ79I= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Juergen Gross , Boris Ostrovsky Subject: [PATCH 5.4 67/68] xen/balloon: fix balloon kthread freezing Date: Mon, 27 Sep 2021 19:03:03 +0200 Message-Id: <20210927170222.284725804@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210927170219.901812470@linuxfoundation.org> References: <20210927170219.901812470@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Juergen Gross commit 96f5bd03e1be606987644b71899ea56a8d05f825 upstream. Commit 8480ed9c2bbd56 ("xen/balloon: use a kernel thread instead a workqueue") switched the Xen balloon driver to use a kernel thread. Unfortunately the patch omitted to call try_to_freeze() or to use wait_event_freezable_timeout(), causing a system suspend to fail. Fixes: 8480ed9c2bbd56 ("xen/balloon: use a kernel thread instead a workqueue") Signed-off-by: Juergen Gross Reviewed-by: Boris Ostrovsky Link: https://lore.kernel.org/r/20210920100345.21939-1-jgross@suse.com Signed-off-by: Juergen Gross Signed-off-by: Greg Kroah-Hartman --- drivers/xen/balloon.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/xen/balloon.c +++ b/drivers/xen/balloon.c @@ -539,8 +539,8 @@ static int balloon_thread(void *unused) timeout = 3600 * HZ; credit = current_credit(); - wait_event_interruptible_timeout(balloon_thread_wq, - balloon_thread_cond(state, credit), timeout); + wait_event_freezable_timeout(balloon_thread_wq, + balloon_thread_cond(state, credit), timeout); if (kthread_should_stop()) return 0;