* [PATCHv2] Enable iBFT IPv6 booting with prefix length
@ 2016-02-25 18:15 Lee Duncan
2016-02-25 18:15 ` [PATCHv2] iscsi_ibft: Add prefix-len attr and display netmask Lee Duncan
0 siblings, 1 reply; 6+ messages in thread
From: Lee Duncan @ 2016-02-25 18:15 UTC (permalink / raw)
To: linux-scsi; +Cc: hare, michaelc, konrad, Lee Duncan
It turns out that IPv6 doesn't care about netmask, but
instead uses "prefix length" to determine the subnet, but
the iBFT subsystem still just supports netmask.
These two patches enable IPv6 iBFT (iscsi booting)
by adding support for IPv6 prefix and prefix length.
Open-iscsi changes to use these new values will be
introduced once these changes are present.
Hannes Reinecke (1):
iscsi_ibft: Add prefix-len attr and display netmask
drivers/firmware/iscsi_ibft.c | 4 ++++
drivers/scsi/iscsi_boot_sysfs.c | 5 +++++
include/linux/iscsi_boot_sysfs.h | 1 +
3 files changed, 10 insertions(+)
--
1.8.5.2
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCHv2] iscsi_ibft: Add prefix-len attr and display netmask
2016-02-25 18:15 [PATCHv2] Enable iBFT IPv6 booting with prefix length Lee Duncan
@ 2016-02-25 18:15 ` Lee Duncan
2016-02-29 18:45 ` Mike Christie
0 siblings, 1 reply; 6+ messages in thread
From: Lee Duncan @ 2016-02-25 18:15 UTC (permalink / raw)
To: linux-scsi; +Cc: hare, michaelc, konrad, Lee Duncan
From: Hannes Reinecke <hare@suse.de>
The iBFT table only specifies a prefix length, not a netmask.
And the netmask is pretty much pointless for IPv6.
So introduce a new attribute 'prefix-len' and display the
netmask attribute only for IPv4 addresses.
Some older user-space code might rely on the netmask attribute
being present, so we should always display it.
Changes from v1:
- Combined two patches into one
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Lee Duncan <lduncan@suse.com>
---
drivers/firmware/iscsi_ibft.c | 4 ++++
drivers/scsi/iscsi_boot_sysfs.c | 5 +++++
include/linux/iscsi_boot_sysfs.h | 1 +
3 files changed, 10 insertions(+)
diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c
index 72791232e46b..81037e5fe301 100644
--- a/drivers/firmware/iscsi_ibft.c
+++ b/drivers/firmware/iscsi_ibft.c
@@ -319,6 +319,9 @@ static ssize_t ibft_attr_show_nic(void *data, int type, char *buf)
val = cpu_to_be32(~((1 << (32-nic->subnet_mask_prefix))-1));
str += sprintf(str, "%pI4", &val);
break;
+ case ISCSI_BOOT_ETH_PREFIX_LEN:
+ str += sprintf(str, "%d\n", nic->subnet_mask_prefix);
+ break;
case ISCSI_BOOT_ETH_ORIGIN:
str += sprintf(str, "%d\n", nic->origin);
break;
@@ -460,6 +463,7 @@ static umode_t ibft_check_nic_for(void *data, int type)
if (address_not_null(nic->ip_addr))
rc = S_IRUGO;
break;
+ case ISCSI_BOOT_ETH_PREFIX_LEN:
case ISCSI_BOOT_ETH_SUBNET_MASK:
if (nic->subnet_mask_prefix)
rc = S_IRUGO;
diff --git a/drivers/scsi/iscsi_boot_sysfs.c b/drivers/scsi/iscsi_boot_sysfs.c
index 680bf6f0ce76..8f0ea97cf31f 100644
--- a/drivers/scsi/iscsi_boot_sysfs.c
+++ b/drivers/scsi/iscsi_boot_sysfs.c
@@ -166,6 +166,7 @@ static struct attribute_group iscsi_boot_target_attr_group = {
iscsi_boot_rd_attr(eth_index, index, ISCSI_BOOT_ETH_INDEX);
iscsi_boot_rd_attr(eth_flags, flags, ISCSI_BOOT_ETH_FLAGS);
iscsi_boot_rd_attr(eth_ip, ip-addr, ISCSI_BOOT_ETH_IP_ADDR);
+iscsi_boot_rd_attr(eth_prefix, prefix-len, ISCSI_BOOT_ETH_PREFIX_LEN);
iscsi_boot_rd_attr(eth_subnet, subnet-mask, ISCSI_BOOT_ETH_SUBNET_MASK);
iscsi_boot_rd_attr(eth_origin, origin, ISCSI_BOOT_ETH_ORIGIN);
iscsi_boot_rd_attr(eth_gateway, gateway, ISCSI_BOOT_ETH_GATEWAY);
@@ -181,6 +182,7 @@ static struct attribute *ethernet_attrs[] = {
&iscsi_boot_attr_eth_index.attr,
&iscsi_boot_attr_eth_flags.attr,
&iscsi_boot_attr_eth_ip.attr,
+ &iscsi_boot_attr_eth_prefix.attr,
&iscsi_boot_attr_eth_subnet.attr,
&iscsi_boot_attr_eth_origin.attr,
&iscsi_boot_attr_eth_gateway.attr,
@@ -208,6 +210,9 @@ static umode_t iscsi_boot_eth_attr_is_visible(struct kobject *kobj,
else if (attr == &iscsi_boot_attr_eth_ip.attr)
return boot_kobj->is_visible(boot_kobj->data,
ISCSI_BOOT_ETH_IP_ADDR);
+ else if (attr == &iscsi_boot_attr_eth_prefix.attr)
+ return boot_kobj->is_visible(boot_kobj->data,
+ ISCSI_BOOT_ETH_PREFIX_LEN);
else if (attr == &iscsi_boot_attr_eth_subnet.attr)
return boot_kobj->is_visible(boot_kobj->data,
ISCSI_BOOT_ETH_SUBNET_MASK);
diff --git a/include/linux/iscsi_boot_sysfs.h b/include/linux/iscsi_boot_sysfs.h
index 2a8b1659bf35..548d55395488 100644
--- a/include/linux/iscsi_boot_sysfs.h
+++ b/include/linux/iscsi_boot_sysfs.h
@@ -23,6 +23,7 @@ enum iscsi_boot_eth_properties_enum {
ISCSI_BOOT_ETH_INDEX,
ISCSI_BOOT_ETH_FLAGS,
ISCSI_BOOT_ETH_IP_ADDR,
+ ISCSI_BOOT_ETH_PREFIX_LEN,
ISCSI_BOOT_ETH_SUBNET_MASK,
ISCSI_BOOT_ETH_ORIGIN,
ISCSI_BOOT_ETH_GATEWAY,
--
1.8.5.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCHv2] iscsi_ibft: Add prefix-len attr and display netmask
2016-02-25 18:15 ` [PATCHv2] iscsi_ibft: Add prefix-len attr and display netmask Lee Duncan
@ 2016-02-29 18:45 ` Mike Christie
2016-02-29 21:04 ` Konrad Rzeszutek Wilk
2016-02-29 21:25 ` Lee Duncan
0 siblings, 2 replies; 6+ messages in thread
From: Mike Christie @ 2016-02-29 18:45 UTC (permalink / raw)
To: Lee Duncan, linux-scsi; +Cc: hare, konrad
On 02/25/2016 12:15 PM, Lee Duncan wrote:
> From: Hannes Reinecke <hare@suse.de>
>
> The iBFT table only specifies a prefix length, not a netmask.
> And the netmask is pretty much pointless for IPv6.
> So introduce a new attribute 'prefix-len' and display the
> netmask attribute only for IPv4 addresses.
The code looks ok to me, but I think this ipv4 comment was left over
from the last posting since it conflicts with the comment below about
always displaying it. Maybe it can just be edited when the patch is
merged to avoid having to resend again. If so,
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
>
> Some older user-space code might rely on the netmask attribute
> being present, so we should always display it.
>
> Changes from v1:
> - Combined two patches into one
>
> Signed-off-by: Hannes Reinecke <hare@suse.de>
> Signed-off-by: Lee Duncan <lduncan@suse.com>
> ---
> drivers/firmware/iscsi_ibft.c | 4 ++++
> drivers/scsi/iscsi_boot_sysfs.c | 5 +++++
> include/linux/iscsi_boot_sysfs.h | 1 +
> 3 files changed, 10 insertions(+)
>
> diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c
> index 72791232e46b..81037e5fe301 100644
> --- a/drivers/firmware/iscsi_ibft.c
> +++ b/drivers/firmware/iscsi_ibft.c
> @@ -319,6 +319,9 @@ static ssize_t ibft_attr_show_nic(void *data, int type, char *buf)
> val = cpu_to_be32(~((1 << (32-nic->subnet_mask_prefix))-1));
> str += sprintf(str, "%pI4", &val);
> break;
> + case ISCSI_BOOT_ETH_PREFIX_LEN:
> + str += sprintf(str, "%d\n", nic->subnet_mask_prefix);
> + break;
> case ISCSI_BOOT_ETH_ORIGIN:
> str += sprintf(str, "%d\n", nic->origin);
> break;
> @@ -460,6 +463,7 @@ static umode_t ibft_check_nic_for(void *data, int type)
> if (address_not_null(nic->ip_addr))
> rc = S_IRUGO;
> break;
> + case ISCSI_BOOT_ETH_PREFIX_LEN:
> case ISCSI_BOOT_ETH_SUBNET_MASK:
> if (nic->subnet_mask_prefix)
> rc = S_IRUGO;
> diff --git a/drivers/scsi/iscsi_boot_sysfs.c b/drivers/scsi/iscsi_boot_sysfs.c
> index 680bf6f0ce76..8f0ea97cf31f 100644
> --- a/drivers/scsi/iscsi_boot_sysfs.c
> +++ b/drivers/scsi/iscsi_boot_sysfs.c
> @@ -166,6 +166,7 @@ static struct attribute_group iscsi_boot_target_attr_group = {
> iscsi_boot_rd_attr(eth_index, index, ISCSI_BOOT_ETH_INDEX);
> iscsi_boot_rd_attr(eth_flags, flags, ISCSI_BOOT_ETH_FLAGS);
> iscsi_boot_rd_attr(eth_ip, ip-addr, ISCSI_BOOT_ETH_IP_ADDR);
> +iscsi_boot_rd_attr(eth_prefix, prefix-len, ISCSI_BOOT_ETH_PREFIX_LEN);
> iscsi_boot_rd_attr(eth_subnet, subnet-mask, ISCSI_BOOT_ETH_SUBNET_MASK);
> iscsi_boot_rd_attr(eth_origin, origin, ISCSI_BOOT_ETH_ORIGIN);
> iscsi_boot_rd_attr(eth_gateway, gateway, ISCSI_BOOT_ETH_GATEWAY);
> @@ -181,6 +182,7 @@ static struct attribute *ethernet_attrs[] = {
> &iscsi_boot_attr_eth_index.attr,
> &iscsi_boot_attr_eth_flags.attr,
> &iscsi_boot_attr_eth_ip.attr,
> + &iscsi_boot_attr_eth_prefix.attr,
> &iscsi_boot_attr_eth_subnet.attr,
> &iscsi_boot_attr_eth_origin.attr,
> &iscsi_boot_attr_eth_gateway.attr,
> @@ -208,6 +210,9 @@ static umode_t iscsi_boot_eth_attr_is_visible(struct kobject *kobj,
> else if (attr == &iscsi_boot_attr_eth_ip.attr)
> return boot_kobj->is_visible(boot_kobj->data,
> ISCSI_BOOT_ETH_IP_ADDR);
> + else if (attr == &iscsi_boot_attr_eth_prefix.attr)
> + return boot_kobj->is_visible(boot_kobj->data,
> + ISCSI_BOOT_ETH_PREFIX_LEN);
> else if (attr == &iscsi_boot_attr_eth_subnet.attr)
> return boot_kobj->is_visible(boot_kobj->data,
> ISCSI_BOOT_ETH_SUBNET_MASK);
> diff --git a/include/linux/iscsi_boot_sysfs.h b/include/linux/iscsi_boot_sysfs.h
> index 2a8b1659bf35..548d55395488 100644
> --- a/include/linux/iscsi_boot_sysfs.h
> +++ b/include/linux/iscsi_boot_sysfs.h
> @@ -23,6 +23,7 @@ enum iscsi_boot_eth_properties_enum {
> ISCSI_BOOT_ETH_INDEX,
> ISCSI_BOOT_ETH_FLAGS,
> ISCSI_BOOT_ETH_IP_ADDR,
> + ISCSI_BOOT_ETH_PREFIX_LEN,
> ISCSI_BOOT_ETH_SUBNET_MASK,
> ISCSI_BOOT_ETH_ORIGIN,
> ISCSI_BOOT_ETH_GATEWAY,
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCHv2] iscsi_ibft: Add prefix-len attr and display netmask
2016-02-29 18:45 ` Mike Christie
@ 2016-02-29 21:04 ` Konrad Rzeszutek Wilk
2016-02-29 21:49 ` Lee Duncan
2016-02-29 21:25 ` Lee Duncan
1 sibling, 1 reply; 6+ messages in thread
From: Konrad Rzeszutek Wilk @ 2016-02-29 21:04 UTC (permalink / raw)
To: Mike Christie; +Cc: Lee Duncan, linux-scsi, hare
On Mon, Feb 29, 2016 at 1:45 PM, Mike Christie <michaelc@cs.wisc.edu> wrote:
> On 02/25/2016 12:15 PM, Lee Duncan wrote:
>> From: Hannes Reinecke <hare@suse.de>
>>
>> The iBFT table only specifies a prefix length, not a netmask.
>> And the netmask is pretty much pointless for IPv6.
>> So introduce a new attribute 'prefix-len' and display the
>> netmask attribute only for IPv4 addresses.
>
> The code looks ok to me, but I think this ipv4 comment was left over
> from the last posting since it conflicts with the comment below about
> always displaying it. Maybe it can just be edited when the patch is
> merged to avoid having to resend again. If so,
>
> Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
>
Cool. Let me roll it up and send the git pull to Linus.
This does not seem be super-urgent so it can wait for the upcoming merge window?
>
>>
>> Some older user-space code might rely on the netmask attribute
>> being present, so we should always display it.
>>
>> Changes from v1:
>> - Combined two patches into one
>>
>> Signed-off-by: Hannes Reinecke <hare@suse.de>
>> Signed-off-by: Lee Duncan <lduncan@suse.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCHv2] iscsi_ibft: Add prefix-len attr and display netmask
2016-02-29 18:45 ` Mike Christie
2016-02-29 21:04 ` Konrad Rzeszutek Wilk
@ 2016-02-29 21:25 ` Lee Duncan
1 sibling, 0 replies; 6+ messages in thread
From: Lee Duncan @ 2016-02-29 21:25 UTC (permalink / raw)
To: Mike Christie, linux-scsi; +Cc: hare, konrad
On 02/29/2016 10:45 AM, Mike Christie wrote:
> On 02/25/2016 12:15 PM, Lee Duncan wrote:
>> From: Hannes Reinecke <hare@suse.de>
>>
>> The iBFT table only specifies a prefix length, not a netmask.
>> And the netmask is pretty much pointless for IPv6.
>> So introduce a new attribute 'prefix-len' and display the
>> netmask attribute only for IPv4 addresses.
>
> The code looks ok to me, but I think this ipv4 comment was left over
> from the last posting since it conflicts with the comment below about
> always displaying it. Maybe it can just be edited when the patch is
> merged to avoid having to resend again. If so,
>
> Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
>
> ...
Since there are no other comments, I will resubmit it with the comment
fixed.
--
Lee Duncan
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCHv2] iscsi_ibft: Add prefix-len attr and display netmask
2016-02-29 21:04 ` Konrad Rzeszutek Wilk
@ 2016-02-29 21:49 ` Lee Duncan
0 siblings, 0 replies; 6+ messages in thread
From: Lee Duncan @ 2016-02-29 21:49 UTC (permalink / raw)
To: Konrad Rzeszutek Wilk, Mike Christie; +Cc: linux-scsi, hare
On 02/29/2016 01:04 PM, Konrad Rzeszutek Wilk wrote:
> On Mon, Feb 29, 2016 at 1:45 PM, Mike Christie <michaelc@cs.wisc.edu> wrote:
>> On 02/25/2016 12:15 PM, Lee Duncan wrote:
>>> From: Hannes Reinecke <hare@suse.de>
>>>
>>> The iBFT table only specifies a prefix length, not a netmask.
>>> And the netmask is pretty much pointless for IPv6.
>>> So introduce a new attribute 'prefix-len' and display the
>>> netmask attribute only for IPv4 addresses.
>>
>> The code looks ok to me, but I think this ipv4 comment was left over
>> from the last posting since it conflicts with the comment below about
>> always displaying it. Maybe it can just be edited when the patch is
>> merged to avoid having to resend again. If so,
>>
>> Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
>>
>
> Cool. Let me roll it up and send the git pull to Linus.
I actually just resent it, but the only change was to truncate the last
line of first paragraph of the comment to:
So introduce a new attribute 'prefix-len'.
>
> This does not seem be super-urgent so it can wait for the upcoming merge window?
>
>>
>>>
>>> Some older user-space code might rely on the netmask attribute
>>> being present, so we should always display it.
>>>
>>> Changes from v1:
>>> - Combined two patches into one
>>>
>>> Signed-off-by: Hannes Reinecke <hare@suse.de>
>>> Signed-off-by: Lee Duncan <lduncan@suse.com>
>
--
Lee Duncan
SUSE Labs
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-02-29 21:52 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-25 18:15 [PATCHv2] Enable iBFT IPv6 booting with prefix length Lee Duncan
2016-02-25 18:15 ` [PATCHv2] iscsi_ibft: Add prefix-len attr and display netmask Lee Duncan
2016-02-29 18:45 ` Mike Christie
2016-02-29 21:04 ` Konrad Rzeszutek Wilk
2016-02-29 21:49 ` Lee Duncan
2016-02-29 21:25 ` Lee Duncan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).