From owner-svn-src-stable-8@FreeBSD.ORG Wed Jan 5 12:45:12 2011 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1D666106566B; Wed, 5 Jan 2011 12:45:12 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E5D2E8FC14; Wed, 5 Jan 2011 12:45:11 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p05CjBTK078460; Wed, 5 Jan 2011 12:45:11 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p05CjBNx078458; Wed, 5 Jan 2011 12:45:11 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201101051245.p05CjBNx078458@svn.freebsd.org> From: Konstantin Belousov Date: Wed, 5 Jan 2011 12:45:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217002 - stable/8/sys/dev/md X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Jan 2011 12:45:12 -0000 Author: kib Date: Wed Jan 5 12:45:11 2011 New Revision: 217002 URL: http://svn.freebsd.org/changeset/base/217002 Log: MFC r216793: Add sysctl vm.md_malloc_wait, non-zero value of which switches malloc-backed md(4) to using M_WAITOK malloc calls. Modified: stable/8/sys/dev/md/md.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/dev/md/md.c ============================================================================== --- stable/8/sys/dev/md/md.c Wed Jan 5 12:27:57 2011 (r217001) +++ stable/8/sys/dev/md/md.c Wed Jan 5 12:45:11 2011 (r217002) @@ -103,6 +103,8 @@ static MALLOC_DEFINE(M_MDSECT, "md_secto static int md_debug; SYSCTL_INT(_debug, OID_AUTO, mddebug, CTLFLAG_RW, &md_debug, 0, ""); +static int md_malloc_wait; +SYSCTL_INT(_vm, OID_AUTO, md_malloc_wait, CTLFLAG_RW, &md_malloc_wait, 0, ""); #if defined(MD_ROOT) && defined(MD_ROOT_SIZE) /* @@ -207,11 +209,12 @@ new_indir(u_int shift) { struct indir *ip; - ip = malloc(sizeof *ip, M_MD, M_NOWAIT | M_ZERO); + ip = malloc(sizeof *ip, M_MD, (md_malloc_wait ? M_WAITOK : M_NOWAIT) + | M_ZERO); if (ip == NULL) return (NULL); ip->array = malloc(sizeof(uintptr_t) * NINDIR, - M_MDSECT, M_NOWAIT | M_ZERO); + M_MDSECT, (md_malloc_wait ? M_WAITOK : M_NOWAIT) | M_ZERO); if (ip->array == NULL) { free(ip, M_MD); return (NULL); @@ -455,6 +458,7 @@ mdstart_malloc(struct md_s *sc, struct b } else { if (osp <= 255) { sp = (uintptr_t)uma_zalloc(sc->uma, + md_malloc_wait ? M_WAITOK : M_NOWAIT); if (sp == 0) { error = ENOSPC; @@ -849,7 +853,8 @@ mdcreate_malloc(struct md_s *sc, struct nsectors = sc->mediasize / sc->sectorsize; for (u = 0; u < nsectors; u++) { - sp = (uintptr_t)uma_zalloc(sc->uma, M_NOWAIT | M_ZERO); + sp = (uintptr_t)uma_zalloc(sc->uma, md_malloc_wait ? + M_WAITOK : M_NOWAIT | M_ZERO); if (sp != 0) error = s_write(sc->indir, u, sp); else