From nobody Tue Feb 24 10:45:07 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fKvW74Fc4z6ThN3 for ; Tue, 24 Feb 2026 10:45:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fKvW71cYNz42mS for ; Tue, 24 Feb 2026 10:45:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771929907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4fUl2TyRqBoGSKkfSWGUriI8mbXYONsl1WrVWoPtNUY=; b=G1xuzgO/smcl/Zrrpd5S1qVRbnUaInHjqY0Lmd8kn/IlgNPQ6Y8Y/9uQvPF4IQWrx2f7eW MQm5dyT3cax96G/uXiwxMgfmRoVlP3N8lvJpSHhHm5ugYTnMPphy541Fh/mUP3ocz5oCj8 pHKkZZcjcne0GCFa/g6ktaolKhB2duoDbCmdh6ItNu088YuJphwOtsD4Gjglv6CsrPl5wN osBf6krFMoER5lEYiBQcaL7KdEGcrSBtSQDpfA662PJgfJHOHhItudZJx16Crl7LjkbHYk gTawLykzpT95UGv9zl0RNVSzrLIwpbrElYTNxVhg3BtPOG19gNZbodeoeOIuzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771929907; a=rsa-sha256; cv=none; b=iMAzrS2Gy5AS/opVhkESLtZNs9TZld7CLy9dSvcoE4Y3yb2Ahjld/b8N9rTVSxVVd5NY0I q5Ip+zediLWKcTKYuuE4O3VBUqPWKWo3u2jP8fXzf4i1k9mYWXQne9vCcguYpVK5YqWiFk MKe3jT6gROIQ5s+EFwa+Zqow7f8dN/XZV14ERSGD6RtXvF221dnymDpQpUDL6Z+KrxdwTU Mh3zW7zCwdFij5tazw9DhD6uChwDWiPhCeN2xLbVMHNofnB1mVB4OIj98TXNvJ5/oC219B S1iHnf5flTL2BaG+O75lRnVDbhVyDHIIM0doZsUY/dptYqY6UJp9fNWFAysBcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771929907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4fUl2TyRqBoGSKkfSWGUriI8mbXYONsl1WrVWoPtNUY=; b=A0B58MiV94HCho0EbWN4oq7ihokEeodNhNo/Rix8kcHE5g4IGpIPyY/V7fUd0IqynZXfAI +/tzQ8ayWGLTglsd2fkoqdFH8o1KS7SmE+QeJJlxtFhfqYs7+ZWe0mYgvuViDAs45qp6vp boOE/jY0UysOIuL09VAAsOMVTsaQDjCQJ+Psv3om/PeEtO1qqtPbXLdcSB4E4tCSHZsf21 075uy1o6ibtBxX39ziaoe10Rwmqi/+gpR/4oc/wt9TtpaEaZv5ExOEJ3JyTMszTAGOa5oY lqWGb0WkfVdrRyswCL7bMU59LFZmcupcBIxTv7gXH/pZd+Mxp0rU4RKwBLl0kg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fKvW71DCmz1BWK for ; Tue, 24 Feb 2026 10:45:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36cf4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Feb 2026 10:45:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 18e4cb41e945 - stable/13 - qlnxe: Avoid memcpy with same source and destination List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 18e4cb41e945a79afabb8fa82fe39f28865aa3cf Auto-Submitted: auto-generated Date: Tue, 24 Feb 2026 10:45:07 +0000 Message-Id: <699d8133.36cf4.46d1f27b@gitrepo.freebsd.org> The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=18e4cb41e945a79afabb8fa82fe39f28865aa3cf commit 18e4cb41e945a79afabb8fa82fe39f28865aa3cf Author: Zhenlei Huang AuthorDate: 2026-02-06 17:52:53 +0000 Commit: Zhenlei Huang CommitDate: 2026-02-24 10:15:35 +0000 qlnxe: Avoid memcpy with same source and destination In case the device is VF, qlnx_get_mac_addr() returns ha->primary_mac hence it ends up memcpy with same source and destination. Refactor slightly to avoid that. Reviewed by: kbowling MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D54884 (cherry picked from commit 3aeeedc7e0dc231c16406ff64f4a08a716964c40) (cherry picked from commit 6462189595047800337aaf052e397d1aade3f9a7) (cherry picked from commit ea1143bddbc3671f49219a6b2a054965deea0c63) --- sys/dev/qlnx/qlnxe/qlnx_def.h | 1 - sys/dev/qlnx/qlnxe/qlnx_os.c | 13 +++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/dev/qlnx/qlnxe/qlnx_def.h b/sys/dev/qlnx/qlnxe/qlnx_def.h index 898d85fdba89..3e63bd2d1882 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_def.h +++ b/sys/dev/qlnx/qlnxe/qlnx_def.h @@ -683,7 +683,6 @@ extern int qlnx_grc_dump(qlnx_host_t *ha, uint32_t *num_dumped_dwords, int hwfn_index); extern int qlnx_idle_chk(qlnx_host_t *ha, uint32_t *num_dumped_dwords, int hwfn_index); -extern uint8_t *qlnx_get_mac_addr(qlnx_host_t *ha); extern void qlnx_fill_link(qlnx_host_t *ha, struct ecore_hwfn *hwfn, struct qlnx_link_output *if_link); extern int qlnx_set_lldp_tlvx(qlnx_host_t *ha, qlnx_lldp_sys_tlvs_t *lldp_tlvs); diff --git a/sys/dev/qlnx/qlnxe/qlnx_os.c b/sys/dev/qlnx/qlnxe/qlnx_os.c index 64909d39ff59..a9acfffee629 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_os.c +++ b/sys/dev/qlnx/qlnxe/qlnx_os.c @@ -94,6 +94,7 @@ static void qlnx_stop(qlnx_host_t *ha); static int qlnx_send(qlnx_host_t *ha, struct qlnx_fastpath *fp, struct mbuf **m_headp); static int qlnx_get_ifq_snd_maxlen(qlnx_host_t *ha); +static void qlnx_get_mac_addr(qlnx_host_t *ha); static uint32_t qlnx_get_optics(qlnx_host_t *ha, struct qlnx_link_output *if_link); static int qlnx_transmit(struct ifnet *ifp, struct mbuf *mp); @@ -2369,7 +2370,7 @@ qlnx_init_ifnet(device_t dev, qlnx_host_t *ha) ha->max_frame_size = ifp->if_mtu + ETHER_HDR_LEN + ETHER_CRC_LEN; - memcpy(ha->primary_mac, qlnx_get_mac_addr(ha), ETH_ALEN); + qlnx_get_mac_addr(ha); if (!ha->primary_mac[0] && !ha->primary_mac[1] && !ha->primary_mac[2] && !ha->primary_mac[3] && @@ -3835,7 +3836,7 @@ qlnx_get_ifq_snd_maxlen(qlnx_host_t *ha) return(TX_RING_SIZE - 1); } -uint8_t * +static void qlnx_get_mac_addr(qlnx_host_t *ha) { struct ecore_hwfn *p_hwfn; @@ -3844,8 +3845,10 @@ qlnx_get_mac_addr(qlnx_host_t *ha) p_hwfn = &ha->cdev.hwfns[0]; - if (qlnx_vf_device(ha) != 0) - return (p_hwfn->hw_info.hw_mac_addr); + if (qlnx_vf_device(ha) != 0) { + memcpy(ha->primary_mac, p_hwfn->hw_info.hw_mac_addr, ETH_ALEN); + return; + } ecore_vf_read_bulletin(p_hwfn, &p_is_forced); if (ecore_vf_bulletin_get_forced_mac(p_hwfn, mac, &p_is_forced) == @@ -3855,8 +3858,6 @@ qlnx_get_mac_addr(qlnx_host_t *ha) p_is_forced, mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); memcpy(ha->primary_mac, mac, ETH_ALEN); } - - return (ha->primary_mac); } static uint32_t