From nobody Thu Jul 25 19:33:28 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 4WVLf04TDCz5R8kn; Thu, 25 Jul 2024 19:33:28 +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 4WVLf03xwcz40p6; Thu, 25 Jul 2024 19:33:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721936008; 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=1kQqtfax+VH/p6GPQeFuMsd+PC43oTfW3YLTCnqYEKY=; b=lVybGL0/u61YUgP02JGD5q1PmY1d6+S2Xp4L2WsR7YtBF2Rp/55nK/Ln+oavxajvAW93Gi A/tpHUlG574zR+DabreQsy9blLN1GHa9fmCZu9SzddbJmFUF3en4A42WhimPeAO6A3pUhJ 9fTRQcwjR3SLFcyBOO/kO8qZ3vPOiLVXtxb6bMP5BrekbHhZUcJatRBCceRyME4shutaRU OzvY5aKILlnZuEpT07aODy5/7fmv1IhT/RUoBTIUSJddZcuh5uFpDn7IaG9hf3rbSr/p/p tQTty/YYe0tL7MJaEps2JlktvX3+8DQGCa9fm5eBcZXb9k0Hpdiudxih5VkTbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721936008; a=rsa-sha256; cv=none; b=oO9KUFr9Vt1LynBa3K2MNrb1Qtis5IJaVnz1e9/g2CtNEalcygbGJm1GZQ/oeg/TCE0bL+ jiKoV66EXbCnUfl9dVbXuy9ryLqAw9KcEkozhyqB8wJa5DG91VxGQ5l5NpjkP5ZV0y0kUS rxNIr5qP4w9gv67Uz9cYWli53RBe5/6DRbPvbDyi0/87edVMqLn93sEvGalSir+866NwbH 4klX28LeTbDKsgOMw6+OgGBl6k0KwR2MBME88NZKFTPyu+5hYKqCeDi1tuRXCj1bopqyVt 9duY9XfVMqnO+v1Ykbbe7/8uo4IbPHvebbZiHH8LQ3BVlauM29UO8dwB2AOOgA== 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=1721936008; 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=1kQqtfax+VH/p6GPQeFuMsd+PC43oTfW3YLTCnqYEKY=; b=NOCgeQDaGCyVdB9wdqQZ7DT5x4Hhp0eF2I03WFBBj54HNt7uDUTHZ7dZVpkrYblPKcDLBs RMvMTiTAkNYgIONi7kvpi7iaNcoA6eP6StFgJu0xpVykoAVE1m5F9GMM/epSaGug6oLkj8 JN8rdkm0Ijj7On3znNip8q2AcqQwdPqWnhst5+lruG+KwHy32mG7VMZV3WlOeswFqvSbCl cmKdL5Vto+CBukXr50i9LUBfPIUe/tbRZNBFhQcll5KrtsGQuudx9H6lP6DE10uGulzB6D ++scKpHweagcxnTw3FLnLjcYkc1pms293CE4XwTvrHLNfgrCr7o6RvN+97mryw== 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 4WVLf03Yfyz17bP; Thu, 25 Jul 2024 19:33:28 +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 46PJXSN5042642; Thu, 25 Jul 2024 19:33:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46PJXSLw042639; Thu, 25 Jul 2024 19:33:28 GMT (envelope-from git) Date: Thu, 25 Jul 2024 19:33:28 GMT Message-Id: <202407251933.46PJXSLw042639@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: 6549718b70f0 - main - nvmfd: Stop setting MAXR2T in association parameters 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: 6549718b70f0e660a15685369afb4f9caf2215ce Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=6549718b70f0e660a15685369afb4f9caf2215ce commit 6549718b70f0e660a15685369afb4f9caf2215ce Author: John Baldwin AuthorDate: 2024-07-25 19:30:52 +0000 Commit: John Baldwin CommitDate: 2024-07-25 19:30:52 +0000 nvmfd: Stop setting MAXR2T in association parameters This is only used for the host side of an association. The controller obtains this value from the host during connection negotiation. Sponsored by: Chelsio Communications --- usr.sbin/nvmfd/discovery.c | 1 - usr.sbin/nvmfd/io.c | 1 - usr.sbin/nvmfd/nvmfd.8 | 7 +++---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/usr.sbin/nvmfd/discovery.c b/usr.sbin/nvmfd/discovery.c index 985c77620a62..1cee8755c65c 100644 --- a/usr.sbin/nvmfd/discovery.c +++ b/usr.sbin/nvmfd/discovery.c @@ -109,7 +109,6 @@ init_discovery(void) aparams.tcp.pda = 0; aparams.tcp.header_digests = header_digests; aparams.tcp.data_digests = data_digests; - aparams.tcp.maxr2t = 1; aparams.tcp.maxh2cdata = 256 * 1024; discovery_na = nvmf_allocate_association(NVMF_TRTYPE_TCP, true, &aparams); diff --git a/usr.sbin/nvmfd/io.c b/usr.sbin/nvmfd/io.c index be845a8ed784..3c25d1944eb8 100644 --- a/usr.sbin/nvmfd/io.c +++ b/usr.sbin/nvmfd/io.c @@ -57,7 +57,6 @@ init_io(const char *subnqn) aparams.tcp.pda = 0; aparams.tcp.header_digests = header_digests; aparams.tcp.data_digests = data_digests; - aparams.tcp.maxr2t = 1; aparams.tcp.maxh2cdata = 256 * 1024; io_na = nvmf_allocate_association(NVMF_TRTYPE_TCP, true, &aparams); diff --git a/usr.sbin/nvmfd/nvmfd.8 b/usr.sbin/nvmfd/nvmfd.8 index 689ac6d4dda1..40b1c0e2ebe0 100644 --- a/usr.sbin/nvmfd/nvmfd.8 +++ b/usr.sbin/nvmfd/nvmfd.8 @@ -3,7 +3,7 @@ .\" .\" Copyright (c) 2024 Chelsio Communications, Inc. .\" -.Dd May 2, 2024 +.Dd July 25, 2024 .Dt NVMFD 8 .Os .Sh NAME @@ -120,7 +120,6 @@ The discovery controller and kernel mode functionality of should be merged into .Xr ctld 8 . .Pp -Additional paramters such as -.Va MAXR2T , -.Va MAXH2CDATA , +Additional parameters such as +.Va MAXH2CDATA and queue sizes should be configurable.