From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 531F037C10C; Tue, 17 Mar 2026 04:56:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=67.231.156.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773723420; cv=none; b=VBKc8I12Twzn7vN3YV90w810MrmQ7xK99NR1YVcBlCLiRiK7JU+ByzyC4LkCXjPaFtYJ01v5Ndgma+Aly8NmAxcV1Nab2817YdoRSYGhfwY789E5VHalxSe2KembGUrGZNLhEm2apQRSLFew0z6G7Fnusf8it+sgJGYOd4vugrY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773723420; c=relaxed/simple; bh=ywj+PAVnI9NymoIRc9HNldJ1XQNmF2FhgIlvn6hBcj0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=OioNRm619vY+Bkv8xhvtXM7ITvVojjT8TLw7BFzB+3ONIgZkDY83D0Y2kVL0kHYufae1WpikRLiw3lf/NgfBtF3M+FQ18eTkOcD4gj/ooztZj2FygcjzLFR3N1pi4TWGDsl1WY8K1vTjGIdSz+l0HvJ/hWlFXoPw/q/r3CCOgVk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=marvell.com; spf=pass smtp.mailfrom=marvell.com; dkim=pass (2048-bit key) header.d=marvell.com header.i=@marvell.com header.b=hcrl4x91; arc=none smtp.client-ip=67.231.156.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=marvell.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=marvell.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=marvell.com header.i=@marvell.com header.b="hcrl4x91" Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62H4TLN13105073; Mon, 16 Mar 2026 21:56:46 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pfpt0220; bh=A fTM7o1D8IdzqXdFq9j0stBC3ziDVDk21Pf2990pkk8=; b=hcrl4x91I8/BVpdv8 VFk/RuIxp2EPjameRKJlGzxUuD4+mZpylSaCnUufaiEMgy12z3ioFlluVGgtucA7 rXhckdkAyhDHyK/WTniTpOp315k38OkOK6karrpE3+fVlnqQghwG5bPGNDyDw+Sg 3hNN7Y0uYYb3QiFgNV4XHlazHHlAxIE4ejmOYnZ1GlYApYlCCEsQ7sLch/tsvf1P xFlQelYFnsqVTrdO5ScnCSZzTGiPYcKA52Z7Ewm3sHXX4FwtcLHNmOUvs0A6k6sQ 4g2yEePtZtyeUFyGVvpVoj9wr/IjFpqDAjcRikatmbLXTlQsLOlZB1i3C5E9ILRM vmPsg== Received: from dc5-exch05.marvell.com ([199.233.59.128]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 4cx02r45cv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 16 Mar 2026 21:56:46 -0700 (PDT) Received: from DC5-EXCH05.marvell.com (10.69.176.209) by DC5-EXCH05.marvell.com (10.69.176.209) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.25; Mon, 16 Mar 2026 21:56:45 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH05.marvell.com (10.69.176.209) with Microsoft SMTP Server id 15.2.1544.25 via Frontend Transport; Mon, 16 Mar 2026 21:56:45 -0700 Received: from rkannoth-OptiPlex-7090.. (unknown [10.28.36.165]) by maili.marvell.com (Postfix) with ESMTP id 5FFB33F7078; Mon, 16 Mar 2026 21:56:40 -0700 (PDT) From: Ratheesh Kannoth To: , CC: , , , , , , , , , , , , "Saeed Mahameed" , Ratheesh Kannoth Subject: [PATCH v5 net-next 2/5] devlink: Implement devlink param multi attribute nested data values Date: Tue, 17 Mar 2026 10:26:20 +0530 Message-ID: <20260317045623.250187-3-rkannoth@marvell.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260317045623.250187-1-rkannoth@marvell.com> References: <20260317045623.250187-1-rkannoth@marvell.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Proofpoint-ORIG-GUID: VwUnLVMxbT-_gAK7r8P1_r-nVOx5Ydjs X-Proofpoint-GUID: VwUnLVMxbT-_gAK7r8P1_r-nVOx5Ydjs X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzE3MDAzOSBTYWx0ZWRfXx4goHAY0w1kZ +s9cdPkO3NYiiM4y6b19j5Qo/+5CRHIWxx8M+WTNIzK5u8Ysdp3P/nofnURHqfNHUpB2i5HK0ey 8d/osbwN5dK8SozPiKu7J2zCer3PBicIo3GzwhPdLHFJvfrXfk3kKOFtCSSwxhZ85mE7g6J5SAW dWAQlwLL0pteejYBhx5v6LD0OEE7G8FRsw8nJsbcfaRKdkoFfFDCLrfdHCFje01QhDRB5VZgS0g iHfrONbUG2NntWk11x85qBVF1cXjClPeTIDpalvlYgce44m3224pQU9ltzomhkajZd/yswYVPxa r+72qyAQYrs1iJVmUGS2HZFIxbqFBfdbgz0R19jxLVQuVuSgV7LYeOgIjoqglLB4buTOO/CIt+c +dQmDV4+zXrcwqoOYslFkj27IpkptCKEdthUn+fkUVxkNyGlIOSBJ5OC5mFzRM3a3AYPnU/1AUY sMhekLFkFE+xukZJB5A== X-Authority-Analysis: v=2.4 cv=RvvI7SmK c=1 sm=1 tr=0 ts=69b8df0e cx=c_pps a=rEv8fa4AjpPjGxpoe8rlIQ==:117 a=rEv8fa4AjpPjGxpoe8rlIQ==:17 a=Yq5XynenixoA:10 a=VkNPw1HP01LnGYTKEx00:22 a=l0iWHRpgs5sLHlkKQ1IR:22 a=QXcCYyLzdtTjyudCfB6f:22 a=Ikd4Dj_1AAAA:8 a=M5GUcnROAAAA:8 a=sSlqG2hmm6If27J4_lgA:9 a=OBjm3rFKGHvpk9ecZwUJ:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-17_01,2026-03-16_06,2025-10-01_01 From: Saeed Mahameed Devlink param value attribute is not defined since devlink is handling the value validating and parsing internally, this allows us to implement multi attribute values without breaking any policies. Devlink param multi-attribute values are considered to be dynamically sized arrays of u32 values, by introducing a new devlink param type DEVLINK_PARAM_TYPE_U32_ARRAY, driver and user space can set a variable count of u32 values into the DEVLINK_ATTR_PARAM_VALUE_DATA attribute. Implement get/set parsing and add to the internal value structure passed to drivers. This is useful for devices that need to configure a list of values for a specific configuration. example: $ devlink dev param show pci/... name multi-value-param name multi-value-param type driver-specific values: cmode permanent value: 0,1,2,3,4,5,6,7 $ devlink dev param set pci/... name multi-value-param \ value 4,5,6,7,0,1,2,3 cmode permanent Signed-off-by: Saeed Mahameed Signed-off-by: Ratheesh Kannoth --- Documentation/netlink/specs/devlink.yaml | 4 ++ include/net/devlink.h | 8 +++ include/uapi/linux/devlink.h | 1 + net/devlink/netlink_gen.c | 2 + net/devlink/param.c | 69 ++++++++++++++++++++---- 5 files changed, 73 insertions(+), 11 deletions(-) diff --git a/Documentation/netlink/specs/devlink.yaml b/Documentation/netlink/specs/devlink.yaml index b495d56b9137..54034a647023 100644 --- a/Documentation/netlink/specs/devlink.yaml +++ b/Documentation/netlink/specs/devlink.yaml @@ -226,6 +226,10 @@ definitions: value: 10 - name: binary + - + name: u32-array + value: 129 + - name: rate-tc-index-max type: const diff --git a/include/net/devlink.h b/include/net/devlink.h index 3038af6ec017..7f78a0103107 100644 --- a/include/net/devlink.h +++ b/include/net/devlink.h @@ -432,6 +432,13 @@ enum devlink_param_type { DEVLINK_PARAM_TYPE_U64 = DEVLINK_VAR_ATTR_TYPE_U64, DEVLINK_PARAM_TYPE_STRING = DEVLINK_VAR_ATTR_TYPE_STRING, DEVLINK_PARAM_TYPE_BOOL = DEVLINK_VAR_ATTR_TYPE_FLAG, + DEVLINK_PARAM_TYPE_U32_ARRAY = DEVLINK_VAR_ATTR_TYPE_U32_ARRAY, +}; + +#define __DEVLINK_PARAM_MAX_ARRAY_SIZE 32 +struct devlink_param_u32_array { + u32 size; + u32 val[__DEVLINK_PARAM_MAX_ARRAY_SIZE]; }; union devlink_param_value { @@ -441,6 +448,7 @@ union devlink_param_value { u64 vu64; char vstr[__DEVLINK_PARAM_MAX_STRING_VALUE]; bool vbool; + struct devlink_param_u32_array u32arr; }; struct devlink_param_gset_ctx { diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h index 7de2d8cc862f..77e75c100e8c 100644 --- a/include/uapi/linux/devlink.h +++ b/include/uapi/linux/devlink.h @@ -406,6 +406,7 @@ enum devlink_var_attr_type { DEVLINK_VAR_ATTR_TYPE_BINARY, __DEVLINK_VAR_ATTR_TYPE_CUSTOM_BASE = 0x80, /* Any possible custom types, unrelated to NLA_* values go below */ + DEVLINK_VAR_ATTR_TYPE_U32_ARRAY, }; enum devlink_attr { diff --git a/net/devlink/netlink_gen.c b/net/devlink/netlink_gen.c index eb35e80e01d1..a88d815156ec 100644 --- a/net/devlink/netlink_gen.c +++ b/net/devlink/netlink_gen.c @@ -37,6 +37,8 @@ devlink_attr_param_type_validate(const struct nlattr *attr, case DEVLINK_VAR_ATTR_TYPE_NUL_STRING: fallthrough; case DEVLINK_VAR_ATTR_TYPE_BINARY: + fallthrough; + case DEVLINK_VAR_ATTR_TYPE_U32_ARRAY: return 0; } NL_SET_ERR_MSG_ATTR(extack, attr, "invalid enum value"); diff --git a/net/devlink/param.c b/net/devlink/param.c index cf95268da5b0..20ec12686834 100644 --- a/net/devlink/param.c +++ b/net/devlink/param.c @@ -252,6 +252,14 @@ devlink_nl_param_value_put(struct sk_buff *msg, enum devlink_param_type type, return -EMSGSIZE; } break; + case DEVLINK_PARAM_TYPE_U32_ARRAY: + if (val.u32arr.size > __DEVLINK_PARAM_MAX_ARRAY_SIZE) + return -EMSGSIZE; + + for (int i = 0; i < val.u32arr.size; i++) + if (nla_put_u32(msg, nla_type, val.u32arr.val[i])) + return -EMSGSIZE; + break; } return 0; } @@ -304,11 +312,11 @@ static int devlink_nl_param_fill(struct sk_buff *msg, struct devlink *devlink, u32 portid, u32 seq, int flags, struct netlink_ext_ack *extack) { - union devlink_param_value default_value[DEVLINK_PARAM_CMODE_MAX + 1]; - union devlink_param_value param_value[DEVLINK_PARAM_CMODE_MAX + 1]; bool default_value_set[DEVLINK_PARAM_CMODE_MAX + 1] = {}; bool param_value_set[DEVLINK_PARAM_CMODE_MAX + 1] = {}; const struct devlink_param *param = param_item->param; + union devlink_param_value *default_value; + union devlink_param_value *param_value; struct devlink_param_gset_ctx ctx; struct nlattr *param_values_list; struct nlattr *param_attr; @@ -316,17 +324,31 @@ static int devlink_nl_param_fill(struct sk_buff *msg, struct devlink *devlink, int err; int i; + default_value = kcalloc(DEVLINK_PARAM_CMODE_MAX + 1, + sizeof(*default_value), GFP_KERNEL); + if (!default_value) + return -ENOMEM; + + param_value = kcalloc(DEVLINK_PARAM_CMODE_MAX + 1, + sizeof(*param_value), GFP_KERNEL); + if (!param_value) { + kfree(default_value); + return -ENOMEM; + } + /* Get value from driver part to driverinit configuration mode */ for (i = 0; i <= DEVLINK_PARAM_CMODE_MAX; i++) { if (!devlink_param_cmode_is_supported(param, i)) continue; if (i == DEVLINK_PARAM_CMODE_DRIVERINIT) { - if (param_item->driverinit_value_new_valid) + if (param_item->driverinit_value_new_valid) { param_value[i] = param_item->driverinit_value_new; - else if (param_item->driverinit_value_valid) + } else if (param_item->driverinit_value_valid) { param_value[i] = param_item->driverinit_value; - else - return -EOPNOTSUPP; + } else { + err = -EOPNOTSUPP; + goto get_put_fail; + } if (param_item->driverinit_value_valid) { default_value[i] = param_item->driverinit_default; @@ -336,7 +358,7 @@ static int devlink_nl_param_fill(struct sk_buff *msg, struct devlink *devlink, ctx.cmode = i; err = devlink_param_get(devlink, param, &ctx, extack); if (err) - return err; + goto get_put_fail; param_value[i] = ctx.val; err = devlink_param_get_default(devlink, param, &ctx, @@ -345,15 +367,16 @@ static int devlink_nl_param_fill(struct sk_buff *msg, struct devlink *devlink, default_value[i] = ctx.val; default_value_set[i] = true; } else if (err != -EOPNOTSUPP) { - return err; + goto get_put_fail; } } param_value_set[i] = true; } + err = -EMSGSIZE; hdr = genlmsg_put(msg, portid, seq, &devlink_nl_family, flags, cmd); if (!hdr) - return -EMSGSIZE; + goto get_put_fail; if (devlink_nl_put_handle(msg, devlink)) goto genlmsg_cancel; @@ -393,6 +416,8 @@ static int devlink_nl_param_fill(struct sk_buff *msg, struct devlink *devlink, nla_nest_end(msg, param_values_list); nla_nest_end(msg, param_attr); genlmsg_end(msg, hdr); + kfree(default_value); + kfree(param_value); return 0; values_list_nest_cancel: @@ -401,7 +426,10 @@ static int devlink_nl_param_fill(struct sk_buff *msg, struct devlink *devlink, nla_nest_cancel(msg, param_attr); genlmsg_cancel: genlmsg_cancel(msg, hdr); - return -EMSGSIZE; +get_put_fail: + kfree(default_value); + kfree(param_value); + return err; } static void devlink_param_notify(struct devlink *devlink, @@ -507,7 +535,7 @@ devlink_param_value_get_from_info(const struct devlink_param *param, union devlink_param_value *value) { struct nlattr *param_data; - int len; + int len, cnt, rem; param_data = info->attrs[DEVLINK_ATTR_PARAM_VALUE_DATA]; @@ -547,6 +575,25 @@ devlink_param_value_get_from_info(const struct devlink_param *param, return -EINVAL; value->vbool = nla_get_flag(param_data); break; + + case DEVLINK_PARAM_TYPE_U32_ARRAY: + cnt = 0; + nla_for_each_attr_type(param_data, + DEVLINK_ATTR_PARAM_VALUE_DATA, + genlmsg_data(info->genlhdr), + genlmsg_len(info->genlhdr), rem) { + if (cnt >= __DEVLINK_PARAM_MAX_ARRAY_SIZE) + return -EMSGSIZE; + + if (nla_len(param_data) != sizeof(u32)) + return -EINVAL; + + value->u32arr.val[cnt] = nla_get_u32(param_data); + cnt++; + } + + value->u32arr.size = cnt; + break; } return 0; } -- 2.43.0