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 49779310784; Thu, 2 Jul 2026 03:14:21 +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=1782962072; cv=none; b=pOT6HEvoE/+dZvHUbNYHuP5Raz9J6DwSHqn+q03IGZHcSZhETkfMEZsl+IFWnkIXT+FidiWbZUbMvEIiOQ8TL6Nx+uTMShCNX9Pr/2ASvBW2a/MMqva6ZmbWrvWrSt+aW6ElzkkEbZc09XGGsioH1MkUYWBm1qEtX1pALQLlFUE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782962072; c=relaxed/simple; bh=UgAf5x6dsdq6KUYlazid4BdjNFfDV/DRoqBL4dAPSxA=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Ki3IOmPKAi2vxTwFdUp8ToVP/PuacunqSlzA43pgmSgmYLLEh0rbizEr0Z6NAlj49uzXe91mkyJUNgMrxg/ZAu9dC+2nR/vk8BlvuN9o2zfjssWaKeGuSrLzWnCo+pnKwH9f3q9REidi8GUqkqdQzHJ5hNaREV3DCxPEBPh3+48= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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=BDY0aDiT; arc=none smtp.client-ip=67.231.156.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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="BDY0aDiT" 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 6621MhMi601502; Wed, 1 Jul 2026 20:14:14 -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=5 r9JGxc1jjvn9e8WncHNi9NUjDZZ6EptqFhMSBG24t4=; b=BDY0aDiTnKl9fiwqI zhH9RGGGj/XauUFYJ0tSisE5DPbky3/jbtAeiV0vjru01ivUuzzGA3tMxV79xjYb zGcUYdVFhTBe032LXbSWZyc6qIQc0O7+3zrxtvJHY88xvSVMoj7Rydt70LrnpFgN wGlzZr8RMgWwYuuZH0RRkA+aicfg0Jrq0ANyloeZBuVNiwqP/w7wLCPJWdUk8yKB qC4eBI1d4WO9x64IQ4a27CGBmrHiOkLjq3WawBd10mdN8Ec04MhgXlmsfTqch6Q3 zk9+pCGymF4dEWZzM5hP2Tk7vdqnP9GH4k9zzrjtEsMd02FBBbrcIkfJous8sDvk xxuQg== Received: from dc5-exch05.marvell.com ([199.233.59.128]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 4f50g3kjqh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 01 Jul 2026 20:14:14 -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; Wed, 1 Jul 2026 20:14:12 -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; Wed, 1 Jul 2026 20:14:12 -0700 Received: from rkannoth-OptiPlex-7090.. (unknown [10.28.36.165]) by maili.marvell.com (Postfix) with ESMTP id B35253F708A; Wed, 1 Jul 2026 20:14:09 -0700 (PDT) From: Ratheesh Kannoth To: , , , , CC: , , , , Subject: [PATCH iproute2-next v4 2/2] devlink: support u64-array values in devlink param show/set Date: Thu, 2 Jul 2026 08:43:59 +0530 Message-ID: <20260702031359.2392868-3-rkannoth@marvell.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260702031359.2392868-1-rkannoth@marvell.com> References: <20260702031359.2392868-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-Authority-Analysis: v=2.4 cv=Gf4nWwXL c=1 sm=1 tr=0 ts=6a45d786 cx=c_pps a=rEv8fa4AjpPjGxpoe8rlIQ==:117 a=rEv8fa4AjpPjGxpoe8rlIQ==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=l0iWHRpgs5sLHlkKQ1IR:22 a=QXcCYyLzdtTjyudCfB6f:22 a=M5GUcnROAAAA:8 a=vs2Y_zNTtb1SDWicX50A:9 a=OBjm3rFKGHvpk9ecZwUJ:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzAyMDAyOSBTYWx0ZWRfX0KfbAcB2urxo wqrTiqtww0hzudb3JCiFSJLcvuulLCk+BNI3u7fIMckX+E/YJAptN5sHgRDGGrB7WwEOxc9EliS UfoLNz+DjSqRxL1Xw/UiV4pDErKtERgdfInbGoEprlr2l+T/l+zwdOsHBSuI1PcZc1yxNY/e29L Z+cde7nhd8pfiQR85fOFgPh8gTD3oVjU499RTWeElUOMLgT6V+ZNwizxl14PHtQzELmPEzTAGDM N20hMG8xEaV1ZbB+6N26k7h8/sbHWPtE+iiryRe8McnPaiB4BhYphWk7kiQQc1cPGA2k36YqJeq XvoZph49dUY6J/Iz1cCxeJ840dKiWfJXujesC788UP8pl8FNhvnBnvpupYvrtz5dtf+LC94ZvS1 juoIWEgc7Q5B1Qt3ZVyQ3TkYAg1uTKlx39GdTtD8+1GrHFZBsZXHm7qQncCtbMTZu73V8emtRxX OD2yWhJxyf3naqBruzw== X-Proofpoint-Spam-Info: AW1haW4tMjYwNzAyMDAyOSBTYWx0ZWRfX4MGZsGsnam0V 8L/DJz+8xtpE8nfdRaprJ9/DSvVF5URvLD4juV3mTuFyR5tDlVL0HEOTetISGiIzjCP2BdraSiW ELM6HeDFC5cKmaRrM6GzLaWtKRSBAf0= X-Proofpoint-GUID: aicT3EdRBkP1NJAQaQcvhjqoOjPXHoxS X-Proofpoint-ORIG-GUID: aicT3EdRBkP1NJAQaQcvhjqoOjPXHoxS X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-07-02_01,2026-06-26_01,2025-10-01_01 Add support for DEVLINK_VAR_ATTR_TYPE_U64_ARRAY parameters that carry multiple DEVLINK_ATTR_PARAM_VALUE_DATA attributes. Parse and display u64 array values in param show, and accept space- or comma-separated u64 values in devlink and port param set commands. - Show search order devlink dev param show pci/0002:01:00.0 name npc_srch_order pci/0002:01:00.0: name npc_srch_order type driver-specific values: cmode runtime value 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 - Set search order devlink dev param set pci/0002:01:00.0 name npc_srch_order value 31,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,\ 22,23,24,25,26,27,28,29,30 cmode runtime Signed-off-by: Ratheesh Kannoth --- devlink/devlink.c | 233 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 209 insertions(+), 24 deletions(-) diff --git a/devlink/devlink.c b/devlink/devlink.c index 803ea5d7..5d092d92 100644 --- a/devlink/devlink.c +++ b/devlink/devlink.c @@ -3516,12 +3516,143 @@ static const struct param_val_conv param_val_conv[] = { #define PARAM_VAL_CONV_LEN ARRAY_SIZE(param_val_conv) +struct devlink_param_u64_array { + uint64_t size; + uint64_t *val; +}; + +static void param_value_u64_array_free(struct devlink_param_u64_array *arr) +{ + free(arr->val); + arr->val = NULL; + arr->size = 0; +} + +static int param_value_nested_u64_attr_cb(const struct nlattr *attr, void *data) +{ + struct devlink_param_u64_array *arr = data; + unsigned int len; + uint64_t val; + uint64_t *new_val; + + if (mnl_attr_get_type(attr) != DEVLINK_ATTR_PARAM_VALUE_DATA) + return MNL_CB_OK; + + len = mnl_attr_get_payload_len(attr); + if (len == sizeof(uint32_t)) + val = mnl_attr_get_u32(attr); + else if (len == sizeof(uint64_t)) + val = mnl_attr_get_u64(attr); + else + return MNL_CB_ERROR; + + new_val = realloc(arr->val, (arr->size + 1) * sizeof(uint64_t)); + if (!new_val) + return MNL_CB_ERROR; + arr->val = new_val; + + arr->val[arr->size] = val; + arr->size++; + + return MNL_CB_OK; +} + +static int param_value_u64_array_fill(struct nlattr *nl, + struct devlink_param_u64_array *arr) +{ + int err; + + param_value_u64_array_free(arr); + err = mnl_attr_parse_nested(nl, param_value_nested_u64_attr_cb, arr); + if (err != MNL_CB_OK) { + param_value_u64_array_free(arr); + return -EINVAL; + } + + return 0; +} + +static bool param_value_u64_array_equal(const struct devlink_param_u64_array *a, + const struct devlink_param_u64_array *b) +{ + uint64_t i; + + if (a->size != b->size) + return false; + + for (i = 0; i < a->size; i++) { + if (a->val[i] != b->val[i]) + return false; + } + + return true; +} + +static int param_value_u64_array_put_from_str(struct nlmsghdr *nlh, + const char *param_value, + const struct devlink_param_u64_array *cur) +{ + struct devlink_param_u64_array new_arr = {}; + char *copy, *token, *saveptr = NULL; + uint64_t val, *new_val; + char delim[] = " ,"; + int err, i; + + copy = strdup(param_value); + if (!copy) + return -ENOMEM; + + token = strtok_r(copy, delim, &saveptr); + while (token) { + err = get_u64((__u64 *)&val, token, 10); + if (err) { + free(copy); + param_value_u64_array_free(&new_arr); + pr_err("Value \"%s\" is not a number or not within range\n", + token); + return err; + } + + new_val = realloc(new_arr.val, (new_arr.size + 1) * sizeof(uint64_t)); + if (!new_val) { + free(copy); + param_value_u64_array_free(&new_arr); + return -ENOMEM; + } + new_arr.val = new_val; + + new_arr.val[new_arr.size] = val; + new_arr.size++; + token = strtok_r(NULL, delim, &saveptr); + } + free(copy); + + if (!new_arr.size) { + param_value_u64_array_free(&new_arr); + pr_err("Value must contain at least one element\n"); + return -EINVAL; + } + + /* Check current and new values. If both are equal, bail out */ + if (cur && param_value_u64_array_equal(&new_arr, cur)) { + param_value_u64_array_free(&new_arr); + return 1; + } + + for (i = 0; i < new_arr.size; i++) + mnl_attr_put_u64(nlh, DEVLINK_ATTR_PARAM_VALUE_DATA, new_arr.val[i]); + + param_value_u64_array_free(&new_arr); + return 0; +} + static int pr_out_param_value_print(const char *nla_name, int nla_type, struct nlattr *val_attr, bool conv_exists, - const char *label, bool flag_as_u8) + const char *label, bool flag_as_u8, struct nlattr *nl) { - const char *vstr; + struct devlink_param_u64_array u64_arr = { }; int err; + const char *vstr; print_string(PRINT_FP, NULL, " %s ", label); @@ -3582,6 +3713,16 @@ static int pr_out_param_value_print(const char *nla_name, int nla_type, else print_bool(PRINT_ANY, label, "%s", val_attr); break; + case DEVLINK_VAR_ATTR_TYPE_U64_ARRAY: + err = param_value_u64_array_fill(flag_as_u8 ? val_attr : nl, &u64_arr); + if (err) + return err; + + for (uint64_t i = 0; i < u64_arr.size; i++) + print_u64(PRINT_ANY, label, "%llu ", u64_arr.val[i]); + + param_value_u64_array_free(&u64_arr); + break; } return 0; @@ -3601,6 +3742,7 @@ static void pr_out_param_value(struct dl *dl, const char *nla_name, if (!nla_value[DEVLINK_ATTR_PARAM_VALUE_CMODE] || (nla_type != MNL_TYPE_FLAG && + nla_type != DEVLINK_VAR_ATTR_TYPE_U64_ARRAY && !nla_value[DEVLINK_ATTR_PARAM_VALUE_DATA])) return; @@ -3614,14 +3756,14 @@ static void pr_out_param_value(struct dl *dl, const char *nla_name, nla_name); err = pr_out_param_value_print(nla_name, nla_type, val_attr, - conv_exists, "value", false); + conv_exists, "value", false, nl); if (err) return; val_attr = nla_value[DEVLINK_ATTR_PARAM_VALUE_DEFAULT]; if (val_attr) { err = pr_out_param_value_print(nla_name, nla_type, val_attr, - conv_exists, "default", true); + conv_exists, "default", true, nl); if (err) return; } @@ -3704,6 +3846,7 @@ struct param_ctx { uint64_t vu64; const char *vstr; bool vbool; + struct devlink_param_u64_array u64arr; } value; }; @@ -3745,6 +3888,7 @@ static int cmd_dev_param_set_cb(const struct nlmsghdr *nlh, void *data) if (!nla_value[DEVLINK_ATTR_PARAM_VALUE_CMODE] || (nla_type != MNL_TYPE_FLAG && + nla_type != DEVLINK_VAR_ATTR_TYPE_U64_ARRAY && !nla_value[DEVLINK_ATTR_PARAM_VALUE_DATA])) return MNL_CB_ERROR; @@ -3771,6 +3915,12 @@ static int cmd_dev_param_set_cb(const struct nlmsghdr *nlh, void *data) case DEVLINK_VAR_ATTR_TYPE_FLAG: ctx->value.vbool = val_attr ? true : false; break; + case DEVLINK_VAR_ATTR_TYPE_U64_ARRAY: + err = param_value_u64_array_fill(param_value_attr, + &ctx->value.u64arr); + if (err) + return MNL_CB_ERROR; + break; } break; } @@ -3818,10 +3968,11 @@ static int cmd_dev_param_set(struct dl *dl) ctx.dl = dl; err = mnlu_gen_socket_sndrcv(&dl->nlg, nlh, cmd_dev_param_set_cb, &ctx); if (err) - return err; + goto out; if (!ctx.cmode_found) { pr_err("Configuration mode not supported\n"); - return -ENOTSUP; + err = -ENOTSUP; + goto out; } if (dl->opts.present & DL_OPT_PARAM_SET_DEFAULT) { @@ -3829,7 +3980,8 @@ static int cmd_dev_param_set(struct dl *dl) NLM_F_REQUEST | NLM_F_ACK); dl_opts_put(nlh, dl); mnl_attr_put_u8(nlh, DEVLINK_ATTR_PARAM_TYPE, ctx.nla_type); - return mnlu_gen_socket_sndrcv(&dl->nlg, nlh, NULL, NULL); + err = mnlu_gen_socket_sndrcv(&dl->nlg, nlh, NULL, NULL); + goto out; } nlh = mnlu_gen_socket_cmd_prepare(&dl->nlg, DEVLINK_CMD_PARAM_SET, @@ -3855,7 +4007,7 @@ static int cmd_dev_param_set(struct dl *dl) if (err) goto err_param_value_parse; if (val_u8 == ctx.value.vu8) - return 0; + goto out; mnl_attr_put_u8(nlh, DEVLINK_ATTR_PARAM_VALUE_DATA, val_u8); break; case DEVLINK_VAR_ATTR_TYPE_U16: @@ -3872,7 +4024,7 @@ static int cmd_dev_param_set(struct dl *dl) if (err) goto err_param_value_parse; if (val_u16 == ctx.value.vu16) - return 0; + goto out; mnl_attr_put_u16(nlh, DEVLINK_ATTR_PARAM_VALUE_DATA, val_u16); break; case DEVLINK_VAR_ATTR_TYPE_U32: @@ -3889,7 +4041,7 @@ static int cmd_dev_param_set(struct dl *dl) if (err) goto err_param_value_parse; if (val_u32 == ctx.value.vu32) - return 0; + goto out; mnl_attr_put_u32(nlh, DEVLINK_ATTR_PARAM_VALUE_DATA, val_u32); break; case DEVLINK_VAR_ATTR_TYPE_U64: @@ -3904,7 +4056,7 @@ static int cmd_dev_param_set(struct dl *dl) if (err) goto err_param_value_parse; if (val_u64 == ctx.value.vu64) - return 0; + goto out; mnl_attr_put_u64(nlh, DEVLINK_ATTR_PARAM_VALUE_DATA, val_u64); break; case DEVLINK_VAR_ATTR_TYPE_FLAG: @@ -3912,7 +4064,7 @@ static int cmd_dev_param_set(struct dl *dl) if (err) goto err_param_value_parse; if (val_bool == ctx.value.vbool) - return 0; + goto out; if (val_bool) mnl_attr_put(nlh, DEVLINK_ATTR_PARAM_VALUE_DATA, 0, NULL); @@ -3921,17 +4073,30 @@ static int cmd_dev_param_set(struct dl *dl) mnl_attr_put_strz(nlh, DEVLINK_ATTR_PARAM_VALUE_DATA, dl->opts.param_value); if (!strcmp(dl->opts.param_value, ctx.value.vstr)) - return 0; + goto out; + break; + case DEVLINK_VAR_ATTR_TYPE_U64_ARRAY: + err = param_value_u64_array_put_from_str(nlh, dl->opts.param_value, + &ctx.value.u64arr); + if (err == 1) + goto out; + if (err) + goto out; break; default: printf("Value type not supported\n"); - return -ENOTSUP; + err = -ENOTSUP; + goto out; } - return mnlu_gen_socket_sndrcv(&dl->nlg, nlh, NULL, NULL); + err = mnlu_gen_socket_sndrcv(&dl->nlg, nlh, NULL, NULL); + goto out; err_param_value_parse: pr_err("Value \"%s\" is not a number or not within range\n", dl->opts.param_value); + +out: + param_value_u64_array_free(&ctx.value.u64arr); return err; } @@ -5369,6 +5534,7 @@ static int cmd_port_param_set_cb(const struct nlmsghdr *nlh, void *data) if (!nla_value[DEVLINK_ATTR_PARAM_VALUE_CMODE] || (nla_type != MNL_TYPE_FLAG && + nla_type != DEVLINK_VAR_ATTR_TYPE_U64_ARRAY && !nla_value[DEVLINK_ATTR_PARAM_VALUE_DATA])) return MNL_CB_ERROR; @@ -5391,6 +5557,12 @@ static int cmd_port_param_set_cb(const struct nlmsghdr *nlh, void *data) case MNL_TYPE_FLAG: ctx->value.vbool = val_attr ? true : false; break; + case DEVLINK_VAR_ATTR_TYPE_U64_ARRAY: + err = param_value_u64_array_fill(param_value_attr, + &ctx->value.u64arr); + if (err) + return MNL_CB_ERROR; + break; } break; } @@ -5426,7 +5598,7 @@ static int cmd_port_param_set(struct dl *dl) ctx.dl = dl; err = mnlu_gen_socket_sndrcv(&dl->nlg, nlh, cmd_port_param_set_cb, &ctx); if (err) - return err; + goto out; nlh = mnlu_gen_socket_cmd_prepare(&dl->nlg, DEVLINK_CMD_PORT_PARAM_SET, NLM_F_REQUEST | NLM_F_ACK); @@ -5451,7 +5623,7 @@ static int cmd_port_param_set(struct dl *dl) if (err) goto err_param_value_parse; if (val_u8 == ctx.value.vu8) - return 0; + goto out; mnl_attr_put_u8(nlh, DEVLINK_ATTR_PARAM_VALUE_DATA, val_u8); break; case MNL_TYPE_U16: @@ -5468,7 +5640,7 @@ static int cmd_port_param_set(struct dl *dl) if (err) goto err_param_value_parse; if (val_u16 == ctx.value.vu16) - return 0; + goto out; mnl_attr_put_u16(nlh, DEVLINK_ATTR_PARAM_VALUE_DATA, val_u16); break; case MNL_TYPE_U32: @@ -5485,7 +5657,7 @@ static int cmd_port_param_set(struct dl *dl) if (err) goto err_param_value_parse; if (val_u32 == ctx.value.vu32) - return 0; + goto out; mnl_attr_put_u32(nlh, DEVLINK_ATTR_PARAM_VALUE_DATA, val_u32); break; case MNL_TYPE_U64: @@ -5500,7 +5672,7 @@ static int cmd_port_param_set(struct dl *dl) if (err) goto err_param_value_parse; if (val_u64 == ctx.value.vu64) - return 0; + goto out; mnl_attr_put_u64(nlh, DEVLINK_ATTR_PARAM_VALUE_DATA, val_u64); break; case MNL_TYPE_FLAG: @@ -5508,7 +5680,7 @@ static int cmd_port_param_set(struct dl *dl) if (err) goto err_param_value_parse; if (val_bool == ctx.value.vbool) - return 0; + goto out; if (val_bool) mnl_attr_put(nlh, DEVLINK_ATTR_PARAM_VALUE_DATA, 0, NULL); @@ -5517,17 +5689,30 @@ static int cmd_port_param_set(struct dl *dl) mnl_attr_put_strz(nlh, DEVLINK_ATTR_PARAM_VALUE_DATA, dl->opts.param_value); if (!strcmp(dl->opts.param_value, ctx.value.vstr)) - return 0; + goto out; + break; + case DEVLINK_VAR_ATTR_TYPE_U64_ARRAY: + err = param_value_u64_array_put_from_str(nlh, dl->opts.param_value, + &ctx.value.u64arr); + if (err == 1) + goto out; + if (err) + goto out; break; default: printf("Value type not supported\n"); - return -ENOTSUP; + err = -ENOTSUP; + goto out; } - return mnlu_gen_socket_sndrcv(&dl->nlg, nlh, NULL, NULL); + err = mnlu_gen_socket_sndrcv(&dl->nlg, nlh, NULL, NULL); + goto out; err_param_value_parse: pr_err("Value \"%s\" is not a number or not within range\n", dl->opts.param_value); + +out: + param_value_u64_array_free(&ctx.value.u64arr); return err; } -- 2.43.0