From nobody Wed Sep 25 20:34:14 2024 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 4XDT3V4YmKz5XgGH; Wed, 25 Sep 2024 20:34: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XDT3V3yqTz5686; Wed, 25 Sep 2024 20:34:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727296454; 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=7OGYwGNx8vcgeIFfc3a7nGye5Peyo4Lyovy4yC+ODR0=; b=E4ggzspi94v5DrAImHN2qxkg0cafQ6zDKimAkgA8t+jZQ+LgrzC3XCMQEeVDruTAKrxQCy 49WJijA1RYEkbIsMC3LnnOY1lodKgl3kPKq5ynAKKdGfVgC5d4jpmNdkw1Ars5LooEPKrK Ujtv0bJ3vLWKEW/5aHs63QPr5xz2zn4MynHSBO7xEcWbTMguIHgPxMrAGAtib4VrHMq2h/ 4NS65bRG/FaYZManS9kYhEKBA0Zs1ra9nqVXwQD2AWBa0t3UyFkjvMKpX/+2kRbn1L5+Jm MO5JMGGQcB9gJjkCxBz2vxAVrAIbb7ddW1XJVxCKqFHtoGLw/9aHLFP4r9/mxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727296454; 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=7OGYwGNx8vcgeIFfc3a7nGye5Peyo4Lyovy4yC+ODR0=; b=SSQceWoZV9c/1SER7lAFTl58rqKYjZQtw2EKnjXmlifTuXHZPBB4IxGhezD+YjPlNIr6of VZV2VErJxHyCuLTQWTwAULgMxABeYhdYoVFDG9vl0EHysKzfHhLrFde0a3agnHZ0nJj2wk Gk8Pix/3z08GmsjeID1lL7a0genBQ8TsCILs1NYs+HHGB5qLC4rzkhR81qjydA1zli+wok dy5ITe+LFDxCsD7fcrx8ep4rXC+Yj5ZvZAyjutxpKtRLPPG6gR0w6obrVNxeX3mX6lOJuR LkFJMNssESq6GPspFKQJVheBwTlU890B6mpIO7lGjHT73/x1uVo4rUyUzubmKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727296454; a=rsa-sha256; cv=none; b=j9iR1KgeU8iqW9KiiF7sRPlmGLec6mLgF/Y5Y9MOx6/ZmedLgN9TbJ7BpgfJ/tB6oiK39O NJxuCeB+eiQDtC2VGqtmo+sCLPKKtNAM8IdysA5m/KZ+ptMJqN9Pa3peqeQkOZmejo/uEs oyTjNGJYM7xBOthKbP6WXUHeE4Kix52kqeHpzxBzJLXJESHRjVZF88UaXvxGWTgyvWSrPa OdZzAtWQcmXD9hKDW5+0tw+X6dhUrxETRdWwJ5U9xRznjBGpEQmThgdfHvuTSmlfBessQO di5odYzScgpHbV3LKz5Nxjc1B2elRU4dUErgKov89/lgrTmE4enEF91gD1RG6g== 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 4XDT3V3SCqzS8T; Wed, 25 Sep 2024 20:34:14 +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 48PKYEEv086471; Wed, 25 Sep 2024 20:34:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48PKYEJ7086468; Wed, 25 Sep 2024 20:34:14 GMT (envelope-from git) Date: Wed, 25 Sep 2024 20:34:14 GMT Message-Id: <202409252034.48PKYEJ7086468@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: 36a001923836 - main - iflib: Simplify iflib_legacy_setup 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 36a001923836e280e750b76947b8705fcc47b0b7 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=36a001923836e280e750b76947b8705fcc47b0b7 commit 36a001923836e280e750b76947b8705fcc47b0b7 Author: Krzysztof Galazka AuthorDate: 2024-09-25 20:28:52 +0000 Commit: Kevin Bowling CommitDate: 2024-09-25 20:33:34 +0000 iflib: Simplify iflib_legacy_setup Follow the pattern from iflib_irq_alloc_generic function and use iflib_fast_intr as a handler for RX only interrupts. Also remove some intermediate variables and use consistent way for referencing queue's structures. Signed-off-by: Krzysztof Galazka Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D46061 --- sys/net/iflib.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index 9df01edc14d6..a2e2c3efa1ad 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -6424,15 +6424,11 @@ iflib_legacy_setup(if_ctx_t ctx, driver_filter_t filter, void *filter_arg, int * device_t dev; struct grouptask *gtask; struct resource *res; - struct taskqgroup *tqg; - void *q; int err, tqrid; bool rx_only; - q = &ctx->ifc_rxqs[0]; - info = &rxq[0].ifr_filter_info; - gtask = &rxq[0].ifr_task; - tqg = qgroup_if_io_tqg; + info = &rxq->ifr_filter_info; + gtask = &rxq->ifr_task; tqrid = *rid; rx_only = (ctx->ifc_sctx->isc_flags & IFLIB_SINGLE_IRQ_RX_ONLY) != 0; @@ -6440,17 +6436,17 @@ iflib_legacy_setup(if_ctx_t ctx, driver_filter_t filter, void *filter_arg, int * info->ifi_filter = filter; info->ifi_filter_arg = filter_arg; info->ifi_task = gtask; - info->ifi_ctx = rx_only ? ctx : q; + info->ifi_ctx = rxq; dev = ctx->ifc_dev; /* We allocate a single interrupt resource */ - err = _iflib_irq_alloc(ctx, irq, tqrid, rx_only ? iflib_fast_intr_ctx : + err = _iflib_irq_alloc(ctx, irq, tqrid, rx_only ? iflib_fast_intr : iflib_fast_intr_rxtx, NULL, info, name); if (err != 0) return (err); - NET_GROUPTASK_INIT(gtask, 0, _task_fn_rx, q); + NET_GROUPTASK_INIT(gtask, 0, _task_fn_rx, rxq); res = irq->ii_res; - taskqgroup_attach(tqg, gtask, q, dev, res, name); + taskqgroup_attach(qgroup_if_io_tqg, gtask, rxq, dev, res, name); GROUPTASK_INIT(&txq->ift_task, 0, _task_fn_tx, txq); taskqgroup_attach(qgroup_if_io_tqg, &txq->ift_task, txq, dev, res,