Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-21 10:31:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

s390/cio: ensure that a chpid is registered only once

Browse Source 
Improve locking in chp_new to make sure that we don't register
the same chpid twice. Chpid registration was synchronized via
the machine check handler thread but we also have codepaths to
look for new chpids triggered independent of that thread (during
IPL or resume from hibernate).

Signed-off-by: Sebastian Ott <sebott@linux.ibm.com>
Reviewed-by: Peter Oberparleiter <oberpar@linux.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Sebastian Ott 2018-06-13 16:26:23 +02:00 committed by Martin Schwidefsky
parent 306d6c49ac
commit 87dc8a0128
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/s390/cio/chp.c
View File

@ -471,14 +471,17 @@ int chp_new(struct chp_id chpid)
{
struct channel_subsystem *css = css_by_id(chpid.cssid);
struct channel_path *chp;
int ret;
int ret = 0;
mutex_lock(&css->mutex);
if (chp_is_registered(chpid))
return 0;
chp = kzalloc(sizeof(struct channel_path), GFP_KERNEL);
if (!chp)
return -ENOMEM;
goto out;
chp = kzalloc(sizeof(struct channel_path), GFP_KERNEL);
if (!chp) {
ret = -ENOMEM;
goto out;
}
/* fill in status, etc. */
chp->chpid = chpid;
chp->state = 1;
@ -505,21 +508,20 @@ int chp_new(struct chp_id chpid)
put_device(&chp->dev);
goto out;
}
mutex_lock(&css->mutex);
if (css->cm_enabled) {
ret = chp_add_cmg_attr(chp);
if (ret) {
device_unregister(&chp->dev);
mutex_unlock(&css->mutex);
goto out;
}
}
css->chps[chpid.id] = chp;
mutex_unlock(&css->mutex);
goto out;
out_free:
kfree(chp);
out:
mutex_unlock(&css->mutex);
return ret;
}
@ -585,8 +587,7 @@ static void chp_process_crw(struct crw *crw0, struct crw *crw1,
switch (crw0->erc) {
case CRW_ERC_IPARM: /* Path has come. */
case CRW_ERC_INIT:
if (!chp_is_registered(chpid))
chp_new(chpid);
chp_new(chpid);
chsc_chp_online(chpid);
break;
case CRW_ERC_PERRI: /* Path has gone. */

3
drivers/s390/cio/css.c
View File

@ -244,8 +244,7 @@ static void ssd_register_chpids(struct chsc_ssd_info *ssd)
for (i = 0; i < 8; i++) {
mask = 0x80 >> i;
if (ssd->path_mask & mask)
if (!chp_is_registered(ssd->chpid[i]))
chp_new(ssd->chpid[i]);
chp_new(ssd->chpid[i]);
}
}