From nobody Thu Aug 24 21:15:19 2023 X-Original-To: dev-commits-src-branches@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 4RWwpc0tlJz4rbBc; Thu, 24 Aug 2023 21:15:20 +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 4RWwpc0RkMz3VGy; Thu, 24 Aug 2023 21:15:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692911720; 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=yOz4PuUzUBoC7vtGNYyHGX0vh67uncnrzFB8Did+Z48=; b=GgCWKDstiXBw6YjtAx32Y24oVtwoUGv1ndGpBkywuA1G2mVpnRPzjWpQk5vlji7waM47tN 4eOUi+1rugxBlD9/Edaw88OsB4ydmA41pBpl8ZPJbN0biMMHzZIcXrE0k7tjaNJP1Dg6Xw wDKi15A1qFV9trX7VbPBXn/dbUSyPp1+13WybALnPG83knVWQMUdVMGtG3iTw0RJv0K8XP HVcF5Vs19JOJhbwSVnmuosL1OkZVDagL2bODIK2VnPKVOpSaWEWelb+OTSlKXP0jTo8UXo q3gGFg/h1oNouTvAPnSsRPPDpeigkS4HOCdYbngabTIOuzCmGmAUFYQGx7U8rA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692911720; 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=yOz4PuUzUBoC7vtGNYyHGX0vh67uncnrzFB8Did+Z48=; b=py8NfcDz6ZsZVK+HiGBApEhlBKnFd4KO4vLI4nrwvl/IuFVbCa799nxFtDZVnZMENdW4zF VXEPte8toEVPK+qq7yHb1QFu+l4LXGqveqYr0EAkM5QCCsOh1MyWOTRPAvx9fpkgwPdWBK MiWjF2FR2qX2gYw8yCJwwiEgaaK2BKvlig5lf7id+VyEEvgcE8BLr11hL0QDbzsmxnSQWp zmuYa8CJZLcISgfb6p1o4npO91RQpc29eb5tAvJjG5nTk7v+xrDLIqN65gMEphQ3ljMzsg 6P8X42a73+iRtzPixe9SGj1STwDId2vqum2oAysypYL2rfdVAlSVwN9jWiWn4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692911720; a=rsa-sha256; cv=none; b=wilVesnVgR3vA8jYWhH5G+b/LVy4sLOp5QcNQ1cHU8MOh2uDEjV2BcB6etlHuGYMFeZtks HoKpRudfBq/Hpj5nxn6BDJ2FWE1XP4X8q26EXKN1IHexROb7N5sy01NMof+B6aNN+QAL6W 8KqPgoTY7caqYvfERpXci3bCpQteYI2wCoRSZQrkr6A3C96g2tbVxINWqVL7U67FtxK8uX uckAl36Bs8DcBeba5Tr5BcFmTJDbwym5eMZNozqFZMu/tpwnk0QGoVXtnoT9F/SNw17gOk zjl6IqMwcx3VZ9avsUPd8bECqgXsOwnnmZ3Nhzf+gX7+EmbdCEFwK2P5V7H6MA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RWwpb6Pq3zhkX; Thu, 24 Aug 2023 21:15:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37OLFJD7075182; Thu, 24 Aug 2023 21:15:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37OLFJca075179; Thu, 24 Aug 2023 21:15:19 GMT (envelope-from git) Date: Thu, 24 Aug 2023 21:15:19 GMT Message-Id: <202308242115.37OLFJca075179@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eric Joyner Subject: git: dadd804ded83 - stable/13 - iflib: Fix white space and reduce some line lengths List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: erj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: dadd804ded83c8fc911ee9607d8e466aaf28d45b Auto-Submitted: auto-generated The branch stable/13 has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=dadd804ded83c8fc911ee9607d8e466aaf28d45b commit dadd804ded83c8fc911ee9607d8e466aaf28d45b Author: Eric Joyner AuthorDate: 2023-08-04 17:53:29 +0000 Commit: Eric Joyner CommitDate: 2023-08-24 21:07:40 +0000 iflib: Fix white space and reduce some line lengths This helps align some of the code with the rest of the style used in iflib, but as marius@ points out, this is not style(9). Signed-off-by: Eric Joyner Reviewed by: kbowling@ Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D41324 (cherry picked from commit 7f527d48124bd03fcfb946ce2d5d0c7bc71e099d) --- sys/net/iflib.c | 18 ++++++++++-------- sys/net/iflib.h | 7 +++++-- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index 2a0181fa2d77..d6dcb09312db 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -209,6 +209,7 @@ struct iflib_ctx { #define isc_legacy_intr ifc_txrx.ift_legacy_intr #define isc_txq_select ifc_txrx.ift_txq_select #define isc_txq_select_v2 ifc_txrx.ift_txq_select_v2 + eventhandler_tag ifc_vlan_attach_event; eventhandler_tag ifc_vlan_detach_event; struct ether_addr ifc_mac; @@ -1934,7 +1935,7 @@ iflib_rxsd_alloc(iflib_rxq_t rxq) MPASS(scctx->isc_nrxd[rxq->ifr_fl_offset] > 0); fl = rxq->ifr_fl; - for (int i = 0; i < rxq->ifr_nfl; i++, fl++) { + for (int i = 0; i < rxq->ifr_nfl; i++, fl++) { fl->ifl_size = scctx->isc_nrxd[rxq->ifr_fl_offset]; /* this isn't necessarily the same */ /* Set up DMA tag for RX buffers. */ err = bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ @@ -6501,7 +6502,8 @@ iflib_irq_alloc_generic(if_ctx_t ctx, if_irq_t irq, int rid, } void -iflib_softirq_alloc_generic(if_ctx_t ctx, if_irq_t irq, iflib_intr_type_t type, void *arg, int qid, const char *name) +iflib_softirq_alloc_generic(if_ctx_t ctx, if_irq_t irq, iflib_intr_type_t type, + void *arg, int qid, const char *name) { device_t dev; struct grouptask *gtask; @@ -6998,16 +7000,16 @@ iflib_add_device_sysctl_pre(if_ctx_t ctx) SYSCTL_ADD_U16(ctx_list, oid_list, OID_AUTO, "override_ntxqs", CTLFLAG_RWTUN, &ctx->ifc_sysctl_ntxqs, 0, - "# of txqs to use, 0 => use default #"); + "# of txqs to use, 0 => use default #"); SYSCTL_ADD_U16(ctx_list, oid_list, OID_AUTO, "override_nrxqs", CTLFLAG_RWTUN, &ctx->ifc_sysctl_nrxqs, 0, - "# of rxqs to use, 0 => use default #"); + "# of rxqs to use, 0 => use default #"); SYSCTL_ADD_U16(ctx_list, oid_list, OID_AUTO, "override_qs_enable", CTLFLAG_RWTUN, &ctx->ifc_sysctl_qs_eq_override, 0, "permit #txq != #rxq"); SYSCTL_ADD_INT(ctx_list, oid_list, OID_AUTO, "disable_msix", - CTLFLAG_RWTUN, &ctx->ifc_softc_ctx.isc_disable_msix, 0, - "disable MSI-X (default 0)"); + CTLFLAG_RWTUN, &ctx->ifc_softc_ctx.isc_disable_msix, 0, + "disable MSI-X (default 0)"); SYSCTL_ADD_U16(ctx_list, oid_list, OID_AUTO, "rx_budget", CTLFLAG_RWTUN, &ctx->ifc_sysctl_rx_budget, 0, "set the RX budget"); @@ -7019,8 +7021,8 @@ iflib_add_device_sysctl_pre(if_ctx_t ctx) CTLFLAG_RDTUN, &ctx->ifc_sysctl_core_offset, 0, "offset to start using cores at"); SYSCTL_ADD_U8(ctx_list, oid_list, OID_AUTO, "separate_txrx", - CTLFLAG_RDTUN, &ctx->ifc_sysctl_separate_txrx, 0, - "use separate cores for TX and RX"); + CTLFLAG_RDTUN, &ctx->ifc_sysctl_separate_txrx, 0, + "use separate cores for TX and RX"); SYSCTL_ADD_U8(ctx_list, oid_list, OID_AUTO, "use_logical_cores", CTLFLAG_RDTUN, &ctx->ifc_sysctl_use_logical_cores, 0, "try to make use of logical cores for TX and RX"); diff --git a/sys/net/iflib.h b/sys/net/iflib.h index 62da5ae25030..da6dc23aefd4 100644 --- a/sys/net/iflib.h +++ b/sys/net/iflib.h @@ -472,11 +472,14 @@ int iflib_device_iov_add_vf(device_t, uint16_t, const nvlist_t *); int iflib_device_register(device_t dev, void *softc, if_shared_ctx_t sctx, if_ctx_t *ctxp); int iflib_device_deregister(if_ctx_t); -int iflib_irq_alloc(if_ctx_t, if_irq_t, int, driver_filter_t, void *filter_arg, driver_intr_t, void *arg, const char *name); +int iflib_irq_alloc(if_ctx_t, if_irq_t, int, driver_filter_t, void *filter_arg, + driver_intr_t, void *arg, const char *name); int iflib_irq_alloc_generic(if_ctx_t ctx, if_irq_t irq, int rid, iflib_intr_type_t type, driver_filter_t *filter, void *filter_arg, int qid, const char *name); -void iflib_softirq_alloc_generic(if_ctx_t ctx, if_irq_t irq, iflib_intr_type_t type, void *arg, int qid, const char *name); +void iflib_softirq_alloc_generic(if_ctx_t ctx, if_irq_t irq, + iflib_intr_type_t type, void *arg, int qid, + const char *name); void iflib_irq_free(if_ctx_t ctx, if_irq_t irq);