From nobody Thu Jul 25 19:33:27 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 4WVLdz400fz5R8kl; Thu, 25 Jul 2024 19:33:27 +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 4WVLdz3GgKz40p5; Thu, 25 Jul 2024 19:33:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721936007; 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=6Y0qPJrCCI34PIN/NdrOahtGUwmCoCng2RFxgZ5dj+k=; b=uFNKVILbDftN/uUglyhJE9/9KMkvSzKpq9LFjlAoR6m1lvHmYR4tUlVHBcSeO1FOBu0rca WLs24G4c+ecWw7A+6Nf3xlSOe6qTcgHJEaPmEPTRZ/TNphvSi9pgoGiwaduK0NKZ90Sumo 5yNlJolOhUfoAKxIMAeMGwuC8W2KguvyyR/SDGU1NqBKV2jW3T4cGpPfb3E3d1HS76Fg+y EynV+WTsGixBPKyWoAkJyjGKnUhEiH/HEHlmrqIQh/RtDzmgNNXoP1p9fgJPfe2X7g1CBn cMclUq9kCfVs/7TfRIPqAPpM2ajSSfo05nU8OaH+wNDV8d1VhCbi2KsgmA73BQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721936007; a=rsa-sha256; cv=none; b=G0NQqxN+oF2+aewebDNDRMmJs4fjftohKpIdUAUBQ7zY2ilGzzUH0ruivv12cI9iJe0jEC zoDryLcqvIJgjxUOfc4sCMEkAkjsGC/5R197p10qOrJHjmQkXih6SWBeUzcczydrOw4Ffd GCRi2qHqcbHaP6w24U1yPbzPwYXbz21hsG/zBYeuhCaZ3KNlkaz/DOfh8LPQq0mZSfmCKb F5voAcUnacgu89+hoCZwDAqprTVQNtUBkEIRUW9uQ1jFzeQMzH0XMdvRdZ8pHD296q7avB irJZTXD5RM2wRtY7EgZY0PrYgkfUYnm648E0svxF6ZO9vJ1kOmavduV9g3rPnA== 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=1721936007; 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=6Y0qPJrCCI34PIN/NdrOahtGUwmCoCng2RFxgZ5dj+k=; b=YXKP3mXVTtoJRSmJ0Q91ge9dhyBSfsNZv0ZowgiOYEqViGMBBy05CSAITrzcViqJbdesGI Pb4zQjZbDCir1A3gDGFwH2UPXBqaR1mHe1WaZQoS0tFOKjGbLPBp3pxYOY18PnY52Su8l/ 0xFFEX/rk3oFdoQuZ1cLf9bMHdFvFmg/d6/f1qLf40kQxuKfJ1oaw/SlAhHeZdJVLk4tjG upVnhzNRhToVG6U1lNXfoD/xJdCN8I567tHlN/D4kCfwUUqElRHm/CtAGFaPEI4Fp6KOpc OiRGIol9NdUi6JPEVvhOgKP9sxjbPsgH4cS8fV3k+hNLmiE5BdTZ7EfpUJDtFw== 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 4WVLdz2m8Pz17Xs; Thu, 25 Jul 2024 19:33:27 +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 46PJXRw4042594; Thu, 25 Jul 2024 19:33:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46PJXRs3042591; Thu, 25 Jul 2024 19:33:27 GMT (envelope-from git) Date: Thu, 25 Jul 2024 19:33:27 GMT Message-Id: <202407251933.46PJXRs3042591@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: 5d0498db4782 - main - nvmf_tcp: Rename max_c2hdata sysctl to max_transmit_data 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: 5d0498db478253c42b5e4140b9aff8596a797464 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5d0498db478253c42b5e4140b9aff8596a797464 commit 5d0498db478253c42b5e4140b9aff8596a797464 Author: John Baldwin AuthorDate: 2024-07-25 19:29:43 +0000 Commit: John Baldwin CommitDate: 2024-07-25 19:29:43 +0000 nvmf_tcp: Rename max_c2hdata sysctl to max_transmit_data This sysctl sets a cap on the maximum payload of transmitted data PDUs including both C2H_DATA and H2C_DATA PDUs, not just C2H_DATA PDUs. Sponsored by: Chelsio Communications --- share/man/man4/nvmf_tcp.4 | 15 +++++++++++---- sys/dev/nvmf/nvmf_tcp.c | 2 +- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/share/man/man4/nvmf_tcp.4 b/share/man/man4/nvmf_tcp.4 index 4d77997c19a2..0a650e342f0e 100644 --- a/share/man/man4/nvmf_tcp.4 +++ b/share/man/man4/nvmf_tcp.4 @@ -3,7 +3,7 @@ .\" .\" Copyright (c) 2024 Chelsio Communications, Inc. .\" -.Dd May 2, 2024 +.Dd July 25, 2024 .Dt NVMF_TCP 4 .Os .Sh NAME @@ -35,10 +35,17 @@ variables and .Xr loader 8 tunables: .Bl -tag -width indent -.It Va kern.nvmf.tcp.max_c2hdata -The maximum data payload size of a +.It Va kern.nvmf.tcp.max_transmit_data +The maximum data payload size of .Va C2H_DATA -PDU sent by the controller to a remote host. +and +.Va H2C_DATA +PDUs. +A remote controller may enforce a lower limit on the size of +.Va H2C_DATA +PDUs via the +.Va MAXH2CDATA +parameter. The default size is 256 kilobytes. .El .Sh SEE ALSO diff --git a/sys/dev/nvmf/nvmf_tcp.c b/sys/dev/nvmf/nvmf_tcp.c index 57c81eceee02..8f1b3bf01e39 100644 --- a/sys/dev/nvmf/nvmf_tcp.c +++ b/sys/dev/nvmf/nvmf_tcp.c @@ -138,7 +138,7 @@ static void tcp_free_qpair(struct nvmf_qpair *nq); SYSCTL_NODE(_kern_nvmf, OID_AUTO, tcp, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "TCP transport"); static u_int tcp_max_transmit_data = 256 * 1024; -SYSCTL_UINT(_kern_nvmf_tcp, OID_AUTO, max_c2hdata, CTLFLAG_RWTUN, +SYSCTL_UINT(_kern_nvmf_tcp, OID_AUTO, max_transmit_data, CTLFLAG_RWTUN, &tcp_max_transmit_data, 0, "Maximum size of data payload in a transmitted PDU");