[PATCH] s390/cio: Remove the invalid condition on IO_SCH_UNREG

[PATCH] s390/cio: Remove the invalid condition on IO_SCH_UNREG

[Vineeth Vijayan]

The condition to check the cdev pointer validity on
css_sch_device_unregister() is a leftover from the 'commit c97cd8c81d4a
("s390/cio: Remove pm support from ccw bus driver")'. This could lead to a
situation, where detaching the disk is not happening completely. Remove
this invalid condition in the IO_SCH_UNREG case.

Fixes: 8cc0dcfdc1c0 ("s390/cio: remove pm support from ccw bus driver")
Reported-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Suggested-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Vineeth Vijayan <vneethv@linux.ibm.com>
---
 drivers/s390/cio/device.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 3f026021e95e..84f659cafe76 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -1532,8 +1532,7 @@ static int io_subchannel_sch_event(struct subchannel *sch, int process)
 	switch (action) {
 	case IO_SCH_ORPH_UNREG:
 	case IO_SCH_UNREG:
-		if (!cdev)
-			css_sch_device_unregister(sch);
+		css_sch_device_unregister(sch);
 		break;
 	case IO_SCH_ORPH_ATTACH:
 	case IO_SCH_UNREG_ATTACH:
-- 
2.25.1

Re: [PATCH] s390/cio: Remove the invalid condition on IO_SCH_UNREG

[Julian Wiedmann]

On 23.04.21 12:08, Vineeth Vijayan wrote:
> The condition to check the cdev pointer validity on
> css_sch_device_unregister() is a leftover from the 'commit c97cd8c81d4a
> ("s390/cio: Remove pm support from ccw bus driver")'. This could lead to a
> situation, where detaching the disk is not happening completely. Remove

s/disk/device

> this invalid condition in the IO_SCH_UNREG case.
> 
> Fixes: 8cc0dcfdc1c0 ("s390/cio: remove pm support from ccw bus driver")
> Reported-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
> Suggested-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>

Thanks! This seems to fix the hot-unplug troubles with qeth devices.

Tested-by: Julian Wiedmann <jwi@linux.ibm.com>

> Cc: <stable@vger.kernel.org>
> Signed-off-by: Vineeth Vijayan <vneethv@linux.ibm.com>
> ---
>  drivers/s390/cio/device.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
> index 3f026021e95e..84f659cafe76 100644
> --- a/drivers/s390/cio/device.c
> +++ b/drivers/s390/cio/device.c
> @@ -1532,8 +1532,7 @@ static int io_subchannel_sch_event(struct subchannel *sch, int process)
>  	switch (action) {
>  	case IO_SCH_ORPH_UNREG:
>  	case IO_SCH_UNREG:
> -		if (!cdev)
> -			css_sch_device_unregister(sch);
> +		css_sch_device_unregister(sch);
>  		break;
>  	case IO_SCH_ORPH_ATTACH:
>  	case IO_SCH_UNREG_ATTACH:
> 

Re: [PATCH] s390/cio: Remove the invalid condition on IO_SCH_UNREG

[Peter Oberparleiter]

On 23.04.2021 12:08, Vineeth Vijayan wrote:
> The condition to check the cdev pointer validity on
> css_sch_device_unregister() is a leftover from the 'commit c97cd8c81d4a
> ("s390/cio: Remove pm support from ccw bus driver")'. This could lead to a
> situation, where detaching the disk is not happening completely. Remove

This applies to all devices types, not just disks. So replace "disk"
with either "device" or "subchannel".

> this invalid condition in the IO_SCH_UNREG case.
> 
> Fixes: 8cc0dcfdc1c0 ("s390/cio: remove pm support from ccw bus driver")
> Reported-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
> Suggested-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Vineeth Vijayan <vneethv@linux.ibm.com>

Reviewed-by: Peter Oberparleiter <oberpar@linux.ibm.com>


-- 
Peter Oberparleiter
Linux on Z Development - IBM Germany

Re: [PATCH] s390/cio: Remove the invalid condition on IO_SCH_UNREG

[Christian Ehrhardt]

On Fri, Apr 23, 2021 at 12:08 PM Vineeth Vijayan <vneethv@linux.ibm.com> wrote:
>
> The condition to check the cdev pointer validity on
> css_sch_device_unregister() is a leftover from the 'commit c97cd8c81d4a
> ("s390/cio: Remove pm support from ccw bus driver")'. This could lead to a
> situation, where detaching the disk is not happening completely. Remove
> this invalid condition in the IO_SCH_UNREG case.
>
> Fixes: 8cc0dcfdc1c0 ("s390/cio: remove pm support from ccw bus driver")
> Reported-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
> Suggested-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>

Thanks, and if you want for a hattrick now also
  Tested-by Christian Ehrhardt <christian.ehrhardt@canonical.com>

> Cc: <stable@vger.kernel.org>
> Signed-off-by: Vineeth Vijayan <vneethv@linux.ibm.com>
> ---
>  drivers/s390/cio/device.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
> index 3f026021e95e..84f659cafe76 100644
> --- a/drivers/s390/cio/device.c
> +++ b/drivers/s390/cio/device.c
> @@ -1532,8 +1532,7 @@ static int io_subchannel_sch_event(struct subchannel *sch, int process)
>         switch (action) {
>         case IO_SCH_ORPH_UNREG:
>         case IO_SCH_UNREG:
> -               if (!cdev)
> -                       css_sch_device_unregister(sch);
> +               css_sch_device_unregister(sch);
>                 break;
>         case IO_SCH_ORPH_ATTACH:
>         case IO_SCH_UNREG_ATTACH:
> --
> 2.25.1
>


-- 
Christian Ehrhardt
Staff Engineer, Ubuntu Server
Canonical Ltd