From owner-freebsd-bugs@FreeBSD.ORG Wed Jul 18 16:10:04 2012 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 141D2106566B for ; Wed, 18 Jul 2012 16:10:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id DA6688FC19 for ; Wed, 18 Jul 2012 16:10:03 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q6IGA3ok062480 for ; Wed, 18 Jul 2012 16:10:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q6IGA3jL062479; Wed, 18 Jul 2012 16:10:03 GMT (envelope-from gnats) Resent-Date: Wed, 18 Jul 2012 16:10:03 GMT Resent-Message-Id: <201207181610.q6IGA3jL062479@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Steven Hartland Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A125D106564A for ; Wed, 18 Jul 2012 16:06:02 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 8C3D88FC0A for ; Wed, 18 Jul 2012 16:06:02 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q6IG62Z3050983 for ; Wed, 18 Jul 2012 16:06:02 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id q6IG62hq050977; Wed, 18 Jul 2012 16:06:02 GMT (envelope-from nobody) Message-Id: <201207181606.q6IG62hq050977@red.freebsd.org> Date: Wed, 18 Jul 2012 16:06:02 GMT From: Steven Hartland To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: kern/169976: Patch to make scsi_da use sysctl values where appropriate X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jul 2012 16:10:04 -0000 >Number: 169976 >Category: kern >Synopsis: Patch to make scsi_da use sysctl values where appropriate >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Wed Jul 18 16:10:03 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Steven Hartland >Release: 8.3-RELEASE >Organization: Multiplay >Environment: FreeBSD build 8.3-RELEASE-p3 FreeBSD 8.3-RELEASE-p3 #3: Tue Jul 3 13:16:31 UTC 2012 root@build:/usr/obj/usr/src/sys/MULTIPLAY amd64 >Description: Changed scsi_da device requests to use the sysctl tunable value for retry_count and da_default_timeout where their current hardcoded values matched the current default value for said tunables. >How-To-Repeat: N/A >Fix: Apply the attached patch Patch attached with submission follows: Changed scsi_da device requests to use the sysctl tunable value for retry_count and da_default_timeout where their current hardcoded values matched the current default value for said tunables. --- sys/cam/scsi/scsi_da.c.orig2 2012-07-18 15:58:29.821055604 +0000 +++ sys/cam/scsi/scsi_da.c 2012-07-18 16:00:39.591128067 +0000 @@ -1955,7 +1955,7 @@ } csio = &start_ccb->csio; scsi_read_capacity(csio, - /*retries*/4, + /*retries*/da_retry_count, dadone, MSG_SIMPLE_Q_TAG, rcap, @@ -1980,7 +1980,7 @@ } csio = &start_ccb->csio; scsi_read_capacity_16(csio, - /*retries*/ 4, + /*retries*/ da_retry_count, /*cbfcnp*/ dadone, /*tag_action*/ MSG_SIMPLE_Q_TAG, /*lba*/ 0, @@ -1989,7 +1989,7 @@ /*rcap_buf*/ (uint8_t *)rcaplong, /*rcap_buf_len*/ sizeof(*rcaplong), /*sense_len*/ SSD_FULL_SIZE, - /*timeout*/ 60000); + /*timeout*/ da_default_timeout * 1000); start_ccb->ccb_h.ccb_bp = NULL; start_ccb->ccb_h.ccb_state = DA_CCB_PROBE2; xpt_action(start_ccb); >Release-Note: >Audit-Trail: >Unformatted: