From nobody Wed Apr 13 00:02:13 2022 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 3DB331B071A8; Wed, 13 Apr 2022 00:02:14 +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 4KdN7V16d1z3sBt; Wed, 13 Apr 2022 00:02:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649808134; 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=BzXHXNcRZ/theljeqZIf/3nGroYzPSe/Yo/E6N8rTaI=; b=GQkVF08i0IogKlr2q7L8JtR9ySh8a/8xA66MxO7z6lhZxcyk8LNHXDOaJaHJy5UCjF8aAs DUsvCg0fmhHai+DmZgyGIDi7J/3kscoHcakC1YLntd1nxkVpdVTi3UhRgHlz4U8fMYttYn ZC+NqYCa/X8066oGhDbRFPPDCMRQOr/G78NBi+m2m+yenXrrZLKVP7LA6zXgfrQTrZPpjy RCABu9ZC9J64P+XD+gCyqyw5527ktnIY9mKaAz70efuMI5XHEIILKL2RLAMgtw7y+W+tCQ BRPU2ML7/Fdg7g85VAmJtRpqb3oMCqccbS0j3nVFmnfNA44XfvBiVYrfWKGSTA== 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 056222139C; Wed, 13 Apr 2022 00:02:14 +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 23D02DfU010362; Wed, 13 Apr 2022 00:02:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23D02D2p010361; Wed, 13 Apr 2022 00:02:13 GMT (envelope-from git) Date: Wed, 13 Apr 2022 00:02:13 GMT Message-Id: <202204130002.23D02D2p010361@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: c0a42a04513d - main - ix: Remove cpu_id and related code from ixgbe_if_msix_intr_assign. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: c0a42a04513de99fc02b30a88a6de0f85cf644db Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649808134; 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=BzXHXNcRZ/theljeqZIf/3nGroYzPSe/Yo/E6N8rTaI=; b=MltS7jV1DmWj2BjAkGMwbjFy5tFaCTNgZnII4oXZ+f8n1Sop1MgjDEhrJpLtwvv7d/nR+u beVPlGhpx95tzeCnebunTtdPi/TUMPvkHUMxEWYHSM2Nrp8nAmyryRYqLUc4qmxhTHY2xu 65x/+gNVekU+ukw6ira1iT/DK1N46WjP8npF+uG6tsRL5MFE7mKMQNNemTXbq6Qgh/yWSM pw1N7OlSREaaD5vn7s2eHl87AKzGtBrsT+NRSOZahBR9/XJdjvBtI6q1FGFWAb1Kznojwu gf1q/NrIeoTaO5wYHvhboCIBHNMt5HzuJo9DrUislLaR3OB0Xc0AamtQImH/Gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649808134; a=rsa-sha256; cv=none; b=pTwXtnKy0OKF1G3FKFBzjSxMFmRggdIZNtOkqNJasGGUl3vbxJHD4faz2l2ot6PZQ2K7pQ 8lZtKVGIpEK5MuEj8ADiG7NW8ihOQC2X654Ad6trBcwzYUleUHKT08hThEpUGGZubO8eVh GTdcWzQApi1xg65Y9qQ2kDhlSHshF4ngzw50E2e5Zf4rVDURex/R6a8YP8AjDQtFdddy+x 5F5xfpK0D5Kyegwo1exJh/s/M2aNEQJ5a7PUZz/2TSwXRuiUdGO5yl5vNjoW5LMSE7pV23 G8VuR+VBxO8/IVAydm5Qr6ynyzJrHAUqPnXyZJRwwy/4vJWvQY39qpY3pyViqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c0a42a04513de99fc02b30a88a6de0f85cf644db commit c0a42a04513de99fc02b30a88a6de0f85cf644db Author: John Baldwin AuthorDate: 2022-04-13 00:01:46 +0000 Commit: John Baldwin CommitDate: 2022-04-13 00:01:46 +0000 ix: Remove cpu_id and related code from ixgbe_if_msix_intr_assign. Reviewed by: erj Differential Revision: https://reviews.freebsd.org/D34828 --- 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 3077fc9ac4f8..4e34a1b12302 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);