From nobody Tue Jul 30 14:29:19 2024 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 4WYHfl5jFBz5S46N; Tue, 30 Jul 2024 14:29:19 +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 4WYHfl43Nyz4yvr; Tue, 30 Jul 2024 14:29:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722349759; 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=MCC47BREyFBAIsN3Q/SfQIrcJnZef3IqpS2s0NaUmxw=; b=kS4/ltHPb2HuB7HV8vGIdCffO+vFCam3oDslUFz3LjfJIceAXTDpLnxW4vpUQtUqfG0kap N+3bq1Ips7V2aHaAoM+Wuky5a53QpCzhZLMkUs+WQvGCRRiLDwoAf4/b+ygS3RD4gRDJLG pAqW+zgRKPZFHX2c4RUEFdxOmLBDjUynH3DuUm/uR0+u6W+N52p817ytI8n0zU5AlRg9Fc MUg4dqJfQAHRdSG5XnN1OwR2VyWRlga5qwa3DM04BCcD0NSUA9yzz2FyASQ9Ak3KTDFhj2 LyWrRvDqApkQOl5FyV9PZ3GVJv3W6EXcJSzqGF4Lk34Z5T/koz2XY0PztO6koQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722349759; a=rsa-sha256; cv=none; b=bKIzYT6wj4CvGeLVXxCg5CqOJ74KiimjoUq0D1QTPbnn+UX6QJH1mn5d3Sk1GmtK8UJONh C/jeLgXgvESvXFcC9JzckSZeth7JSPxVBFAs8y370E0xDn//C+8F3bqq33yFyX2exaTxWx BsIHAigQDo+yMvywXw+1Mk+llLLwNeGWs3SQq/i5pk5TmOaoRVzmFxXMIzfOiJen4Yrb/3 6DML672S+/d8rwFJ2YU7nSmFydlBm+H5XGUc07J4pyB8aU9WTmvFV2QToJ76LBUI/QKSLT W8q0a/CIHkMtmCgY12IW7mbH159eY1rdxwK6cf68hBypKHHJCZO0NbvezHT6Og== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722349759; 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=MCC47BREyFBAIsN3Q/SfQIrcJnZef3IqpS2s0NaUmxw=; b=hrjBo8qtpgY8QhiaS/3Eg3dHuHtDm/+QUr1qHYnci/6pFYwvvo73FLSForgzbET7jvDNBA P8mFoU2yRbruOMM9Zcfi1PS8nfUS4tJJO+vSHALEvGIcojbaeRtDQfIpTMg0LqH2CgGn0z 9WLMT8iet3CzFTGX9ln5vI15ilYoav7FBNau39V1LYpaeDbzkDcLniWCH0G4SNCO5gI890 1woAt9ZjyJNYblp1DduW/Obu9cqrn+JDpPlTRnsUKJ+MAsD5dZgCpxDLn1ZOmW8CMqjukL u7jkGie88TDZKjxa4TddXGJNi/mZ6yvT+Mi0hYh2xRbFqxP8/QpGDWx7bvwG8w== 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 4WYHfl3g6fzLqP; Tue, 30 Jul 2024 14:29:19 +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 46UETJZn029614; Tue, 30 Jul 2024 14:29:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46UETJ9d029611; Tue, 30 Jul 2024 14:29:19 GMT (envelope-from git) Date: Tue, 30 Jul 2024 14:29:19 GMT Message-Id: <202407301429.46UETJ9d029611@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 6df040ea6e4a - main - nvmf_tcp: Avoid setting some unused parameters in tcp_allocate_qpair 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6df040ea6e4a533d4010b810c8aa74a3c3979d9a Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=6df040ea6e4a533d4010b810c8aa74a3c3979d9a commit 6df040ea6e4a533d4010b810c8aa74a3c3979d9a Author: John Baldwin AuthorDate: 2024-07-30 14:27:47 +0000 Commit: John Baldwin CommitDate: 2024-07-30 14:27:47 +0000 nvmf_tcp: Avoid setting some unused parameters in tcp_allocate_qpair Specifically, some parameters only apply to either controller or host queue pairs but not both. Sponsored by: Chelsio Communications --- sys/dev/nvmf/nvmf_tcp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/dev/nvmf/nvmf_tcp.c b/sys/dev/nvmf/nvmf_tcp.c index 6c84a40611c3..80c75e02c9b5 100644 --- a/sys/dev/nvmf/nvmf_tcp.c +++ b/sys/dev/nvmf/nvmf_tcp.c @@ -1450,12 +1450,13 @@ tcp_allocate_qpair(bool controller, qp->header_digests = params->tcp.header_digests; qp->data_digests = params->tcp.data_digests; qp->maxr2t = params->tcp.maxr2t; - qp->maxh2cdata = params->tcp.maxh2cdata; + if (controller) + qp->maxh2cdata = params->tcp.maxh2cdata; qp->max_tx_data = tcp_max_transmit_data; if (!controller) { qp->max_tx_data = min(qp->max_tx_data, params->tcp.maxh2cdata); + qp->max_icd = params->tcp.max_icd; } - qp->max_icd = params->tcp.max_icd; if (controller) { /* Use the SUCCESS flag if SQ flow control is disabled. */