From nobody Thu Jul 18 18:55: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 4WQ27N2CFTz5QB9g; Thu, 18 Jul 2024 18:55: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 4WQ27N1Xvlz4rnn; Thu, 18 Jul 2024 18:55:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721328928; 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=POfW/+rgrpz7Tq7s2YGQ9jWDaL5KHYPpdaOyRE2pNWY=; b=op98G1IKgLC8rAcRfmoxYSWYSYxjISV0Z9FLMM20z4AeZIcgUZVARqwapgydL1UaQm3fSy HNvgjQhUYnZx/sXX+8XbhIZopsGKGzPF7i5SQ9jkOrWNV+ceom0sHzXWfDdEuSlF0Hl23M UVLlBwUwlHPmSyh4ESRYTDNa63XVo5T3xbxV80zfkghs39M3PPuO+YwlQHEp5E6ywND1m/ 1Eeehm8G/1Kktmb53HWyCWKfLpjDsxPqrAYMHvWBVgmwg8opA46axJbRYooXd8/qLkPxtt AZE8N1ofNl64ZX7xNbDVnF4N/cwmgSJGJkszw3u59mRXq/FzilRsW2gQ9f2+2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721328928; a=rsa-sha256; cv=none; b=D14HJ+ql9jId0YCqtjnIeFOseT2+Ev0lopWPHjL9sd2niv6m/r4NzF7NQWF5/QKCRWkrEk b/IkT1uuuToEabCvECah9W+Wcbc7CHC6T94c5mVtS9cPPJnqlz0cf5WVUcjpNDWmiT6NZu xiZVuFV79KZ6PYrkTzqraQ8fNUwxIr8hBUt9c2uy7CM3QOqDcGZLYmlb89KwHPqOCmRIZw bEKQRzIpFsoByZzIK0DEHatZsOqohrIzGnumkKgCYihZuz4oO5Oi405T6dO5a3qzAlgbJO TzHjcjz4bGYMQWHV3ZPNtgTvZugxhF36eYREAIFvQxI7Bt0iWDwx8QiJezO+Rg== 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=1721328928; 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=POfW/+rgrpz7Tq7s2YGQ9jWDaL5KHYPpdaOyRE2pNWY=; b=h4oa/SWhWgWIg1WgbLtbm9lmyzR0huabGKmUtx6/qw/MONOb2ZGA4dG0qFFRi9XXIfyw6o 6RLBcPDqQw3jex1MIsGfhQqC82SH5tiGNvbWoru4ua1oylzrnXEDm+lUSwbW4GMkxke/aO cRv5DLn7TryUl/qMeC5phCImhVqUiSLTvFV+uYTyppL/IjfEch76nppOz1YRWW4qEbKSf0 A36BL2q2lK3AFKaGvlj+MKZXC1oChcMyoJzei6n4xz2U3vmOC2FGPlEfQeuN/dtewXTmir Dxe/oz7UD19TRwUcE+rfVrpbypVmA4JktxzzqwIxELE+8Xs0LRqdluVM70DZqA== 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 4WQ27N12BJz10nn; Thu, 18 Jul 2024 18:55: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 46IItSd1034243; Thu, 18 Jul 2024 18:55:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46IItS87034240; Thu, 18 Jul 2024 18:55:28 GMT (envelope-from git) Date: Thu, 18 Jul 2024 18:55:28 GMT Message-Id: <202407181855.46IItS87034240@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: ee912ee57a21 - main - nvmecontrol: Treat requested KeepAlive timeout as seconds 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: ee912ee57a213b25fc9e559054e5869b4a6b2f61 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ee912ee57a213b25fc9e559054e5869b4a6b2f61 commit ee912ee57a213b25fc9e559054e5869b4a6b2f61 Author: John Baldwin AuthorDate: 2024-07-18 18:54:43 +0000 Commit: John Baldwin CommitDate: 2024-07-18 18:54:43 +0000 nvmecontrol: Treat requested KeepAlive timeout as seconds The internal KATO is stored in milliseconds, so convert the command line argument (given in seconds) to milliseconds before passing to nvmf_connect(). Sponsored by: Chelsio Communications --- sbin/nvmecontrol/connect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/nvmecontrol/connect.c b/sbin/nvmecontrol/connect.c index 14bd0cce1f8f..ef614eca2e2a 100644 --- a/sbin/nvmecontrol/connect.c +++ b/sbin/nvmecontrol/connect.c @@ -82,7 +82,7 @@ connect_nvm_controller(enum nvmf_trtype trtype, int adrfam, const char *address, io = calloc(opt.num_io_queues, sizeof(*io)); error = connect_nvm_queues(&aparams, trtype, adrfam, address, port, - cntlid, subnqn, opt.hostnqn, opt.kato, &admin, io, + cntlid, subnqn, opt.hostnqn, opt.kato * 1000, &admin, io, opt.num_io_queues, opt.queue_size, &cdata); if (error != 0) { free(io);