From nobody Thu Feb 02 07:39:30 2023 X-Original-To: dev-commits-src-all@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 4P6rJz1qt3z3c9Bt; Thu, 2 Feb 2023 07:39:31 +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 4P6rJz1Mb0z3CCD; Thu, 2 Feb 2023 07:39:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675323571; 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=17aPCr6ooN6m6OTiGA249qvjYKGUY1s42u+bKy0Gpwc=; b=LWq/+WSjZVmV9K/3nkE6DHSmeFf81rIMetgCLoCHwicgOcsNZp+ewMrNbFOdUPcOVH/JwN iZMFuNoiAuNGr2Mf0H26wDeGvjGBknq9ERa+eDlfJLG8oXcEUKFZETsVKPzRbpfrv+l4Na o5CmzjD4xZxr1HqYhSFgurMVDUuaqPNa8IUQW3sihtdC7zuA3dq78A4mCAxzw8MZtF/6/R zHtaSFgtS5wKo6tjYKJ2G+x+IGklY1//JpUdd9pEsgT7493fwTJ/w7AFy4DsdFLs/2Y21j +5wr8kwV04jJxuaOTOJreGyATz7IKa+w1+sa6nGhUyY8Uc7uQYZrZVV1CdCRYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675323571; 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=17aPCr6ooN6m6OTiGA249qvjYKGUY1s42u+bKy0Gpwc=; b=Cd0rb/kWDFBMrb2e0t3W7FPshCcnKIFMEX6iYxKwRwvesnJdRKtlGGtvdFyb3XrWEhzmg7 7c3wWDUIGdssWT8jlDAHnk7wK8SbAmDnzPdXTmzYFMHu2QhIy2f3M7nIGBYZmBYL/PaTya HyNAjMK5CLJGjb8iAIqhJq+wZQGuN2Duc0BzosWGz5bZWDk0Rvb/yQL97UVhoewpThG36n QW/a2zn64X/VYW3uzy6wEkgn7lDxdGjzucQODQjUqRoSRS2L/at3cIk2DLRBOF9jJkpgks 4qNecPu9m3KtwXBa7+RVOjUKUF8cCIbwIIcZBi/dOmHxrcahc927MJm4K7LOzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675323571; a=rsa-sha256; cv=none; b=ZMgtG4+X5VKc66tVAgj9lHop414EBexu0sGde9pqVG18WZNgtEsAho9cdlexqVIvP1Tjtm e11gA8Ht1/p5jjNC4zMHeN+Zs9vSF5t3wMfbOHVsJ1uXMoIMRm2h2b3Ijvmr+DertBun/M JlXNOWvXvzk2QGiQuyWQJ032JOY/ToCclCS58pOh4V4FMlxUM3BrWcw0u2bASbhsyC2TLx s87lF9gjkVAyhNOKDEFLjsttF63D+3dj5RwylKuvPdw2wMrxRllfdILhuRtAvoJLAcwXlU sk8TP2OJaDIpPkTJRgvZe1mjD5BeZZQnD8pCGtMM39iDBXxGPrCi6lukqof+vA== 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 4P6rJz0JdLzm4w; Thu, 2 Feb 2023 07:39:31 +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 3127dU7s062003; Thu, 2 Feb 2023 07:39:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3127dUdw062002; Thu, 2 Feb 2023 07:39:30 GMT (envelope-from git) Date: Thu, 2 Feb 2023 07:39:30 GMT Message-Id: <202302020739.3127dUdw062002@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: 1af49ac2e40e - stable/13 - cxgbetool(8): User interface to round-robin queue selection via COP. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 1af49ac2e40e46cca5d015aa48660c9ca37f96fc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=1af49ac2e40e46cca5d015aa48660c9ca37f96fc commit 1af49ac2e40e46cca5d015aa48660c9ca37f96fc Author: Navdeep Parhar AuthorDate: 2022-04-14 22:54:13 +0000 Commit: Navdeep Parhar CommitDate: 2023-02-02 07:14:24 +0000 cxgbetool(8): User interface to round-robin queue selection via COP. Queue "roundrobin" in a COP rule means the driver should select queues for new tids in a round-robin manner. Reviewed by: jhb@ Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D34922 (cherry picked from commit 811a82d53aaf905bebb523600d375a457069f022) --- usr.sbin/cxgbetool/cxgbetool.8 | 18 +++++++++++------- usr.sbin/cxgbetool/cxgbetool.c | 15 +++++++++------ 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/usr.sbin/cxgbetool/cxgbetool.8 b/usr.sbin/cxgbetool/cxgbetool.8 index d1c6f528d04e..96e66632e758 100644 --- a/usr.sbin/cxgbetool/cxgbetool.8 +++ b/usr.sbin/cxgbetool/cxgbetool.8 @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 23, 2021 +.Dd April 14, 2022 .Dt CXGBETOOL 8 .Os .Sh NAME @@ -649,18 +649,22 @@ must be one of .It Cm class Ar sc Bind the connection to the specified tx scheduling class. Valid range is 0 to 14 (for T4) and 0 to 15 (T5 onwards). -.It Cm rxq Ar qid +.It Cm rxq Ar qnum Use the specified offload rx queue. -.Ar qid -should be between 0 and nofldrxq for the ifnet. +.Ar qnum +should be +.Cm random Ns , Cm roundrobin Ns , +or a number between 0 and nofldrxq for the ifnet. .It Cm txq Ar qnum Use the specified offload tx queue. -.Ar qid -should be between 0 and nofldtxq for the ifnet. +.Ar qnum +should be +.Cm random Ns , Cm roundrobin Ns , +or a number between 0 and nofldtxq for the ifnet. .It Cm bind Ar qnum Shorthand for .Cm rxq Ar qnum Cm txq Ar qnum Ns . -Use only when nofldrxq is the same as nofldtxq. +Use when nofldrxq is the same as nofldtxq. .It Cm mss Ar val Set the advertised TCP MSS in the SYN for this connection to .Ar val diff --git a/usr.sbin/cxgbetool/cxgbetool.c b/usr.sbin/cxgbetool/cxgbetool.c index 1d239ccf238a..f93c28da8e16 100644 --- a/usr.sbin/cxgbetool/cxgbetool.c +++ b/usr.sbin/cxgbetool/cxgbetool.c @@ -3150,14 +3150,17 @@ parse_offload_settings_word(const char *s, char **pnext, const char *ws, os->sched_class = val; } else if (!strcmp(s, "bind") || !strcmp(s, "txq") || !strcmp(s, "rxq")) { - val = -1; - if (strcmp(param, "random")) { + if (!strcmp(param, "random")) { + val = QUEUE_RANDOM; + } else if (!strcmp(param, "roundrobin")) { + val = QUEUE_ROUNDROBIN; + } else { p = str_to_number(param, &val, NULL); if (*p || val < 0 || val > 0xffff) { warnx("invalid queue specification " "\"%s\". \"%s\" needs an integer" - " value, or \"random\".", - param, s); + " value, \"random\", or " + "\"roundrobin\".", param, s); return (EINVAL); } } @@ -3207,8 +3210,8 @@ parse_offload_settings(const char *settings_ro, struct offload_settings *os) .ecn = -1, .ddp = -1, .tls = -1, - .txq = -1, - .rxq = -1, + .txq = QUEUE_RANDOM, + .rxq = QUEUE_RANDOM, .mss = -1, };