From owner-svn-src-stable@FreeBSD.ORG Sat Feb 14 08:44:14 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8BFDB531; Sat, 14 Feb 2015 08:44:14 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 75AB1341; Sat, 14 Feb 2015 08:44:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1E8iEPd023935; Sat, 14 Feb 2015 08:44:14 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1E8iDSM023928; Sat, 14 Feb 2015 08:44:13 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201502140844.t1E8iDSM023928@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sat, 14 Feb 2015 08:44:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r278746 - in stable/10/sys: arm/arm dev/mem i386/i386 mips/mips sparc64/sparc64 X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Feb 2015 08:44:14 -0000 Author: kib Date: Sat Feb 14 08:44:12 2015 New Revision: 278746 URL: https://svnweb.freebsd.org/changeset/base/278746 Log: MFC r277643: Remove Giant from /dev/mem and /dev/kmem. MFC r277743: Arm: ensure that _tmppt KVA is used exclusively. Modified: stable/10/sys/arm/arm/mem.c stable/10/sys/dev/mem/memdev.c stable/10/sys/i386/i386/mem.c stable/10/sys/mips/mips/mem.c stable/10/sys/sparc64/sparc64/mem.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/arm/arm/mem.c ============================================================================== --- stable/10/sys/arm/arm/mem.c Sat Feb 14 08:20:31 2015 (r278745) +++ stable/10/sys/arm/arm/mem.c Sat Feb 14 08:44:12 2015 (r278746) @@ -55,6 +55,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -72,6 +73,9 @@ MALLOC_DEFINE(M_MEMDESC, "memdesc", "mem struct mem_range_softc mem_range_softc; +static struct sx tmppt_lock; +SX_SYSINIT(tmppt, &tmppt_lock, "mem4map"); + /* ARGSUSED */ int memrw(struct cdev *dev, struct uio *uio, int flags) @@ -82,8 +86,6 @@ memrw(struct cdev *dev, struct uio *uio, int error = 0; vm_offset_t addr, eaddr; - GIANT_REQUIRED; - while (uio->uio_resid > 0 && error == 0) { iov = uio->uio_iov; if (iov->iov_len == 0) { @@ -109,6 +111,7 @@ memrw(struct cdev *dev, struct uio *uio, } if (!address_valid) return (EINVAL); + sx_xlock(&tmppt_lock); pmap_kenter((vm_offset_t)_tmppt, v); o = (int)uio->uio_offset & PAGE_MASK; c = (u_int)(PAGE_SIZE - ((int)iov->iov_base & PAGE_MASK)); @@ -116,6 +119,7 @@ memrw(struct cdev *dev, struct uio *uio, c = min(c, (u_int)iov->iov_len); error = uiomove((caddr_t)&_tmppt[o], (int)c, uio); pmap_qremove((vm_offset_t)_tmppt, 1); + sx_xunlock(&tmppt_lock); continue; } else if (dev2unit(dev) == CDEV_MINOR_KMEM) { Modified: stable/10/sys/dev/mem/memdev.c ============================================================================== --- stable/10/sys/dev/mem/memdev.c Sat Feb 14 08:20:31 2015 (r278745) +++ stable/10/sys/dev/mem/memdev.c Sat Feb 14 08:44:12 2015 (r278746) @@ -52,7 +52,7 @@ static struct cdev *memdev, *kmemdev; static struct cdevsw mem_cdevsw = { .d_version = D_VERSION, - .d_flags = D_MEM|D_NEEDGIANT, + .d_flags = D_MEM, .d_open = memopen, .d_read = memrw, .d_write = memrw, Modified: stable/10/sys/i386/i386/mem.c ============================================================================== --- stable/10/sys/i386/i386/mem.c Sat Feb 14 08:20:31 2015 (r278745) +++ stable/10/sys/i386/i386/mem.c Sat Feb 14 08:44:12 2015 (r278746) @@ -86,10 +86,6 @@ memrw(struct cdev *dev, struct uio *uio, int error = 0; vm_offset_t addr; - /* XXX UPS Why ? */ - GIANT_REQUIRED; - - if (dev2unit(dev) != CDEV_MINOR_MEM && dev2unit(dev) != CDEV_MINOR_KMEM) return EIO; Modified: stable/10/sys/mips/mips/mem.c ============================================================================== --- stable/10/sys/mips/mips/mem.c Sat Feb 14 08:20:31 2015 (r278745) +++ stable/10/sys/mips/mips/mem.c Sat Feb 14 08:44:12 2015 (r278746) @@ -85,8 +85,6 @@ memrw(struct cdev *dev, struct uio *uio, cnt = 0; error = 0; - GIANT_REQUIRED; - pmap_page_init(&m); while (uio->uio_resid > 0 && !error) { iov = uio->uio_iov; Modified: stable/10/sys/sparc64/sparc64/mem.c ============================================================================== --- stable/10/sys/sparc64/sparc64/mem.c Sat Feb 14 08:20:31 2015 (r278745) +++ stable/10/sys/sparc64/sparc64/mem.c Sat Feb 14 08:44:12 2015 (r278746) @@ -100,8 +100,6 @@ memrw(struct cdev *dev, struct uio *uio, error = 0; ova = 0; - GIANT_REQUIRED; - while (uio->uio_resid > 0 && error == 0) { iov = uio->uio_iov; if (iov->iov_len == 0) {