From nobody Fri May 13 22:54:54 2022 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 C51B31AD4C41; Fri, 13 May 2022 22:54:55 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L0P9V3r0sz3ns6; Fri, 13 May 2022 22:54:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652482495; 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=/elzisdrLYk4rOdwckrmvbD0mMM2xw06jQ4LBpWG4ps=; b=tUykQiNJ7eghN9cLOs0NXdYDm3MW5Gk+RAFn0z6ntC5PEpN1ZrGzc45MZ1sSndKVF0p9LV wK3ZK1+0ss7cb3ZWxCgweIeMu4YAOR6QBnPv4xHKi9rtnK3C26yq1o1+75Fj+41hPtzO3V 6pmcEJnsuDtj+r+SDpykdGsHr7Cz6cNxaWzEbFATvaDCReA6Wm0AHVHew5dY/e0lZzqwUd DtUIe4BLFsxtgARidYSTVLH62RSJ/AxEMvWR9bSJ60RT4fIK+4wg6L4VtmVLDQ/P7wMSdG xLA5RIuJ7iR+fhcI9+HcMRcR/l4ZGX5VVAFQ+kxxvX61dpTIoEhq5GOLrAcliQ== 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 602363C08; Fri, 13 May 2022 22:54:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24DMss4A078387; Fri, 13 May 2022 22:54:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24DMssvl078386; Fri, 13 May 2022 22:54:54 GMT (envelope-from git) Date: Fri, 13 May 2022 22:54:54 GMT Message-Id: <202205132254.24DMssvl078386@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: d32888f4fefa - stable/13 - ix: Remove cpu_id and related code from ixgbe_if_msix_intr_assign. 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d32888f4fefa28acf4d020073374e66a894f62d6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652482495; 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=/elzisdrLYk4rOdwckrmvbD0mMM2xw06jQ4LBpWG4ps=; b=oaq5NCRkiIJV9PlMDgLKBlQlqt+inWxo1Zc3Y1RNu8FwGixVgqQrYNFpiSlcaAukJFe3Tg NTsTbGTPoD3vt2wcWgobBIXqcsfrqjie9L598s8/pFstLL6Ai7l+UtrhZ8WWWHvXndbhoK FDmrN1FdyiBui2Wt/0xqy0FG7wz+d19xvqI0IycyeMslV4Sw48xectd2PmgNJcAbHmyLU2 x91JHt04av5Ped4RIoY0Oao0wsrN7Z83FuWRcbmGz6yDcYSlnW+vTH9d1SfGjbiGOF3syJ h9OLJGfilKV361UfTle1cW9DbQzDkPHFF3NFRz2vZXiNOheR0sYBL0h8UFcCcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652482495; a=rsa-sha256; cv=none; b=KF+sz72l4uhvV4n4ght9ADyIVb5pD9iwBn93186RVLctNziVSzF+O8ljVfxNjLH0IH1v7G Qzc89KE6HzMebrOEoUTPXGRZE5gdEd4QDVI7zJDI/V31f6VNT0UrG4J/WhOk1VWH5EdocJ msKrEbSROZGYr3GMVrWEZokFAcoWXcgUfKmLTr8ulrUFulvJfdxFGHMZmecvN22lddNyAj vWrsr5RSAEt9URudviXkCOoKrR8muRaCIDk5C6aMI8yWgQNwnqaacSaIT0QGXRvwnE/XRx gWBh+nVRYUQAHJ9TO/8u09Aox13FGpRuXZYdxY37fn1lpTt0JMb8aokxCKakvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d32888f4fefa28acf4d020073374e66a894f62d6 commit d32888f4fefa28acf4d020073374e66a894f62d6 Author: John Baldwin AuthorDate: 2022-04-13 00:01:46 +0000 Commit: John Baldwin CommitDate: 2022-05-13 20:14:07 +0000 ix: Remove cpu_id and related code from ixgbe_if_msix_intr_assign. Reviewed by: erj Differential Revision: https://reviews.freebsd.org/D34828 (cherry picked from commit c0a42a04513de99fc02b30a88a6de0f85cf644db) --- sys/dev/ixgbe/if_ix.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c index 68a17993cac5..d7df1dcf6899 100644 --- a/sys/dev/ixgbe/if_ix.c +++ b/sys/dev/ixgbe/if_ix.c @@ -2075,7 +2075,6 @@ ixgbe_if_msix_intr_assign(if_ctx_t ctx, int msix) struct ix_rx_queue *rx_que = sc->rx_queues; struct ix_tx_queue *tx_que; int error, rid, vector = 0; - int cpu_id = 0; char buf[16]; /* Admin Que is vector 0*/ @@ -2095,25 +2094,6 @@ ixgbe_if_msix_intr_assign(if_ctx_t ctx, int msix) } rx_que->msix = vector; - if (sc->feat_en & IXGBE_FEATURE_RSS) { - /* - * The queue ID is used as the RSS layer bucket ID. - * We look up the queue ID -> RSS CPU ID and select - * that. - */ - cpu_id = rss_getcpu(i % rss_getnumbuckets()); - } else { - /* - * Bind the MSI-X vector, and thus the - * rings to the corresponding cpu. - * - * This just happens to match the default RSS - * round-robin bucket -> queue -> CPU allocation. - */ - if (sc->num_rx_queues > 1) - cpu_id = i; - } - } for (int i = 0; i < sc->num_tx_queues; i++) { snprintf(buf, sizeof(buf), "txq%d", i);