[PATCH 2/5] ISCSIUIO: Added fix for the iface.subnet_mask decoding for IPv6
Fixed a inet_pton decode error for the iface.subnet_mask for IPv6. Signed-off-by: Eddie Wai eddie@broadcom.com --- iscsiuio/src/unix/iscsid_ipc.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/iscsiuio/src/unix/iscsid_ipc.c b/iscsiuio/src/unix/iscsid_ipc.c index e22de0d..033308d 100644 --- a/iscsiuio/src/unix/iscsid_ipc.c +++ b/iscsiuio/src/unix/iscsid_ipc.c @@ -274,7 +274,7 @@ static int decode_iface(struct iface_rec_decode *ird, struct iface_rec *rec) sizeof(struct in6_addr)); /* Subnet mask priority: CIDR, then rec */ if (!ird-ipv6_subnet_mask.s6_addr) - inet_pton(AF_INET, rec-subnet_mask, + inet_pton(AF_INET6, rec-subnet_mask, ird-ipv6_subnet_mask); /* For LL on, ignore the IPv6 addr in the iface */ -- 1.7.1 -- You received this message because you are subscribed to the Google Groups open-iscsi group. To unsubscribe from this group and stop receiving emails from it, send an email to open-iscsi+unsubscr...@googlegroups.com. To post to this group, send email to open-iscsi@googlegroups.com. Visit this group at http://groups.google.com/group/open-iscsi. For more options, visit https://groups.google.com/groups/opt_out.
[PATCH 4/5] ISCSIUIO: Updated RELEASE note and version
old version: 0.7.8.1b new version: 0.7.8.2 Signed-off-by: Eddie Wai eddie@broadcom.com --- iscsiuio/README |4 ++-- iscsiuio/RELEASE.TXT | 24 ++-- iscsiuio/configure.ac|4 ++-- iscsiuio/docs/iscsiuio.8 |2 +- 4 files changed, 27 insertions(+), 7 deletions(-) diff --git a/iscsiuio/README b/iscsiuio/README index e7e5fe4..a283116 100644 --- a/iscsiuio/README +++ b/iscsiuio/README @@ -1,6 +1,6 @@ Iscsiuio Userspace Tool -Version 0.7.8.1b -May 01, 2013 +Version 0.7.8.2 +Dec 10, 2013 -- This tool is to be used in conjunction with the Broadcom NetXtreme II Linux diff --git a/iscsiuio/RELEASE.TXT b/iscsiuio/RELEASE.TXT index de70667..22628fd 100644 --- a/iscsiuio/RELEASE.TXT +++ b/iscsiuio/RELEASE.TXT @@ -1,7 +1,7 @@ Release Notes Broadcom uIP Linux Driver -Version 0.7.8.1b - 05/01/2013 +Version 0.7.8.2 + 12/10/2013 Broadcom Corporation 5300 California Avenue, @@ -10,6 +10,26 @@ Copyright (c) 2004 - 2013 Broadcom Corporation All rights reserved +uIP v0.7.8.2 (Dec 10, 2013) +=== + Fixes + - + 1. Problem: Cont00072053 - Some hardware iSCSI paths fail during test + Cause: The test exercised a corner case where the ARP cache flush + mechanism didn't work properly + Change: Fixed the ARP cache flush mechanism + Impact: All + + Enhancements + + 1. Change: Added a new tx doorbell field in the uio path to work with + the new bnx2x/cnic drivers that supports VF_RSS + Impact: 10G only + + 2. Change: Fixed the iface.subnet_mask decoding for IPv6 + Impact: IPv6 + + uIP v0.7.8.1b (May 01, 2013) === Enhancements diff --git a/iscsiuio/configure.ac b/iscsiuio/configure.ac index e9a5e32..381b94d 100644 --- a/iscsiuio/configure.ac +++ b/iscsiuio/configure.ac @@ -11,9 +11,9 @@ dnl Benjamin Li (be...@broadcom.com) dnl PACKAGE=iscsiuio -VERSION=0.7.8.1b +VERSION=0.7.8.2 -AC_INIT(iscsiuio, 0.7.8.1b, eddie@broadcom.com) +AC_INIT(iscsiuio, 0.7.8.2, eddie@broadcom.com) AM_INIT_AUTOMAKE($PACKAGE, $VERSION) AC_CONFIG_HEADER(config.h) diff --git a/iscsiuio/docs/iscsiuio.8 b/iscsiuio/docs/iscsiuio.8 index ea21d78..3b50409 100644 --- a/iscsiuio/docs/iscsiuio.8 +++ b/iscsiuio/docs/iscsiuio.8 @@ -5,7 +5,7 @@ .\ .\ bnx2.4,v 0.7.8.1b .\ -.TH iscsiuio 8 05/01/2013 Broadcom Corporation +.TH iscsiuio 8 12/10/2013 Broadcom Corporation .\ .\ NAME part .\ -- 1.7.1 -- You received this message because you are subscribed to the Google Groups open-iscsi group. To unsubscribe from this group and stop receiving emails from it, send an email to open-iscsi+unsubscr...@googlegroups.com. To post to this group, send email to open-iscsi@googlegroups.com. Visit this group at http://groups.google.com/group/open-iscsi. For more options, visit https://groups.google.com/groups/opt_out.
[PATCH 3/5] ISCSIUIO: Added fix for the ARP cache flush mechanism
The ARP cache table wasn't being flushed correctly due to a bug
in the time stamp comparison. The same bug can also be observed
to find the oldest entry in the ARP cache table to override.
Signed-off-by: Eddie Wai eddie@broadcom.com
---
iscsiuio/src/uip/uip_arp.c |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/iscsiuio/src/uip/uip_arp.c b/iscsiuio/src/uip/uip_arp.c
index f7a9594..a8de07f 100644
--- a/iscsiuio/src/uip/uip_arp.c
+++ b/iscsiuio/src/uip/uip_arp.c
@@ -112,7 +112,7 @@ void uip_arp_timer(void)
for (i = 0; i UIP_ARPTAB_SIZE; ++i) {
tabptr = arp_table[i];
if ((tabptr-ipaddr[0] | tabptr-ipaddr[1]) != 0
- arptime - tabptr-time = UIP_ARP_MAXAGE)
+ (u8_t)(arptime - tabptr-time) = UIP_ARP_MAXAGE)
memset(tabptr-ipaddr, 0, 4);
}
@@ -165,8 +165,8 @@ static void uip_arp_update(u16_t *ipaddr, struct
uip_eth_addr *ethaddr)
c = 0;
for (i = 0; i UIP_ARPTAB_SIZE; ++i) {
tabptr = arp_table[i];
- if (arptime - tabptr-time tmpage) {
- tmpage = arptime - tabptr-time;
+ if ((u8_t)(arptime - tabptr-time) tmpage) {
+ tmpage = (u8_t)(arptime - tabptr-time);
c = i;
}
}
--
1.7.1
--
You received this message because you are subscribed to the Google Groups
open-iscsi group.
To unsubscribe from this group and stop receiving emails from it, send an email
to open-iscsi+unsubscr...@googlegroups.com.
To post to this group, send email to open-iscsi@googlegroups.com.
Visit this group at http://groups.google.com/group/open-iscsi.
For more options, visit https://groups.google.com/groups/opt_out.
[PATCH 0/5] ISCSIUIO patchset for various fixes
This iscsiuio patchset includes various bug fixes. The version has also been bumped from 0.7.8.1b to 0.7.8.2. Thanks. Eddie Wai (5): ISCSIUIO: Added tx doorbell override mechanism ISCSIUIO: Added fix for the iface.subnet_mask decoding for IPv6 ISCSIUIO: Added fix for the ARP cache flush mechanism ISCSIUIO: Updated RELEASE note and version ISCSIUIO: Updated the configure file to reflect the new version iscsiuio/README|4 +- iscsiuio/RELEASE.TXT | 24 +- iscsiuio/configure |11348 +++- iscsiuio/configure.ac |4 +- iscsiuio/docs/iscsiuio.8 |2 +- iscsiuio/src/uip/uip_arp.c |6 +- iscsiuio/src/unix/iscsid_ipc.c |2 +- iscsiuio/src/unix/libs/bnx2x.c | 13 +- iscsiuio/src/unix/libs/bnx2x.h |9 +- 9 files changed, 6475 insertions(+), 4937 deletions(-) -- You received this message because you are subscribed to the Google Groups open-iscsi group. To unsubscribe from this group and stop receiving emails from it, send an email to open-iscsi+unsubscr...@googlegroups.com. To post to this group, send email to open-iscsi@googlegroups.com. Visit this group at http://groups.google.com/group/open-iscsi. For more options, visit https://groups.google.com/groups/opt_out.
[PATCH 1/5] ISCSIUIO: Added tx doorbell override mechanism
Added a new tx doorbell field in the uio path to work with new
bnx2x/cnic drivers that supports VF_RSS.
Signed-off-by: Eddie Wai eddie@broadcom.com
---
iscsiuio/src/unix/libs/bnx2x.c | 13 ++---
iscsiuio/src/unix/libs/bnx2x.h |9 -
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/iscsiuio/src/unix/libs/bnx2x.c b/iscsiuio/src/unix/libs/bnx2x.c
index 36fc48e..748b59d 100644
--- a/iscsiuio/src/unix/libs/bnx2x.c
+++ b/iscsiuio/src/unix/libs/bnx2x.c
@@ -900,8 +900,14 @@ static int bnx2x_open(nic_t *nic)
struct client_init_general_data *data = bp-bufs;
bp-client_id = data-client_id;
- if (data-reserved0)
- bp-cid = data-reserved0;
+ if (data-uid.cid)
+ bp-cid = data-uid.cid;
+ if (bp-version.minor = 78 bp-version.sub_minor = 55
+ data-uid.cid_override_key == UIO_USE_TX_DOORBELL) {
+ bp-tx_doorbell = data-uid.tx_db_off;
+ LOG_INFO(PFX %s: tx doorbell override offset = 0x%x,
+nic-log_name, bp-tx_doorbell);
+ }
}
LOG_INFO(PFX %s: func 0x%x, pfid 0x%x, client_id 0x%x, cid 0x%x,
@@ -928,7 +934,8 @@ static int bnx2x_open(nic_t *nic)
USTORM_RX_PRODS_E2_OFFSET(cl_qzone_id) :
USTORM_RX_PRODS_E1X_OFFSET(bp-port, bp-client_id));
- bp-tx_doorbell = bp-cid * 0x80 + 0x40;
+ if (!bp-tx_doorbell)
+ bp-tx_doorbell = bp-cid * 0x80 + 0x40;
bp-get_rx_cons = bnx2x_get_rx_60;
bp-get_tx_cons = bnx2x_get_tx_60;
diff --git a/iscsiuio/src/unix/libs/bnx2x.h b/iscsiuio/src/unix/libs/bnx2x.h
index 0b74e44..ce55cfc 100644
--- a/iscsiuio/src/unix/libs/bnx2x.h
+++ b/iscsiuio/src/unix/libs/bnx2x.h
@@ -382,6 +382,13 @@ union eth_rx_cqe_70 {
struct eth_rx_cqe_next_page_70 next_page_cqe_70;
};
+struct uio_init_data {
+ __u32 cid;
+ __u32 tx_db_off;
+ __u32 cid_override_key;
+#define UIO_USE_TX_DOORBELL0x017855DB
+};
+
struct client_init_general_data {
__u8 client_id;
__u8 statistics_counter_id;
@@ -394,7 +401,7 @@ struct client_init_general_data {
__u8 func_id;
__u8 cos;
__u8 traffic_type;
- __u32 reserved0;
+ struct uio_init_data uid;
};
/**
--
1.7.1
--
You received this message because you are subscribed to the Google Groups
open-iscsi group.
To unsubscribe from this group and stop receiving emails from it, send an email
to open-iscsi+unsubscr...@googlegroups.com.
To post to this group, send email to open-iscsi@googlegroups.com.
Visit this group at http://groups.google.com/group/open-iscsi.
For more options, visit https://groups.google.com/groups/opt_out.
