From: Jakub Kicinski <kuba@kernel.org>

Date: Tue, 19 Oct 2021 11:26:02 -0700

Subject: RDMA/ipoib: Use dev_addr_mod()

Patch-mainline: v5.16-rc1

Git-commit: 10f7b9bc85ec2421c46588732ea72a58c00d0926

References: jsc#SLE-19249

Commit 406f42fa0d3c ("net-next: When a bond have a massive amount of

VLANs...") introduced a rbtree for faster Ethernet address look up. To

maintain netdev->dev_addr in this tree we need to make all the writes to

it got through appropriate helpers.

Link: https://lore.kernel.org/r/20211019182604.1441387-2-kuba@kernel.org

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

Reviewed-by: Leon Romanovsky <leonro@nvidia.com>

Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>

---

 drivers/infiniband/ulp/ipoib/ipoib_cm.c   |    4 +++-

 drivers/infiniband/ulp/ipoib/ipoib_ib.c   |    9 ++++-----

 drivers/infiniband/ulp/ipoib/ipoib_main.c |   17 +++++++++--------

 3 files changed, 16 insertions(+), 14 deletions(-)

--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c

+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c

@@ -1583,6 +1583,7 @@ int ipoib_cm_dev_init(struct net_device

 {

 	struct ipoib_dev_priv *priv = ipoib_priv(dev);

 	int max_srq_sge, i;

+	u8 addr;

 	INIT_LIST_HEAD(&priv->cm.passive_ids);

 	INIT_LIST_HEAD(&priv->cm.reap_list);

@@ -1636,7 +1637,8 @@ int ipoib_cm_dev_init(struct net_device

 		}

 	}

-	priv->dev->dev_addr[0] = IPOIB_FLAGS_RC;

+	addr = IPOIB_FLAGS_RC;

+	dev_addr_mod(dev, 0, &addr, 1);

 	return 0;

 }

--- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c

+++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c

@@ -1057,13 +1057,11 @@ static bool ipoib_dev_addr_changed_valid

 {

 	union ib_gid search_gid;

 	union ib_gid gid0;

-	union ib_gid *netdev_gid;

 	int err;

 	u16 index;

 	u32 port;

 	bool ret = false;

-	netdev_gid = (union ib_gid *)(priv->dev->dev_addr + 4);

 	if (rdma_query_gid(priv->ca, priv->port, 0, &gid0))

 		return false;

@@ -1073,7 +1071,8 @@ static bool ipoib_dev_addr_changed_valid

 	 * to do it later

 	 */

 	priv->local_gid.global.subnet_prefix = gid0.global.subnet_prefix;

-	netdev_gid->global.subnet_prefix = gid0.global.subnet_prefix;

+	dev_addr_mod(priv->dev, 4, (u8 *)&gid0.global.subnet_prefix,

+		     sizeof(gid0.global.subnet_prefix));

 	search_gid.global.subnet_prefix = gid0.global.subnet_prefix;

 	search_gid.global.interface_id = priv->local_gid.global.interface_id;

@@ -1135,8 +1134,8 @@ static bool ipoib_dev_addr_changed_valid

 			if (!test_bit(IPOIB_FLAG_DEV_ADDR_CTRL, &priv->flags)) {

 				memcpy(&priv->local_gid, &gid0,

 				       sizeof(priv->local_gid));

-				memcpy(priv->dev->dev_addr + 4, &gid0,

-				       sizeof(priv->local_gid));

+				dev_addr_mod(priv->dev, 4, (u8 *)&gid0,

+					     sizeof(priv->local_gid));

 				ret = true;

 			}

 		}

--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c

+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c

@@ -1696,6 +1696,7 @@ static void ipoib_dev_uninit_default(str

 static int ipoib_dev_init_default(struct net_device *dev)

 {

 	struct ipoib_dev_priv *priv = ipoib_priv(dev);

+	u8 addr_mod[3];

 	ipoib_napi_add(dev);

@@ -1723,9 +1724,10 @@ static int ipoib_dev_init_default(struct

 	}

 	/* after qp created set dev address */

-	priv->dev->dev_addr[1] = (priv->qp->qp_num >> 16) & 0xff;

-	priv->dev->dev_addr[2] = (priv->qp->qp_num >>  8) & 0xff;

-	priv->dev->dev_addr[3] = (priv->qp->qp_num) & 0xff;

+	addr_mod[0] = (priv->qp->qp_num >> 16) & 0xff;

+	addr_mod[1] = (priv->qp->qp_num >>  8) & 0xff;

+	addr_mod[2] = (priv->qp->qp_num) & 0xff;

+	dev_addr_mod(priv->dev, 1, addr_mod, sizeof(addr_mod));

 	return 0;

@@ -1886,8 +1888,7 @@ static int ipoib_parent_init(struct net_

 			priv->ca->name, priv->port, result);

 		return result;

 	}

-	memcpy(priv->dev->dev_addr + 4, priv->local_gid.raw,

-	       sizeof(union ib_gid));

+	dev_addr_mod(priv->dev, 4, priv->local_gid.raw, sizeof(union ib_gid));

 	SET_NETDEV_DEV(priv->dev, priv->ca->dev.parent);

 	priv->dev->dev_port = priv->port - 1;

@@ -1908,8 +1909,8 @@ static void ipoib_child_init(struct net_

 		memcpy(&priv->local_gid, priv->dev->dev_addr + 4,

 		       sizeof(priv->local_gid));

 	else {

-		memcpy(priv->dev->dev_addr, ppriv->dev->dev_addr,

-		       INFINIBAND_ALEN);

+		__dev_addr_set(priv->dev, ppriv->dev->dev_addr,

+			       INFINIBAND_ALEN);

 		memcpy(&priv->local_gid, &ppriv->local_gid,

 		       sizeof(priv->local_gid));

 	}

@@ -2326,7 +2327,7 @@ static void set_base_guid(struct ipoib_d

 	memcpy(&priv->local_gid.global.interface_id,

 	       &gid->global.interface_id,

 	       sizeof(gid->global.interface_id));

-	memcpy(netdev->dev_addr + 4, &priv->local_gid, sizeof(priv->local_gid));

+	dev_addr_mod(netdev, 4, (u8 *)&priv->local_gid, sizeof(priv->local_gid));

 	clear_bit(IPOIB_FLAG_DEV_ADDR_SET, &priv->flags);

 	netif_addr_unlock_bh(netdev);