* [PATCH 0/1] Option for scsi_debug to fake removable devices @ 2012-09-06 10:03 Martin Pitt 2012-09-06 10:04 ` [PATCH 1/1] [SCSI] scsi_debug: Add "removable" parameter Martin Pitt 0 siblings, 1 reply; 8+ messages in thread From: Martin Pitt @ 2012-09-06 10:03 UTC (permalink / raw) To: James E.J. Bottomley, linux-scsi; +Cc: linux-kernel [-- Attachment #1: Type: text/plain, Size: 1817 bytes --] Hello all, I already re-sent this 1.5 months ago, but did not get any answer back then; I guess it got lost in the noise by now. So, patiently retrying again. For the purposes of automatically testing udisks and gvfs automounting I would like to add a parameter to scsi_debug to control the "removable" attribute of the created block device. With that, we can test system-internal and removable drives, as well as CD-ROMs (which scsi_debug can already emulate). udisks requires different privileges for mounting system-internal drives vs. removable/hotpluggable drives. This will also allow us to write system integration tests for gvfs, which will exercise the whole stack including the actual polkit configuration in a VM. I wrote a simple kernel patch for this (against linux-next), and tested this quite thoroughly. I ran the style checker, and it reports two problems: ------------ 8< -------------- WARNING: line over 80 characters #109: FILE: drivers/scsi/scsi_debug.c:3255: + ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_removable); WARNING: Prefer pr_err(... to printk(KERN_ERR, ... #126: FILE: drivers/scsi/scsi_debug.c:3353: + printk(KERN_ERR "scsi_debug_init: removable must be 0 or 1\n"); ------------ 8< -------------- But as the existing code uses this style in the adjacent lines, I favored consistency over fixing those. If the latter is desired, I'd rather send a separate patch with just the style cleanup for the whole file. I got an ack from David Zeuthen (the primary udisks maintainer) already, noted so in the patch. Thank you in advance for considering, Martin -- Martin Pitt | http://www.piware.de Ubuntu Developer (www.ubuntu.com) | Debian Developer (www.debian.org) [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/1] [SCSI] scsi_debug: Add "removable" parameter 2012-09-06 10:03 [PATCH 0/1] Option for scsi_debug to fake removable devices Martin Pitt @ 2012-09-06 10:04 ` Martin Pitt 2012-09-06 14:22 ` Douglas Gilbert 0 siblings, 1 reply; 8+ messages in thread From: Martin Pitt @ 2012-09-06 10:04 UTC (permalink / raw) To: James E.J. Bottomley, linux-scsi; +Cc: linux-kernel Add "removable" module parameter to set the "removable" attribute of any subsequently created debug block device. It is a writable driver option, so that you can switch between removable and "fixed" media block devices in between the add_host calls. This is useful for being able to test the different behaviour/required privileges in e. g. the udisks test suite. Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com> Acked-By: David Zeuthen <zeuthen@gmail.com> --- drivers/scsi/scsi_debug.c | 30 +++++++++++++++++++++++++++--- 1 files changed, 27 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c index 182d5a5..57fbd5a 100644 --- a/drivers/scsi/scsi_debug.c +++ b/drivers/scsi/scsi_debug.c @@ -109,6 +109,7 @@ static const char * scsi_debug_version_date = "20100324"; #define DEF_OPT_BLKS 64 #define DEF_PHYSBLK_EXP 0 #define DEF_PTYPE 0 +#define DEF_REMOVABLE false #define DEF_SCSI_LEVEL 5 /* INQUIRY, byte2 [5->SPC-3] */ #define DEF_SECTOR_SIZE 512 #define DEF_UNMAP_ALIGNMENT 0 @@ -193,11 +194,11 @@ static unsigned int scsi_debug_unmap_granularity = DEF_UNMAP_GRANULARITY; static unsigned int scsi_debug_unmap_max_blocks = DEF_UNMAP_MAX_BLOCKS; static unsigned int scsi_debug_unmap_max_desc = DEF_UNMAP_MAX_DESC; static unsigned int scsi_debug_write_same_length = DEF_WRITESAME_LENGTH; +static bool scsi_debug_removable = DEF_REMOVABLE; static int scsi_debug_cmnd_count = 0; #define DEV_READONLY(TGT) (0) -#define DEV_REMOVEABLE(TGT) (0) static unsigned int sdebug_store_sectors; static sector_t sdebug_capacity; /* in sectors */ @@ -919,7 +920,7 @@ static int resp_inquiry(struct scsi_cmnd * scp, int target, return ret; } /* drops through here for a standard inquiry */ - arr[1] = DEV_REMOVEABLE(target) ? 0x80 : 0; /* Removable disk */ + arr[1] = scsi_debug_removable ? 0x80 : 0; /* Removable disk */ arr[2] = scsi_debug_scsi_level; arr[3] = 2; /* response_data_format==2 */ arr[4] = SDEBUG_LONG_INQ_SZ - 5; @@ -1211,7 +1212,7 @@ static int resp_format_pg(unsigned char * p, int pcontrol, int target) p[11] = sdebug_sectors_per & 0xff; p[12] = (scsi_debug_sector_size >> 8) & 0xff; p[13] = scsi_debug_sector_size & 0xff; - if (DEV_REMOVEABLE(target)) + if (scsi_debug_removable) p[20] |= 0x20; /* should agree with INQUIRY */ if (1 == pcontrol) memset(p + 2, 0, sizeof(format_pg) - 2); @@ -2754,6 +2755,7 @@ module_param_named(opt_blks, scsi_debug_opt_blks, int, S_IRUGO); module_param_named(opts, scsi_debug_opts, int, S_IRUGO | S_IWUSR); module_param_named(physblk_exp, scsi_debug_physblk_exp, int, S_IRUGO); module_param_named(ptype, scsi_debug_ptype, int, S_IRUGO | S_IWUSR); +module_param_named(removable, scsi_debug_removable, bool, S_IRUGO | S_IWUSR); module_param_named(scsi_level, scsi_debug_scsi_level, int, S_IRUGO); module_param_named(sector_size, scsi_debug_sector_size, int, S_IRUGO); module_param_named(unmap_alignment, scsi_debug_unmap_alignment, int, S_IRUGO); @@ -2796,6 +2798,7 @@ MODULE_PARM_DESC(opt_blks, "optimal transfer length in block (def=64)"); MODULE_PARM_DESC(opts, "1->noise, 2->medium_err, 4->timeout, 8->recovered_err... (def=0)"); MODULE_PARM_DESC(physblk_exp, "physical block exponent (def=0)"); MODULE_PARM_DESC(ptype, "SCSI peripheral type(def=0[disk])"); +MODULE_PARM_DESC(removable, "claim to have removable media (def=0)"); MODULE_PARM_DESC(scsi_level, "SCSI level to simulate(def=5[SPC-3])"); MODULE_PARM_DESC(sector_size, "logical block size in bytes (def=512)"); MODULE_PARM_DESC(unmap_alignment, "lowest aligned thin provisioning lba (def=0)"); @@ -3205,6 +3208,25 @@ static ssize_t sdebug_map_show(struct device_driver *ddp, char *buf) } DRIVER_ATTR(map, S_IRUGO, sdebug_map_show, NULL); +static ssize_t sdebug_removable_show(struct device_driver *ddp, + char *buf) +{ + return scnprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_removable ? 1 : 0); +} +static ssize_t sdebug_removable_store(struct device_driver *ddp, + const char *buf, size_t count) +{ + int n; + + if ((count > 0) && (1 == sscanf(buf, "%d", &n)) && (n >= 0)) { + scsi_debug_removable = (n > 0); + return count; + } + return -EINVAL; +} +DRIVER_ATTR(removable, S_IRUGO | S_IWUSR, sdebug_removable_show, + sdebug_removable_store); + /* Note: The following function creates attribute files in the /sys/bus/pseudo/drivers/scsi_debug directory. The advantage of these @@ -3230,6 +3252,7 @@ static int do_create_driverfs_files(void) ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_num_tgts); ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_ptype); ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_opts); + ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_removable); ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_scsi_level); ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_virtual_gb); ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_vpd_use_hostno); @@ -3255,6 +3278,7 @@ static void do_remove_driverfs_files(void) driver_remove_file(&sdebug_driverfs_driver, &driver_attr_scsi_level); driver_remove_file(&sdebug_driverfs_driver, &driver_attr_opts); driver_remove_file(&sdebug_driverfs_driver, &driver_attr_ptype); + driver_remove_file(&sdebug_driverfs_driver, &driver_attr_removable); driver_remove_file(&sdebug_driverfs_driver, &driver_attr_num_tgts); driver_remove_file(&sdebug_driverfs_driver, &driver_attr_num_parts); driver_remove_file(&sdebug_driverfs_driver, &driver_attr_no_uld); -- 1.7.2.5 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 1/1] [SCSI] scsi_debug: Add "removable" parameter 2012-09-06 10:04 ` [PATCH 1/1] [SCSI] scsi_debug: Add "removable" parameter Martin Pitt @ 2012-09-06 14:22 ` Douglas Gilbert 0 siblings, 0 replies; 8+ messages in thread From: Douglas Gilbert @ 2012-09-06 14:22 UTC (permalink / raw) To: Martin Pitt; +Cc: James E.J. Bottomley, linux-scsi, linux-kernel On 12-09-06 06:04 AM, Martin Pitt wrote: > Add "removable" module parameter to set the "removable" attribute of any > subsequently created debug block device. It is a writable driver option, so > that you can switch between removable and "fixed" media block devices in > between the add_host calls. > > This is useful for being able to test the different behaviour/required > privileges in e. g. the udisks test suite. > > Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com> > Acked-By: David Zeuthen <zeuthen@gmail.com> Acked-by: Douglas Gilbert <dgilbert@interlog.com> ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 0/1] Option for scsi_debug to fake removable devices @ 2012-07-10 9:22 Martin Pitt 2012-07-10 9:24 ` [PATCH 1/1] [SCSI] scsi_debug: Add "removable" parameter Martin Pitt 0 siblings, 1 reply; 8+ messages in thread From: Martin Pitt @ 2012-07-10 9:22 UTC (permalink / raw) To: James E.J. Bottomley, linux-scsi; +Cc: linux-kernel [-- Attachment #1: Type: text/plain, Size: 1889 bytes --] Hello all, sorry for resending this twice to the lists. Initially I thought mailing James directly was not appropriate, but I was now told that get_maintainer.pl is actually speaking the truth and I am supposed to do just that. For the purposes of automatically testing udisks and gvfs automounting I would like to add a parameter to scsi_debug to control the "removable" attribute of the created block device. With that, we can test system-internal and removable drives, as well as CD-ROMs (which scsi_debug can already emulate). udisks requires different privileges for mounting system-internal drives vs. removable/hotpluggable drives. This will also allow us to write system integration tests for gvfs, which will exercise the whole stack including the actual polkit configuration in a VM. I wrote a simple kernel patch for this (against linux-next), and tested this quite thoroughly. I ran the style checker, and it reports two problems: ------------ 8< -------------- WARNING: line over 80 characters #109: FILE: drivers/scsi/scsi_debug.c:3255: + ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_removable); WARNING: Prefer pr_err(... to printk(KERN_ERR, ... #126: FILE: drivers/scsi/scsi_debug.c:3353: + printk(KERN_ERR "scsi_debug_init: removable must be 0 or 1\n"); ------------ 8< -------------- But as the existing code uses this style in the adjacent lines, I favored consistency over fixing those. If the latter is desired, I'd rather send a separate patch with just the style cleanup for the whole file. I got an ack from David Zeuthen (the primary udisks maintainer) already, noted so in the patch. Thank you in advance for considering, Martin -- Martin Pitt | http://www.piware.de Ubuntu Developer (www.ubuntu.com) | Debian Developer (www.debian.org) [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/1] [SCSI] scsi_debug: Add "removable" parameter 2012-07-10 9:22 [PATCH 0/1] Option for scsi_debug to fake removable devices Martin Pitt @ 2012-07-10 9:24 ` Martin Pitt 0 siblings, 0 replies; 8+ messages in thread From: Martin Pitt @ 2012-07-10 9:24 UTC (permalink / raw) To: James E.J. Bottomley, linux-scsi; +Cc: linux-kernel Add "removable" module parameter to set the "removable" attribute of any subsequently created debug block device. It is a writable driver option, so that you can switch between removable and "fixed" media block devices in between the add_host calls. This is useful for being able to test the different behaviour/required privileges in e. g. the udisks test suite. Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com> Acked-By: David Zeuthen <zeuthen@gmail.com> --- drivers/scsi/scsi_debug.c | 30 +++++++++++++++++++++++++++--- 1 files changed, 27 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c index 182d5a5..57fbd5a 100644 --- a/drivers/scsi/scsi_debug.c +++ b/drivers/scsi/scsi_debug.c @@ -109,6 +109,7 @@ static const char * scsi_debug_version_date = "20100324"; #define DEF_OPT_BLKS 64 #define DEF_PHYSBLK_EXP 0 #define DEF_PTYPE 0 +#define DEF_REMOVABLE false #define DEF_SCSI_LEVEL 5 /* INQUIRY, byte2 [5->SPC-3] */ #define DEF_SECTOR_SIZE 512 #define DEF_UNMAP_ALIGNMENT 0 @@ -193,11 +194,11 @@ static unsigned int scsi_debug_unmap_granularity = DEF_UNMAP_GRANULARITY; static unsigned int scsi_debug_unmap_max_blocks = DEF_UNMAP_MAX_BLOCKS; static unsigned int scsi_debug_unmap_max_desc = DEF_UNMAP_MAX_DESC; static unsigned int scsi_debug_write_same_length = DEF_WRITESAME_LENGTH; +static bool scsi_debug_removable = DEF_REMOVABLE; static int scsi_debug_cmnd_count = 0; #define DEV_READONLY(TGT) (0) -#define DEV_REMOVEABLE(TGT) (0) static unsigned int sdebug_store_sectors; static sector_t sdebug_capacity; /* in sectors */ @@ -919,7 +920,7 @@ static int resp_inquiry(struct scsi_cmnd * scp, int target, return ret; } /* drops through here for a standard inquiry */ - arr[1] = DEV_REMOVEABLE(target) ? 0x80 : 0; /* Removable disk */ + arr[1] = scsi_debug_removable ? 0x80 : 0; /* Removable disk */ arr[2] = scsi_debug_scsi_level; arr[3] = 2; /* response_data_format==2 */ arr[4] = SDEBUG_LONG_INQ_SZ - 5; @@ -1211,7 +1212,7 @@ static int resp_format_pg(unsigned char * p, int pcontrol, int target) p[11] = sdebug_sectors_per & 0xff; p[12] = (scsi_debug_sector_size >> 8) & 0xff; p[13] = scsi_debug_sector_size & 0xff; - if (DEV_REMOVEABLE(target)) + if (scsi_debug_removable) p[20] |= 0x20; /* should agree with INQUIRY */ if (1 == pcontrol) memset(p + 2, 0, sizeof(format_pg) - 2); @@ -2754,6 +2755,7 @@ module_param_named(opt_blks, scsi_debug_opt_blks, int, S_IRUGO); module_param_named(opts, scsi_debug_opts, int, S_IRUGO | S_IWUSR); module_param_named(physblk_exp, scsi_debug_physblk_exp, int, S_IRUGO); module_param_named(ptype, scsi_debug_ptype, int, S_IRUGO | S_IWUSR); +module_param_named(removable, scsi_debug_removable, bool, S_IRUGO | S_IWUSR); module_param_named(scsi_level, scsi_debug_scsi_level, int, S_IRUGO); module_param_named(sector_size, scsi_debug_sector_size, int, S_IRUGO); module_param_named(unmap_alignment, scsi_debug_unmap_alignment, int, S_IRUGO); @@ -2796,6 +2798,7 @@ MODULE_PARM_DESC(opt_blks, "optimal transfer length in block (def=64)"); MODULE_PARM_DESC(opts, "1->noise, 2->medium_err, 4->timeout, 8->recovered_err... (def=0)"); MODULE_PARM_DESC(physblk_exp, "physical block exponent (def=0)"); MODULE_PARM_DESC(ptype, "SCSI peripheral type(def=0[disk])"); +MODULE_PARM_DESC(removable, "claim to have removable media (def=0)"); MODULE_PARM_DESC(scsi_level, "SCSI level to simulate(def=5[SPC-3])"); MODULE_PARM_DESC(sector_size, "logical block size in bytes (def=512)"); MODULE_PARM_DESC(unmap_alignment, "lowest aligned thin provisioning lba (def=0)"); @@ -3205,6 +3208,25 @@ static ssize_t sdebug_map_show(struct device_driver *ddp, char *buf) } DRIVER_ATTR(map, S_IRUGO, sdebug_map_show, NULL); +static ssize_t sdebug_removable_show(struct device_driver *ddp, + char *buf) +{ + return scnprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_removable ? 1 : 0); +} +static ssize_t sdebug_removable_store(struct device_driver *ddp, + const char *buf, size_t count) +{ + int n; + + if ((count > 0) && (1 == sscanf(buf, "%d", &n)) && (n >= 0)) { + scsi_debug_removable = (n > 0); + return count; + } + return -EINVAL; +} +DRIVER_ATTR(removable, S_IRUGO | S_IWUSR, sdebug_removable_show, + sdebug_removable_store); + /* Note: The following function creates attribute files in the /sys/bus/pseudo/drivers/scsi_debug directory. The advantage of these @@ -3230,6 +3252,7 @@ static int do_create_driverfs_files(void) ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_num_tgts); ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_ptype); ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_opts); + ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_removable); ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_scsi_level); ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_virtual_gb); ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_vpd_use_hostno); @@ -3255,6 +3278,7 @@ static void do_remove_driverfs_files(void) driver_remove_file(&sdebug_driverfs_driver, &driver_attr_scsi_level); driver_remove_file(&sdebug_driverfs_driver, &driver_attr_opts); driver_remove_file(&sdebug_driverfs_driver, &driver_attr_ptype); + driver_remove_file(&sdebug_driverfs_driver, &driver_attr_removable); driver_remove_file(&sdebug_driverfs_driver, &driver_attr_num_tgts); driver_remove_file(&sdebug_driverfs_driver, &driver_attr_num_parts); driver_remove_file(&sdebug_driverfs_driver, &driver_attr_no_uld); -- 1.7.2.5 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 0/1] Option for scsi_debug to fake removable devices
2012-06-05 7:25 Martin Pitt
@ 2012-06-05 18:10 Rolf Eike Beer
0 siblings, 0 replies; 8+ messages in thread
From: Rolf Eike Beer @ 2012-06-05 18:10 UTC (permalink / raw)
To: Martin Pitt; +Cc: linux-scsi, linux-kernel, David Zeuthen, Kay Sievers
[-- Attachment #1: Type: text/plain, Size: 344 bytes --]
Martin Pitt wrote:
> I got a signoff from David Zeuthen (the primary udisks maintainer)
> already, noted so in the patch.
This is wrong. Signed-off would mean that he takes the patch and passed it on.
So what this really is as you as the original author push this out is either
Acked-by, Tested-by, Reviewed-by or something like that.
Eike
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 0/1] Option for scsi_debug to fake removable devices @ 2012-06-05 7:25 Martin Pitt 2012-06-05 7:27 ` [PATCH 1/1] [SCSI] scsi_debug: Add "removable" parameter Martin Pitt 0 siblings, 1 reply; 8+ messages in thread From: Martin Pitt @ 2012-06-05 7:25 UTC (permalink / raw) To: linux-scsi; +Cc: linux-kernel, David Zeuthen, Kay Sievers [-- Attachment #1: Type: text/plain, Size: 1510 bytes --] Hello all, For the purposes of automatically testing udisks and gvfs automounting I would like to add a parameter to scsi_debug to control the "removable" attribute of the created block device. With that, we can test system-internal and removable drives, as well as CD-ROMs (which scsi_debug can already emulate). udisks requires different privileges for mounting system-internal drives vs. removable/hotpluggable drives. I wrote a simple kernel patch for this (against linux-next), and tested this quite thoroughly. I ran the style checker, and it reports two problems: ------------ 8< -------------- WARNING: line over 80 characters #109: FILE: drivers/scsi/scsi_debug.c:3255: + ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_removable); WARNING: Prefer pr_err(... to printk(KERN_ERR, ... #126: FILE: drivers/scsi/scsi_debug.c:3353: + printk(KERN_ERR "scsi_debug_init: removable must be 0 or 1\n"); ------------ 8< -------------- But as the existing code uses this style in the adjacent lines, I favored consistency over fixing those. If the latter is desired, I'd rather send a separate patch with just the style cleanup for the whole file. I got a signoff from David Zeuthen (the primary udisks maintainer) already, noted so in the patch. Thank you in advance for considering, Martin -- Martin Pitt | http://www.piware.de Ubuntu Developer (www.ubuntu.com) | Debian Developer (www.debian.org) [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/1] [SCSI] scsi_debug: Add "removable" parameter 2012-06-05 7:25 Martin Pitt @ 2012-06-05 7:27 ` Martin Pitt 2012-06-05 16:16 ` Randy Dunlap 0 siblings, 1 reply; 8+ messages in thread From: Martin Pitt @ 2012-06-05 7:27 UTC (permalink / raw) To: linux-scsi; +Cc: linux-kernel, David Zeuthen, Kay Sievers Add "removable" module parameter to set the "removable" attribute of any subsequently created debug block device. It is a writable driver option, so that you can switch between removable and "fixed" media block devices in between the add_host calls. This is useful for being able to test the different behaviour/required privileges in e. g. the udisks test suite. Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com> Signed-off-by: David Zeuthen <zeuthen@gmail.com> --- drivers/scsi/scsi_debug.c | 35 ++++++++++++++++++++++++++++++++--- 1 files changed, 32 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c index 182d5a5..6eaa95e 100644 --- a/drivers/scsi/scsi_debug.c +++ b/drivers/scsi/scsi_debug.c @@ -109,6 +109,7 @@ static const char * scsi_debug_version_date = "20100324"; #define DEF_OPT_BLKS 64 #define DEF_PHYSBLK_EXP 0 #define DEF_PTYPE 0 +#define DEF_REMOVABLE 0 #define DEF_SCSI_LEVEL 5 /* INQUIRY, byte2 [5->SPC-3] */ #define DEF_SECTOR_SIZE 512 #define DEF_UNMAP_ALIGNMENT 0 @@ -180,6 +181,7 @@ static int scsi_debug_opt_blks = DEF_OPT_BLKS; static int scsi_debug_opts = DEF_OPTS; static int scsi_debug_physblk_exp = DEF_PHYSBLK_EXP; static int scsi_debug_ptype = DEF_PTYPE; /* SCSI peripheral type (0==disk) */ +static int scsi_debug_removable = DEF_REMOVABLE; static int scsi_debug_scsi_level = DEF_SCSI_LEVEL; static int scsi_debug_sector_size = DEF_SECTOR_SIZE; static int scsi_debug_virtual_gb = DEF_VIRTUAL_GB; @@ -197,7 +199,6 @@ static unsigned int scsi_debug_write_same_length = DEF_WRITESAME_LENGTH; static int scsi_debug_cmnd_count = 0; #define DEV_READONLY(TGT) (0) -#define DEV_REMOVEABLE(TGT) (0) static unsigned int sdebug_store_sectors; static sector_t sdebug_capacity; /* in sectors */ @@ -919,7 +920,7 @@ static int resp_inquiry(struct scsi_cmnd * scp, int target, return ret; } /* drops through here for a standard inquiry */ - arr[1] = DEV_REMOVEABLE(target) ? 0x80 : 0; /* Removable disk */ + arr[1] = scsi_debug_removable ? 0x80 : 0; /* Removable disk */ arr[2] = scsi_debug_scsi_level; arr[3] = 2; /* response_data_format==2 */ arr[4] = SDEBUG_LONG_INQ_SZ - 5; @@ -1211,7 +1212,7 @@ static int resp_format_pg(unsigned char * p, int pcontrol, int target) p[11] = sdebug_sectors_per & 0xff; p[12] = (scsi_debug_sector_size >> 8) & 0xff; p[13] = scsi_debug_sector_size & 0xff; - if (DEV_REMOVEABLE(target)) + if (scsi_debug_removable) p[20] |= 0x20; /* should agree with INQUIRY */ if (1 == pcontrol) memset(p + 2, 0, sizeof(format_pg) - 2); @@ -2754,6 +2755,7 @@ module_param_named(opt_blks, scsi_debug_opt_blks, int, S_IRUGO); module_param_named(opts, scsi_debug_opts, int, S_IRUGO | S_IWUSR); module_param_named(physblk_exp, scsi_debug_physblk_exp, int, S_IRUGO); module_param_named(ptype, scsi_debug_ptype, int, S_IRUGO | S_IWUSR); +module_param_named(removable, scsi_debug_removable, int, S_IRUGO | S_IWUSR); module_param_named(scsi_level, scsi_debug_scsi_level, int, S_IRUGO); module_param_named(sector_size, scsi_debug_sector_size, int, S_IRUGO); module_param_named(unmap_alignment, scsi_debug_unmap_alignment, int, S_IRUGO); @@ -2796,6 +2798,7 @@ MODULE_PARM_DESC(opt_blks, "optimal transfer length in block (def=64)"); MODULE_PARM_DESC(opts, "1->noise, 2->medium_err, 4->timeout, 8->recovered_err... (def=0)"); MODULE_PARM_DESC(physblk_exp, "physical block exponent (def=0)"); MODULE_PARM_DESC(ptype, "SCSI peripheral type(def=0[disk])"); +MODULE_PARM_DESC(removable, "claim to have removable media (def=0)"); MODULE_PARM_DESC(scsi_level, "SCSI level to simulate(def=5[SPC-3])"); MODULE_PARM_DESC(sector_size, "logical block size in bytes (def=512)"); MODULE_PARM_DESC(unmap_alignment, "lowest aligned thin provisioning lba (def=0)"); @@ -3205,6 +3208,25 @@ static ssize_t sdebug_map_show(struct device_driver *ddp, char *buf) } DRIVER_ATTR(map, S_IRUGO, sdebug_map_show, NULL); +static ssize_t sdebug_removable_show(struct device_driver *ddp, + char *buf) +{ + return scnprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_removable); +} +static ssize_t sdebug_removable_store(struct device_driver *ddp, + const char *buf, size_t count) +{ + int n; + + if ((count > 0) && (1 == sscanf(buf, "%d", &n)) && (n >= 0)) { + scsi_debug_removable = n; + return count; + } + return -EINVAL; +} +DRIVER_ATTR(removable, S_IRUGO | S_IWUSR, sdebug_removable_show, + sdebug_removable_store); + /* Note: The following function creates attribute files in the /sys/bus/pseudo/drivers/scsi_debug directory. The advantage of these @@ -3230,6 +3252,7 @@ static int do_create_driverfs_files(void) ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_num_tgts); ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_ptype); ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_opts); + ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_removable); ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_scsi_level); ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_virtual_gb); ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_vpd_use_hostno); @@ -3255,6 +3278,7 @@ static void do_remove_driverfs_files(void) driver_remove_file(&sdebug_driverfs_driver, &driver_attr_scsi_level); driver_remove_file(&sdebug_driverfs_driver, &driver_attr_opts); driver_remove_file(&sdebug_driverfs_driver, &driver_attr_ptype); + driver_remove_file(&sdebug_driverfs_driver, &driver_attr_removable); driver_remove_file(&sdebug_driverfs_driver, &driver_attr_num_tgts); driver_remove_file(&sdebug_driverfs_driver, &driver_attr_num_parts); driver_remove_file(&sdebug_driverfs_driver, &driver_attr_no_uld); @@ -3325,6 +3349,11 @@ static int __init scsi_debug_init(void) return -EINVAL; } + if (scsi_debug_removable > 1) { + printk(KERN_ERR "scsi_debug_init: removable must be 0 or 1\n"); + return -EINVAL; + } + if (scsi_debug_dev_size_mb < 1) scsi_debug_dev_size_mb = 1; /* force minimum 1 MB ramdisk */ sz = (unsigned long)scsi_debug_dev_size_mb * 1048576; -- 1.7.2.5 -- Martin Pitt | http://www.piware.de Ubuntu Developer (www.ubuntu.com) | Debian Developer (www.debian.org) ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 1/1] [SCSI] scsi_debug: Add "removable" parameter 2012-06-05 7:27 ` [PATCH 1/1] [SCSI] scsi_debug: Add "removable" parameter Martin Pitt @ 2012-06-05 16:16 ` Randy Dunlap 2012-06-05 17:39 ` Martin Pitt 2012-06-27 13:01 ` Martin Pitt 0 siblings, 2 replies; 8+ messages in thread From: Randy Dunlap @ 2012-06-05 16:16 UTC (permalink / raw) To: Martin Pitt; +Cc: linux-scsi, linux-kernel, David Zeuthen, Kay Sievers On 06/05/2012 12:27 AM, Martin Pitt wrote: > Add "removable" module parameter to set the "removable" attribute of any > subsequently created debug block device. It is a writable driver option, so > that you can switch between removable and "fixed" media block devices in > between the add_host calls. > > This is useful for being able to test the different behaviour/required > privileges in e. g. the udisks test suite. > > Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com> > Signed-off-by: David Zeuthen <zeuthen@gmail.com> > --- > drivers/scsi/scsi_debug.c | 35 ++++++++++++++++++++++++++++++++--- > 1 files changed, 32 insertions(+), 3 deletions(-) > > diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c > index 182d5a5..6eaa95e 100644 > --- a/drivers/scsi/scsi_debug.c > +++ b/drivers/scsi/scsi_debug.c > @@ -109,6 +109,7 @@ static const char * scsi_debug_version_date = "20100324"; > #define DEF_OPT_BLKS 64 > #define DEF_PHYSBLK_EXP 0 > #define DEF_PTYPE 0 > +#define DEF_REMOVABLE 0 > #define DEF_SCSI_LEVEL 5 /* INQUIRY, byte2 [5->SPC-3] */ > #define DEF_SECTOR_SIZE 512 > #define DEF_UNMAP_ALIGNMENT 0 > @@ -180,6 +181,7 @@ static int scsi_debug_opt_blks = DEF_OPT_BLKS; > static int scsi_debug_opts = DEF_OPTS; > static int scsi_debug_physblk_exp = DEF_PHYSBLK_EXP; > static int scsi_debug_ptype = DEF_PTYPE; /* SCSI peripheral type (0==disk) */ > +static int scsi_debug_removable = DEF_REMOVABLE; > static int scsi_debug_scsi_level = DEF_SCSI_LEVEL; > static int scsi_debug_sector_size = DEF_SECTOR_SIZE; > static int scsi_debug_virtual_gb = DEF_VIRTUAL_GB; > @@ -2754,6 +2755,7 @@ module_param_named(opt_blks, scsi_debug_opt_blks, int, S_IRUGO); > module_param_named(opts, scsi_debug_opts, int, S_IRUGO | S_IWUSR); > module_param_named(physblk_exp, scsi_debug_physblk_exp, int, S_IRUGO); > module_param_named(ptype, scsi_debug_ptype, int, S_IRUGO | S_IWUSR); > +module_param_named(removable, scsi_debug_removable, int, S_IRUGO | S_IWUSR); > module_param_named(scsi_level, scsi_debug_scsi_level, int, S_IRUGO); > module_param_named(sector_size, scsi_debug_sector_size, int, S_IRUGO); > module_param_named(unmap_alignment, scsi_debug_unmap_alignment, int, S_IRUGO); > @@ -2796,6 +2798,7 @@ MODULE_PARM_DESC(opt_blks, "optimal transfer length in block (def=64)"); > MODULE_PARM_DESC(opts, "1->noise, 2->medium_err, 4->timeout, 8->recovered_err... (def=0)"); > MODULE_PARM_DESC(physblk_exp, "physical block exponent (def=0)"); > MODULE_PARM_DESC(ptype, "SCSI peripheral type(def=0[disk])"); > +MODULE_PARM_DESC(removable, "claim to have removable media (def=0)"); > MODULE_PARM_DESC(scsi_level, "SCSI level to simulate(def=5[SPC-3])"); > MODULE_PARM_DESC(sector_size, "logical block size in bytes (def=512)"); > MODULE_PARM_DESC(unmap_alignment, "lowest aligned thin provisioning lba (def=0)"); > @@ -3205,6 +3208,25 @@ static ssize_t sdebug_map_show(struct device_driver *ddp, char *buf) > } > DRIVER_ATTR(map, S_IRUGO, sdebug_map_show, NULL); > > +static ssize_t sdebug_removable_show(struct device_driver *ddp, > + char *buf) > +{ > + return scnprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_removable); > +} > +static ssize_t sdebug_removable_store(struct device_driver *ddp, > + const char *buf, size_t count) > +{ > + int n; > + > + if ((count > 0) && (1 == sscanf(buf, "%d", &n)) && (n >= 0)) { > + scsi_debug_removable = n; > + return count; > + } > + return -EINVAL; > +} > +DRIVER_ATTR(removable, S_IRUGO | S_IWUSR, sdebug_removable_show, > + sdebug_removable_store); > + > > /* Note: The following function creates attribute files in the > /sys/bus/pseudo/drivers/scsi_debug directory. The advantage of these > @@ -3325,6 +3349,11 @@ static int __init scsi_debug_init(void) > return -EINVAL; > } > > + if (scsi_debug_removable > 1) { > + printk(KERN_ERR "scsi_debug_init: removable must be 0 or 1\n"); > + return -EINVAL; > + } > + so why not make it a bool instead of an int value? > if (scsi_debug_dev_size_mb < 1) > scsi_debug_dev_size_mb = 1; /* force minimum 1 MB ramdisk */ > sz = (unsigned long)scsi_debug_dev_size_mb * 1048576; -- ~Randy ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/1] [SCSI] scsi_debug: Add "removable" parameter 2012-06-05 16:16 ` Randy Dunlap @ 2012-06-05 17:39 ` Martin Pitt 2012-06-27 13:01 ` Martin Pitt 1 sibling, 0 replies; 8+ messages in thread From: Martin Pitt @ 2012-06-05 17:39 UTC (permalink / raw) To: Randy Dunlap; +Cc: linux-scsi, linux-kernel, David Zeuthen, Kay Sievers Randy Dunlap [2012-06-05 9:16 -0700]: > so why not make it a bool instead of an int value? Just like the obsolete printk KERN_ERR and the overly long lines (see my intro mail) I wanted to be consistent with the existing boolean options (the other flags also use an int). However, I don't mind much either way; if it is preferred, I can send a patch with int → bool. Thanks, Martin -- Martin Pitt | http://www.piware.de Ubuntu Developer (www.ubuntu.com) | Debian Developer (www.debian.org) ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/1] [SCSI] scsi_debug: Add "removable" parameter 2012-06-05 16:16 ` Randy Dunlap 2012-06-05 17:39 ` Martin Pitt @ 2012-06-27 13:01 ` Martin Pitt 1 sibling, 0 replies; 8+ messages in thread From: Martin Pitt @ 2012-06-27 13:01 UTC (permalink / raw) To: Randy Dunlap, Rolf Eike Beer Cc: linux-scsi, linux-kernel, David Zeuthen, Kay Sievers Hello Randy, Eike, Randy Dunlap [2012-06-05 9:16 -0700]: > so why not make it a bool instead of an int value? Rolf Eike Beer [2012-06-05 20:10 +0200]: > This is wrong. Signed-off would mean that he takes the patch and passed it on. > So what this really is as you as the original author push this out is either > Acked-by, Tested-by, Reviewed-by or something like that. I did not hear any other feedback, so I'm resending the patch with these two changes. Thanks, Martin -- Martin Pitt | http://www.piware.de Ubuntu Developer (www.ubuntu.com) | Debian Developer (www.debian.org) ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2012-09-06 14:23 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2012-09-06 10:03 [PATCH 0/1] Option for scsi_debug to fake removable devices Martin Pitt 2012-09-06 10:04 ` [PATCH 1/1] [SCSI] scsi_debug: Add "removable" parameter Martin Pitt 2012-09-06 14:22 ` Douglas Gilbert -- strict thread matches above, loose matches on Subject: below -- 2012-07-10 9:22 [PATCH 0/1] Option for scsi_debug to fake removable devices Martin Pitt 2012-07-10 9:24 ` [PATCH 1/1] [SCSI] scsi_debug: Add "removable" parameter Martin Pitt 2012-06-05 18:10 [PATCH 0/1] Option for scsi_debug to fake removable devices Rolf Eike Beer 2012-06-05 7:25 Martin Pitt 2012-06-05 7:27 ` [PATCH 1/1] [SCSI] scsi_debug: Add "removable" parameter Martin Pitt 2012-06-05 16:16 ` Randy Dunlap 2012-06-05 17:39 ` Martin Pitt 2012-06-27 13:01 ` Martin Pitt
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).