From nobody Sat Aug 30 15:25:04 2025 X-Original-To: dev-commits-src-main@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 4cDf8K0PyHz65d9R; Sat, 30 Aug 2025 15:25:05 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cDf8J6rTlz3Zbt; Sat, 30 Aug 2025 15:25:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756567505; 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=AiFpF7gvC6hjh338HEXlNzGKzcfn4cQp/yzbzNYQgp8=; b=X4LlIP0pjboxpoJ7APiiPFxzQZSeZgFOqHYW9GvSQqgVUEOyb1p7eQiKidPfc4N7N4K3L8 17yK2jy8XkSDoyJ9etazBP3ZMNKD5fJ0R8Ow0hVI/s1kgRyZUReYYym37MKlV2BWwc1vMP j7XG3LNBaja8c538J2V1tSE5Ode6OA7SYlsDei+/OrgDNWWhVjwHwlHj2BZf6jS8WD+kuM GbkBrdR+uMsZ49NW097sQ3bsub7m9mwWcPo9HFukVrnYGm4/cQ4RrdB6A9p0YXh3GpbPRf HZ0Y0EQKBj4kj9895HCD8RUW3ZeEBGquu1CUZJtMjusFEufZhqG3miolsRyeuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756567505; 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=AiFpF7gvC6hjh338HEXlNzGKzcfn4cQp/yzbzNYQgp8=; b=py+iAQqb8fVoVk78rImxcZt5SMjZoy3pTQ5e1RCmMrMa6w/vU738GJIRkTOAHg0X802sBP 15T++qSfzyeRMNWxmwJqcyXQuMWjioVE7BLTgREw3Su2CGKwHvzjDcmoh8ka5OYU07s+Bg Bjpm6SxdpicbmzEG7PK9ai+yR5Kq/I8RF7nPOCJHolt/1XLgZVUo2jhsU0Igs1h08mdw68 2INnMpZc+MHMLPusYUZBWm03GWxInrpelpikpMsRlMsLCYwjGU18UrP3XwpTLYzVwkLwYl khlel3RA/UgC8SoL18VIMEQsnI8Lw0YuTPf+kSFZtPERigj2UfiTpVqJ5belCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756567505; a=rsa-sha256; cv=none; b=BGDGM+ZkFtx1AxU8zTlWg+YtQVIUSTY2B3jv0/+VWkwhIpbdN8up3+hlJYED6UKH2S+uiH bLVm9IlN/GPQVoaWo6Tl/L2dsfjGI/EmJoeS/glBHKMnP+jhAogXRmc6uL5z1Km0oPyDmW leq5IyTa5l3X5NKGSeOHXbiOppvbqzptcJqXmrRZhEmN85YFAa3obRX7lQJ9aYFLej8d4l XJPIJli9JWPxjcPNjdBP7mT3+YU2ji3E/ElLo82YZ60/rFSSEZ5JqVG7HkIFk35DvswTcL 5TPhif63CSSPlMQqtjG0o5PMH23b5q70jvN8IIwGOCmUk0eleYKVLAyJpoZNPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cDf8J6HGfzYMP; Sat, 30 Aug 2025 15:25:04 +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 57UFP4pb032569; Sat, 30 Aug 2025 15:25:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57UFP4Gl032566; Sat, 30 Aug 2025 15:25:04 GMT (envelope-from git) Date: Sat, 30 Aug 2025 15:25:04 GMT Message-Id: <202508301525.57UFP4Gl032566@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: ae7f8da8bf6e - main - iflib: Set the get counter routine prior to attaching the interface List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: ae7f8da8bf6ed0c4f0e9f0e95ae2b08abce54378 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=ae7f8da8bf6ed0c4f0e9f0e95ae2b08abce54378 commit ae7f8da8bf6ed0c4f0e9f0e95ae2b08abce54378 Author: Zhenlei Huang AuthorDate: 2025-08-30 15:23:51 +0000 Commit: Zhenlei Huang CommitDate: 2025-08-30 15:23:51 +0000 iflib: Set the get counter routine prior to attaching the interface This ensures other threads, e.g. ioctl threads, see the correct counter routine once after the interface has been attached. This change partially reverts commit 23ac9029f96b, which for unclear reason moved setting the get counter routine after ether_ifattach(). Reviewed by: kbowling, kgalazka, #iflib Fixes: 23ac9029f96b Update iflib to support more NIC designs MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D50712 --- sys/net/iflib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index 992f3f24c178..308ecad0a846 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -5360,7 +5360,6 @@ iflib_device_register(device_t dev, void *sc, if_shared_ctx_t sctx, if_ctx_t *ct DEBUGNET_SET(ctx->ifc_ifp, iflib); - if_setgetcounterfn(ctx->ifc_ifp, iflib_if_get_counter); iflib_add_device_sysctl_post(ctx); iflib_add_pfil(ctx); ctx->ifc_flags |= IFC_INIT_DONE; @@ -5714,6 +5713,7 @@ iflib_register(if_ctx_t ctx) if_settransmitfn(ifp, iflib_if_transmit); #endif if_setqflushfn(ifp, iflib_if_qflush); + if_setgetcounterfn(ifp, iflib_if_get_counter); if_setflags(ifp, IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST); ctx->ifc_vlan_attach_event = EVENTHANDLER_REGISTER(vlan_config, iflib_vlan_register, ctx,