From nobody Tue Dec 03 04:01:27 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 4Y2Rm82cjqz5fcyB; Tue, 03 Dec 2024 04:01:28 +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 4Y2Rm75k6jz4tXL; Tue, 3 Dec 2024 04:01:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733198487; 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=l3oXDM59rJ6OM+k4vylTRYQHgN/cA/4hxZt/fM/vBIE=; b=R9DyuxWDTtobK6v1wfG6/vP0XJqVrFiqV9vzPO4Iv5FQmZWVnUK1drgk4zAt6nYWNVIQoV F5wvn4SE9//U4uQp2Ot+Wt8dBqXm+oQYfgmln95gTmdY5y/dpn/t/uVw2xY2JAe8gBAD40 QUH33voi3NtwDDFogQqna6vcAtQTce8F7jxbHSuCH+YcGzVO/6OFBTk+8xrlRgvBmjI31f CpbuSC16lcvu1t5p4npjz3V9vqfKRvgisfcY1efrncpVs9Q2GfywVhUPALv2W8PyLEgzsb lK7uApRAagvP8KLY1wLsFpQi9MzLa3VATOiFNLLQjRz5UlMz54sa0nb6Hv7LNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733198487; 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=l3oXDM59rJ6OM+k4vylTRYQHgN/cA/4hxZt/fM/vBIE=; b=S6+2vvr8snhToqCoWrytXCONvR7qFyxSefX1QWEQvwG+5F2KmT8+hzLO0qM5HYwHCmKYS/ ucsZw/uccwk5qWKuxM7h5H5YAo25mxXn2BdjTXU2CpHIGnJo5tncHmCVu0BN+YPLw4DQ4e AjTUZ1dtxgGSmOW0iJqSi2+E4hrmaONn5/nPIhvebCr1Do8sCIW4D28sNsm9Po3d3rzy4A 2zS44rIuXCm7P6tgka3LJ1dH1R9Pc7xCb5Eyspt8+jjcHd4g/uYPh0UPZJj8fwVAtAopGX 0aQ3xfusMADdeWb9IxjNZ9VWXP7u6v3aS2wu+QV35YPtEqwyU3GqprOUOkSW+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733198487; a=rsa-sha256; cv=none; b=t7j36D4Y3Z4WN7mDhLmprJtT0famkU7vzUbwOUPoz9BOqcHQ6MfXHycsmpfbTQsZAZ+Ziu /0K1L3kjRT6hcv1dQnsXVWQBNGwe44q/Sl/zF033nMw5UAFStlPy9b2QGf7Pbc3PfRjtSD XCaIY2W1CRqyADX34V3qo7Pvb91nfo7RcG9BFv1wWllmYXZIxLyBXl0o+VL2k2+frtXiCo 9ZsrmiBDf6y5Iy92IVrfuntbhtNRAoYPhcScaEom2HhJ+nIbJ67h5vH5Kt5rKiShYPYXlP Zlp7/GkNQugyMX5fzRSP5ang8FCusnN+1KfQ8Fs86O6o1W3sQ9oG/ZDAqkS75Q== 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 4Y2Rm75Kzmz16gk; Tue, 3 Dec 2024 04:01:27 +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 4B341RDT071242; Tue, 3 Dec 2024 04:01:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B341RWm071239; Tue, 3 Dec 2024 04:01:27 GMT (envelope-from git) Date: Tue, 3 Dec 2024 04:01:27 GMT Message-Id: <202412030401.4B341RWm071239@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: edf50670e215 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: edf50670e215ca1427817ef2598a5acb3ae3b5c4 Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=edf50670e215ca1427817ef2598a5acb3ae3b5c4 commit edf50670e215ca1427817ef2598a5acb3ae3b5c4 Author: Kevin Bowling AuthorDate: 2024-11-29 06:23:23 +0000 Commit: Kevin Bowling CommitDate: 2024-12-03 04:01:14 +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 Relnotes: yes Sponsored by: BBOX.io (cherry picked from commit 4020351325c02cc27aa4992c199ff18a9542a52c) --- 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;