[PATCH] multipath-tools: fix default blacklist of s390 devices

[PATCH] multipath-tools: fix default blacklist of s390 devices

[Xose Vazquez Perez]

Each blacklist only their own devices.

Cc: Stefan Haberland <sth@linux.ibm.com>
Cc: Nigel Hislop <hislop_nigel@emc.com>
Cc: Matthias Rudolph <Matthias.Rudolph@hitachivantara.com>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
Cc: Sven Schnelle <svens@linux.ibm.com>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Martin Wilck <mwilck@suse.com>
Cc: Benjamin Marzinski <bmarzins@redhat.com>
Cc: Christophe Varoqui <christophe.varoqui@opensvc.com>
Cc: S390-ML <linux-s390@vger.kernel.org>
Cc: DM-DEVEL-ML <dm-devel@lists.linux.dev>
Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
---
DASD devices been blacklisted twice, since:
https://github.com/opensvc/multipath-tools/commit/a6ff4f957c78bd15c49278ad359671a705eaf4b5
In the current code:
https://github.com/opensvc/multipath-tools/blob/de16cf82c5263fc148118be56ebf44c8f0ee60b8/libmultipath/blacklist.c#L233
---
 libmultipath/hwtable.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c
index 081d119c..4ca4245c 100644
--- a/libmultipath/hwtable.c
+++ b/libmultipath/hwtable.c
@@ -677,7 +677,7 @@ static struct hwentry default_hw[] = {
 		/* PAV DASD ECKD */
 		.vendor        = "IBM",
 		.product       = "S/390 DASD ECKD",
-		.bl_product    = "S/390",
+		.bl_product    = "S/390 DASD ECKD",
 		.uid_attribute = "ID_UID",
 		.no_path_retry = NO_PATH_RETRY_QUEUE,
 		.pgpolicy      = MULTIBUS,
@@ -687,7 +687,7 @@ static struct hwentry default_hw[] = {
 		/* PAV DASD FBA */
 		.vendor        = "IBM",
 		.product       = "S/390 DASD FBA",
-		.bl_product    = "S/390",
+		.bl_product    = "S/390 DASD FBA",
 		.uid_attribute = "ID_UID",
 		.no_path_retry = NO_PATH_RETRY_QUEUE,
 		.pgpolicy      = MULTIBUS,
-- 
2.50.1

Re: [PATCH] multipath-tools: fix default blacklist of s390 devices

[Xose Vazquez Perez]

On 7/12/25 10:14 PM, Xose Vazquez Perez wrote:

>   libmultipath/hwtable.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c
> index 081d119c..4ca4245c 100644
> --- a/libmultipath/hwtable.c
> +++ b/libmultipath/hwtable.c
> @@ -687,7 +687,7 @@ static struct hwentry default_hw[] = {
>   		/* PAV DASD FBA */
>   		.vendor        = "IBM",
>   		.product       = "S/390 DASD FBA",
> -		.bl_product    = "S/390",
> +		.bl_product    = "S/390 DASD FBA",
>   		.uid_attribute = "ID_UID",
>   		.no_path_retry = NO_PATH_RETRY_QUEUE,
>   		.pgpolicy      = MULTIBUS,

Is PAV really supported on FBA devices ???
And other than 3390 and 3380(3390 model 2/3 in track-compatibility mode) ECKD types ?

Source, z/vm docs: https://www.vm.ibm.com/storman/pav/pav2.html#2001

Thanks.

Re: [PATCH] multipath-tools: fix default blacklist of s390 devices

[Martin Wilck]

On Sun, 2025-07-13 at 00:11 +0200, Xose Vazquez Perez wrote:
> On 7/12/25 10:14 PM, Xose Vazquez Perez wrote:
> 
> >   libmultipath/hwtable.c | 4 ++--
> >   1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c
> > index 081d119c..4ca4245c 100644
> > --- a/libmultipath/hwtable.c
> > +++ b/libmultipath/hwtable.c
> > @@ -687,7 +687,7 @@ static struct hwentry default_hw[] = {
> >   		/* PAV DASD FBA */
> >   		.vendor        = "IBM",
> >   		.product       = "S/390 DASD FBA",
> > -		.bl_product    = "S/390",
> > +		.bl_product    = "S/390 DASD FBA",
> >   		.uid_attribute = "ID_UID",
> >   		.no_path_retry = NO_PATH_RETRY_QUEUE,
> >   		.pgpolicy      = MULTIBUS,
> 
> Is PAV really supported on FBA devices ???
> And other than 3390 and 3380(3390 model 2/3 in track-compatibility
> mode) ECKD types ?

I don't know, but either way I don't think blacklisting them would
hurt.

Martin

> 
> Source, z/vm docs: https://www.vm.ibm.com/storman/pav/pav2.html#2001
> 
> Thanks.

Re: [PATCH] multipath-tools: fix default blacklist of s390 devices

[Martin Wilck]

On Sat, 2025-07-12 at 22:14 +0200, Xose Vazquez Perez wrote:
> Each blacklist only their own devices.
> 
> Cc: Stefan Haberland <sth@linux.ibm.com>
> Cc: Nigel Hislop <hislop_nigel@emc.com>
> Cc: Matthias Rudolph <Matthias.Rudolph@hitachivantara.com>
> Cc: Heiko Carstens <hca@linux.ibm.com>
> Cc: Vasily Gorbik <gor@linux.ibm.com>
> Cc: Alexander Gordeev <agordeev@linux.ibm.com>
> Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
> Cc: Sven Schnelle <svens@linux.ibm.com>
> Cc: Hannes Reinecke <hare@suse.de>
> Cc: Martin Wilck <mwilck@suse.com>
> Cc: Benjamin Marzinski <bmarzins@redhat.com>
> Cc: Christophe Varoqui <christophe.varoqui@opensvc.com>
> Cc: S390-ML <linux-s390@vger.kernel.org>
> Cc: DM-DEVEL-ML <dm-devel@lists.linux.dev>
> Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
> ---
> DASD devices been blacklisted twice, since:
> https://github.com/opensvc/multipath-tools/commit/a6ff4f957c78bd15c49278ad359671a705eaf4b5
> In the current code:
> https://github.com/opensvc/multipath-tools/blob/de16cf82c5263fc148118be56ebf44c8f0ee60b8/libmultipath/blacklist.c#L233
> ---
>  libmultipath/hwtable.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Reviewed-by: Martin Wilck <mwilck@suse.com>

Re: [PATCH] multipath-tools: fix default blacklist of s390 devices

[Stefan Haberland]

Am 13.07.25 um 00:11 schrieb Xose Vazquez Perez:
> On 7/12/25 10:14 PM, Xose Vazquez Perez wrote:
>
>>   libmultipath/hwtable.c | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c
>> index 081d119c..4ca4245c 100644
>> --- a/libmultipath/hwtable.c
>> +++ b/libmultipath/hwtable.c
>> @@ -687,7 +687,7 @@ static struct hwentry default_hw[] = {
>>           /* PAV DASD FBA */
>>           .vendor        = "IBM",
>>           .product       = "S/390 DASD FBA",
>> -        .bl_product    = "S/390",
>> +        .bl_product    = "S/390 DASD FBA",
>>           .uid_attribute = "ID_UID",
>>           .no_path_retry = NO_PATH_RETRY_QUEUE,
>>           .pgpolicy      = MULTIBUS,
>
> Is PAV really supported on FBA devices ???
> And other than 3390 and 3380(3390 model 2/3 in track-compatibility mode) ECKD types ?

Currently there is no support in the driver for PAV with FBA devices.
But the devices itself are capable of PAV.

Re: [PATCH] multipath-tools: fix default blacklist of s390 devices

[Stefan Haberland]

Am 12.07.25 um 22:14 schrieb Xose Vazquez Perez:
> Each blacklist only their own devices.
>
> Cc: Stefan Haberland <sth@linux.ibm.com>
> Cc: Nigel Hislop <hislop_nigel@emc.com>
> Cc: Matthias Rudolph <Matthias.Rudolph@hitachivantara.com>
> Cc: Heiko Carstens <hca@linux.ibm.com>
> Cc: Vasily Gorbik <gor@linux.ibm.com>
> Cc: Alexander Gordeev <agordeev@linux.ibm.com>
> Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
> Cc: Sven Schnelle <svens@linux.ibm.com>
> Cc: Hannes Reinecke <hare@suse.de>
> Cc: Martin Wilck <mwilck@suse.com>
> Cc: Benjamin Marzinski <bmarzins@redhat.com>
> Cc: Christophe Varoqui <christophe.varoqui@opensvc.com>
> Cc: S390-ML <linux-s390@vger.kernel.org>
> Cc: DM-DEVEL-ML <dm-devel@lists.linux.dev>
> Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
> ---
> DASD devices been blacklisted twice, since:
> https://github.com/opensvc/multipath-tools/commit/a6ff4f957c78bd15c49278ad359671a705eaf4b5
> In the current code:
> https://github.com/opensvc/multipath-tools/blob/de16cf82c5263fc148118be56ebf44c8f0ee60b8/libmultipath/blacklist.c#L233
> ---

Reviewed-by: Stefan Haberland <sth@linux.ibm.com>

Re: [PATCH] multipath-tools: fix default blacklist of s390 devices

[Xose Vazquez Perez]

On 7/14/25 2:38 PM, Stefan Haberland wrote:

>> Is PAV really supported on FBA devices ???
>> And other than 3390 and 3380(3390 model 2/3 in track-compatibility mode) ECKD types ?
> 
> Currently there is no support in the driver for PAV with FBA devices.
> But the devices itself are capable of PAV.

If there is no PAV support for FBA devices on Linux, and it looks like it won't be
implemented even in the distant future. The detection code, and the device, could
be deleted from multipath-tools:
https://github.com/opensvc/multipath-tools/blob/de16cf82c5263fc148118be56ebf44c8f0ee60b8/libmultipath/hwtable.c#L688-L697
https://github.com/opensvc/multipath-tools/blob/de16cf82c5263fc148118be56ebf44c8f0ee60b8/libmultipath/discovery.c#L1674-L1685

Is PAV supported on 9343/9345 (cutype/devtype) ECKD devices?


Thanks.

Re: [PATCH] multipath-tools: fix default blacklist of s390 devices

[Martin Wilck]

On Fri, 2025-07-18 at 22:54 +0200, Xose Vazquez Perez wrote:
> On 7/14/25 2:38 PM, Stefan Haberland wrote:
> 
> > > Is PAV really supported on FBA devices ???
> > > And other than 3390 and 3380(3390 model 2/3 in track-
> > > compatibility mode) ECKD types ?
> > 
> > Currently there is no support in the driver for PAV with FBA
> > devices.
> > But the devices itself are capable of PAV.
> 
> If there is no PAV support for FBA devices on Linux, and it looks
> like it won't be
> implemented even in the distant future. The detection code, and the
> device, could
> be deleted from multipath-tools:

I agree. @Stefan, it would be appreciated if you or someone from your
group could send a patch.

Martin

> https://github.com/opensvc/multipath-tools/blob/de16cf82c5263fc148118be56ebf44c8f0ee60b8/libmultipath/hwtable.c#L688-L697
> https://github.com/opensvc/multipath-tools/blob/de16cf82c5263fc148118be56ebf44c8f0ee60b8/libmultipath/discovery.c#L1674-L1685
> 
> Is PAV supported on 9343/9345 (cutype/devtype) ECKD devices?
> 
> 
> Thanks.

Re: [PATCH] multipath-tools: fix default blacklist of s390 devices

[Xose Vazquez Perez]

On 7/19/25 2:34 PM, Martin Wilck wrote:

> On Fri, 2025-07-18 at 22:54 +0200, Xose Vazquez Perez wrote:

>> On 7/14/25 2:38 PM, Stefan Haberland wrote:
>>
>>>> Is PAV really supported on FBA devices ???
>>>> And other than 3390 and 3380(3390 model 2/3 in track-
>>>> compatibility mode) ECKD types ?

>>> Currently there is no support in the driver for PAV with FBA
>>> devices.
>>> But the devices itself are capable of PAV.

>> If there is no PAV support for FBA devices on Linux, and it looks
>> like it won't be
>> implemented even in the distant future. The detection code, and the
>> device, could
>> be deleted from multipath-tools:

> I agree. @Stefan, it would be appreciated if you or someone from your
> group could send a patch.

Something like (untested!):

diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c
index 31db8758..4fc0c496 100644
--- a/libmultipath/discovery.c
+++ b/libmultipath/discovery.c
@@ -1677,11 +1677,9 @@ ccw_sysfs_pathinfo (struct path *pp, const struct vector_s *hwtable)
  	if (sysfs_get_devtype(parent, attr_buff, FILE_NAME_SIZE) <= 0)
  		return PATHINFO_FAILED;

-	if (!strncmp(attr_buff, "3370", 4)) {
-		sprintf(pp->product_id,"S/390 DASD FBA");
-	} else if (!strncmp(attr_buff, "9336", 4)) {
-		sprintf(pp->product_id,"S/390 DASD FBA");
-	} else {
+	// PAV is only supported on ECKD devices.
+	// Defined in drivers/s390/block/dasd_eckd.c
+	if (!strncmp(attr_buff, "3390", 4) || !strncmp(attr_buff, "3380", 4)) {
  		sprintf(pp->product_id,"S/390 DASD ECKD");
  	}

diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c
index 4ca4245c..8e052147 100644
--- a/libmultipath/hwtable.c
+++ b/libmultipath/hwtable.c
@@ -674,7 +674,8 @@ static struct hwentry default_hw[] = {
  		.no_path_retry = NO_PATH_RETRY_QUEUE,
  	},
  	{
-		/* PAV DASD ECKD */
+		// PAV DASD ECKD
+		// "ECKD devices" enumerated in: libmultipath/discovery.c
  		.vendor        = "IBM",
  		.product       = "S/390 DASD ECKD",
  		.bl_product    = "S/390 DASD ECKD",
@@ -683,16 +684,6 @@ static struct hwentry default_hw[] = {
  		.pgpolicy      = MULTIBUS,
  		.checker_name  = DIRECTIO,
  	},
-	{
-		/* PAV DASD FBA */
-		.vendor        = "IBM",
-		.product       = "S/390 DASD FBA",
-		.bl_product    = "S/390 DASD FBA",
-		.uid_attribute = "ID_UID",
-		.no_path_retry = NO_PATH_RETRY_QUEUE,
-		.pgpolicy      = MULTIBUS,
-		.checker_name  = DIRECTIO,
-	},
  	{
  		/* Power RAID */
  		.vendor        = "IBM",