From patchwork Tue Jan 10 07:38:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 135160 X-Patchwork-Delegate: davem@davemloft.net 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 9FD72B6F7E for ; Tue, 10 Jan 2012 18:38:39 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752353Ab2AJHii (ORCPT ); Tue, 10 Jan 2012 02:38:38 -0500 Received: from mga02.intel.com ([134.134.136.20]:64286 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752011Ab2AJHih (ORCPT ); Tue, 10 Jan 2012 02:38:37 -0500 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 09 Jan 2012 23:38:37 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.67,351,1309762800"; d="scan'208";a="96396749" Received: from dwillia2-linux.jf.intel.com (HELO dwillia2-linux.localdomain) ([10.23.45.73]) by orsmga002.jf.intel.com with ESMTP; 09 Jan 2012 23:38:36 -0800 Received: from localhost6.localdomain6 (localhost.localdomain [127.0.0.1]) by dwillia2-linux.localdomain (Postfix) with ESMTP id E5D13500248; Mon, 9 Jan 2012 23:38:36 -0800 (PST) Subject: [PATCH v4 2/2] libsas: feed the scsi_block_when_processing_errors() meter To: linux-scsi@vger.kernel.org From: Dan Williams Cc: linux-ide@vger.kernel.org, Abraham Carranza , jack_wang@usish.com Date: Mon, 09 Jan 2012 23:38:36 -0800 Message-ID: <20120110073836.4563.85860.stgit@localhost6.localdomain6> In-Reply-To: <20120110073647.4563.7504.stgit@localhost6.localdomain6> References: <20120110073647.4563.7504.stgit@localhost6.localdomain6> User-Agent: StGit/0.15-7-g9bfb-dirty MIME-Version: 1.0 Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org This is called per-sdev but in the sas-transport case this waits for the entire domain to recover which is never guaranteed to be less than 120 seconds with libata taking nearly a minute per-device to recover. Ping the waitqueue so that the hung task timer knows we're still making progress. Reported-by: Abraham Carranza Signed-off-by: Dan Williams --- drivers/scsi/libsas/sas_ata.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c index 37a9e73..a062adc 100644 --- a/drivers/scsi/libsas/sas_ata.c +++ b/drivers/scsi/libsas/sas_ata.c @@ -663,6 +663,11 @@ static void async_sas_ata_eh(void *data, async_cookie_t cookie) ata_port_printk(ap, KERN_DEBUG, "sas eh calling libata port error handler"); ata_scsi_port_error_handler(ha->core.shost, ap); + + /* tell scsi_block_when_processing_errors() waiters that we are + * still making forward progress + */ + wake_up(&ha->core.shost->host_wait); } void sas_ata_strategy_handler(struct Scsi_Host *shost)