Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2009-02-20 14:33:26 -08:00
parent 29946892d9 4d28f29b6c
commit 7eeec4808a
3 changed files with 43 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
module/zpios/include/zpios-ctl.h
View File

@ -58,10 +58,16 @@
#define ZPIOS_NAME_SIZE 16 #define ZPIOS_NAME_SIZE 16
#define ZPIOS_PATH_SIZE 128 #define ZPIOS_PATH_SIZE 128
#define PHASE_PRE "pre" #define PHASE_PRE_RUN "pre-run"
#define PHASE_POST "post" #define PHASE_PRE_CREATE "pre-create"
#define PHASE_WRITE "write" #define PHASE_PRE_WRITE "pre-write"
#define PHASE_READ "read" #define PHASE_PRE_READ "pre-read"
#define PHASE_PRE_REMOVE "pre-remove"
#define PHASE_POST_RUN "post-run"
#define PHASE_POST_CREATE "post-create"
#define PHASE_POST_WRITE "post-write"
#define PHASE_POST_READ "post-read"
#define PHASE_POST_REMOVE "post-remove"
#define ZPIOS_CFG_MAGIC 0x87237190U #define ZPIOS_CFG_MAGIC 0x87237190U
typedef struct zpios_cfg { typedef struct zpios_cfg {

26
module/zpios/zpios.c
View File

@ -29,7 +29,7 @@
* *
* CDDL HEADER END * CDDL HEADER END
* *
* Kernel PIOS DMU implemenation originally derived from PIOS test code. * Kernel PIOS DMU implementation originally derived from PIOS test code.
* Character control interface derived from SPL code. * Character control interface derived from SPL code.
*/ */
@ -63,7 +63,7 @@ int zpios_upcall(char *path, char *phase, run_args_t *run_args, int rc)
char thread_delay[16], flags[16], result[8]; char thread_delay[16], flags[16], result[8];
char *argv[16], *envp[4]; char *argv[16], *envp[4];
if (strlen(path) == 0) if ((path == NULL) || (strlen(path) == 0))
return -ENOENT; return -ENOENT;
snprintf(id, 15, "%d", run_args->id); snprintf(id, 15, "%d", run_args->id);
@ -174,6 +174,7 @@ zpios_dmu_setup(run_args_t *run_args)
uint64_t obj = 0ULL; uint64_t obj = 0ULL;
int i, rc = 0; int i, rc = 0;
(void)zpios_upcall(run_args->pre, PHASE_PRE_CREATE, run_args, 0);
t->start = current_kernel_time(); t->start = current_kernel_time();
rc = dmu_objset_open(run_args->pool, DMU_OST_ZFS, DS_MODE_USER, &os); rc = dmu_objset_open(run_args->pool, DMU_OST_ZFS, DS_MODE_USER, &os);
@ -225,6 +226,7 @@ zpios_dmu_setup(run_args_t *run_args)
out: out:
t->stop = current_kernel_time(); t->stop = current_kernel_time();
t->delta = timespec_sub(t->stop, t->start); t->delta = timespec_sub(t->stop, t->start);
(void)zpios_upcall(run_args->post, PHASE_POST_CREATE, run_args, rc);
return rc; return rc;
} }
@ -352,6 +354,7 @@ zpios_remove_objects(run_args_t *run_args)
zpios_region_t *region; zpios_region_t *region;
int rc = 0, i; int rc = 0, i;
(void)zpios_upcall(run_args->pre, PHASE_PRE_REMOVE, run_args, 0);
t->start = current_kernel_time(); t->start = current_kernel_time();
if (run_args->flags & DMU_REMOVE) { if (run_args->flags & DMU_REMOVE) {
@ -382,6 +385,7 @@ zpios_remove_objects(run_args_t *run_args)
t->stop = current_kernel_time(); t->stop = current_kernel_time();
t->delta = timespec_sub(t->stop, t->start); t->delta = timespec_sub(t->stop, t->start);
(void)zpios_upcall(run_args->post, PHASE_POST_REMOVE, run_args, rc);
} }
static void static void
@ -665,8 +669,6 @@ zpios_threads_run(run_args_t *run_args)
zpios_time_t *tr = &(run_args->stats.rd_time); zpios_time_t *tr = &(run_args->stats.rd_time);
int i, rc = 0, tc = run_args->thread_count; int i, rc = 0, tc = run_args->thread_count;
zpios_upcall(run_args->pre, PHASE_PRE, run_args, 0);
tsks = kmem_zalloc(sizeof(struct task_struct *) * tc, KM_SLEEP); tsks = kmem_zalloc(sizeof(struct task_struct *) * tc, KM_SLEEP);
if (tsks == NULL) { if (tsks == NULL) {
rc = -ENOMEM; rc = -ENOMEM;
@ -709,7 +711,7 @@ zpios_threads_run(run_args_t *run_args)
tt->start = current_kernel_time(); tt->start = current_kernel_time();
/* Wake up all threads for write phase */ /* Wake up all threads for write phase */
zpios_upcall(run_args->pre, PHASE_WRITE, run_args, 0); (void)zpios_upcall(run_args->pre, PHASE_PRE_WRITE, run_args, 0);
for (i = 0; i < tc; i++) for (i = 0; i < tc; i++)
wake_up_process(tsks[i]); wake_up_process(tsks[i]);
@ -717,6 +719,7 @@ zpios_threads_run(run_args_t *run_args)
tw->start = current_kernel_time(); tw->start = current_kernel_time();
wait_event(run_args->waitq, zpios_thread_done(run_args)); wait_event(run_args->waitq, zpios_thread_done(run_args));
tw->stop = current_kernel_time(); tw->stop = current_kernel_time();
(void)zpios_upcall(run_args->post, PHASE_POST_WRITE, run_args, rc);
for (i = 0; i < tc; i++) { for (i = 0; i < tc; i++) {
thr = run_args->threads[i]; thr = run_args->threads[i];
@ -731,7 +734,6 @@ zpios_threads_run(run_args_t *run_args)
mutex_exit(&thr->lock); mutex_exit(&thr->lock);
} }
zpios_upcall(run_args->post, PHASE_WRITE, run_args, rc);
if (rc) { if (rc) {
/* Wake up all threads and tell them to exit */ /* Wake up all threads and tell them to exit */
for (i = 0; i < tc; i++) { for (i = 0; i < tc; i++) {
@ -750,7 +752,7 @@ zpios_threads_run(run_args_t *run_args)
mutex_exit(&run_args->lock_ctl); mutex_exit(&run_args->lock_ctl);
/* Wake up all threads for read phase */ /* Wake up all threads for read phase */
zpios_upcall(run_args->pre, PHASE_READ, run_args, 0); (void)zpios_upcall(run_args->pre, PHASE_PRE_READ, run_args, 0);
for (i = 0; i < tc; i++) for (i = 0; i < tc; i++)
wake_up_process(tsks[i]); wake_up_process(tsks[i]);
@ -758,6 +760,7 @@ zpios_threads_run(run_args_t *run_args)
tr->start = current_kernel_time(); tr->start = current_kernel_time();
wait_event(run_args->waitq, zpios_thread_done(run_args)); wait_event(run_args->waitq, zpios_thread_done(run_args));
tr->stop = current_kernel_time(); tr->stop = current_kernel_time();
(void)zpios_upcall(run_args->post, PHASE_POST_READ, run_args, rc);
for (i = 0; i < tc; i++) { for (i = 0; i < tc; i++) {
thr = run_args->threads[i]; thr = run_args->threads[i];
@ -771,8 +774,6 @@ zpios_threads_run(run_args_t *run_args)
run_args->stats.rd_chunks += thr->stats.rd_chunks; run_args->stats.rd_chunks += thr->stats.rd_chunks;
mutex_exit(&thr->lock); mutex_exit(&thr->lock);
} }
zpios_upcall(run_args->post, PHASE_READ, run_args, rc);
out: out:
tt->stop = current_kernel_time(); tt->stop = current_kernel_time();
tt->delta = timespec_sub(tt->stop, tt->start); tt->delta = timespec_sub(tt->stop, tt->start);
@ -782,8 +783,6 @@ out:
cleanup: cleanup:
kmem_free(tsks, sizeof(struct task_struct *) * tc); kmem_free(tsks, sizeof(struct task_struct *) * tc);
cleanup2: cleanup2:
zpios_upcall(run_args->post, PHASE_POST, run_args, rc);
/* Returns first encountered thread error (if any) */ /* Returns first encountered thread error (if any) */
return rc; return rc;
@ -844,6 +843,8 @@ zpios_do_one_run(struct file *file, zpios_cmd_t *kcmd,
return -ENOSPC; return -ENOSPC;
} }
(void)zpios_upcall(kcmd->cmd_pre, PHASE_PRE_RUN, run_args, 0);
rc = zpios_setup_run(&run_args, kcmd, file); rc = zpios_setup_run(&run_args, kcmd, file);
if (rc) if (rc)
return rc; return rc;
@ -867,6 +868,9 @@ zpios_do_one_run(struct file *file, zpios_cmd_t *kcmd,
cleanup: cleanup:
zpios_cleanup_run(run_args); zpios_cleanup_run(run_args);
(void)zpios_upcall(kcmd->cmd_post, PHASE_POST_RUN, run_args, 0);
return rc; return rc;
} }

30
scripts/zpios.sh
View File

@ -117,30 +117,34 @@ cat > ${PROFILE_ZPIOS_LOG}/zpios-config.sh << EOF
# Zpios Profiling Configuration # Zpios Profiling Configuration
# #
KERNEL_BIN="/lib/modules/`uname -r`/kernel/" PROFILE_ZPIOS_LOG=/tmp/zpios/${ZPOOL_CONFIG}+${ZPIOS_TEST_ARG}+${DATE}
SPL_BIN="${SPLBUILD}/module/" PROFILE_ZPIOS_PRE=${TOPDIR}/scripts/zpios-profile/zpios-profile-pre.sh
ZFS_BIN="${TOPDIR}/module/" PROFILE_ZPIOS_POST=${TOPDIR}/scripts/zpios-profile/zpios-profile-post.sh
PROFILE_ZPIOS_USER=${TOPDIR}/scripts/zpios-profile/zpios-profile.sh
PROFILE_ZPIOS_PIDS=${TOPDIR}/scripts/zpios-profile/zpios-profile-pids.sh
PROFILE_ZPIOS_DISK=${TOPDIR}/scripts/zpios-/profile/zpios-profile-disk.sh
PROFILE_ZPIOS_BIN=${TOPDIR}/scripts/zpios-profile/zpios-profile.sh OPROFILE_KERNEL_BIN="/boot/vmlinux-`uname -r`"
PROFILE_ZPIOS_PIDS_BIN=${TOPDIR}/scripts/zpios-profile/zpios-profile-pids.sh OPROFILE_KERNEL_BIN_DIR="/lib/modules/`uname -r`/kernel/"
PROFILE_ZPIOS_DISK_BIN=${TOPDIR}/scripts/zpios-/profile/zpios-profile-disk.sh OPROFILE_SPL_BIN_DIR="${SPLBUILD}/module/"
OPROFILE_ZFS_BIN_DIR="${TOPDIR}/module/"
EOF EOF
} }
zpios_profile_start() { zpios_profile_start() {
PROFILE_ZPIOS_PRE=${TOPDIR}/scripts/zpios-profile/zpios-profile-pre.sh
PROFILE_ZPIOS_POST=${TOPDIR}/scripts/zpios-profile/zpios-profile-post.sh
PROFILE_ZPIOS_LOG=/tmp/zpios/${ZPOOL_CONFIG}+${ZPIOS_TEST_ARG}+${DATE} PROFILE_ZPIOS_LOG=/tmp/zpios/${ZPOOL_CONFIG}+${ZPIOS_TEST_ARG}+${DATE}
mkdir -p ${PROFILE_ZPIOS_LOG}
zpios_profile_config
. ${PROFILE_ZPIOS_LOG}/zpios-config.sh
ZPIOS_OPTIONS="${ZPIOS_OPTIONS} --log=${PROFILE_ZPIOS_LOG}" ZPIOS_OPTIONS="${ZPIOS_OPTIONS} --log=${PROFILE_ZPIOS_LOG}"
ZPIOS_OPTIONS="${ZPIOS_OPTIONS} --prerun=${PROFILE_ZPIOS_PRE}" ZPIOS_OPTIONS="${ZPIOS_OPTIONS} --prerun=${PROFILE_ZPIOS_PRE}"
ZPIOS_OPTIONS="${ZPIOS_OPTIONS} --postrun=${PROFILE_ZPIOS_POST}" ZPIOS_OPTIONS="${ZPIOS_OPTIONS} --postrun=${PROFILE_ZPIOS_POST}"
mkdir -p ${PROFILE_ZPIOS_LOG} /usr/bin/opcontrol --init
zpios_profile_config /usr/bin/opcontrol --setup --vmlinux=${OPROFILE_KERNEL_BIN}
/usr/bin/opcontrol --init || exit 1
/usr/bin/opcontrol --setup --vmlinux=/boot/vmlinux || exit 1
} }
zpios_profile_stop() { zpios_profile_stop() {