From nobody Tue Dec 03 04:02:09 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 4Y2Rmy0cRHz5fcyW; Tue, 03 Dec 2024 04:02:10 +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 4Y2Rmy06NMz4tWD; Tue, 3 Dec 2024 04:02:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733198530; 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=lVsR6VHtAubB1OP8rzwjaSuaRSZfGzMDBu3XgkGcfRA=; b=Ogi9QfACN5Ub712Mb1/zJke/W5KrH3uNcH1HS+zWLHRQ3z7jDinvOsFeSYZ1P4Gq8rZGYc V6LIO3AuB/2eX10NvKUnkQKF9PCH/V5mFqWgJRQOcsP4CuWjYRtBOR6F8HK4+bdsr7xSHU Yg28cWzUX2lupQ4x8BPbBtbp0kXL0hlkHHlxVS8+d9p78js1aangGn/0IIJWS6Gw2muKr3 EECjD/Mh5FLY83qTsT8JUL19wVtzgtU33NW4XFscCbsevdPn3O5XKLNQivs+fYylLCcxt+ m2Q79Gu8f719SGBDeJoFvqggbJRjLZPk+klKoPznvWWETBHsUuEJryj886L8Lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733198530; 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=lVsR6VHtAubB1OP8rzwjaSuaRSZfGzMDBu3XgkGcfRA=; b=lgS0oqGKEVbpWxQBRWHL/cKqpskDiSbTMKMhDY0s5FJ8QKwKTrMqKBB1lwZ8e/3emZMG0F P/OsPrmewNa5c7N+gaSiz395cjq78ep0lgzsLBQd6J0OPvyBIHWpfC8Qgvbk0GJB1WrYsI 6Z9WpUK0rxkEkKapZyT23qBR3k8dL9cnhttkOuCpB+lYk/nHhdZ22YCxBgQN6rXW/erZj4 2BwcegLuZ15k+INn95+KECthGuwXl0Jo0bUspPpt1hvxHhLimfNAo9YhxgKGO38LiZ8cCp We163SHw8XMKwbSiYzGTV8K1GCb73O7hWA6mKO1TcCjm+a1K3x5oecx9SGnz9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733198530; a=rsa-sha256; cv=none; b=FEmBQeNAcbkwQvLRYlYjNbH/WZj2Xwq9CaVlX9UuoYCWr0tqBIHlvlCBnWb8VD8e8hchFg rGrsQ+WwznmZ4qGIN/wZMKgTSCnT580Mf0dKY/twLzS6msTYHAADpI16TZ9lYxBuLVuQg3 63Dk8um1BO1Z3nqArewKMDc3USxc6o7c+sHQfRh1KwpF3gfcVqMoH91hodedzSy6brxdPt 22c6/C/eeCcpgoPG5K33MVNZSBZCC46Rf1upDpaoBMW19otgOD/FE2ROrxEWNT5PqgBeP8 /dyuzEMC3DS8Ln06GBSIu3vWIJ6fGmXVdJ+mGDKWQTD+9Bw8gs1NRgyGy60QNg== 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 4Y2Rmx6ql9z16l1; Tue, 3 Dec 2024 04:02:09 +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 4B3429nf072853; Tue, 3 Dec 2024 04:02:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B34290n072850; Tue, 3 Dec 2024 04:02:09 GMT (envelope-from git) Date: Tue, 3 Dec 2024 04:02:09 GMT Message-Id: <202412030402.4B34290n072850@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: a42c3e61504b - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: a42c3e61504b136ad9eecbd2ba0c763035dd1b7d Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=a42c3e61504b136ad9eecbd2ba0c763035dd1b7d commit a42c3e61504b136ad9eecbd2ba0c763035dd1b7d Author: Kevin Bowling AuthorDate: 2024-11-29 06:23:23 +0000 Commit: Kevin Bowling CommitDate: 2024-12-03 04:01:53 +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 1a5dbe2335ba..fcf1ccbd9a3e 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -1236,10 +1236,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; @@ -5405,8 +5401,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;