From nobody Wed Feb 26 15:15:55 2025 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 4Z2yj7756Hz5qHBn; Wed, 26 Feb 2025 15:15:55 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z2yj71tdJz3Nsq; Wed, 26 Feb 2025 15:15:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740582955; 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=YjWYkAD3tBKLjsqm00PAGtOep9drW7pB2yJ+o3/KO+Y=; b=pDojmtQFY6UC1fjegVt/Sw9yhKXPGcnoNhwQI7uS9fD5h9XUHsRdTPikgt71EFgG9OGqHP xSKxYP4t+TJUW55me790tPwGw1hTqccnAIlBOS5FsCWRYImm15v8AyR4JE6DEd4YfXnAq6 1TJGSLQ7ERzjPNkUG2PAM7t52hJGA1tOGCAtaCVwchPjBdcQW5EuLMStOxSCulF1ypHT4h YXkmUD7ZlHRQPsXiYIs9JR38hupRD1zw5nIHO8rv2dwIFRcVxSiXSOTwobtuRspAMPVIe1 +UQry1ptJbTdLp84CxAWXaJeDaUHWseuNfGTijvzgRkPyB12YFWWAAXzALpPOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740582955; a=rsa-sha256; cv=none; b=sPOltpKoEhJZtcSLah1bCEOHu0Pm3XHPFpYBCj7dFM7MUfaDEfs65kYZ1Rajg8Iddk1n06 rhrmrfQ4W7y86CZcu4zy9YKau3Hwg+rfjbv/rLpONUJlDZKMBX+BQ7xriEKJtnmO1bXm0F LWNc6dW4uo09nKt/MP8XAVdI7us/MbBG/OGFfBouAxifTzQ6XZowVfahghJDQEXObPLzTn kmYUS32a34vDkcbAVsOZvAbDkRRLozoFh1XDh+6znFLSMR8ui3zgI+g87ddWUFAZxohHiS /9oFgoHHubGi/7FCrK2q9Wfa13kEH6WTQNldxC4KyvFSHTqeLF24T5XoMkFSuw== 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=1740582955; 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=YjWYkAD3tBKLjsqm00PAGtOep9drW7pB2yJ+o3/KO+Y=; b=XC66v1Hh1tSmGBWwyJog+TlHVj3wJVmW5neP+Pfg4fBYwnk0idk+xtU7jj21M4lcxHN6qQ GJUS+gjgQum8RgdWCZhNZCoiBKWO2hUiGgsAZ2jbXNRQzJ7U25o1/wyl+cpF+46V21sqaE 60iG4SumtqCMXNWAg6Hpl6qkWsqt+iJ4VIMetS2iQdfb6q/B7SmDHFh5A5hHH2t9zA7u+q fAugOT2dWiNnBRKygqeHSxHbpVbEGe5zjDVe3oevFQDMEHHBLastg2uO3Jp44NepNrmNAQ 5eKVwNm7luTm21mJHF3KrPOlRIAW63Sz0Sc5DYfq93C7mkoyG5PIaDViRDmjgw== 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 4Z2yj71Cdyz1HDC; Wed, 26 Feb 2025 15:15:55 +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 51QFFtxJ034127; Wed, 26 Feb 2025 15:15:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51QFFtxA034124; Wed, 26 Feb 2025 15:15:55 GMT (envelope-from git) Date: Wed, 26 Feb 2025 15:15:55 GMT Message-Id: <202502261515.51QFFtxA034124@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: 5b511473999a - main - ctld: Permit simpler syntax for target LUNs in UCL 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: 5b511473999a1d0145635fcc9d922601f34b670b Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5b511473999a1d0145635fcc9d922601f34b670b commit 5b511473999a1d0145635fcc9d922601f34b670b Author: John Baldwin AuthorDate: 2025-02-26 15:14:53 +0000 Commit: John Baldwin CommitDate: 2025-02-26 15:14:53 +0000 ctld: Permit simpler syntax for target LUNs in UCL Allow the LUN number to be specified as the key for a LUN instead of requiring it as a "number" field. If a key is used, permit a simple string value to be used for non-anymous LUNs. This permits replacing: lun = [ { number = 0, name = zvol_lun }, { number = 1 backend = ramdisk size = 1GB } ] with: lun = { 0 = zvol_lun 1 { backend = ramdisk size = 1GB } } Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D48939 --- usr.sbin/ctld/ctl.conf.5 | 22 ++++++++++------------ usr.sbin/ctld/uclparse.c | 30 +++++++++++++++++++++++------- 2 files changed, 33 insertions(+), 19 deletions(-) diff --git a/usr.sbin/ctld/ctl.conf.5 b/usr.sbin/ctld/ctl.conf.5 index 8cc7c85b6f95..e42dd8067006 100644 --- a/usr.sbin/ctld/ctl.conf.5 +++ b/usr.sbin/ctld/ctl.conf.5 @@ -555,36 +555,34 @@ target { "iqn.2012-06.com.example:target0" { alias = "Example target" auth-group = no-authentication - lun = [ - { - number = 0 + lun = { + 0 { path = /dev/zvol/tank/example_0 blocksize = 4096 size = 4GB } - ] + } } "iqn.2012-06.com.example:target1" { auth-group = ag0 portal-group = pg0 - lun = [ - { number = 0, name = example_1 }, - { - number = 1 + lun { + 0 = example_1 + 1 { path = /dev/zvol/tank/example_2 options { vendor = "FreeBSD" } } - ] + } } naa.50015178f369f092 { port = isp0 - lun = [ - { number = 0, name = example_1 } - ] + lun { + 0 = example_1 + } } } .Ed diff --git a/usr.sbin/ctld/uclparse.c b/usr.sbin/ctld/uclparse.c index ab41e328cd90..05cfcc8df7e7 100644 --- a/usr.sbin/ctld/uclparse.c +++ b/usr.sbin/ctld/uclparse.c @@ -233,23 +233,39 @@ uclparse_target_lun(const char *t_name, const ucl_object_t *obj) { const ucl_object_t *num; const ucl_object_t *name; - char *lun_name; + const char *key; + char *end, *lun_name; u_int id; bool ok; + key = ucl_object_key(obj); + if (key != NULL) { + id = strtoul(key, &end, 0); + if (*end != '\0') { + log_warnx("lun key \"%s\" in target \"%s\" is invalid", + key, t_name); + return (false); + } + + if (obj->type == UCL_STRING) + return (target_add_lun(id, ucl_object_tostring(obj))); + } + if (obj->type != UCL_OBJECT) { log_warnx("lun section entries in target \"%s\" must be objects", t_name); return (false); } - num = ucl_object_find_key(obj, "number"); - if (num == NULL || num->type != UCL_INT) { - log_warnx("lun section in target \"%s\" is missing " - "\"number\" integer property", t_name); - return (false); + if (key == NULL) { + num = ucl_object_find_key(obj, "number"); + if (num == NULL || num->type != UCL_INT) { + log_warnx("lun section in target \"%s\" is missing " + "\"number\" integer property", t_name); + return (false); + } + id = ucl_object_toint(num); } - id = ucl_object_toint(num); name = ucl_object_find_key(obj, "name"); if (name == NULL) {