d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add reader/writer lock around mem_range_attr_get() and mem_range_attr_set().

Browse Source 
Compile sys/dev/mem/memutil.c for all supported platforms and remove now
unnecessary dev_mem_md_init().  Consistently define mem_range_softc from
mem.c for all platforms.  Add missing #include guards for machine/memdev.h
and sys/memrange.h.  Clean up some nearby style(9) nits.

MFC after:	1 month
This commit is contained in:
Jung-uk Kim 2011-01-17 22:58:28 +00:00
parent db3a488fb0
commit 2fea643112
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=217515
23 changed files with 92 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/amd64/amd64/machdep.c
View File

@ -74,7 +74,6 @@ __FBSDID("$FreeBSD$");
#include <sys/linker.h> #include <sys/linker.h>
#include <sys/lock.h> #include <sys/lock.h>
#include <sys/malloc.h> #include <sys/malloc.h>
#include <sys/memrange.h>
#include <sys/msgbuf.h> #include <sys/msgbuf.h>
#include <sys/mutex.h> #include <sys/mutex.h>
#include <sys/pcpu.h> #include <sys/pcpu.h>
@ -196,8 +195,6 @@ struct pcpu __pcpu[MAXCPU];
struct mtx icu_lock; struct mtx icu_lock;
struct mem_range_softc mem_range_softc;
struct mtx dt_lock; /* lock for GDT and LDT */ struct mtx dt_lock; /* lock for GDT and LDT */
static void static void

9
sys/amd64/amd64/mem.c
View File

@ -72,6 +72,8 @@ __FBSDID("$FreeBSD$");
*/ */
MALLOC_DEFINE(M_MEMDESC, "memdesc", "memory range descriptors"); MALLOC_DEFINE(M_MEMDESC, "memdesc", "memory range descriptors");
struct mem_range_softc mem_range_softc;
/* ARGSUSED */ /* ARGSUSED */
int int
memrw(struct cdev *dev, struct uio *uio, int flags) memrw(struct cdev *dev, struct uio *uio, int flags)
@ -214,10 +216,3 @@ memioctl(struct cdev *dev __unused, u_long cmd, caddr_t data, int flags,
} }
return (error); return (error);
} }
void
dev_mem_md_init(void)
{
if (mem_range_softc.mr_op != NULL)
mem_range_softc.mr_op->init(&mem_range_softc);
}

5
sys/amd64/include/memdev.h
View File

@ -26,6 +26,9 @@
* $FreeBSD$ * $FreeBSD$
*/ */
#ifndef _MACHINE_MEMDEV_H_
#define _MACHINE_MEMDEV_H_
#define CDEV_MINOR_MEM 0 #define CDEV_MINOR_MEM 0
#define CDEV_MINOR_KMEM 1 #define CDEV_MINOR_KMEM 1
@ -34,4 +37,4 @@ d_read_t memrw;
d_ioctl_t memioctl; d_ioctl_t memioctl;
d_mmap_t memmmap; d_mmap_t memmmap;
void dev_mem_md_init(void); #endif /* _MACHINE_MEMDEV_H_ */

2
sys/arm/arm/mem.c
View File

@ -70,6 +70,8 @@ __FBSDID("$FreeBSD$");
*/ */
MALLOC_DEFINE(M_MEMDESC, "memdesc", "memory range descriptors"); MALLOC_DEFINE(M_MEMDESC, "memdesc", "memory range descriptors");
struct mem_range_softc mem_range_softc;
/* ARGSUSED */ /* ARGSUSED */
int int
memrw(struct cdev *dev, struct uio *uio, int flags) memrw(struct cdev *dev, struct uio *uio, int flags)

5
sys/arm/include/memdev.h
View File

@ -26,6 +26,9 @@
* $FreeBSD$ * $FreeBSD$
*/ */
#ifndef _MACHINE_MEMDEV_H_
#define _MACHINE_MEMDEV_H_
#define CDEV_MINOR_MEM 0 #define CDEV_MINOR_MEM 0
#define CDEV_MINOR_KMEM 1 #define CDEV_MINOR_KMEM 1
@ -34,4 +37,4 @@ d_read_t memrw;
d_mmap_t memmmap; d_mmap_t memmmap;
#define memioctl (d_ioctl_t *)NULL #define memioctl (d_ioctl_t *)NULL
void dev_mem_md_init(void); #endif /* _MACHINE_MEMDEV_H_ */

1
sys/conf/files
View File

@ -1292,6 +1292,7 @@ dev/mcd/mcd.c optional mcd isa nowerror
dev/mcd/mcd_isa.c optional mcd isa nowerror dev/mcd/mcd_isa.c optional mcd isa nowerror
dev/md/md.c optional md dev/md/md.c optional md
dev/mem/memdev.c optional mem dev/mem/memdev.c optional mem
dev/mem/memutil.c optional mem
dev/mfi/mfi.c optional mfi dev/mfi/mfi.c optional mfi
dev/mfi/mfi_debug.c optional mfi dev/mfi/mfi_debug.c optional mfi
dev/mfi/mfi_pci.c optional mfi pci dev/mfi/mfi_pci.c optional mfi pci

1
sys/conf/files.amd64
View File

@ -206,7 +206,6 @@ dev/hwpmc/hwpmc_x86.c optional hwpmc
dev/kbd/kbd.c optional atkbd | sc | ukbd dev/kbd/kbd.c optional atkbd | sc | ukbd
dev/lindev/full.c optional lindev dev/lindev/full.c optional lindev
dev/lindev/lindev.c optional lindev dev/lindev/lindev.c optional lindev
dev/mem/memutil.c optional mem
dev/nfe/if_nfe.c optional nfe pci dev/nfe/if_nfe.c optional nfe pci
dev/nve/if_nve.c optional nve pci dev/nve/if_nve.c optional nve pci
dev/nvram/nvram.c optional nvram isa dev/nvram/nvram.c optional nvram isa

1
sys/conf/files.i386
View File

@ -209,7 +209,6 @@ dev/kbd/kbd.c optional atkbd | sc | ukbd
dev/le/if_le_isa.c optional le isa dev/le/if_le_isa.c optional le isa
dev/lindev/full.c optional lindev dev/lindev/full.c optional lindev
dev/lindev/lindev.c optional lindev dev/lindev/lindev.c optional lindev
dev/mem/memutil.c optional mem
dev/mse/mse.c optional mse dev/mse/mse.c optional mse
dev/mse/mse_isa.c optional mse isa dev/mse/mse_isa.c optional mse isa
dev/nfe/if_nfe.c optional nfe pci dev/nfe/if_nfe.c optional nfe pci

1
sys/conf/files.pc98
View File

@ -110,7 +110,6 @@ dev/kbd/kbd.c optional pckbd | sc | ukbd
dev/le/if_le_cbus.c optional le isa dev/le/if_le_cbus.c optional le isa
dev/lindev/full.c optional lindev dev/lindev/full.c optional lindev
dev/lindev/lindev.c optional lindev dev/lindev/lindev.c optional lindev
dev/mem/memutil.c optional mem
dev/mse/mse.c optional mse dev/mse/mse.c optional mse
dev/mse/mse_cbus.c optional mse isa dev/mse/mse_cbus.c optional mse isa
dev/sbni/if_sbni.c optional sbni dev/sbni/if_sbni.c optional sbni

1
sys/conf/files.powerpc
View File

@ -30,7 +30,6 @@ dev/hwpmc/hwpmc_powerpc.c optional hwpmc
dev/iicbus/ds1775.c optional ds1775 powermac dev/iicbus/ds1775.c optional ds1775 powermac
dev/iicbus/max6690.c optional max6690 powermac dev/iicbus/max6690.c optional max6690 powermac
dev/kbd/kbd.c optional sc dev/kbd/kbd.c optional sc
dev/mem/memutil.c optional mem
dev/ofw/openfirm.c optional aim | fdt dev/ofw/openfirm.c optional aim | fdt
dev/ofw/openfirmio.c optional aim | fdt dev/ofw/openfirmio.c optional aim | fdt
dev/ofw/ofw_bus_if.m optional aim | fdt dev/ofw/ofw_bus_if.m optional aim | fdt

4
sys/dev/mem/memdev.c
View File

@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h> #include <sys/kernel.h>
#include <sys/lock.h> #include <sys/lock.h>
#include <sys/malloc.h> #include <sys/malloc.h>
#include <sys/memrange.h>
#include <sys/module.h> #include <sys/module.h>
#include <sys/mutex.h> #include <sys/mutex.h>
#include <sys/proc.h> #include <sys/proc.h>
@ -80,7 +81,7 @@ mem_modevent(module_t mod __unused, int type, void *data __unused)
case MOD_LOAD: case MOD_LOAD:
if (bootverbose) if (bootverbose)
printf("mem: <memory>\n"); printf("mem: <memory>\n");
dev_mem_md_init(); /* Machine dependant bit */ mem_range_init();
memdev = make_dev(&mem_cdevsw, CDEV_MINOR_MEM, memdev = make_dev(&mem_cdevsw, CDEV_MINOR_MEM,
UID_ROOT, GID_KMEM, 0640, "mem"); UID_ROOT, GID_KMEM, 0640, "mem");
kmemdev = make_dev(&mem_cdevsw, CDEV_MINOR_KMEM, kmemdev = make_dev(&mem_cdevsw, CDEV_MINOR_KMEM,
@ -88,6 +89,7 @@ mem_modevent(module_t mod __unused, int type, void *data __unused)
break; break;
case MOD_UNLOAD: case MOD_UNLOAD:
mem_range_destroy();
destroy_dev(memdev); destroy_dev(memdev);
destroy_dev(kmemdev); destroy_dev(kmemdev);
break; break;

45
sys/dev/mem/memutil.c
View File

@ -28,35 +28,64 @@
__FBSDID("$FreeBSD$"); __FBSDID("$FreeBSD$");
#include <sys/param.h> #include <sys/param.h>
#include <sys/kernel.h>
#include <sys/lock.h>
#include <sys/malloc.h> #include <sys/malloc.h>
#include <sys/memrange.h> #include <sys/memrange.h>
#include <sys/rwlock.h>
#include <sys/systm.h> #include <sys/systm.h>
static struct rwlock mr_lock;
/* /*
* Implementation-neutral, kernel-callable functions for manipulating * Implementation-neutral, kernel-callable functions for manipulating
* memory range attributes. * memory range attributes.
*/ */
void
mem_range_init(void)
{
if (mem_range_softc.mr_op == NULL)
return;
rw_init(&mr_lock, "memrange");
mem_range_softc.mr_op->init(&mem_range_softc);
}
void
mem_range_destroy(void)
{
if (mem_range_softc.mr_op == NULL)
return;
rw_destroy(&mr_lock);
}
int int
mem_range_attr_get(struct mem_range_desc *mrd, int *arg) mem_range_attr_get(struct mem_range_desc *mrd, int *arg)
{ {
/* can we handle this? */ int nd;
if (mem_range_softc.mr_op == NULL) if (mem_range_softc.mr_op == NULL)
return (EOPNOTSUPP); return (EOPNOTSUPP);
nd = *arg;
if (*arg == 0) rw_rlock(&mr_lock);
if (nd == 0)
*arg = mem_range_softc.mr_ndesc; *arg = mem_range_softc.mr_ndesc;
else else
bcopy(mem_range_softc.mr_desc, mrd, bcopy(mem_range_softc.mr_desc, mrd, nd * sizeof(*mrd));
(*arg) * sizeof(struct mem_range_desc)); rw_runlock(&mr_lock);
return (0); return (0);
} }
int int
mem_range_attr_set(struct mem_range_desc *mrd, int *arg) mem_range_attr_set(struct mem_range_desc *mrd, int *arg)
{ {
/* can we handle this? */ int ret;
if (mem_range_softc.mr_op == NULL) if (mem_range_softc.mr_op == NULL)
return (EOPNOTSUPP); return (EOPNOTSUPP);
rw_wlock(&mr_lock);
return (mem_range_softc.mr_op->set(&mem_range_softc, mrd, arg)); ret = mem_range_softc.mr_op->set(&mem_range_softc, mrd, arg);
rw_wunlock(&mr_lock);
return (ret);
} }

3
sys/i386/i386/machdep.c
View File

@ -73,7 +73,6 @@ __FBSDID("$FreeBSD$");
#include <sys/linker.h> #include <sys/linker.h>
#include <sys/lock.h> #include <sys/lock.h>
#include <sys/malloc.h> #include <sys/malloc.h>
#include <sys/memrange.h>
#include <sys/msgbuf.h> #include <sys/msgbuf.h>
#include <sys/mutex.h> #include <sys/mutex.h>
#include <sys/pcpu.h> #include <sys/pcpu.h>
@ -239,8 +238,6 @@ struct pcpu __pcpu[MAXCPU];
struct mtx icu_lock; struct mtx icu_lock;
struct mem_range_softc mem_range_softc;
static void static void
cpu_startup(dummy) cpu_startup(dummy)
void *dummy; void *dummy;

10
sys/i386/i386/mem.c
View File

@ -72,10 +72,11 @@ __FBSDID("$FreeBSD$");
*/ */
MALLOC_DEFINE(M_MEMDESC, "memdesc", "memory range descriptors"); MALLOC_DEFINE(M_MEMDESC, "memdesc", "memory range descriptors");
struct mem_range_softc mem_range_softc;
static struct sx memsxlock; static struct sx memsxlock;
SX_SYSINIT(memsxlockinit, &memsxlock, "/dev/mem lock"); SX_SYSINIT(memsxlockinit, &memsxlock, "/dev/mem lock");
/* ARGSUSED */ /* ARGSUSED */
int int
memrw(struct cdev *dev, struct uio *uio, int flags) memrw(struct cdev *dev, struct uio *uio, int flags)
@ -233,10 +234,3 @@ memioctl(struct cdev *dev __unused, u_long cmd, caddr_t data, int flags,
} }
return (error); return (error);
} }
void
dev_mem_md_init(void)
{
if (mem_range_softc.mr_op != NULL)
mem_range_softc.mr_op->init(&mem_range_softc);
}

5
sys/i386/include/memdev.h
View File

@ -26,6 +26,9 @@
* $FreeBSD$ * $FreeBSD$
*/ */
#ifndef _MACHINE_MEMDEV_H_
#define _MACHINE_MEMDEV_H_
#define CDEV_MINOR_MEM 0 #define CDEV_MINOR_MEM 0
#define CDEV_MINOR_KMEM 1 #define CDEV_MINOR_KMEM 1
@ -34,4 +37,4 @@ d_read_t memrw;
d_ioctl_t memioctl; d_ioctl_t memioctl;
d_mmap_t memmmap; d_mmap_t memmmap;
void dev_mem_md_init(void); #endif /* _MACHINE_MEMDEV_H_ */

5
sys/ia64/include/memdev.h
View File

@ -26,6 +26,9 @@
* $FreeBSD$ * $FreeBSD$
*/ */
#ifndef _MACHINE_MEMDEV_H_
#define _MACHINE_MEMDEV_H_
#define CDEV_MINOR_MEM 0 #define CDEV_MINOR_MEM 0
#define CDEV_MINOR_KMEM 1 #define CDEV_MINOR_KMEM 1
@ -34,4 +37,4 @@ d_read_t memrw;
#define memioctl (d_ioctl_t *)NULL #define memioctl (d_ioctl_t *)NULL
d_mmap_t memmmap; d_mmap_t memmmap;
void dev_mem_md_init(void); #endif /* _MACHINE_MEMDEV_H_ */

5
sys/mips/include/memdev.h
View File

@ -27,6 +27,9 @@
* $FreeBSD$ * $FreeBSD$
*/ */
#ifndef _MACHINE_MEMDEV_H_
#define _MACHINE_MEMDEV_H_
#define CDEV_MINOR_MEM 0 #define CDEV_MINOR_MEM 0
#define CDEV_MINOR_KMEM 1 #define CDEV_MINOR_KMEM 1
@ -35,4 +38,4 @@ d_read_t memrw;
#define memioctl (d_ioctl_t *)NULL #define memioctl (d_ioctl_t *)NULL
d_mmap_t memmmap; d_mmap_t memmmap;
void dev_mem_md_init(void); #endif /* _MACHINE_MEMDEV_H_ */

5
sys/modules/mem/Makefile
View File

@ -5,10 +5,7 @@
.PATH: ${.CURDIR}/../../${MACHINE_CPUARCH}/${MACHINE_CPUARCH} .PATH: ${.CURDIR}/../../${MACHINE_CPUARCH}/${MACHINE_CPUARCH}
KMOD= mem KMOD= mem
SRCS= memdev.c mem.c SRCS= mem.c memdev.c memutil.c
.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "powerpc"
SRCS+= memutil.c
.endif
.if ${MACHINE_CPUARCH} == "i386" .if ${MACHINE_CPUARCH} == "i386"
SRCS+= i686_mem.c k6_mem.c SRCS+= i686_mem.c k6_mem.c
.endif .endif

5
sys/powerpc/include/memdev.h
View File

@ -26,6 +26,9 @@
* $FreeBSD$ * $FreeBSD$
*/ */
#ifndef _MACHINE_MEMDEV_H_
#define _MACHINE_MEMDEV_H_
#define CDEV_MINOR_MEM 0 #define CDEV_MINOR_MEM 0
#define CDEV_MINOR_KMEM 1 #define CDEV_MINOR_KMEM 1
@ -34,4 +37,4 @@ d_read_t memrw;
d_ioctl_t memioctl; d_ioctl_t memioctl;
d_mmap_t memmmap; d_mmap_t memmmap;
void dev_mem_md_init(void); #endif /* _MACHINE_MEMDEV_H_ */

9
sys/powerpc/powerpc/mem.c
View File

@ -82,7 +82,7 @@ static struct mem_range_ops ppc_mem_range_ops = {
}; };
struct mem_range_softc mem_range_softc = { struct mem_range_softc mem_range_softc = {
&ppc_mem_range_ops, &ppc_mem_range_ops,
0, 0, 0 0, 0, NULL
}; };
/* ARGSUSED */ /* ARGSUSED */
@ -225,12 +225,6 @@ memmmap(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr,
return (0); return (0);
} }
void
dev_mem_md_init(void)
{
mem_range_softc.mr_op->init(&mem_range_softc);
}
static void static void
ppc_mrinit(struct mem_range_softc *sc) ppc_mrinit(struct mem_range_softc *sc)
{ {
@ -334,4 +328,3 @@ memioctl(struct cdev *dev __unused, u_long cmd, caddr_t data, int flags,
} }
return (error); return (error);
} }

5
sys/sparc64/include/memdev.h
View File

@ -26,6 +26,9 @@
* $FreeBSD$ * $FreeBSD$
*/ */
#ifndef _MACHINE_MEMDEV_H_
#define _MACHINE_MEMDEV_H_
#define CDEV_MINOR_MEM 0 #define CDEV_MINOR_MEM 0
#define CDEV_MINOR_KMEM 1 #define CDEV_MINOR_KMEM 1
@ -34,4 +37,4 @@ d_read_t memrw;
#define memioctl (d_ioctl_t *)NULL #define memioctl (d_ioctl_t *)NULL
#define memmmap (d_mmap_t *)NULL #define memmmap (d_mmap_t *)NULL
void dev_mem_md_init(void); #endif /* _MACHINE_MEMDEV_H_ */

5
sys/sun4v/include/memdev.h
View File

@ -26,6 +26,9 @@
* $FreeBSD$ * $FreeBSD$
*/ */
#ifndef _MACHINE_MEMDEV_H_
#define _MACHINE_MEMDEV_H_
#define CDEV_MINOR_MEM 0 #define CDEV_MINOR_MEM 0
#define CDEV_MINOR_KMEM 1 #define CDEV_MINOR_KMEM 1
@ -34,4 +37,4 @@ d_read_t memrw;
#define memioctl (d_ioctl_t *)NULL #define memioctl (d_ioctl_t *)NULL
#define memmmap (d_mmap_t *)NULL #define memmmap (d_mmap_t *)NULL
void dev_mem_md_init(void); #endif /* _MACHINE_MEMDEV_H_ */

14
sys/sys/memrange.h
View File

@ -4,6 +4,9 @@
* $FreeBSD$ * $FreeBSD$
*/ */
#ifndef _SYS_MEMRANGE_H_
#define _SYS_MEMRANGE_H_
/* Memory range attributes */ /* Memory range attributes */
#define MDF_UNCACHEABLE (1<<0) /* region not cached */ #define MDF_UNCACHEABLE (1<<0) /* region not cached */
#define MDF_WRITECOMBINE (1<<1) /* region supports "write combine" action */ #define MDF_WRITECOMBINE (1<<1) /* region supports "write combine" action */
@ -65,7 +68,12 @@ struct mem_range_softc
extern struct mem_range_softc mem_range_softc; extern struct mem_range_softc mem_range_softc;
extern int mem_range_attr_get(struct mem_range_desc *mrd, int *arg); extern void mem_range_init(void);
extern int mem_range_attr_set(struct mem_range_desc *mrd, int *arg); extern void mem_range_destroy(void);
#endif extern int mem_range_attr_get(struct mem_range_desc *mrd, int *arg);
extern int mem_range_attr_set(struct mem_range_desc *mrd, int *arg);
#endif /* _KERNEL */
#endif /* _SYS_MEMRANGE_H_ */