* [PATCH v2] {net,IB}/{rxe,usnic}: Utilize generic mac to eui32 function
@ 2017-03-06 18:54 Yuval Shaia
2017-03-07 14:27 ` Leon Romanovsky
0 siblings, 1 reply; 3+ messages in thread
From: Yuval Shaia @ 2017-03-06 18:54 UTC (permalink / raw)
To: benve, dgoodell, dledford, sean.hefty, hal.rosenstock, monis,
davem, linux-rdma, netdev, leon
Cc: Yuval Shaia
This logic seems to be duplicated in (at least) three separate files.
Move it to one place so code can be re-use.
Signed-off-by: Yuval Shaia <yuval.shaia@oracle.com>
---
v0 -> v1:
* Add missing #include
* Rename to genaddrconf_ifid_eui48
v1 -> v2:
* Reset eui[0] to default if dev_id is used
---
drivers/infiniband/hw/usnic/usnic_common_util.h | 11 +++--------
drivers/infiniband/sw/rxe/rxe_net.c | 11 ++---------
include/net/addrconf.h | 19 +++++++++++++------
3 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/drivers/infiniband/hw/usnic/usnic_common_util.h b/drivers/infiniband/hw/usnic/usnic_common_util.h
index b54986d..09871da 100644
--- a/drivers/infiniband/hw/usnic/usnic_common_util.h
+++ b/drivers/infiniband/hw/usnic/usnic_common_util.h
@@ -34,6 +34,8 @@
#ifndef USNIC_CMN_UTIL_H
#define USNIC_CMN_UTIL_H
+#include <net/addrconf.h>
+
static inline void
usnic_mac_to_gid(const char *const mac, char *raw_gid)
{
@@ -57,14 +59,7 @@ usnic_mac_ip_to_gid(const char *const mac, const __be32 inaddr, char *raw_gid)
raw_gid[1] = 0x80;
memset(&raw_gid[2], 0, 2);
memcpy(&raw_gid[4], &inaddr, 4);
- raw_gid[8] = mac[0]^2;
- raw_gid[9] = mac[1];
- raw_gid[10] = mac[2];
- raw_gid[11] = 0xff;
- raw_gid[12] = 0xfe;
- raw_gid[13] = mac[3];
- raw_gid[14] = mac[4];
- raw_gid[15] = mac[5];
+ genaddrconf_ifid_eui48(&raw_gid[8], mac);
}
static inline void
diff --git a/drivers/infiniband/sw/rxe/rxe_net.c b/drivers/infiniband/sw/rxe/rxe_net.c
index d8610960..90285c8 100644
--- a/drivers/infiniband/sw/rxe/rxe_net.c
+++ b/drivers/infiniband/sw/rxe/rxe_net.c
@@ -38,6 +38,7 @@
#include <linux/if_vlan.h>
#include <net/udp_tunnel.h>
#include <net/sch_generic.h>
+#include <net/addrconf.h>
#include <linux/netfilter.h>
#include <rdma/ib_addr.h>
@@ -86,18 +87,10 @@ struct rxe_recv_sockets recv_sockets;
static __be64 rxe_mac_to_eui64(struct net_device *ndev)
{
- unsigned char *mac_addr = ndev->dev_addr;
__be64 eui64;
unsigned char *dst = (unsigned char *)&eui64;
- dst[0] = mac_addr[0] ^ 2;
- dst[1] = mac_addr[1];
- dst[2] = mac_addr[2];
- dst[3] = 0xff;
- dst[4] = 0xfe;
- dst[5] = mac_addr[3];
- dst[6] = mac_addr[4];
- dst[7] = mac_addr[5];
+ genaddrconf_ifid_eui48(dst, ndev->dev_addr);
return eui64;
}
diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index 17c6fd8..cdfa73f 100644
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -103,12 +103,21 @@ int addrconf_prefix_rcv_add_addr(struct net *net, struct net_device *dev,
u32 addr_flags, bool sllao, bool tokenized,
__u32 valid_lft, u32 prefered_lft);
+static inline void genaddrconf_ifid_eui48(u8 *eui, const char *const addr)
+{
+ memcpy(eui, addr, 3);
+ eui[0] ^= 2;
+ eui[3] = 0xFF;
+ eui[4] = 0xFE;
+ memcpy(eui + 5, addr + 3, 3);
+}
+
static inline int addrconf_ifid_eui48(u8 *eui, struct net_device *dev)
{
if (dev->addr_len != ETH_ALEN)
return -1;
- memcpy(eui, dev->dev_addr, 3);
- memcpy(eui + 5, dev->dev_addr + 3, 3);
+
+ genaddrconf_ifid_eui48(eui, dev->dev_addr);
/*
* The zSeries OSA network cards can be shared among various
@@ -124,13 +133,11 @@ static inline int addrconf_ifid_eui48(u8 *eui, struct net_device *dev)
* scope according to RFC2373.
*/
if (dev->dev_id) {
+ eui[0] = dev->dev_addr[0];
eui[3] = (dev->dev_id >> 8) & 0xFF;
eui[4] = dev->dev_id & 0xFF;
- } else {
- eui[3] = 0xFF;
- eui[4] = 0xFE;
- eui[0] ^= 2;
}
+
return 0;
}
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v2] {net,IB}/{rxe,usnic}: Utilize generic mac to eui32 function
2017-03-06 18:54 [PATCH v2] {net,IB}/{rxe,usnic}: Utilize generic mac to eui32 function Yuval Shaia
@ 2017-03-07 14:27 ` Leon Romanovsky
2017-03-07 18:37 ` Yuval Shaia
0 siblings, 1 reply; 3+ messages in thread
From: Leon Romanovsky @ 2017-03-07 14:27 UTC (permalink / raw)
To: Yuval Shaia
Cc: benve, dgoodell, dledford, sean.hefty, hal.rosenstock, monis,
davem, linux-rdma, netdev
[-- Attachment #1: Type: text/plain, Size: 3905 bytes --]
On Mon, Mar 06, 2017 at 08:54:06PM +0200, Yuval Shaia wrote:
> This logic seems to be duplicated in (at least) three separate files.
> Move it to one place so code can be re-use.
>
> Signed-off-by: Yuval Shaia <yuval.shaia@oracle.com>
> ---
> v0 -> v1:
> * Add missing #include
> * Rename to genaddrconf_ifid_eui48
> v1 -> v2:
> * Reset eui[0] to default if dev_id is used
> ---
> drivers/infiniband/hw/usnic/usnic_common_util.h | 11 +++--------
> drivers/infiniband/sw/rxe/rxe_net.c | 11 ++---------
> include/net/addrconf.h | 19 +++++++++++++------
> 3 files changed, 18 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/infiniband/hw/usnic/usnic_common_util.h b/drivers/infiniband/hw/usnic/usnic_common_util.h
> index b54986d..09871da 100644
> --- a/drivers/infiniband/hw/usnic/usnic_common_util.h
> +++ b/drivers/infiniband/hw/usnic/usnic_common_util.h
> @@ -34,6 +34,8 @@
> #ifndef USNIC_CMN_UTIL_H
> #define USNIC_CMN_UTIL_H
>
> +#include <net/addrconf.h>
> +
> static inline void
> usnic_mac_to_gid(const char *const mac, char *raw_gid)
> {
> @@ -57,14 +59,7 @@ usnic_mac_ip_to_gid(const char *const mac, const __be32 inaddr, char *raw_gid)
> raw_gid[1] = 0x80;
> memset(&raw_gid[2], 0, 2);
> memcpy(&raw_gid[4], &inaddr, 4);
> - raw_gid[8] = mac[0]^2;
> - raw_gid[9] = mac[1];
> - raw_gid[10] = mac[2];
> - raw_gid[11] = 0xff;
> - raw_gid[12] = 0xfe;
> - raw_gid[13] = mac[3];
> - raw_gid[14] = mac[4];
> - raw_gid[15] = mac[5];
> + genaddrconf_ifid_eui48(&raw_gid[8], mac);
> }
>
> static inline void
> diff --git a/drivers/infiniband/sw/rxe/rxe_net.c b/drivers/infiniband/sw/rxe/rxe_net.c
> index d8610960..90285c8 100644
> --- a/drivers/infiniband/sw/rxe/rxe_net.c
> +++ b/drivers/infiniband/sw/rxe/rxe_net.c
> @@ -38,6 +38,7 @@
> #include <linux/if_vlan.h>
> #include <net/udp_tunnel.h>
> #include <net/sch_generic.h>
> +#include <net/addrconf.h>
> #include <linux/netfilter.h>
> #include <rdma/ib_addr.h>
>
> @@ -86,18 +87,10 @@ struct rxe_recv_sockets recv_sockets;
>
> static __be64 rxe_mac_to_eui64(struct net_device *ndev)
> {
> - unsigned char *mac_addr = ndev->dev_addr;
> __be64 eui64;
> unsigned char *dst = (unsigned char *)&eui64;
>
> - dst[0] = mac_addr[0] ^ 2;
> - dst[1] = mac_addr[1];
> - dst[2] = mac_addr[2];
> - dst[3] = 0xff;
> - dst[4] = 0xfe;
> - dst[5] = mac_addr[3];
> - dst[6] = mac_addr[4];
> - dst[7] = mac_addr[5];
> + genaddrconf_ifid_eui48(dst, ndev->dev_addr);
>
> return eui64;
> }
> diff --git a/include/net/addrconf.h b/include/net/addrconf.h
> index 17c6fd8..cdfa73f 100644
> --- a/include/net/addrconf.h
> +++ b/include/net/addrconf.h
> @@ -103,12 +103,21 @@ int addrconf_prefix_rcv_add_addr(struct net *net, struct net_device *dev,
> u32 addr_flags, bool sllao, bool tokenized,
> __u32 valid_lft, u32 prefered_lft);
>
> +static inline void genaddrconf_ifid_eui48(u8 *eui, const char *const addr)
> +{
> + memcpy(eui, addr, 3);
> + eui[0] ^= 2;
> + eui[3] = 0xFF;
> + eui[4] = 0xFE;
> + memcpy(eui + 5, addr + 3, 3);
> +}
> +
> static inline int addrconf_ifid_eui48(u8 *eui, struct net_device *dev)
> {
> if (dev->addr_len != ETH_ALEN)
> return -1;
> - memcpy(eui, dev->dev_addr, 3);
> - memcpy(eui + 5, dev->dev_addr + 3, 3);
> +
> + genaddrconf_ifid_eui48(eui, dev->dev_addr);
>
> /*
> * The zSeries OSA network cards can be shared among various
> @@ -124,13 +133,11 @@ static inline int addrconf_ifid_eui48(u8 *eui, struct net_device *dev)
> * scope according to RFC2373.
> */
> if (dev->dev_id) {
> + eui[0] = dev->dev_addr[0];
> eui[3] = (dev->dev_id >> 8) & 0xFF;
> eui[4] = dev->dev_id & 0xFF;
> - } else {
> - eui[3] = 0xFF;
> - eui[4] = 0xFE;
> - eui[0] ^= 2;
> }
> +
> return 0;
> }
Technically, the code is correct now, but it doesn't look right
to set the value and restore it right after that.
Thanks
>
> --
> 2.7.4
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v2] {net,IB}/{rxe,usnic}: Utilize generic mac to eui32 function
2017-03-07 14:27 ` Leon Romanovsky
@ 2017-03-07 18:37 ` Yuval Shaia
0 siblings, 0 replies; 3+ messages in thread
From: Yuval Shaia @ 2017-03-07 18:37 UTC (permalink / raw)
To: Leon Romanovsky
Cc: benve, dgoodell, dledford, sean.hefty, hal.rosenstock, monis,
davem, linux-rdma, netdev
On Tue, Mar 07, 2017 at 04:27:11PM +0200, Leon Romanovsky wrote:
> On Mon, Mar 06, 2017 at 08:54:06PM +0200, Yuval Shaia wrote:
> > This logic seems to be duplicated in (at least) three separate files.
> > Move it to one place so code can be re-use.
> >
> > Signed-off-by: Yuval Shaia <yuval.shaia@oracle.com>
> > ---
> > v0 -> v1:
> > * Add missing #include
> > * Rename to genaddrconf_ifid_eui48
> > v1 -> v2:
> > * Reset eui[0] to default if dev_id is used
> > ---
> > drivers/infiniband/hw/usnic/usnic_common_util.h | 11 +++--------
> > drivers/infiniband/sw/rxe/rxe_net.c | 11 ++---------
> > include/net/addrconf.h | 19 +++++++++++++------
> > 3 files changed, 18 insertions(+), 23 deletions(-)
> >
> > * scope according to RFC2373.
> > */
> > if (dev->dev_id) {
> > + eui[0] = dev->dev_addr[0];
> > eui[3] = (dev->dev_id >> 8) & 0xFF;
> > eui[4] = dev->dev_id & 0xFF;
> > - } else {
> > - eui[3] = 0xFF;
> > - eui[4] = 0xFE;
> > - eui[0] ^= 2;
> > }
> > +
> > return 0;
> > }
>
> Technically, the code is correct now, but it doesn't look right
> to set the value and restore it right after that.
Agree.
I will soon send v3 that offers an alternative by adding new helper
function so this re-assignment can be avoid.
>
> Thanks
>
> >
> > --
> > 2.7.4
> >
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-03-07 19:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-06 18:54 [PATCH v2] {net,IB}/{rxe,usnic}: Utilize generic mac to eui32 function Yuval Shaia
2017-03-07 14:27 ` Leon Romanovsky
2017-03-07 18:37 ` Yuval Shaia
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).