svn commit: r278746 - in stable/10/sys: arm/arm dev/mem i386/i386 mips/mips sparc64/sparc64

[Konstantin Belousov]

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 <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/signalvar.h>
+#include <sys/sx.h>
 #include <sys/systm.h>
 #include <sys/uio.h>
 
@@ -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) {