From patchwork Mon May 10 10:16:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 433091 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp2759260jao; Mon, 10 May 2021 04:47:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwGktdglkwo0Ym06ElReiNh1TGh0NGRU0J9GJ0LOOvvy3AAUQFU+i/XJlO3+W6VYibaIO0/ X-Received: by 2002:a17:906:747:: with SMTP id z7mr25492774ejb.252.1620647251124; Mon, 10 May 2021 04:47:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620647251; cv=none; d=google.com; s=arc-20160816; b=nrb1og95dqWiJ7cez13+3jFi4w8zlmDy3uf9Z3gvcpXZdR2uiLHUPQa5jBZH4QuURa oQuo83ImReZxM69k7QIGaRjqY/Az7JYTiMD/K94K+eBBzws8OKkOVcwn0Kae52T3d693 5+BZ49SZCdkJxmVytV8MDcu6s0FA3+XAchAMsErChBoc5vz+KbPrF844vfCiWZywEmgR wDAB9N3AFen5fI5nLSu2RhTKeAHJfuqCs+IsJLNS4ud5xgDA7SboGr0cL5Axp8Xe3+Dy xgqug0CkehtEOW+2iWOUidpzY4dvhJ4yufVABZ8Qv4ltRBudSRAbj70ZcTVRe9wpXe3C 1FuA== 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=aAM8MwxLglDvQbbJW1BNBxbyZUuIQjlpOQKj7Zuq9qA=; b=K4PWcyl/4vcNs4DghuZUXaQrPq/PGBkjHN/fCqBFHxvKZ4W0T6wLAvJYFqRkLu/Ewg 1jw2ObFbIh4stLLk1mfRXBmLANuAyzOcI2xyccOtmDF7mC3i4i5LROrJ691/WUqviGiD MfmDtsGC9CvrR6Mko0fDgwZFaNCS+0ldUzLWM+g58tTfw3rJ3DUVh7T1XDGVphdG/H5g iA1+XWbgX9vuI66xEm+5nkw2+8bxNI58yLNDWwW+hrnFGHFuDujHwhXyJis/lxyoe23f HK0pq/ibXBVCdLPlSy9axUmlE/F6VTc/k15wmg8vkKAsVDBa5fhzGmor4wOvl0xk/3JU t4tg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=0F3+ISLE; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-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 r17si13500365edw.273.2021.05.10.04.47.30; Mon, 10 May 2021 04:47:31 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-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=0F3+ISLE; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-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 S237364AbhEJLOt (ORCPT + 12 others); Mon, 10 May 2021 07:14:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:46278 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236178AbhEJLHl (ORCPT ); Mon, 10 May 2021 07:07:41 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D44A661928; Mon, 10 May 2021 10:58:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620644325; bh=Ug7awv2zgEY/tKfDC97Qj8A85U8SPgOr1V5z8QO5iU4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0F3+ISLED7tfwQkOLvEcjp+y4wrX44dT7OIas0X/xwfoGcHnUTd/C0mG42ZeoOhT3 fPe31q3vblQkiDuFfBM0tFVexaLeKshzsiE8ZDifeg0Sj7s+BdQcepOa+8gBvphvm6 FxjE6BvY2cJngKK2ARurJMtu4mH2OixT4hAtzAQs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Loic Poulain , Bhaumik Bhatt , Manivannan Sadhasivam Subject: [PATCH 5.12 005/384] bus: mhi: pci_generic: Remove WQ_MEM_RECLAIM flag from state workqueue Date: Mon, 10 May 2021 12:16:34 +0200 Message-Id: <20210510102015.042260603@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510102014.849075526@linuxfoundation.org> References: <20210510102014.849075526@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Loic Poulain commit 0fccbf0a3b690b162f53b13ed8bc442ea33437dc upstream. A recent change created a dedicated workqueue for the state-change work with WQ_HIGHPRI (no strong reason for that) and WQ_MEM_RECLAIM flags, but the state-change work (mhi_pm_st_worker) does not guarantee forward progress under memory pressure, and will even wait on various memory allocations when e.g. creating devices, loading firmware, etc... The work is then not part of a memory reclaim path... Moreover, this causes a warning in check_flush_dependency() since we end up in code that flushes a non-reclaim workqueue: [ 40.969601] workqueue: WQ_MEM_RECLAIM mhi_hiprio_wq:mhi_pm_st_worker [mhi] is flushing !WQ_MEM_RECLAIM events_highpri:flush_backlog [ 40.969612] WARNING: CPU: 4 PID: 158 at kernel/workqueue.c:2607 check_flush_dependency+0x11c/0x140 [ 40.969733] Call Trace: [ 40.969740] __flush_work+0x97/0x1d0 [ 40.969745] ? wake_up_process+0x15/0x20 [ 40.969749] ? insert_work+0x70/0x80 [ 40.969750] ? __queue_work+0x14a/0x3e0 [ 40.969753] flush_work+0x10/0x20 [ 40.969756] rollback_registered_many+0x1c9/0x510 [ 40.969759] unregister_netdevice_queue+0x94/0x120 [ 40.969761] unregister_netdev+0x1d/0x30 [ 40.969765] mhi_net_remove+0x1a/0x40 [mhi_net] [ 40.969770] mhi_driver_remove+0x124/0x250 [mhi] [ 40.969776] device_release_driver_internal+0xf0/0x1d0 [ 40.969778] device_release_driver+0x12/0x20 [ 40.969782] bus_remove_device+0xe1/0x150 [ 40.969786] device_del+0x17b/0x3e0 [ 40.969791] mhi_destroy_device+0x9a/0x100 [mhi] [ 40.969796] ? mhi_unmap_single_use_bb+0x50/0x50 [mhi] [ 40.969799] device_for_each_child+0x5e/0xa0 [ 40.969804] mhi_pm_st_worker+0x921/0xf50 [mhi] Fixes: 8f7039787687 ("bus: mhi: core: Move to using high priority workqueue") Signed-off-by: Loic Poulain Reviewed-by: Bhaumik Bhatt Reviewed-by: Manivannan Sadhasivam Link: https://lore.kernel.org/r/1614161930-8513-1-git-send-email-loic.poulain@linaro.org Signed-off-by: Manivannan Sadhasivam Signed-off-by: Greg Kroah-Hartman --- drivers/bus/mhi/core/init.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/drivers/bus/mhi/core/init.c +++ b/drivers/bus/mhi/core/init.c @@ -901,8 +901,7 @@ int mhi_register_controller(struct mhi_c INIT_WORK(&mhi_cntrl->st_worker, mhi_pm_st_worker); init_waitqueue_head(&mhi_cntrl->state_event); - mhi_cntrl->hiprio_wq = alloc_ordered_workqueue - ("mhi_hiprio_wq", WQ_MEM_RECLAIM | WQ_HIGHPRI); + mhi_cntrl->hiprio_wq = alloc_ordered_workqueue("mhi_hiprio_wq", WQ_HIGHPRI); if (!mhi_cntrl->hiprio_wq) { dev_err(mhi_cntrl->cntrl_dev, "Failed to allocate workqueue\n"); ret = -ENOMEM;