From 2fea6431120dc19a04430c68b2484524074b2e43 Mon Sep 17 00:00:00 2001 From: Jung-uk Kim Date: Mon, 17 Jan 2011 22:58:28 +0000 Subject: [PATCH] Add reader/writer lock around mem_range_attr_get() and mem_range_attr_set(). 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 --- sys/amd64/amd64/machdep.c | 3 --- sys/amd64/amd64/mem.c | 9 ++------ sys/amd64/include/memdev.h | 5 +++- sys/arm/arm/mem.c | 2 ++ sys/arm/include/memdev.h | 5 +++- sys/conf/files | 1 + sys/conf/files.amd64 | 1 - sys/conf/files.i386 | 1 - sys/conf/files.pc98 | 1 - sys/conf/files.powerpc | 1 - sys/dev/mem/memdev.c | 4 +++- sys/dev/mem/memutil.c | 45 +++++++++++++++++++++++++++++------- sys/i386/i386/machdep.c | 3 --- sys/i386/i386/mem.c | 10 ++------ sys/i386/include/memdev.h | 5 +++- sys/ia64/include/memdev.h | 5 +++- sys/mips/include/memdev.h | 5 +++- sys/modules/mem/Makefile | 5 +--- sys/powerpc/include/memdev.h | 5 +++- sys/powerpc/powerpc/mem.c | 9 +------- sys/sparc64/include/memdev.h | 5 +++- sys/sun4v/include/memdev.h | 5 +++- sys/sys/memrange.h | 14 ++++++++--- 23 files changed, 92 insertions(+), 57 deletions(-) diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index 72e0fd77ae89..3e0e7bbd38fa 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -74,7 +74,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include @@ -196,8 +195,6 @@ struct pcpu __pcpu[MAXCPU]; struct mtx icu_lock; -struct mem_range_softc mem_range_softc; - struct mtx dt_lock; /* lock for GDT and LDT */ static void diff --git a/sys/amd64/amd64/mem.c b/sys/amd64/amd64/mem.c index 3a968bbc6abd..b86f5ddd4e77 100644 --- a/sys/amd64/amd64/mem.c +++ b/sys/amd64/amd64/mem.c @@ -72,6 +72,8 @@ __FBSDID("$FreeBSD$"); */ MALLOC_DEFINE(M_MEMDESC, "memdesc", "memory range descriptors"); +struct mem_range_softc mem_range_softc; + /* ARGSUSED */ int 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); } - -void -dev_mem_md_init(void) -{ - if (mem_range_softc.mr_op != NULL) - mem_range_softc.mr_op->init(&mem_range_softc); -} diff --git a/sys/amd64/include/memdev.h b/sys/amd64/include/memdev.h index 97000c951b29..649b5576f306 100644 --- a/sys/amd64/include/memdev.h +++ b/sys/amd64/include/memdev.h @@ -26,6 +26,9 @@ * $FreeBSD$ */ +#ifndef _MACHINE_MEMDEV_H_ +#define _MACHINE_MEMDEV_H_ + #define CDEV_MINOR_MEM 0 #define CDEV_MINOR_KMEM 1 @@ -34,4 +37,4 @@ d_read_t memrw; d_ioctl_t memioctl; d_mmap_t memmmap; -void dev_mem_md_init(void); +#endif /* _MACHINE_MEMDEV_H_ */ diff --git a/sys/arm/arm/mem.c b/sys/arm/arm/mem.c index a77ad900b4b4..57fd2eb81ec0 100644 --- a/sys/arm/arm/mem.c +++ b/sys/arm/arm/mem.c @@ -70,6 +70,8 @@ __FBSDID("$FreeBSD$"); */ MALLOC_DEFINE(M_MEMDESC, "memdesc", "memory range descriptors"); +struct mem_range_softc mem_range_softc; + /* ARGSUSED */ int memrw(struct cdev *dev, struct uio *uio, int flags) diff --git a/sys/arm/include/memdev.h b/sys/arm/include/memdev.h index d32432e01cf6..3ce0f38f33cd 100644 --- a/sys/arm/include/memdev.h +++ b/sys/arm/include/memdev.h @@ -26,6 +26,9 @@ * $FreeBSD$ */ +#ifndef _MACHINE_MEMDEV_H_ +#define _MACHINE_MEMDEV_H_ + #define CDEV_MINOR_MEM 0 #define CDEV_MINOR_KMEM 1 @@ -34,4 +37,4 @@ d_read_t memrw; d_mmap_t memmmap; #define memioctl (d_ioctl_t *)NULL -void dev_mem_md_init(void); +#endif /* _MACHINE_MEMDEV_H_ */ diff --git a/sys/conf/files b/sys/conf/files index 8c102a967e35..916fe3fa4482 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1292,6 +1292,7 @@ dev/mcd/mcd.c optional mcd isa nowerror dev/mcd/mcd_isa.c optional mcd isa nowerror dev/md/md.c optional md dev/mem/memdev.c optional mem +dev/mem/memutil.c optional mem dev/mfi/mfi.c optional mfi dev/mfi/mfi_debug.c optional mfi dev/mfi/mfi_pci.c optional mfi pci diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index 2b56a15b3d9b..303cd8587f8d 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -206,7 +206,6 @@ dev/hwpmc/hwpmc_x86.c optional hwpmc dev/kbd/kbd.c optional atkbd | sc | ukbd dev/lindev/full.c optional lindev dev/lindev/lindev.c optional lindev -dev/mem/memutil.c optional mem dev/nfe/if_nfe.c optional nfe pci dev/nve/if_nve.c optional nve pci dev/nvram/nvram.c optional nvram isa diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index 179306b8fbd9..daef25604d50 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -209,7 +209,6 @@ dev/kbd/kbd.c optional atkbd | sc | ukbd dev/le/if_le_isa.c optional le isa dev/lindev/full.c optional lindev dev/lindev/lindev.c optional lindev -dev/mem/memutil.c optional mem dev/mse/mse.c optional mse dev/mse/mse_isa.c optional mse isa dev/nfe/if_nfe.c optional nfe pci diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98 index 158fbbd56547..46b1d94a8695 100644 --- a/sys/conf/files.pc98 +++ b/sys/conf/files.pc98 @@ -110,7 +110,6 @@ dev/kbd/kbd.c optional pckbd | sc | ukbd dev/le/if_le_cbus.c optional le isa dev/lindev/full.c optional lindev dev/lindev/lindev.c optional lindev -dev/mem/memutil.c optional mem dev/mse/mse.c optional mse dev/mse/mse_cbus.c optional mse isa dev/sbni/if_sbni.c optional sbni diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc index b6d7e6e8ca3f..217b8fe70016 100644 --- a/sys/conf/files.powerpc +++ b/sys/conf/files.powerpc @@ -30,7 +30,6 @@ dev/hwpmc/hwpmc_powerpc.c optional hwpmc dev/iicbus/ds1775.c optional ds1775 powermac dev/iicbus/max6690.c optional max6690 powermac dev/kbd/kbd.c optional sc -dev/mem/memutil.c optional mem dev/ofw/openfirm.c optional aim | fdt dev/ofw/openfirmio.c optional aim | fdt dev/ofw/ofw_bus_if.m optional aim | fdt diff --git a/sys/dev/mem/memdev.c b/sys/dev/mem/memdev.c index 9fb33d2c4d48..28ed6ebc4e93 100644 --- a/sys/dev/mem/memdev.c +++ b/sys/dev/mem/memdev.c @@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -80,7 +81,7 @@ mem_modevent(module_t mod __unused, int type, void *data __unused) case MOD_LOAD: if (bootverbose) printf("mem: \n"); - dev_mem_md_init(); /* Machine dependant bit */ + mem_range_init(); memdev = make_dev(&mem_cdevsw, CDEV_MINOR_MEM, UID_ROOT, GID_KMEM, 0640, "mem"); kmemdev = make_dev(&mem_cdevsw, CDEV_MINOR_KMEM, @@ -88,6 +89,7 @@ mem_modevent(module_t mod __unused, int type, void *data __unused) break; case MOD_UNLOAD: + mem_range_destroy(); destroy_dev(memdev); destroy_dev(kmemdev); break; diff --git a/sys/dev/mem/memutil.c b/sys/dev/mem/memutil.c index f514f50bedb6..f4ea103b39f9 100644 --- a/sys/dev/mem/memutil.c +++ b/sys/dev/mem/memutil.c @@ -28,35 +28,64 @@ __FBSDID("$FreeBSD$"); #include +#include +#include #include #include +#include #include +static struct rwlock mr_lock; + /* * Implementation-neutral, kernel-callable functions for manipulating * 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 mem_range_attr_get(struct mem_range_desc *mrd, int *arg) { - /* can we handle this? */ + int nd; + if (mem_range_softc.mr_op == NULL) return (EOPNOTSUPP); - - if (*arg == 0) + nd = *arg; + rw_rlock(&mr_lock); + if (nd == 0) *arg = mem_range_softc.mr_ndesc; else - bcopy(mem_range_softc.mr_desc, mrd, - (*arg) * sizeof(struct mem_range_desc)); + bcopy(mem_range_softc.mr_desc, mrd, nd * sizeof(*mrd)); + rw_runlock(&mr_lock); return (0); } int mem_range_attr_set(struct mem_range_desc *mrd, int *arg) { - /* can we handle this? */ + int ret; + if (mem_range_softc.mr_op == NULL) return (EOPNOTSUPP); - - return (mem_range_softc.mr_op->set(&mem_range_softc, mrd, arg)); + rw_wlock(&mr_lock); + ret = mem_range_softc.mr_op->set(&mem_range_softc, mrd, arg); + rw_wunlock(&mr_lock); + return (ret); } diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index a24fb11aaf5a..b0f5bc254169 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -73,7 +73,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include @@ -239,8 +238,6 @@ struct pcpu __pcpu[MAXCPU]; struct mtx icu_lock; -struct mem_range_softc mem_range_softc; - static void cpu_startup(dummy) void *dummy; diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c index 11bfc37cfbe4..dbbe242fd4d2 100644 --- a/sys/i386/i386/mem.c +++ b/sys/i386/i386/mem.c @@ -72,10 +72,11 @@ __FBSDID("$FreeBSD$"); */ MALLOC_DEFINE(M_MEMDESC, "memdesc", "memory range descriptors"); +struct mem_range_softc mem_range_softc; + static struct sx memsxlock; SX_SYSINIT(memsxlockinit, &memsxlock, "/dev/mem lock"); - /* ARGSUSED */ int 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); } - -void -dev_mem_md_init(void) -{ - if (mem_range_softc.mr_op != NULL) - mem_range_softc.mr_op->init(&mem_range_softc); -} diff --git a/sys/i386/include/memdev.h b/sys/i386/include/memdev.h index 97000c951b29..649b5576f306 100644 --- a/sys/i386/include/memdev.h +++ b/sys/i386/include/memdev.h @@ -26,6 +26,9 @@ * $FreeBSD$ */ +#ifndef _MACHINE_MEMDEV_H_ +#define _MACHINE_MEMDEV_H_ + #define CDEV_MINOR_MEM 0 #define CDEV_MINOR_KMEM 1 @@ -34,4 +37,4 @@ d_read_t memrw; d_ioctl_t memioctl; d_mmap_t memmmap; -void dev_mem_md_init(void); +#endif /* _MACHINE_MEMDEV_H_ */ diff --git a/sys/ia64/include/memdev.h b/sys/ia64/include/memdev.h index d4f0eb3d0cb0..85fca0790cec 100644 --- a/sys/ia64/include/memdev.h +++ b/sys/ia64/include/memdev.h @@ -26,6 +26,9 @@ * $FreeBSD$ */ +#ifndef _MACHINE_MEMDEV_H_ +#define _MACHINE_MEMDEV_H_ + #define CDEV_MINOR_MEM 0 #define CDEV_MINOR_KMEM 1 @@ -34,4 +37,4 @@ d_read_t memrw; #define memioctl (d_ioctl_t *)NULL d_mmap_t memmmap; -void dev_mem_md_init(void); +#endif /* _MACHINE_MEMDEV_H_ */ diff --git a/sys/mips/include/memdev.h b/sys/mips/include/memdev.h index 8cca46100936..f30945da1cee 100644 --- a/sys/mips/include/memdev.h +++ b/sys/mips/include/memdev.h @@ -27,6 +27,9 @@ * $FreeBSD$ */ +#ifndef _MACHINE_MEMDEV_H_ +#define _MACHINE_MEMDEV_H_ + #define CDEV_MINOR_MEM 0 #define CDEV_MINOR_KMEM 1 @@ -35,4 +38,4 @@ d_read_t memrw; #define memioctl (d_ioctl_t *)NULL d_mmap_t memmmap; -void dev_mem_md_init(void); +#endif /* _MACHINE_MEMDEV_H_ */ diff --git a/sys/modules/mem/Makefile b/sys/modules/mem/Makefile index b65a4447dcdb..952f50f1ca26 100644 --- a/sys/modules/mem/Makefile +++ b/sys/modules/mem/Makefile @@ -5,10 +5,7 @@ .PATH: ${.CURDIR}/../../${MACHINE_CPUARCH}/${MACHINE_CPUARCH} KMOD= mem -SRCS= memdev.c mem.c -.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "powerpc" -SRCS+= memutil.c -.endif +SRCS= mem.c memdev.c memutil.c .if ${MACHINE_CPUARCH} == "i386" SRCS+= i686_mem.c k6_mem.c .endif diff --git a/sys/powerpc/include/memdev.h b/sys/powerpc/include/memdev.h index 97000c951b29..649b5576f306 100644 --- a/sys/powerpc/include/memdev.h +++ b/sys/powerpc/include/memdev.h @@ -26,6 +26,9 @@ * $FreeBSD$ */ +#ifndef _MACHINE_MEMDEV_H_ +#define _MACHINE_MEMDEV_H_ + #define CDEV_MINOR_MEM 0 #define CDEV_MINOR_KMEM 1 @@ -34,4 +37,4 @@ d_read_t memrw; d_ioctl_t memioctl; d_mmap_t memmmap; -void dev_mem_md_init(void); +#endif /* _MACHINE_MEMDEV_H_ */ diff --git a/sys/powerpc/powerpc/mem.c b/sys/powerpc/powerpc/mem.c index b4636ecfce81..08e1cce88cd1 100644 --- a/sys/powerpc/powerpc/mem.c +++ b/sys/powerpc/powerpc/mem.c @@ -82,7 +82,7 @@ static struct mem_range_ops ppc_mem_range_ops = { }; struct mem_range_softc mem_range_softc = { &ppc_mem_range_ops, - 0, 0, 0 + 0, 0, NULL }; /* ARGSUSED */ @@ -225,12 +225,6 @@ memmmap(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr, return (0); } -void -dev_mem_md_init(void) -{ - mem_range_softc.mr_op->init(&mem_range_softc); -} - static void 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); } - diff --git a/sys/sparc64/include/memdev.h b/sys/sparc64/include/memdev.h index 2186c5dbe8f3..f16ba16d5f6b 100644 --- a/sys/sparc64/include/memdev.h +++ b/sys/sparc64/include/memdev.h @@ -26,6 +26,9 @@ * $FreeBSD$ */ +#ifndef _MACHINE_MEMDEV_H_ +#define _MACHINE_MEMDEV_H_ + #define CDEV_MINOR_MEM 0 #define CDEV_MINOR_KMEM 1 @@ -34,4 +37,4 @@ d_read_t memrw; #define memioctl (d_ioctl_t *)NULL #define memmmap (d_mmap_t *)NULL -void dev_mem_md_init(void); +#endif /* _MACHINE_MEMDEV_H_ */ diff --git a/sys/sun4v/include/memdev.h b/sys/sun4v/include/memdev.h index 2186c5dbe8f3..f16ba16d5f6b 100644 --- a/sys/sun4v/include/memdev.h +++ b/sys/sun4v/include/memdev.h @@ -26,6 +26,9 @@ * $FreeBSD$ */ +#ifndef _MACHINE_MEMDEV_H_ +#define _MACHINE_MEMDEV_H_ + #define CDEV_MINOR_MEM 0 #define CDEV_MINOR_KMEM 1 @@ -34,4 +37,4 @@ d_read_t memrw; #define memioctl (d_ioctl_t *)NULL #define memmmap (d_mmap_t *)NULL -void dev_mem_md_init(void); +#endif /* _MACHINE_MEMDEV_H_ */ diff --git a/sys/sys/memrange.h b/sys/sys/memrange.h index c90104f75942..32ae238517e1 100644 --- a/sys/sys/memrange.h +++ b/sys/sys/memrange.h @@ -4,6 +4,9 @@ * $FreeBSD$ */ +#ifndef _SYS_MEMRANGE_H_ +#define _SYS_MEMRANGE_H_ + /* Memory range attributes */ #define MDF_UNCACHEABLE (1<<0) /* region not cached */ #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 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); +extern void mem_range_init(void); +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_ */