From nobody Mon Apr 04 19:04:33 2022 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 0A3121A9F7F4; Mon, 4 Apr 2022 19:04:34 +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 4KXKvj6kBKz3rZq; Mon, 4 Apr 2022 19:04:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649099074; 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=LXGmzysl50IrJeJFoxojkuPZtDqcwIdRgsAGwFphsiA=; b=YhjzJsAGQTAmevjTWLPRwZ/8VnWxnfrhAKeldv68EazGArkGKY37CckZGhrxF+7JPwu7E8 CZ9FJ6+gcGP1Rlo18y/bIeBQPA2/eyhK4LdPo+LRxlEX9UXufiJCPyzebQ1ixJyrDRfMxu fzDa0YLrBh+n5ZHLGD+Seor0B7MKuwnsRTV/Be23NTGjfbyz3V0w85mxCA5EiNhv0Q+yu1 LSTh+mSFwH011ZJ9GFBkwzpUBvvHy6UKJ+/Hyy/syD0ma62cXdkYYON93EQNd3Km7Dg2dg bYuLvI987fSlM6Iz36o0SyPePDtEO1hGJKY9OYIfXrBIIj1xdRBYVZIsh7mifA== 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 BE194178DD; Mon, 4 Apr 2022 19:04:33 +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 234J4Xu6038992; Mon, 4 Apr 2022 19:04:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 234J4XJD038991; Mon, 4 Apr 2022 19:04:33 GMT (envelope-from git) Date: Mon, 4 Apr 2022 19:04:33 GMT Message-Id: <202204041904.234J4XJD038991@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: 392d7f026962 - stable/13 - cxgbe: fix enabling lro & rxtimestamps 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: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 392d7f026962b273cdcd3b230403efaa05f29efe Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649099074; 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=LXGmzysl50IrJeJFoxojkuPZtDqcwIdRgsAGwFphsiA=; b=yNpK/L6/UeRkhXQY81Xuz41hwZlFp1lkyoInpr9duJs4XmeGC2QDlnecb+AfXIlFxgPbxS 7zfPIYAX+d7vHSZ8sThzcLw1xOv6f8m6hRw9aag9kXG7TQgHySQXF/C3ISEype/8W3wl9R 6D1/VoN1MwaPMCheGwo/CkVNrk0bTzmwF5bP/0uyyXxdpgqZ9MyQn2S8PAHf3uI1EaDXgZ KOd/XXKtHuUWb/AcClLb6jatnFlIU8drMcemouEaRqVAwTFyUePdTYjjvOsgGERHEUBuEt 2CYd3oOL9t4kVq3+NbAcCFA4yA02R+6qARcvU5ObTVdpeJreYXc1Om19Kgk+iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649099074; a=rsa-sha256; cv=none; b=xQtlLcvgpZmUYmV4FOdqA53UCj50KfTNYXsNW76hm4p7F6ttch3FdCxspCnbqfktDjFMqs szDUfbtMP6L3lZ8h/3d3HYyrciRmpTL/uF2rfaur+CCnBWQBl7NxGPxQplFkCwH4NZ3GJy Xl+EZl1jWNdNrzLqYLn3kAIh/UxVu3eLWQJxibhXBss7jcQTsyfi3QES6eJLu6s36jnJtw ApfqVTjPbKGjxmdjxadpiyZ2++rg+lg23BbbYDDvtyntHXl/JjQFvewm+xTc6dVoh1zTCb 6mZA6MxJay9otuh7F6+qb24tzonoD9+kbLS7K4+JUTsQVX0uOCH7T6rjNiQEHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=392d7f026962b273cdcd3b230403efaa05f29efe commit 392d7f026962b273cdcd3b230403efaa05f29efe Author: Andrew Gallatin AuthorDate: 2021-05-26 13:54:26 +0000 Commit: Navdeep Parhar CommitDate: 2022-04-04 18:57:15 +0000 cxgbe: fix enabling lro & rxtimestamps A recent change caused iq flags, like LRO, to be set before init_iq(). However, init_iq() clears those flags, so they became effectively impossible to set. This change moves the initializion of these flags to after the call to init_iq(). This fixes LRO. Differential Revision: https://reviews.freebsd.org/D30460 Reviewed by: np, rrs Sponsored by: Netflix Fixes: 43bbae19483fbde0a91e61acad8a6e71e334c8b8 (cherry picked from commit df8437a93dd5268e5bfd06411c01a5cbdb38c6ac) --- sys/dev/cxgbe/t4_sge.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sys/dev/cxgbe/t4_sge.c b/sys/dev/cxgbe/t4_sge.c index 1c2102f4f06e..da0ac13c90e4 100644 --- a/sys/dev/cxgbe/t4_sge.c +++ b/sys/dev/cxgbe/t4_sge.c @@ -3953,12 +3953,7 @@ alloc_rxq(struct vi_info *vi, struct sge_rxq *rxq, int idx, int intr_idx, if (rc != 0) return (rc); MPASS(rxq->lro.ifp == ifp); /* also indicates LRO init'ed */ - - if (ifp->if_capenable & IFCAP_LRO) - rxq->iq.flags |= IQ_LRO_ENABLED; #endif - if (ifp->if_capenable & IFCAP_HWRXTSTMP) - rxq->iq.flags |= IQ_RX_TIMESTAMP; rxq->ifp = ifp; snprintf(name, sizeof(name), "%d", idx); @@ -3968,6 +3963,12 @@ alloc_rxq(struct vi_info *vi, struct sge_rxq *rxq, int idx, int intr_idx, init_iq(&rxq->iq, sc, vi->tmr_idx, vi->pktc_idx, vi->qsize_rxq, intr_idx, tnl_cong(vi->pi, cong_drop)); +#if defined(INET) || defined(INET6) + if (ifp->if_capenable & IFCAP_LRO) + rxq->iq.flags |= IQ_LRO_ENABLED; +#endif + if (ifp->if_capenable & IFCAP_HWRXTSTMP) + rxq->iq.flags |= IQ_RX_TIMESTAMP; snprintf(name, sizeof(name), "%s rxq%d-fl", device_get_nameunit(vi->dev), idx); init_fl(sc, &rxq->fl, vi->qsize_rxq / 8, maxp, name);