Re: [PATCH 1/3] SCSI: Introduce device_lock and target_lock in Scsi_Host
Hi Johannes,
[auto build test ERROR on scsi/for-next -- if it's inappropriate base, please
suggest rules for selecting the more suitable base]
url:
https://github.com/0day-ci/linux/commits/Johannes-Thumshirn/SCSI-Introduce-device_lock-and-target_lock-in-Scsi_Host/20151014-215532
config: i386-allmodconfig (attached as .config)
reproduce:
# save the attached .config to linux build tree
make ARCH=i386
All error/warnings (new ones prefixed by >>):
In file included from include/linux/mmzone.h:7:0,
from include/linux/gfp.h:5,
from include/linux/slab.h:14,
from drivers/scsi/53c700.c:120:
drivers/scsi/53c700.c: In function 'process_script_interrupt':
>> drivers/scsi/53c700.c:1104:21: error: incompatible type for argument 1 of
>> 'spinlock_check'
spin_lock_irqsave(host->device_lock, flags);
^
include/linux/spinlock.h:208:34: note: in definition of macro
'raw_spin_lock_irqsave'
flags = _raw_spin_lock_irqsave(lock); \
^
>> drivers/scsi/53c700.c:1104:3: note: in expansion of macro 'spin_lock_irqsave'
spin_lock_irqsave(host->device_lock, flags);
^
In file included from include/linux/mmzone.h:7:0,
from include/linux/gfp.h:5,
from include/linux/slab.h:14,
from drivers/scsi/53c700.c:120:
include/linux/spinlock.h:289:40: note: expected 'spinlock_t * {aka struct
spinlock *}' but argument is of type 'spinlock_t {aka struct spinlock}'
static __always_inline raw_spinlock_t *spinlock_check(spinlock_t *lock)
^
>> drivers/scsi/53c700.c:1106:26: error: incompatible type for argument 1 of
>> 'spin_unlock_irqrestore'
spin_unlock_irqrestore(host->device_lock, flags);
^
In file included from include/linux/mmzone.h:7:0,
from include/linux/gfp.h:5,
from include/linux/slab.h:14,
from drivers/scsi/53c700.c:120:
include/linux/spinlock.h:360:29: note: expected 'spinlock_t * {aka struct
spinlock *}' but argument is of type 'spinlock_t {aka struct spinlock}'
static __always_inline void spin_unlock_irqrestore(spinlock_t *lock,
unsigned long flags)
^
vim +/spinlock_check +1104 drivers/scsi/53c700.c
1098 lun = hostdata->msgin[0] & 0x1f;
1099
1100 hostdata->reselection_id = 0xff;
1101 DEBUG(("scsi%d: (%d:%d) RESELECTED!\n",
1102 host->host_no, reselection_id, lun));
1103 /* clear the reselection indicator */
> 1104 spin_lock_irqsave(host->device_lock, flags);
1105 SDp = __scsi_device_lookup(host, 0, reselection_id,
lun);
> 1106 spin_unlock_irqrestore(host->device_lock, flags);
1107 if(unlikely(SDp == NULL)) {
1108 printk(KERN_ERR "scsi%d: (%d:%d) HAS NO
device\n",
1109 host->host_no, reselection_id, lun);
---
0-DAY kernel test infrastructureOpen Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
.config.gz
Description: Binary data
Re: [PATCH 1/3] SCSI: Introduce device_lock and target_lock in Scsi_Host
On 10/14/2015 03:50 PM, Johannes Thumshirn wrote: > Introduce target_lock and device_lock to untangle the __devices and __targets > lists from the host_lock. > > Signed-off-by: Johannes Thumshirn > --- Actually, you need to convert scsi_lookup_by_target, too. That, too, relies on the host_lock. Cheers, Hannes -- Dr. Hannes ReineckezSeries & Storage h...@suse.de +49 911 74053 688 SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton HRB 21284 (AG Nürnberg) -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/3] SCSI: Introduce device_lock and target_lock in Scsi_Host
On 10/14/2015 03:50 PM, Johannes Thumshirn wrote:
> Introduce target_lock and device_lock to untangle the __devices and __targets
> lists from the host_lock.
>
> Signed-off-by: Johannes Thumshirn
> ---
> drivers/scsi/53c700.c | 3 +++
> drivers/scsi/hosts.c | 2 ++
> drivers/scsi/scsi.c | 8
> drivers/scsi/scsi_scan.c | 10 +-
> drivers/scsi/scsi_sysfs.c | 18 --
> include/scsi/scsi_host.h | 2 ++
> 6 files changed, 24 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/scsi/53c700.c b/drivers/scsi/53c700.c
> index a209c34..e2b4d04 100644
> --- a/drivers/scsi/53c700.c
> +++ b/drivers/scsi/53c700.c
> @@ -1093,6 +1093,7 @@ process_script_interrupt(__u32 dsps, __u32 dsp, struct
> scsi_cmnd *SCp,
> struct NCR_700_command_slot *slot;
> __u8 reselection_id = hostdata->reselection_id;
> struct scsi_device *SDp;
> + unsigned long flags;
>
> lun = hostdata->msgin[0] & 0x1f;
>
> @@ -1100,7 +1101,9 @@ process_script_interrupt(__u32 dsps, __u32 dsp, struct
> scsi_cmnd *SCp,
> DEBUG(("scsi%d: (%d:%d) RESELECTED!\n",
> host->host_no, reselection_id, lun));
> /* clear the reselection indicator */
> + spin_lock_irqsave(host->device_lock, flags);
> SDp = __scsi_device_lookup(host, 0, reselection_id, lun);
> + spin_unlock_irqrestore(host->device_lock, flags);
> if(unlikely(SDp == NULL)) {
> printk(KERN_ERR "scsi%d: (%d:%d) HAS NO device\n",
> host->host_no, reselection_id, lun);
Hmm. Unfortunate.
Can't we get rid of the underscore version altogether, seeing that
we have our own lock now?
Cheers,
Hannes
--
Dr. Hannes ReineckezSeries & Storage
h...@suse.de +49 911 74053 688
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton
HRB 21284 (AG Nürnberg)
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/3] SCSI: Introduce device_lock and target_lock in Scsi_Host
Introduce target_lock and device_lock to untangle the __devices and __targets
lists from the host_lock.
Signed-off-by: Johannes Thumshirn
---
drivers/scsi/53c700.c | 3 +++
drivers/scsi/hosts.c | 2 ++
drivers/scsi/scsi.c | 8
drivers/scsi/scsi_scan.c | 10 +-
drivers/scsi/scsi_sysfs.c | 18 --
include/scsi/scsi_host.h | 2 ++
6 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/drivers/scsi/53c700.c b/drivers/scsi/53c700.c
index a209c34..e2b4d04 100644
--- a/drivers/scsi/53c700.c
+++ b/drivers/scsi/53c700.c
@@ -1093,6 +1093,7 @@ process_script_interrupt(__u32 dsps, __u32 dsp, struct
scsi_cmnd *SCp,
struct NCR_700_command_slot *slot;
__u8 reselection_id = hostdata->reselection_id;
struct scsi_device *SDp;
+ unsigned long flags;
lun = hostdata->msgin[0] & 0x1f;
@@ -1100,7 +1101,9 @@ process_script_interrupt(__u32 dsps, __u32 dsp, struct
scsi_cmnd *SCp,
DEBUG(("scsi%d: (%d:%d) RESELECTED!\n",
host->host_no, reselection_id, lun));
/* clear the reselection indicator */
+ spin_lock_irqsave(host->device_lock, flags);
SDp = __scsi_device_lookup(host, 0, reselection_id, lun);
+ spin_unlock_irqrestore(host->device_lock, flags);
if(unlikely(SDp == NULL)) {
printk(KERN_ERR "scsi%d: (%d:%d) HAS NO device\n",
host->host_no, reselection_id, lun);
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index 8bb173e..6855434 100644
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -380,6 +380,8 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template
*sht, int privsize)
shost->host_lock = &shost->default_lock;
spin_lock_init(shost->host_lock);
+ spin_lock_init(&shost->device_lock);
+ spin_lock_init(&shost->target_lock);
shost->shost_state = SHOST_CREATED;
INIT_LIST_HEAD(&shost->__devices);
INIT_LIST_HEAD(&shost->__targets);
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 207d6a7..0e1046a 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -970,7 +970,7 @@ struct scsi_device *__scsi_iterate_devices(struct Scsi_Host
*shost,
struct scsi_device *next = NULL;
unsigned long flags;
- spin_lock_irqsave(shost->host_lock, flags);
+ spin_lock_irqsave(&shost->device_lock, flags);
while (list->next != &shost->__devices) {
next = list_entry(list->next, struct scsi_device, siblings);
/* skip devices that we can't get a reference to */
@@ -979,7 +979,7 @@ struct scsi_device *__scsi_iterate_devices(struct Scsi_Host
*shost,
next = NULL;
list = list->next;
}
- spin_unlock_irqrestore(shost->host_lock, flags);
+ spin_unlock_irqrestore(&shost->device_lock, flags);
if (prev)
scsi_device_put(prev);
@@ -1144,11 +1144,11 @@ struct scsi_device *scsi_device_lookup(struct Scsi_Host
*shost,
struct scsi_device *sdev;
unsigned long flags;
- spin_lock_irqsave(shost->host_lock, flags);
+ spin_lock_irqsave(&shost->device_lock, flags);
sdev = __scsi_device_lookup(shost, channel, id, lun);
if (sdev && scsi_device_get(sdev))
sdev = NULL;
- spin_unlock_irqrestore(shost->host_lock, flags);
+ spin_unlock_irqrestore(&shost->device_lock, flags);
return sdev;
}
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index f9f3f82..ac68531 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -441,14 +441,14 @@ static struct scsi_target *scsi_alloc_target(struct
device *parent,
starget->scsi_level = SCSI_2;
starget->max_target_blocked = SCSI_DEFAULT_TARGET_BLOCKED;
retry:
- spin_lock_irqsave(shost->host_lock, flags);
+ spin_lock_irqsave(&shost->target_lock, flags);
found_target = __scsi_find_target(parent, channel, id);
if (found_target)
goto found;
list_add_tail(&starget->siblings, &shost->__targets);
- spin_unlock_irqrestore(shost->host_lock, flags);
+ spin_unlock_irqrestore(&shost->target_lock, flags);
/* allocate and add */
transport_setup_device(dev);
if (shost->hostt->target_alloc) {
@@ -1854,15 +1854,15 @@ void scsi_forget_host(struct Scsi_Host *shost)
unsigned long flags;
restart:
- spin_lock_irqsave(shost->host_lock, flags);
+ spin_lock_irqsave(&shost->device_lock, flags);
list_for_each_entry(sdev, &shost->__devices, siblings) {
if (sdev->sdev_state == SDEV_DEL)
continue;
- spin_unlock_irqrestore(shost->host_lock, flags);
+ spin_unlock_irqrestore(&shost->device_lock, flags);
