From nobody Mon Sep 12 18:48:16 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 4MRFwc3mTVz4c1SZ; Mon, 12 Sep 2022 18:48:16 +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 4MRFwc2wQ5z3T5n; Mon, 12 Sep 2022 18:48:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663008496; 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=X2p/HAc34MVRcV5pJzUnhnQoH+6iCa8tQVDGq0buDpM=; b=jiF3d8/bUyLzViRAKpKd0LIy98TQ9RaXDLHD72CXMKR3EMD3FH0ABVeOkShIuH2bNT8tcb uAzFuxwOiK8z4NoTGzJQgZAjJ83AlZFlYqVA9PxvSJJPLK1lL/mowKXhc1WpCLdRYfK48A Ko8fkRwaaEeK+zAbB3sq/0XwyDxfkaPp1hJXZY2LRtaE7pfQoZLIGCireys7bROTdyahKF sOKYBxYstJQil7/Rw9gWQh2C2GKsdJDqD+cAl3QbVmvcVuSzBsuQupJRQ+tkuMQuldna48 VKieMslW4PGqnu01TtkYezGAgd4uztQDGv6zxN18iZVYH0wRTEj5OjbO3EXQMQ== 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 4MRFwc1pTnz14hs; Mon, 12 Sep 2022 18:48:16 +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 28CImGqH038472; Mon, 12 Sep 2022 18:48:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28CImGgZ038471; Mon, 12 Sep 2022 18:48:16 GMT (envelope-from git) Date: Mon, 12 Sep 2022 18:48:16 GMT Message-Id: <202209121848.28CImGgZ038471@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: 998eb37aca66 - main - cxgbe(4): Add knob to control congestion behavior for TOE queues. 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: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 998eb37aca6670b1ecbb7b5cad2b5b2d85d744b8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663008496; 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=X2p/HAc34MVRcV5pJzUnhnQoH+6iCa8tQVDGq0buDpM=; b=qYwgRSXaFJcJk/N7FQTZrPh8yFVpP0QJO3r4GScFKhOzvYfY4Bb3LMVYGa7yABom1L1hbl Uc5nas2v7p8j9Fzs3xEGeCGd5jteO8nbPwyZt1UfgVEfy1MXzk5+SgZU6YeRBpGOjq3LpU IfmrwJxGFNQPNdzMvZ+gqMeOoqPLJntQGL7e2dY+wkKj34xFLwZAIMaqMAXN7WUETLQ/V1 aeqVmON3mwrzTyZzaREVRG4QyU5UfMZ3XM0Zlukz7Bui70cM2I5FdTre3I3UB6okUPgZgk 7T40UlSICXJU92PWLeiuEJqQqUxmOGmQaTuO3lSwpzOGtDdWs8tVrupqxXqnfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663008496; a=rsa-sha256; cv=none; b=P1r/IOhY8oW0xWpOGCVplhsidqN3t7g3Zz134VtgiES92Z/F8PKCyhrqvh8eVFOay212L9 SKXh4AWpO3DrrBfPTIPxgusne/AUI7/ssCRocJE4O5KCTphtE6eOl3oZ2LNEzhP0vJ/dd8 m4cIdKR7iOBv+2nbH4C/6yiJ/A6R4gyBh9mcbyBso9Seph81dD7wxkpkrLTa1LBFgxpjSb Ctvx7MgeznDUVf/VIbLIK026BRKaNpnRb0QQW3ue6OdoWq4PtVxBKyJ7mSTQoi3e/H96B8 BuplffP85mAMrE9GAhdZHPZjDf5vf/J4ilS8/ShV991IOjXKgba1HNYXXuumrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=998eb37aca6670b1ecbb7b5cad2b5b2d85d744b8 commit 998eb37aca6670b1ecbb7b5cad2b5b2d85d744b8 Author: Navdeep Parhar AuthorDate: 2022-09-09 22:21:18 +0000 Commit: Navdeep Parhar CommitDate: 2022-09-12 18:40:35 +0000 cxgbe(4): Add knob to control congestion behavior for TOE queues. hw.cxgbe.ofld_cong_drop works just like hw.cxgbe.cong_drop but for TOE rx queues. MFC after: 2 weeks Sponsored by: Chelsio Communications --- sys/dev/cxgbe/t4_sge.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/sys/dev/cxgbe/t4_sge.c b/sys/dev/cxgbe/t4_sge.c index 9e75d1d96bad..0ee8d709eca4 100644 --- a/sys/dev/cxgbe/t4_sge.c +++ b/sys/dev/cxgbe/t4_sge.c @@ -129,6 +129,11 @@ SYSCTL_INT(_hw_cxgbe, OID_AUTO, spg_len, CTLFLAG_RDTUN, &spg_len, 0, static int cong_drop = 0; SYSCTL_INT(_hw_cxgbe, OID_AUTO, cong_drop, CTLFLAG_RDTUN, &cong_drop, 0, "Congestion control for NIC RX queues (0 = backpressure, 1 = drop, 2 = both"); +#ifdef TCP_OFFLOAD +static int ofld_cong_drop = 0; +SYSCTL_INT(_hw_cxgbe, OID_AUTO, ofld_cong_drop, CTLFLAG_RDTUN, &ofld_cong_drop, 0, + "Congestion control for TOE RX queues (0 = backpressure, 1 = drop, 2 = both"); +#endif /* * Deliver multiple frames in the same free list buffer if they fit. @@ -560,6 +565,13 @@ t4_sge_modload(void) " using 0 instead.\n", cong_drop); cong_drop = 0; } +#ifdef TCP_OFFLOAD + if (ofld_cong_drop < -1 || ofld_cong_drop > 2) { + printf("Invalid hw.cxgbe.ofld_cong_drop value (%d)," + " using 0 instead.\n", ofld_cong_drop); + ofld_cong_drop = 0; + } +#endif if (tscale != 1 && (tscale < 3 || tscale > 17)) { printf("Invalid hw.cxgbe.tscale value (%d)," @@ -1004,6 +1016,10 @@ t4_sge_sysctls(struct adapter *sc, struct sysctl_ctx_list *ctx, SYSCTL_ADD_INT(ctx, children, OID_AUTO, "cong_drop", CTLFLAG_RD, NULL, cong_drop, "congestion drop setting"); +#ifdef TCP_OFFLOAD + SYSCTL_ADD_INT(ctx, children, OID_AUTO, "ofld_cong_drop", CTLFLAG_RD, + NULL, ofld_cong_drop, "congestion drop setting"); +#endif SYSCTL_ADD_INT(ctx, children, OID_AUTO, "fl_pack", CTLFLAG_RD, NULL, sp->pack_boundary, "payload pack boundary (bytes)"); @@ -4113,7 +4129,7 @@ alloc_ofld_rxq(struct vi_info *vi, struct sge_ofld_rxq *ofld_rxq, int idx, CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, "offload rx queue"); init_iq(&ofld_rxq->iq, sc, vi->ofld_tmr_idx, vi->ofld_pktc_idx, - vi->qsize_rxq, intr_idx, 0, IQ_OFLD); + vi->qsize_rxq, intr_idx, ofld_cong_drop, IQ_OFLD); snprintf(name, sizeof(name), "%s ofld_rxq%d-fl", device_get_nameunit(vi->dev), idx); init_fl(sc, &ofld_rxq->fl, vi->qsize_rxq / 8, maxp, name);