From nobody Tue Apr 22 11:22:45 2025 X-Original-To: dev-commits-src-all@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 4Zhfwj6sQsz5sTj0; Tue, 22 Apr 2025 11:22:45 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zhfwj5SWHz3C1H; Tue, 22 Apr 2025 11:22:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745320965; 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=otIRwAPVKRNQ94324acvM5/pjMHB3Z0dFvgU9H39OBY=; b=JuNHUjPq6ckllCXQWSiVQyyUIN90SIoJOVTB308REYSFr99w8NsxRbRIIjBBDWkIdkgbON D2bCcdxzPJzdcQsxU6Z81KMYOWqJGz5d1jX7xbkP6sPPN8prMcsjOicH4pQTcGj71Cl9Iv mPSGDZvyorqqHHt1LXssAzDFzd7l8NZzMBPU9PE1Z/6xiJhRjFm14+CWOxP4NOb2OoUn/c 2StjZ70O46uGTS9GFp45M0h+8joM/Andm+Ze8+1bjI1GIZP9fIQ1sJiMSLKa5xwb6CYPQV rHF3dWk+6nMp8dOPjz2KBSvWnLyv/xeBVKOLIxXIf2UGyJCR+UeooTJivl0UFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745320965; a=rsa-sha256; cv=none; b=qJXw3YWGdF3kf7F/MabogfZid0ed06bd22TvbIXU2KdZa4eUSwUYNKkhAL3/r8E2tot5hW kwMU+PXBrGeu2ajc18snqBXBpgt/GY0qHIGt95CVJAjUBhxkqfP1txnuWPFteRweLuRggo psWQytufu1cn0SCTyr4LeWDrYABjx46023/1a0nDbPrYwBtZgsDNBRke9WNcSiELuWRS2n 1Y93uP+P2jdF6uTU8DKoQ7S0bLpMQngfAXYqyTS730/l+XSaAINusI07QSpaR4wFbNEepQ xnlKOb6RhIPGI2bSH9udZwzkLxf6nhHLRPT/uuN2kTAfTa8IUYuZLk3Mk0hbDw== 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=1745320965; 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=otIRwAPVKRNQ94324acvM5/pjMHB3Z0dFvgU9H39OBY=; b=m8GKUWgp6f8FXnh2M7IoOYbeijHgX/EFRJmZZ6HaBV/aXVKbvjrw5cIVbI1/53OKRkiOfB 4di2U+eT5hJxazvXylJNztnKnKf00m6/zedInQ7fBDUBbC6m1YzXXhhBQJomQcPHsYd/CH V156isU6fmSyNPrrIl5s0I/mJjzBNPfi3pzt7Iy/g728IL7O9wSbopqoHnF2A9vg0jdcFM p9o0RGjMBpBHHz5W5jyYEC/AwVEviEdpeFwYDMPL90JUBgbJeMEPcTF8WotyrQUlm+PLc9 FPgfGPrFOIR2H++o5rg3t9EhYj51yjUJUUs5ChoN/3MD9jWT5lya5HLGWhHwBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zhfwj5031z2Vf; Tue, 22 Apr 2025 11:22:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53MBMjqu026053; Tue, 22 Apr 2025 11:22:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53MBMj8A026049; Tue, 22 Apr 2025 11:22:45 GMT (envelope-from git) Date: Tue, 22 Apr 2025 11:22:45 GMT Message-Id: <202504221122.53MBMj8A026049@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: b5a68e064164 - stable/14 - cxgbe(4): Remove smt_idx from the L2 table entry structure. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b5a68e0641648be374718105b0e3e085794bb4e5 Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=b5a68e0641648be374718105b0e3e085794bb4e5 commit b5a68e0641648be374718105b0e3e085794bb4e5 Author: Navdeep Parhar AuthorDate: 2024-09-17 02:55:09 +0000 Commit: Navdeep Parhar CommitDate: 2025-04-22 11:12:45 +0000 cxgbe(4): Remove smt_idx from the L2 table entry structure. An L2 table entry isn't associated with a particular SMT (Source MAC Table) entry. Sponsored by: Chelsio Communications (cherry picked from commit f79fba05a016d53e054d6f587213889c3e31b4db) --- sys/dev/cxgbe/t4_l2t.h | 1 - sys/dev/cxgbe/tom/t4_tom_l2t.c | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/dev/cxgbe/t4_l2t.h b/sys/dev/cxgbe/t4_l2t.h index f8681a4ab556..13e085bb7467 100644 --- a/sys/dev/cxgbe/t4_l2t.h +++ b/sys/dev/cxgbe/t4_l2t.h @@ -63,7 +63,6 @@ struct l2t_entry { uint32_t iqid; /* iqid for reply to write_l2e */ struct sge_wrq *wrq; /* queue to use for write_l2e */ if_t ifp; /* outgoing interface */ - uint16_t smt_idx; /* SMT index */ uint16_t vlan; /* VLAN TCI (id: 0-11, prio: 13-15) */ struct l2t_entry *first; /* start of hash chain */ struct l2t_entry *next; /* next l2t_entry on chain */ diff --git a/sys/dev/cxgbe/tom/t4_tom_l2t.c b/sys/dev/cxgbe/tom/t4_tom_l2t.c index 8cc3e633444a..909abe793835 100644 --- a/sys/dev/cxgbe/tom/t4_tom_l2t.c +++ b/sys/dev/cxgbe/tom/t4_tom_l2t.c @@ -361,7 +361,7 @@ t4_l2t_get(struct port_info *pi, if_t ifp, struct sockaddr *sa) struct l2t_entry *e; struct adapter *sc = pi->adapter; struct l2t_data *d = sc->l2t; - u_int hash, smt_idx = pi->port_id; + u_int hash; uint16_t vid, pcp, vtag; KASSERT(sa->sa_family == AF_INET || sa->sa_family == AF_INET6, @@ -386,8 +386,7 @@ t4_l2t_get(struct port_info *pi, if_t ifp, struct sockaddr *sa) goto done; } for (e = d->l2tab[hash].first; e; e = e->next) { - if (l2_cmp(sa, e) == 0 && e->ifp == ifp && e->vlan == vtag && - e->smt_idx == smt_idx) { + if (l2_cmp(sa, e) == 0 && e->ifp == ifp && e->vlan == vtag) { l2t_hold(d, e); goto done; } @@ -403,7 +402,6 @@ t4_l2t_get(struct port_info *pi, if_t ifp, struct sockaddr *sa) e->state = L2T_STATE_RESOLVING; l2_store(sa, e); e->ifp = ifp; - e->smt_idx = smt_idx; e->hash = hash; e->lport = pi->lport; e->wrq = &sc->sge.ctrlq[pi->port_id];