From nobody Fri Nov 29 07:16:02 2024 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 4Y04GW1NG3z5fwwN; Fri, 29 Nov 2024 07:16:03 +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 4Y04GW0fldz4r7x; Fri, 29 Nov 2024 07:16:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732864563; 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=9iRpmuTMsC0Kaxqo7qLWo3+0QvWdQtWQL1wUpxvBkB8=; b=FCE+MCNDj1ldHwCIpy9CC1EVz9BbxvS6bjPofzqCsCLDvYIOWQgzOk1JIVV9UuZGQqrVr5 hUPfCz9IbO8fmhw86QTwVxCm2DuptmhjDTs3GaMzBQD6uLaE452o+jY477WRl8mnGdlCdH Xzvfltz+p8U9jvRPakNGh/s+/rSZmWQbLkLrwUqyEJL+QQnpwywMmWw2QDvfqRbwdhcb9b oeW9q8NkvcgJTfanjWbGHbw/CmxZIakJ7XJLerAy8EQPgK7SPOaa/gjAqJTtZEDZ9MK4Qn L2ZCrxZGjB0h49TooH/KLS6NIeWKQHZOmC86Ty9yFDC0MuLpsIxuZUBvSddzow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732864563; 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=9iRpmuTMsC0Kaxqo7qLWo3+0QvWdQtWQL1wUpxvBkB8=; b=QQX0btLhq9cF6K8K0iEpXKpqE6BApaBPkm9aXuaeG0N2VHvXzdwiYY/IXspkq5pxpwLuiU z8k0lfDdMPU1Ozpts5cRtjz7pExFFo0xZ2NpCov9NsUedklrTnBi1zBflRBewt12vswjZV VibGp0hnetvdXcT1S9HwHZzjDissiTtqrqKH9AMpOc+hyOvZyqSByLIgNBFXTGDv4FKizF so1F4xOwupJh1jJrup7dR1lUSg+XrBLkJQdyERDAirvob0yBvRksRf70VxJz2uAbhNsBM2 8RL5DmhmjzLAbYzAVLmPszaPynHHcZAA61gOkv2v0iTzaOjrDCN4Flw2tba6yg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732864563; a=rsa-sha256; cv=none; b=YGBh1uGM8WU7v3dh/fYhawarALawYjLaj1U0lR0yAFQOYvwPVcr78UFE5452NAx46mx+ke fT1bks4FqBxwfSzvS47KnJJRD29nNnpVKTGhYguggwpD2cflxVDQ3PjXhTM+apcgQem8nt PfDXQjxF6FjpBMif5FKIWkV78IKJ4+xaCXvowDIdZrwXO9HgJKad9Hj84MN3RSAxy3KTaU by5u/jGnpoHtQU66T3oj9Aoy2lWZpU5aobu9ry5lrlACkJigZbGMHR2t+5ctsg2tD+zjKj G6RZpSagkK4NyAbU+qFKsQWwGDZwYYGscQ8oVXUwQknKDQr+h2BtYenlpT7+XA== 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 4Y04GW07Qzz1CK2; Fri, 29 Nov 2024 07:16:03 +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 4AT7G2ka093338; Fri, 29 Nov 2024 07:16:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AT7G2uv093335; Fri, 29 Nov 2024 07:16:02 GMT (envelope-from git) Date: Fri, 29 Nov 2024 07:16:02 GMT Message-Id: <202411290716.4AT7G2uv093335@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 4020351325c0 - main - e1000: Remove old itr sysctl handler 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4020351325c02cc27aa4992c199ff18a9542a52c Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=4020351325c02cc27aa4992c199ff18a9542a52c commit 4020351325c02cc27aa4992c199ff18a9542a52c Author: Kevin Bowling AuthorDate: 2024-11-29 06:23:23 +0000 Commit: Kevin Bowling CommitDate: 2024-11-29 07:15:54 +0000 e1000: Remove old itr sysctl handler This implementation had various bugs. bde@ reported that the unit conversion/scaling is wrong, and it also does not handle 82574L or igb(4) devices correctly. With the new AIM code, it is expected most users will not need to manually tune this. If you do need static control: hw.em.enable_aim=0 for all interfaces at boot or dev.em.X.enable_aim=0 for individual interfaces at runtime and they will track the hw.em.max_interrupt_rate tunable. That codepath has been bugfixed for all supported chipsets. You may view the current rate with dev.em.X.queue_rx_0.interrupt_rate which has been bugfixed for all supported chipsets. If you need to set different rates per interface for some reason let me know and I will rethink how to add this back. Otherwise you can leave AIM on for general purpose interfaces and disable it at runtime on special purpose low or high latency interfaces that would track hw.em.max_interrupt_rate if you have a mix of concerns. PR: 235031 Reported by: Bruce Evans MFC after: 3 days Relnotes: yes Sponsored by: BBOX.io --- sys/dev/e1000/if_em.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index aed97d076a5e..449cb9e07f3a 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -1234,10 +1234,6 @@ em_if_attach_pre(if_ctx_t ctx) "transmit interrupt delay limit in usecs", &sc->tx_abs_int_delay, E1000_REGISTER(hw, E1000_TADV), em_tx_abs_int_delay_dflt); - em_add_int_delay_sysctl(sc, "itr", - "interrupt delay limit in usecs/4", &sc->tx_itr, - E1000_REGISTER(hw, E1000_ITR), - EM_INTS_TO_ITR(em_max_interrupt_rate)); } hw->mac.autoneg = DO_AUTO_NEG; @@ -5403,8 +5399,6 @@ em_sysctl_int_delay(SYSCTL_HANDLER_ARGS) return (EINVAL); info->value = usecs; ticks = EM_USECS_TO_TICKS(usecs); - if (info->offset == E1000_ITR) /* units are 256ns here */ - ticks *= 4; sc = info->sc;