Skip to content

Commit

Permalink
s390/cio: dont unregister subchannel from child-drivers
Browse files Browse the repository at this point in the history
The devices owned by the parent-driver (css) was getting unregistered
from the io-subchannel driver is clearly a layering violation.
Remove the subchannel unregistration from the child-drivers.

This also means, if the device connected to the subchannel is not
operational, or not accessible, the subchannel will not be unregistered.
Instead the CIO layer will allow valid subchannels without any operational
devices in sysfs. And the userspace tooling might need to be modified to
optimally handle this new situation.

Signed-off-by: Vineeth Vijayan <vneethv@linux.ibm.com>
Reviewed-by: Peter Oberparleiter <oberpar@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
  • Loading branch information
vneethv authored and hcahca committed Aug 31, 2021
1 parent c7a5238 commit 2297791
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 18 deletions.
5 changes: 4 additions & 1 deletion drivers/s390/cio/blacklist.c
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,10 @@ static int blacklist_parse_proc_parameters(char *buf)

if (strcmp("free", parm) == 0) {
rc = blacklist_parse_parameters(buf, free, 0);
css_schedule_eval_all_unreg(0);
/* There could be subchannels without proper devices connected.
* evaluate all the entries
*/
css_schedule_eval_all();
} else if (strcmp("add", parm) == 0)
rc = blacklist_parse_parameters(buf, add, 0);
else if (strcmp("purge", parm) == 0)
Expand Down
21 changes: 4 additions & 17 deletions drivers/s390/cio/device.c
Original file line number Diff line number Diff line change
Expand Up @@ -867,19 +867,6 @@ static void io_subchannel_register(struct ccw_device *cdev)
wake_up(&ccw_device_init_wq);
}

static void ccw_device_call_sch_unregister(struct ccw_device *cdev)
{
struct subchannel *sch;

/* Get subchannel reference for local processing. */
if (!get_device(cdev->dev.parent))
return;
sch = to_subchannel(cdev->dev.parent);
css_sch_device_unregister(sch);
/* Release subchannel reference for local processing. */
put_device(&sch->dev);
}

/*
* subchannel recognition done. Called from the state machine.
*/
Expand Down Expand Up @@ -1860,10 +1847,10 @@ static void ccw_device_todo(struct work_struct *work)
css_schedule_eval(sch->schid);
fallthrough;
case CDEV_TODO_UNREG:
if (sch_is_pseudo_sch(sch))
ccw_device_unregister(cdev);
else
ccw_device_call_sch_unregister(cdev);
spin_lock_irq(sch->lock);
sch_set_cdev(sch, NULL);
spin_unlock_irq(sch->lock);
ccw_device_unregister(cdev);
break;
default:
break;
Expand Down

0 comments on commit 2297791

Please sign in to comment.