Commit a08aaf39 authored by Abhijit Gangurde's avatar Abhijit Gangurde Committed by Leon Romanovsky
Browse files

RDMA/ionic: Preserve and set Ethernet source MAC after ib_ud_header_init() 



ionic_build_hdr() populated the Ethernet source MAC (hdr->eth.smac_h) by
passing the header’s storage directly to rdma_read_gid_l2_fields().
However, ib_ud_header_init() is called after that and re-initializes the
UD header, which wipes the previously written smac_h. As a result, packets
are emitted with an zero source MAC address on the wire.

Correct the source MAC by reading the GID-derived smac into a temporary
buffer and copy it after ib_ud_header_init() completes.

Fixes: e8521822 ("RDMA/ionic: Register device ops for control path")
Cc: stable@vger.kernel.org # 6.18
Signed-off-by: default avatarAbhijit Gangurde <abhijit.gangurde@amd.com>
Link: https://patch.msgid.link/20260227061809.2979990-1-abhijit.gangurde@amd.com


Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
parent 29a3edd7

drivers/infiniband/hw/ionic/ionic_controlpath.c

+3 −1
Original line number Diff line number Diff line
@@ -508,6 +508,7 @@ static int ionic_build_hdr(struct ionic_ibdev *dev, 
{

	const struct ib_global_route *grh;

	enum rdma_network_type net;

	u8 smac[ETH_ALEN];

	u16 vlan;

	int rc;
@@ -518,7 +519,7 @@ static int ionic_build_hdr(struct ionic_ibdev *dev, 


	grh = rdma_ah_read_grh(attr);



	rc = rdma_read_gid_l2_fields(grh->sgid_attr, &vlan, &hdr->eth.smac_h[0]);

	rc = rdma_read_gid_l2_fields(grh->sgid_attr, &vlan, smac);

	if (rc)

		return rc;
@@ -536,6 +537,7 @@ static int ionic_build_hdr(struct ionic_ibdev *dev, 
	if (rc)

		return rc;



	ether_addr_copy(hdr->eth.smac_h, smac);

	ether_addr_copy(hdr->eth.dmac_h, attr->roce.dmac);



	if (net == RDMA_NETWORK_IPV4) {