From nobody Wed Feb 11 20:29:46 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 4fB95l09Zfz6S9FH for ; Wed, 11 Feb 2026 20:29:47 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fB95k5D5mz3HD8 for ; Wed, 11 Feb 2026 20:29:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770841786; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=duI2v3XigSFsD8qOP0JMMohnps1986bSDPvXt/wvN7E=; b=pK8oJw70nj2X+JkcGCi2c33oJQbfixm7B/xILdf0yqVhMypaluuAPfu2CHFgSv+4iMSnfX j5d1FudkT8RTLTuBAr9f9pILVi68S/tD4KU7Bb8JIjlVvySRLYsatb0CbiHtGVdtAnLMZA X9GGhoYspSa4jX6aCeIXzBwq4mOS/m/IjuuuiazUFEhno/zLyWXgGHuZb5289v2jBYjZpP OeLeAyL7Q+TmYU6KQxpRRJpXtM5nppDV5aL2jBn8Bk25n7OIJ2Sv2iZQnoaLsfgoaWap6t AhteLXbK3wP4BT/tKSR5+D8D5A9lXfYMuPLRdNjOR7y4QuCuos2Yskxi8yDUUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770841786; a=rsa-sha256; cv=none; b=Rl6OwI4P8fn6WN1HDwejgq/OsXeZdB9V+pg+CMIN5seUb4ehWB60xsrneRN0oHjsYMbx7d YAujLMFV3wvlr62L4eBmoOoLPPi7UHQ3OpmY4bH9hG35UhJN2ryTNPeBmfXZqfW9mLoRVj 8eYIzTBYeaDiA6L0dVxKVEIba6F7QPYFG5NQe3WCePth8TBVAu+ftrdS33L+vNYi/Umjy5 ZNAfKmMsvLqtfXW/J+f6Y8u/64MAa5GEREIqrqcJPRyCHa3xdmV8aw/P9qzv0ZzhqL3Jgm q9Y9yt59FWO3X5WqRZHQW4gZGze3jETYQZm7MYlu9IbUVQiR8GMtCt+cCqFFiQ== 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=1770841786; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=duI2v3XigSFsD8qOP0JMMohnps1986bSDPvXt/wvN7E=; b=rLxPQcp6q5TLoD+l+w0AGEpxRNdpgSBPkQOtb3JhW1bRNyUpcqMsjmBIczzmUNYi5yzNfw ulD7ykHs6YUAkCc8Io5+yqn/S0kUQopL4wPb6CQOpr6CrflFl+3mGLDqletfi2rEVVCBHd v5IqwyMg/KfXxTHAlWDkbSaKcDR0D7Gkz1UXg52KJP95pCCOe0Z5tdTt0piC//L3CTw2in T0VKqSBKLEOrZrhK5QSjJFQPb8D8aa1syj2ZgWZcvu9rn9Tsy86KdKq1ABC6iNXnoCqTay gQDg260liLPRPxZ1vpXbIEynm2LMcYsUrB1alQNPzQgy0lvDAf6R1FwY6NJesA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fB95k4YLLz14Vs for ; Wed, 11 Feb 2026 20:29:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 457fd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 20:29:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Zhenlei Huang From: Colin Percival Subject: git: 36ebcb4f8219 - releng/14.4 - 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.4 X-Git-Reftype: branch X-Git-Commit: 36ebcb4f8219dcd638e0dbbc738b655bc5e709c2 Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 20:29:46 +0000 Message-Id: <698ce6ba.457fd.4c52ad4c@gitrepo.freebsd.org> The branch releng/14.4 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=36ebcb4f8219dcd638e0dbbc738b655bc5e709c2 commit 36ebcb4f8219dcd638e0dbbc738b655bc5e709c2 Author: Zhenlei Huang AuthorDate: 2026-02-06 17:52:53 +0000 Commit: Colin Percival CommitDate: 2026-02-11 20:29:01 +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. Approved by: re (cperciva) 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 796845f3f8c6..ed3a0403bb6f 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 9616d9f4d611..1c885133c3ec 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_os.c +++ b/sys/dev/qlnx/qlnxe/qlnx_os.c @@ -101,6 +101,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(if_t ifp, struct mbuf *mp); @@ -2322,7 +2323,7 @@ qlnx_init_ifnet(device_t dev, qlnx_host_t *ha) ha->max_frame_size = if_getmtu(ifp) + 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] && @@ -3772,7 +3773,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; @@ -3781,8 +3782,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) == @@ -3792,8 +3795,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