From owner-svn-src-all@FreeBSD.ORG Wed Aug 14 15:50:35 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 03EB063A; Wed, 14 Aug 2013 15:50:35 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E4F5923C0; Wed, 14 Aug 2013 15:50:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7EFoYTi018214; Wed, 14 Aug 2013 15:50:34 GMT (envelope-from sbruno@svn.freebsd.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7EFoYhk018213; Wed, 14 Aug 2013 15:50:34 GMT (envelope-from sbruno@svn.freebsd.org) Message-Id: <201308141550.r7EFoYhk018213@svn.freebsd.org> From: Sean Bruno Date: Wed, 14 Aug 2013 15:50:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r254330 - head/sys/dev/mfi X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Aug 2013 15:50:35 -0000 Author: sbruno Date: Wed Aug 14 15:50:34 2013 New Revision: 254330 URL: http://svnweb.freebsd.org/changeset/base/254330 Log: If sys/param.h MAXPHYS has been tuned to exceed MFI_MAXPHYS, the mfi(4) real JBOD mode (SYS PD) would fail fairly reliably during I/O. Steal the mfi_disk.c check for this condition (indirectly) when establishing d_maxsize. Reviewed by: ambrisko@ MFC after: 4 weeks Sponsored by: Yahoo! Inc. Modified: head/sys/dev/mfi/mfi_syspd.c Modified: head/sys/dev/mfi/mfi_syspd.c ============================================================================== --- head/sys/dev/mfi/mfi_syspd.c Wed Aug 14 15:18:28 2013 (r254329) +++ head/sys/dev/mfi/mfi_syspd.c Wed Aug 14 15:50:34 2013 (r254330) @@ -126,7 +126,8 @@ mfi_syspd_attach(device_t dev) sectors / (1024 * 1024 / secsize), sectors, sc->pd_id); sc->pd_disk = disk_alloc(); sc->pd_disk->d_drv1 = sc; - sc->pd_disk->d_maxsize = sc->pd_controller->mfi_max_io * secsize; + sc->pd_disk->d_maxsize = min(sc->pd_controller->mfi_max_io * secsize, + (sc->pd_controller->mfi_max_sge - 1) * PAGE_SIZE); sc->pd_disk->d_name = "mfisyspd"; sc->pd_disk->d_open = mfi_syspd_open; sc->pd_disk->d_close = mfi_syspd_close;