From patchwork Mon Apr 16 16:29:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 152933 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D743CB700D for ; Tue, 17 Apr 2012 02:33:15 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752394Ab2DPQdO (ORCPT ); Mon, 16 Apr 2012 12:33:14 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:52165 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750735Ab2DPQdN (ORCPT ); Mon, 16 Apr 2012 12:33:13 -0400 Received: by mail-pb0-f46.google.com with SMTP id un15so6539626pbc.19 for ; Mon, 16 Apr 2012 09:33:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=6i0iDF16k72zt3F+ayhljSnN5gohbIp5XvbSV9XrkUc=; b=oU+rdu4Hi7Aq5bxIkZSoQtePzuEBX4qSiUX+AMxp5MD3+k5hxewnQWKauV6X2psQyv 9aBj47p7kJ/hGNWwBGOUnIOWsuAmXjRPiGGsG2gYO9LvuBXe8SYZqkhaaR23luhPJeZm 2v/n0bnk73XJ6BTlc0J71kpfe5V7FDktX1l/cL6KGwFHOsJ/ICdcb/ZCunAsXCqnzsDt xaLQ4YcA9yzGYH/po8JLFHQ9N1ydL282EzETj76AIMVAZaLCa9TOsnTNsNpsbnqUFZi7 3TWKFzt7OVO/hO7P14oce9UQ1v8KlKXcviM9rTyYJlrag/ZUcesSlLYKxH8RjTPDnDgL kRYQ== Received: by 10.68.220.99 with SMTP id pv3mr28784672pbc.53.1334593993533; Mon, 16 Apr 2012 09:33:13 -0700 (PDT) Received: from localhost.localdomain ([221.221.22.162]) by mx.google.com with ESMTPS id v1sm18106794pbk.10.2012.04.16.09.33.06 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 16 Apr 2012 09:33:12 -0700 (PDT) From: Jiang Liu To: Yinghai Lu , Kenji Kaneshige , Bjorn Helgaas , Dan Zink , Greg Kroah-Hartman , Dely Sy Cc: Jiang Liu , Jiang Liu , Keping Chen , linux-pci@vger.kernel.org Subject: [PATCH RFC 09/17] PCI: correctly flush workqueues and timer when destroy SHPC controller Date: Tue, 17 Apr 2012 00:29:03 +0800 Message-Id: <1334593751-5916-10-git-send-email-jiang.liu@huawei.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1334593751-5916-1-git-send-email-jiang.liu@huawei.com> References: <1334593751-5916-1-git-send-email-jiang.liu@huawei.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org del_timer() only deactivates a timer but doesn't wait for the handler to finish, so use del_timer_sync() to deactivate a timer and wait for the handler to finish in hpc_release_ctrl(). This patch also tune the workqueue flush logic to correctly flush all work items. Signed-off-by: Jiang Liu --- drivers/pci/hotplug/shpchp_core.c | 2 +- drivers/pci/hotplug/shpchp_hpc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pci/hotplug/shpchp_core.c b/drivers/pci/hotplug/shpchp_core.c index aaa66be..19762b3 100644 --- a/drivers/pci/hotplug/shpchp_core.c +++ b/drivers/pci/hotplug/shpchp_core.c @@ -173,8 +173,8 @@ void cleanup_slots(struct controller *ctrl) list_for_each_safe(tmp, next, &ctrl->slot_list) { slot = list_entry(tmp, struct slot, slot_list); list_del(&slot->slot_list); - cancel_delayed_work(&slot->work); flush_workqueue(shpchp_wq); + cancel_delayed_work_sync(&slot->work); flush_workqueue(shpchp_ordered_wq); pci_hp_deregister(slot->hotplug_slot); } diff --git a/drivers/pci/hotplug/shpchp_hpc.c b/drivers/pci/hotplug/shpchp_hpc.c index 2bc6182..ff63887 100644 --- a/drivers/pci/hotplug/shpchp_hpc.c +++ b/drivers/pci/hotplug/shpchp_hpc.c @@ -593,7 +593,7 @@ static void hpc_release_ctlr(struct controller *ctrl) } if (shpchp_poll_mode) - del_timer(&ctrl->poll_timer); + del_timer_sync(&ctrl->poll_timer); else { free_irq(ctrl->pci_dev->irq, ctrl); pci_disable_msi(ctrl->pci_dev);