Search
j0ke.net Open Build Service
>
Projects
>
GFS
>
multipath-tools
> multipath-tools-rename-netapp-prio
Sign Up
|
Log In
Username
Password
Cancel
Overview
Repositories
Revisions
Requests
Users
Advanced
Attributes
Meta
File multipath-tools-rename-netapp-prio of Package multipath-tools
From 3e8200734f0385ab1f8b8e3a797196f7754a2e49 Mon Sep 17 00:00:00 2001 From: Hannes Reinecke <hare@suse.de> Date: Fri, 9 Nov 2007 14:31:17 +0100 Subject: [PATCH] Rename NetApp priotizer to pp_ontap NetApp requested to rename their prioritizer to pp_ontap. So here we go. References: 309559 Signed-off-by: Hannes Reinecke <hare@suse.de> --- libmultipath/hwtable.c | 4 +- multipath-tools.spec.in | 2 +- path_priority/pp_netapp/Makefile | 22 --- path_priority/pp_netapp/pp_netapp.c | 268 ---------------------------------- path_priority/pp_ontap/Makefile | 22 +++ path_priority/pp_ontap/pp_ontap.c | 272 +++++++++++++++++++++++++++++++++++ 6 files changed, 297 insertions(+), 293 deletions(-) delete mode 100644 path_priority/pp_netapp/Makefile delete mode 100644 path_priority/pp_netapp/pp_netapp.c create mode 100644 path_priority/pp_ontap/Makefile create mode 100644 path_priority/pp_ontap/pp_ontap.c diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c index 49b38e2..3294cd0 100644 --- a/libmultipath/hwtable.c +++ b/libmultipath/hwtable.c @@ -460,7 +460,7 @@ static struct hwentry default_hw[] = { .vendor = "NETAPP", .product = "LUN.*", .getuid = DEFAULT_GETUID, - .getprio = "mpath_prio_netapp /dev/%n", + .getprio = "mpath_prio_ontap /dev/%n", .features = "1 queue_if_no_path", .hwhandler = DEFAULT_HWHANDLER, .selector = DEFAULT_SELECTOR, @@ -481,7 +481,7 @@ static struct hwentry default_hw[] = { .vendor = "IBM", .product = "Nseries.*", .getuid = DEFAULT_GETUID, - .getprio = "mpath_prio_netapp /dev/%n", + .getprio = "mpath_prio_ontap /dev/%n", .features = "1 queue_if_no_path", .hwhandler = DEFAULT_HWHANDLER, .selector = DEFAULT_SELECTOR, diff --git a/multipath-tools.spec.in b/multipath-tools.spec.in index 9d6a7ea..31db0f6 100644 --- a/multipath-tools.spec.in +++ b/multipath-tools.spec.in @@ -48,7 +48,7 @@ rm -rf $RPM_BUILD_ROOT %{prefix}/sbin/mpath_prio_emc %{prefix}/sbin/mpath_prio_random %{prefix}/sbin/mpath_prio_balance_units -%{prefix}/sbin/mpath_prio_netapp +%{prefix}/sbin/mpath_prio_ontap %{prefix}/sbin/mpath_prio_tpc %{prefix}/sbin/mpath_prio_hds_modular %{prefix}/usr/share/man/man8/devmap_name.8.gz diff --git a/path_priority/pp_netapp/Makefile b/path_priority/pp_netapp/Makefile deleted file mode 100644 index 2d571b0..0000000 --- a/path_priority/pp_netapp/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -EXEC = mpath_prio_netapp -BUILD = glibc -OBJS = pp_netapp.o - -TOPDIR = ../.. -include $(TOPDIR)/Makefile.inc - -all: $(BUILD) - -glibc: $(OBJS) - $(CC) -o $(EXEC) $(OBJS) $(LDFLAGS) - -klibc: $(OBJS) - $(CC) -static -o $(EXEC) $(OBJS) - -install: $(EXEC) - install -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC) - -uninstall: - rm $(DESTDIR)$(bindir)/$(EXEC) -clean: - rm -f *.o $(EXEC) diff --git a/path_priority/pp_netapp/pp_netapp.c b/path_priority/pp_netapp/pp_netapp.c deleted file mode 100644 index 8562a95..0000000 --- a/path_priority/pp_netapp/pp_netapp.c +++ /dev/null @@ -1,268 +0,0 @@ -/* - * Copyright 2005 Network Appliance, Inc., All Rights Reserved - * Author: David Wysochanski available at davidw@netapp.com - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License v2 for more details. - */ - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <unistd.h> -#include <fcntl.h> -#include <sys/ioctl.h> -#include <errno.h> -#include <assert.h> - -#include "../../libmultipath/sg_include.h" - -#define INQUIRY_CMD 0x12 -#define INQUIRY_CMDLEN 6 -#define DEFAULT_PRIO 10 -#define RESULTS_MAX 256 -#define SG_TIMEOUT 30000 - - -static void dump_cdb(unsigned char *cdb, int size) -{ - int i; - - fprintf(stderr, "- SCSI CDB: "); - for (i=0; i<size; i++) { - fprintf(stderr, "0x%02x ", cdb[i]); - } - fprintf(stderr, "\n"); -} - -static void process_sg_error(struct sg_io_hdr *io_hdr) -{ - int i; - - fprintf(stderr, "- masked_status=0x%02x, host_status=0x%02x, " - "driver_status=0x%02x\n", io_hdr->masked_status, - io_hdr->host_status, io_hdr->driver_status); - if (io_hdr->sb_len_wr > 0) { - fprintf(stderr, "- SCSI sense data: "); - for (i=0; i<io_hdr->sb_len_wr; i++) { - fprintf(stderr, "0x%02x ", io_hdr->sbp[i]); - } - fprintf(stderr, "\n"); - } -} - -/* - * Returns: - * -1: error, errno set - * 0: success - */ -static int send_gva(const char *dev, unsigned char pg, - unsigned char *results, int *results_size) -{ - unsigned char sb[128]; - unsigned char cdb[10] = {0xc0, 0, 0x1, 0xa, 0x98, 0xa, - pg, sizeof(sb), 0, 0}; - struct sg_io_hdr io_hdr; - int ret = -1; - int fd; - - fd = open(dev, O_RDWR|O_NONBLOCK); - - if (fd <= 0) { - fprintf(stderr, "Opening %s failed, errno=%d.\n", dev, errno); - goto out_no_close; - } - - memset(&io_hdr, 0, sizeof (struct sg_io_hdr)); - io_hdr.interface_id = 'S'; - io_hdr.cmd_len = sizeof (cdb); - io_hdr.mx_sb_len = sizeof (sb); - io_hdr.dxfer_direction = SG_DXFER_FROM_DEV; - io_hdr.dxfer_len = *results_size; - io_hdr.dxferp = results; - io_hdr.cmdp = cdb; - io_hdr.sbp = sb; - io_hdr.timeout = SG_TIMEOUT; - io_hdr.pack_id = 0; - if (ioctl(fd, SG_IO, &io_hdr) < 0) { - fprintf(stderr, "SG_IO ioctl failed, errno=%d\n", errno); - dump_cdb(cdb, sizeof(cdb)); - goto out; - } - if (io_hdr.info & SG_INFO_OK_MASK) { - fprintf(stderr, "SCSI error\n"); - dump_cdb(cdb, sizeof(cdb)); - process_sg_error(&io_hdr); - goto out; - } - - if (results[4] != 0x0a || results[5] != 0x98 || - results[6] != 0x0a ||results[7] != 0x01) { - dump_cdb(cdb, sizeof(cdb)); - fprintf(stderr, "GVA return wrong format "); - fprintf(stderr, "results[4-7] = 0x%02x 0x%02x 0x%02x 0x%02x\n", - results[4], results[5], results[6], results[7]); - goto out; - } - ret = 0; - out: - close(fd); - out_no_close: - return(ret); -} - -/* - * Retuns: - * -1: Unable to obtain proxy info - * 0: Device _not_ proxy path - * 1: Device _is_ proxy path - */ -static int get_proxy(const char *dev) -{ - unsigned char results[256]; - unsigned char sb[128]; - unsigned char cdb[INQUIRY_CMDLEN] = {INQUIRY_CMD, 1, 0xc1, 0, - sizeof(sb), 0}; - struct sg_io_hdr io_hdr; - int ret = -1; - int fd; - - fd = open(dev, O_RDWR|O_NONBLOCK); - - if (fd <= 0) { - fprintf(stderr, "Opening %s failed, errno=%d.\n", dev, errno); - goto out_no_close; - } - - memset(&results, 0, sizeof (results)); - memset(&io_hdr, 0, sizeof (struct sg_io_hdr)); - io_hdr.interface_id = 'S'; - io_hdr.cmd_len = sizeof (cdb); - io_hdr.mx_sb_len = sizeof (sb); - io_hdr.dxfer_direction = SG_DXFER_FROM_DEV; - io_hdr.dxfer_len = sizeof (results); - io_hdr.dxferp = results; - io_hdr.cmdp = cdb; - io_hdr.sbp = sb; - io_hdr.timeout = SG_TIMEOUT; - io_hdr.pack_id = 0; - if (ioctl(fd, SG_IO, &io_hdr) < 0) { - fprintf(stderr, "ioctl sending inquiry command failed, " - "errno=%d\n", errno); - dump_cdb(cdb, sizeof(cdb)); - goto out; - } - if (io_hdr.info & SG_INFO_OK_MASK) { - fprintf(stderr, "SCSI error\n"); - dump_cdb(cdb, sizeof(cdb)); - process_sg_error(&io_hdr); - goto out; - } - - if (results[1] != 0xc1 || results[8] != 0x0a || - results[9] != 0x98 || results[10] != 0x0a || - results[11] != 0x0 || results[12] != 0xc1 || - results[13] != 0x0) { - fprintf(stderr,"Proxy info page in unknown format - "); - fprintf(stderr,"results[8-13]=0x%02x 0x%02x 0x%02x 0x%02x " - "0x%02x 0x%02x\n", - results[8], results[9], results[10], - results[11], results[12], results[13]); - dump_cdb(cdb, sizeof(cdb)); - goto out; - } - ret = (results[19] & 0x02) >> 1; - - out: - close(fd); - out_no_close: - return(ret); -} - -/* - * Returns priority of device based on device info. - * - * 4: FCP non-proxy, FCP proxy unknown, or unable to determine protocol - * 3: iSCSI HBA - * 2: iSCSI software - * 1: FCP proxy - */ -static int netapp_prio(const char *dev) -{ - unsigned char results[RESULTS_MAX]; - int results_size=RESULTS_MAX; - int rc; - int is_proxy; - int is_iscsi_software; - int is_iscsi_hardware; - int tot_len; - - is_iscsi_software = is_iscsi_hardware = is_proxy = 0; - - memset(&results, 0, sizeof (results)); - rc = send_gva(dev, 0x41, results, &results_size); - if (rc == 0) { - tot_len = results[0] << 24 | results[1] << 16 | - results[2] << 8 | results[3]; - if (tot_len <= 8) { - goto try_fcp_proxy; - } - if (results[8] != 0x41) { - fprintf(stderr, "GVA page 0x41 error - " - "results[8] = 0x%x\n", results[8]); - goto try_fcp_proxy; - } - if ((strncmp((char *)&results[12], "ism_sw", 6) == 0) || - (strncmp((char *)&results[12], "iswt", 4) == 0)) { - is_iscsi_software = 1; - goto prio_select; - } - else if (strncmp((char *)&results[12], "ism_sn", 6) == 0) { - is_iscsi_hardware = 1; - goto prio_select; - } - } - - try_fcp_proxy: - rc = get_proxy(dev); - if (rc >= 0) { - is_proxy = rc; - } - - prio_select: - if (is_iscsi_hardware) { - return 3; - } else if (is_iscsi_software) { - return 2; - } else { - if (is_proxy) { - return 1; - } else { - /* Either non-proxy, or couldn't get proxy info */ - return 4; - } - } -} - -int -main (int argc, char **argv) -{ - int prio; - if (argc != 2) { - fprintf(stderr, "Arguments wrong!\n"); - prio = 0; - } else - prio = netapp_prio(argv[1]); - - printf("%d\n", prio); - exit(0); -} - diff --git a/path_priority/pp_ontap/Makefile b/path_priority/pp_ontap/Makefile new file mode 100644 index 0000000..8b8f901 --- /dev/null +++ b/path_priority/pp_ontap/Makefile @@ -0,0 +1,22 @@ +EXEC = mpath_prio_ontap +BUILD = glibc +OBJS = pp_ontap.o + +TOPDIR = ../.. +include $(TOPDIR)/Makefile.inc + +all: $(BUILD) + +glibc: $(OBJS) + $(CC) -o $(EXEC) $(OBJS) $(LDFLAGS) + +klibc: $(OBJS) + $(CC) -static -o $(EXEC) $(OBJS) + +install: $(EXEC) + install -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC) + +uninstall: + rm $(DESTDIR)$(bindir)/$(EXEC) +clean: + rm -f *.o $(EXEC) diff --git a/path_priority/pp_ontap/pp_ontap.c b/path_priority/pp_ontap/pp_ontap.c new file mode 100644 index 0000000..38ab277 --- /dev/null +++ b/path_priority/pp_ontap/pp_ontap.c @@ -0,0 +1,272 @@ +/* + * Copyright 2005 Network Appliance, Inc., All Rights Reserved + * Author: David Wysochanski available at davidw@netapp.com + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License v2 for more details. + */ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> +#include <fcntl.h> +#include <sys/ioctl.h> +#include <errno.h> +#include <assert.h> + +#include "../../libmultipath/sg_include.h" + +#define INQUIRY_CMD 0x12 +#define INQUIRY_CMDLEN 6 +#define DEFAULT_PRIO 10 +#define RESULTS_MAX 256 +#define SG_TIMEOUT 60000 + + +static void dump_cdb(unsigned char *cdb, int size) +{ + int i; + + fprintf(stderr, "- SCSI CDB: "); + for (i=0; i<size; i++) { + fprintf(stderr, "0x%02x ", cdb[i]); + } + fprintf(stderr, "\n"); +} + +static void process_sg_error(struct sg_io_hdr *io_hdr) +{ + int i; + + fprintf(stderr, "- masked_status=0x%02x, host_status=0x%02x, " + "driver_status=0x%02x\n", io_hdr->masked_status, + io_hdr->host_status, io_hdr->driver_status); + if (io_hdr->sb_len_wr > 0) { + fprintf(stderr, "- SCSI sense data: "); + for (i=0; i<io_hdr->sb_len_wr; i++) { + fprintf(stderr, "0x%02x ", io_hdr->sbp[i]); + } + fprintf(stderr, "\n"); + } +} + +/* + * Returns: + * -1: error, errno set + * 0: success + */ +static int send_gva(const char *dev, unsigned char pg, + unsigned char *results, int *results_size) +{ + unsigned char sb[128]; + unsigned char cdb[10] = {0xc0, 0, 0x1, 0xa, 0x98, 0xa, + pg, sizeof(sb), 0, 0}; + struct sg_io_hdr io_hdr; + int ret = -1; + int fd; + + fd = open(dev, O_RDWR|O_NONBLOCK); + + if (fd <= 0) { + fprintf(stderr, "Opening %s failed, errno=%d.\n", dev, errno); + goto out_no_close; + } + + memset(&io_hdr, 0, sizeof (struct sg_io_hdr)); + io_hdr.interface_id = 'S'; + io_hdr.cmd_len = sizeof (cdb); + io_hdr.mx_sb_len = sizeof (sb); + io_hdr.dxfer_direction = SG_DXFER_FROM_DEV; + io_hdr.dxfer_len = *results_size; + io_hdr.dxferp = results; + io_hdr.cmdp = cdb; + io_hdr.sbp = sb; + io_hdr.timeout = SG_TIMEOUT; + io_hdr.pack_id = 0; + if (ioctl(fd, SG_IO, &io_hdr) < 0) { + fprintf(stderr, "SG_IO ioctl failed, errno=%d\n", errno); + dump_cdb(cdb, sizeof(cdb)); + goto out; + } + if (io_hdr.info & SG_INFO_OK_MASK) { + fprintf(stderr, "SCSI error\n"); + dump_cdb(cdb, sizeof(cdb)); + process_sg_error(&io_hdr); + goto out; + } + + if (results[4] != 0x0a || results[5] != 0x98 || + results[6] != 0x0a ||results[7] != 0x01) { + dump_cdb(cdb, sizeof(cdb)); + fprintf(stderr, "GVA return wrong format "); + fprintf(stderr, "results[4-7] = 0x%02x 0x%02x 0x%02x 0x%02x\n", + results[4], results[5], results[6], results[7]); + goto out; + } + ret = 0; + out: + close(fd); + out_no_close: + return(ret); +} + +/* + * Retuns: + * -1: Unable to obtain proxy info + * 0: Device _not_ proxy path + * 1: Device _is_ proxy path + */ +static int get_proxy(const char *dev) +{ + unsigned char results[256]; + unsigned char sb[128]; + unsigned char cdb[INQUIRY_CMDLEN] = {INQUIRY_CMD, 1, 0xc1, 0, + sizeof(sb), 0}; + struct sg_io_hdr io_hdr; + int ret = -1; + int fd; + + fd = open(dev, O_RDWR|O_NONBLOCK); + + if (fd <= 0) { + fprintf(stderr, "Opening %s failed, errno=%d.\n", dev, errno); + goto out_no_close; + } + + memset(&results, 0, sizeof (results)); + memset(&io_hdr, 0, sizeof (struct sg_io_hdr)); + io_hdr.interface_id = 'S'; + io_hdr.cmd_len = sizeof (cdb); + io_hdr.mx_sb_len = sizeof (sb); + io_hdr.dxfer_direction = SG_DXFER_FROM_DEV; + io_hdr.dxfer_len = sizeof (results); + io_hdr.dxferp = results; + io_hdr.cmdp = cdb; + io_hdr.sbp = sb; + io_hdr.timeout = SG_TIMEOUT; + io_hdr.pack_id = 0; + if (ioctl(fd, SG_IO, &io_hdr) < 0) { + fprintf(stderr, "ioctl sending inquiry command failed, " + "errno=%d\n", errno); + dump_cdb(cdb, sizeof(cdb)); + goto out; + } + if (io_hdr.info & SG_INFO_OK_MASK) { + fprintf(stderr, "SCSI error\n"); + dump_cdb(cdb, sizeof(cdb)); + process_sg_error(&io_hdr); + goto out; + } + + if (results[1] != 0xc1 || results[8] != 0x0a || + results[9] != 0x98 || results[10] != 0x0a || + results[11] != 0x0 || results[12] != 0xc1 || + results[13] != 0x0) { + fprintf(stderr,"Proxy info page in unknown format - "); + fprintf(stderr,"results[8-13]=0x%02x 0x%02x 0x%02x 0x%02x " + "0x%02x 0x%02x\n", + results[8], results[9], results[10], + results[11], results[12], results[13]); + dump_cdb(cdb, sizeof(cdb)); + goto out; + } + ret = (results[19] & 0x02) >> 1; + + out: + close(fd); + out_no_close: + return(ret); +} + +/* + * Returns priority of device based on device info. + * + * 4: FCP non-proxy, FCP proxy unknown, or unable to determine protocol + * 3: iSCSI HBA + * 2: iSCSI software + * 1: FCP proxy + */ +static int netapp_prio(const char *dev) +{ + unsigned char results[RESULTS_MAX]; + int results_size=RESULTS_MAX; + int rc; + int is_proxy; + int is_iscsi_software; + int is_iscsi_hardware; + int tot_len; + + is_iscsi_software = is_iscsi_hardware = is_proxy = 0; + + memset(&results, 0, sizeof (results)); + rc = send_gva(dev, 0x41, results, &results_size); + if (rc >= 0) { + tot_len = results[0] << 24 | results[1] << 16 | + results[2] << 8 | results[3]; + if (tot_len <= 8) { + goto try_fcp_proxy; + } + if (results[8] != 0x41) { + fprintf(stderr, "GVA page 0x41 error - " + "results[8] = 0x%x\n", results[8]); + goto try_fcp_proxy; + } + if ((strncmp((char *)&results[12], "ism_sw", 6) == 0) || + (strncmp((char *)&results[12], "iswt", 4) == 0)) { + is_iscsi_software = 1; + goto prio_select; + } + else if (strncmp((char *)&results[12], "ism_sn", 6) == 0) { + is_iscsi_hardware = 1; + goto prio_select; + } + } else { + return 0; + } + + try_fcp_proxy: + rc = get_proxy(dev); + if (rc >= 0) { + is_proxy = rc; + } else { + return 0; + } + + prio_select: + if (is_iscsi_hardware) { + return 3; + } else if (is_iscsi_software) { + return 2; + } else { + if (is_proxy) { + return 1; + } else { + /* Either non-proxy, or couldn't get proxy info */ + return 4; + } + } +} + +int +main (int argc, char **argv) +{ + int prio; + if (argc != 2) { + fprintf(stderr, "Arguments wrong!\n"); + prio = 0; + } else + prio = netapp_prio(argv[1]); + + printf("%d\n", prio); + exit(0); +} + -- 1.5.0.4.GIT
