From nobody Sat Feb 7 15:11:04 2026 Received: from mail-yx1-f52.google.com (mail-yx1-f52.google.com [74.125.224.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8D0CF30E82E for ; Fri, 6 Feb 2026 21:11:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.224.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770412292; cv=none; b=J0Pprf0wNkePCVpEaOruooFhzbxfTT0ngAwtzhE1hkm/vpZP9e1XbQqC0hY7Z4mTeL46iRXYHtFS4Pxwa30dJrVbRy1mnK0JpJsdgFvOb7fhO6kD9k41X7ga1dcDEIeas0Bc8947uCh34w8tvvLNgJayvkk9X4vidJdRcnY5DcU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770412292; c=relaxed/simple; bh=T+49pOJ1fDgUzxKHPwJw01e7UAor5dg2+yDlNOe+kOE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=lhd6OwMu12mlZ1BpSaM1mGZA3m+D3T+ZO7zvXkz0rzbIgBYxrLtZopI3hLXYzAgU+QEIonkk56cE4EBgxi9FHzScXM6OeONjwFNlTZcaaDNWfSBh5n+RMjlfn4NLZ3RgxSvcOAyweZtBUvtNeLUtqrn31lZaK2DRBpAvgoLpuzo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=XWpctIxE; arc=none smtp.client-ip=74.125.224.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XWpctIxE" Received: by mail-yx1-f52.google.com with SMTP id 956f58d0204a3-649f2d9fe48so1197440d50.2 for ; Fri, 06 Feb 2026 13:11:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770412292; x=1771017092; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=6g2kfTlobODQFHlTsoKDvmUW3DnO86HThLRDw7n56Kw=; b=XWpctIxEsI6HGNbjyhZnT83nwMRbWcnmfmneNrPuj7yw9XiXH5QRD4hRojstBBlTKk gC2ktoVeT9DzSLMFbKSzUX1NZ5S+8bQk5WIoKo2KMk2yyhBGp8wbbsJ38zAUPvcc+A7a 2u3l1/Fkce081Y8zKj3Zx8O9FD1sEP0538jJ2YCOJ4RyCuvYPwgWJljaZZIaThxzob8B FPAyWy1Uz5jMLbosf5bMWI39kSwQ/R7auAp4yfX11h/qnqcuQ0NX6+sb6qikeR5oKvCI 1QKvUKxiI2YQKlCOjVDO/0ORYjGa02olxOR3PjRpKuo1ne4B/qwiSW8PLeZPI7fvKV/+ ZYEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770412292; x=1771017092; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=6g2kfTlobODQFHlTsoKDvmUW3DnO86HThLRDw7n56Kw=; b=wgy8d43Cmn5JORva11Ogu+DPccSoXuoVgt51WVmm1dXgRo5IGYkedVoQu0nZK3Da3N 9Qaid04t+UrSyBrdFAYdGRjlkYNXpE0qlhVDm4eLLk+9r6vnBHShB5HxujDacpokM9Rt CC0A8nHEvVDkHeQvkGILmHztHcFNzRX/Noy3y9w66eBdSQqu5ShLp/tLr3sPcUiO0UYm Z/6AOfYUXDzbVWfCT3yeKd+FGfG7fUCe2d6Mbam5sDsxciPoeGuPF/QOE7t7dsWfzeaQ ZVDAwZ9XPx0bWfG/MR05YlZGgkw/p5sBdVGwZdmVlUCMitKMMhUvVLQmwmtjg+W1uMA4 G0PQ== X-Forwarded-Encrypted: i=1; AJvYcCVYKiUzq9BH8aL9yZsAsvdkAYKqRiEEONO6e/WWWLGYLdzJg9xPmwrqXU0noqCDLMVBhLgksQz6dD7a3So=@vger.kernel.org X-Gm-Message-State: AOJu0YzcmNSrLWz2Nr0EJxwudCvND8DRnRU7BETCeH8dSYVad29N56XW BMLSnNAnPiAlY9mf9oW43hFoD2EQUzhgJlVD8nNJHssrqRoro0GWHMag X-Gm-Gg: AZuq6aJSd+uQPeKK40LPfpJT0Mr6D45QrorvMkn3522YTRCrkcC8LsfQRK4S+Ae71pm 3UKqwI/00sG7JJf6fFUR+r4MzqUqqCRESusypnHMwLN9dxBfIRJfFHwR8NtHf/potUoxjTxFuwT bEuEaYXDd6MQGVt57VFEJFkB/HEZ0zYoqt0HSxThs0NTEk78070wI78eS4HHX1im8CYVcSrtm/l CLx0QZTX60Es6BnVHaAbDgNoarhJDbT6pBdjjCrm5qwhonAvuOC83p0fBSpNfqec4l6vMGUcc94 5b+AGtfbjjo6ciRD+Adh8N0bVW7heeRWR9mCdgCLHm4iND45s34zqAN4ZXP+9RPy4aUdnhsquwR whNDncIDq0+WwggK88w+SniXq1gXACRRcyeP+oCLEIRE3chasMXkCs+WBXMTZXix258S4ScZ9EZ QwOTLpN8g= X-Received: by 2002:a05:690c:60ca:b0:795:617:308a with SMTP id 00721157ae682-7952ab24d5fmr73627967b3.43.1770412291563; Fri, 06 Feb 2026 13:11:31 -0800 (PST) Received: from localhost ([2a03:2880:25ff:a::]) by smtp.gmail.com with ESMTPSA id 00721157ae682-7952a012af9sm32452517b3.4.2026.02.06.13.11.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Feb 2026 13:11:30 -0800 (PST) From: Daniel Zahka Date: Fri, 06 Feb 2026 13:11:29 -0800 Subject: [PATCH iproute2-next v2 1/2] devlink: Pull the value printing logic out of pr_out_param_value() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260206-param-defaults-v2-1-1ce78e2c5a31@gmail.com> References: <20260206-param-defaults-v2-0-1ce78e2c5a31@gmail.com> In-Reply-To: <20260206-param-defaults-v2-0-1ce78e2c5a31@gmail.com> To: Jiri Pirko , "David S. Miller" , Jakub Kicinski , Paolo Abeni , Simon Horman , Donald Hunter , David Ahern Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Daniel Zahka X-Mailer: b4 0.13.0 Split the type demux and value print out of pr_out_param_value() into a new function pr_out_param_value_print(). This new function can be re-used for printing additional kinds of values e.g., a default value reported by the kernel. Signed-off-by: Daniel Zahka --- devlink/devlink.c | 79 ++++++++++++++++++++++++++++++++-------------------= ---- 1 file changed, 46 insertions(+), 33 deletions(-) diff --git a/devlink/devlink.c b/devlink/devlink.c index 0b3bf197..81739291 100644 --- a/devlink/devlink.c +++ b/devlink/devlink.c @@ -3502,32 +3502,14 @@ static const struct param_val_conv param_val_conv[]= =3D { =20 #define PARAM_VAL_CONV_LEN ARRAY_SIZE(param_val_conv) =20 -static void pr_out_param_value(struct dl *dl, const char *nla_name, - int nla_type, struct nlattr *nl) +static int pr_out_param_value_print(const char *nla_name, int nla_type, + struct nlattr *val_attr, bool conv_exists, + const char *label) { - struct nlattr *nla_value[DEVLINK_ATTR_MAX + 1] =3D {}; - struct nlattr *val_attr; const char *vstr; - bool conv_exists; int err; =20 - err =3D mnl_attr_parse_nested(nl, attr_cb, nla_value); - if (err !=3D MNL_CB_OK) - return; - - if (!nla_value[DEVLINK_ATTR_PARAM_VALUE_CMODE] || - (nla_type !=3D MNL_TYPE_FLAG && - !nla_value[DEVLINK_ATTR_PARAM_VALUE_DATA])) - return; - - check_indent_newline(dl); - print_string(PRINT_ANY, "cmode", "cmode %s", - param_cmode_name(mnl_attr_get_u8(nla_value[DEVLINK_ATTR_PARAM_VALUE= _CMODE]))); - - val_attr =3D nla_value[DEVLINK_ATTR_PARAM_VALUE_DATA]; - - conv_exists =3D param_val_conv_exists(param_val_conv, PARAM_VAL_CONV_LEN, - nla_name); + print_string(PRINT_FP, NULL, " %s ", label); =20 switch (nla_type) { case MNL_TYPE_U8: @@ -3538,10 +3520,10 @@ static void pr_out_param_value(struct dl *dl, const= char *nla_name, mnl_attr_get_u8(val_attr), &vstr); if (err) - return; - print_string(PRINT_ANY, "value", " value %s", vstr); + return err; + print_string(PRINT_ANY, label, "%s", vstr); } else { - print_uint(PRINT_ANY, "value", " value %u", + print_uint(PRINT_ANY, label, "%u", mnl_attr_get_u8(val_attr)); } break; @@ -3553,10 +3535,10 @@ static void pr_out_param_value(struct dl *dl, const= char *nla_name, mnl_attr_get_u16(val_attr), &vstr); if (err) - return; - print_string(PRINT_ANY, "value", " value %s", vstr); + return err; + print_string(PRINT_ANY, label, "%s", vstr); } else { - print_uint(PRINT_ANY, "value", " value %u", + print_uint(PRINT_ANY, label, "%u", mnl_attr_get_u16(val_attr)); } break; @@ -3568,21 +3550,52 @@ static void pr_out_param_value(struct dl *dl, const= char *nla_name, mnl_attr_get_u32(val_attr), &vstr); if (err) - return; - print_string(PRINT_ANY, "value", " value %s", vstr); + return err; + print_string(PRINT_ANY, label, "%s", vstr); } else { - print_uint(PRINT_ANY, "value", " value %u", + print_uint(PRINT_ANY, label, "%u", mnl_attr_get_u32(val_attr)); } break; case MNL_TYPE_STRING: - print_string(PRINT_ANY, "value", " value %s", + print_string(PRINT_ANY, label, "%s", mnl_attr_get_str(val_attr)); break; case MNL_TYPE_FLAG: - print_bool(PRINT_ANY, "value", " value %s", val_attr); + print_bool(PRINT_ANY, label, "%s", val_attr); break; } + + return 0; +} + +static void pr_out_param_value(struct dl *dl, const char *nla_name, + int nla_type, struct nlattr *nl) +{ + struct nlattr *nla_value[DEVLINK_ATTR_MAX + 1] =3D {}; + struct nlattr *val_attr; + bool conv_exists; + int err; + + err =3D mnl_attr_parse_nested(nl, attr_cb, nla_value); + if (err !=3D MNL_CB_OK) + return; + + if (!nla_value[DEVLINK_ATTR_PARAM_VALUE_CMODE] || + (nla_type !=3D MNL_TYPE_FLAG && + !nla_value[DEVLINK_ATTR_PARAM_VALUE_DATA])) + return; + + check_indent_newline(dl); + print_string(PRINT_ANY, "cmode", "cmode %s", + param_cmode_name(mnl_attr_get_u8(nla_value[DEVLINK_ATTR_PARAM_VALUE= _CMODE]))); + + val_attr =3D nla_value[DEVLINK_ATTR_PARAM_VALUE_DATA]; + + conv_exists =3D param_val_conv_exists(param_val_conv, PARAM_VAL_CONV_LEN, + nla_name); + + pr_out_param_value_print(nla_name, nla_type, val_attr, conv_exists, "valu= e"); } =20 static void pr_out_param(struct dl *dl, struct nlattr **tb, bool array, --=20 2.47.3 From nobody Sat Feb 7 15:11:04 2026 Received: from mail-yw1-f171.google.com (mail-yw1-f171.google.com [209.85.128.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E42E9311C2D for ; Fri, 6 Feb 2026 21:11:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770412294; cv=none; b=cgTr11UJXNetWFcyggBsKf5twOr8/nx0fJunaKDx6dnijLqEHqmA5/KXTeUWHNAGlkphbaEjYNE6edKUIqbED3iMakwL7zb3+3USMza7RpkUSh4L9OHS1e+ynaOJuEdITfgtsmopmFjVfLo1qyTldQUdx9n5C4B0Qe30T23COzs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770412294; c=relaxed/simple; bh=ZJGt5PZM/nN3kZTykMYBSMrst9tts/dfMPeqZox+nFI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=AY7hht2rvxc40kPoT1SqXTQL8AQVq2GxmyEdh3XCK/dx1UfJhe4dkUn96embUwPgn2hkpawMTCkh8POi2hdyOmnqmjz5dl4ZtzRPtlxHq+V40wc0lg0zuhWjOTG9r0iDsyAXFYMa32+m03WcsL3ib4+FGSpXmwbM13dWgWJvh9o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=iBh4+y/o; arc=none smtp.client-ip=209.85.128.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="iBh4+y/o" Received: by mail-yw1-f171.google.com with SMTP id 00721157ae682-79628fb5c05so4705117b3.2 for ; Fri, 06 Feb 2026 13:11:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770412293; x=1771017093; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=y3mrRd/DcSc3QJ3DMZSsD+xWxAcjq5y0z1Z50HIA9dk=; b=iBh4+y/omRzhorSMH1GWOJWS/CvDJ8jlUL8t2FA1Hgo7gXuPN4BWgFudTcK74pJNCZ XwwvkIx78dxcbbSa8XD8XZiX+Z7116jcS6nD1j5x4zQqVwVl3GAyE+8nUfGxP7flUSek n2vAWM7v/0GHWG2kffRtcwJWokVtLRkacbuCm+mgHT6uG6kgQnNClyDetic/spm7CWWj NWIKqs9lMzgudWUV1j/N3b7HYDCgTQHS8u8r90XqmI3g8KptzLXK6GWM0uk/VuQLCQHG 8Py02AwTqS8a+OoBcxEg6KhGFwdfbVo0UQAC8WTl91/Wg5xGkBaeLRyKg8S4FaCAMwVw 0wEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770412293; x=1771017093; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=y3mrRd/DcSc3QJ3DMZSsD+xWxAcjq5y0z1Z50HIA9dk=; b=ssq1pYHuvp1BlHpHzBIXwqiUWek+lyTIwXOQkw1dBA1YYIPSFGWagC16JSas6nZtZa Uoq2KQQLp7bwYeUgvL0PjZgr7ICCgkYKtqQ8BZ0vsnpsVj5TRGoOG8Quuer0jYjiq4Zs re1s2kV3AyNneEzM35tUoSLB56E5XOg5+tCczWA+J/sqOWBVbhmaY0DDpdpvKC1s/LWt bMXQGKknlUokID57wk2VKMxLzXst8TBRV7Qi7LuSCoGC4Omssy8/O8H9EqLLemv8yWkd C+gNhUQUk4uRPCQnHbB8tAz5+8wotjo7aGFMJ3VP39zafrdVcbEwRcEPoKRZj52g9v5b Dm7g== X-Forwarded-Encrypted: i=1; AJvYcCU4pRKnOyOAHdaGvZ0JrqL1NdP6l30CCRiUzsBDB6Id151dSJ1TDRpmypPLOTJ0LRz+ElVBcgkEuQHzsf0=@vger.kernel.org X-Gm-Message-State: AOJu0YxeEaoranvNBzj+Vrm50k1I3BdZjDh/v+EwErG6/o1JEjR7mR+L EB7k+jnZ8nJgRgG6By/XHfk2Rz+o1XLUJ4V0YP2H53lup4JDHs0MsM7c X-Gm-Gg: AZuq6aKXS0Y8BcmrhbbSC2sGLWo54EINd63Z+sJ00bHQSM1gWQ5zNJum/rRROqvFtkX 343vIqY5CZtARrIVc3VNmZ4uHKO0dh7AnLRVJRjcoS2S5N4VfcVrIAjJSHT8w/rs9sou1fvnhq9 zqUQuztkbLuLbTuKCLBndR0rG0avVuuUSgmIew/kLtjccnRR48sR69HeVM9tqWPc+RtiEx86wyc y7/qIpDJs108iBJp44BvG+BNsl0VGcvJePgUag4On354pCGViF6hwoHPwTHIX0TIv6RfjgsWEmm 6EFlbOz/zzi/NHmCWmODF0JvS9KwrqJeS29x9uKBsfQ9c0KBEpwDPAQhRj141mdKxCFUKrswAPe +hWDJErtdgbkR4maJQit+efkYLa09N3xg0YKxrGvrR7bNgS8/UaJrrOzKnqOif98UwpItjE+pQD Tg1dGYYUeI X-Received: by 2002:a05:690c:38b:b0:794:c8da:d2db with SMTP id 00721157ae682-7952ab5a4b8mr39818707b3.52.1770412292698; Fri, 06 Feb 2026 13:11:32 -0800 (PST) Received: from localhost ([2a03:2880:25ff:5b::]) by smtp.gmail.com with ESMTPSA id 00721157ae682-7952a012af9sm32452877b3.4.2026.02.06.13.11.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Feb 2026 13:11:32 -0800 (PST) From: Daniel Zahka Date: Fri, 06 Feb 2026 13:11:30 -0800 Subject: [PATCH iproute2-next v2 2/2] devlink: support displaying and resetting to default params Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260206-param-defaults-v2-2-1ce78e2c5a31@gmail.com> References: <20260206-param-defaults-v2-0-1ce78e2c5a31@gmail.com> In-Reply-To: <20260206-param-defaults-v2-0-1ce78e2c5a31@gmail.com> To: Jiri Pirko , "David S. Miller" , Jakub Kicinski , Paolo Abeni , Simon Horman , Donald Hunter , David Ahern Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Daniel Zahka X-Mailer: b4 0.13.0 Add devlink cli support for default param values. For param-get, any default values provided by the kernel will be displayed next to the current value. For param-set, DEVLINK_ATTR_PARAM_RESET_DEFAULT can be included in the request to request that the parameter be reset to its default value. Default values of type bool are encoded with a u8 by the kernel to distinguish "false" from "not present". Signed-off-by: Daniel Zahka --- devlink/devlink.c | 54 ++++++++++++++++++++++++++++++++++++++++++++--= ---- man/man8/devlink-dev.8 | 22 ++++++++++++++++++-- 2 files changed, 68 insertions(+), 8 deletions(-) diff --git a/devlink/devlink.c b/devlink/devlink.c index 81739291..39b0fac0 100644 --- a/devlink/devlink.c +++ b/devlink/devlink.c @@ -313,6 +313,7 @@ static int ifname_map_update(struct ifname_map *ifname_= map, const char *ifname) #define DL_OPT_PORT_FN_MAX_IO_EQS BIT(58) #define DL_OPT_PORT_FN_RATE_TC_BWS BIT(59) #define DL_OPT_HEALTH_REPORTER_BURST_PERIOD BIT(60) +#define DL_OPT_PARAM_SET_DEFAULT BIT(61) =20 struct dl_opts { uint64_t present; /* flags of present items */ @@ -2011,6 +2012,10 @@ static int dl_argv_parse(struct dl *dl, uint64_t o_r= equired, if (err) return err; o_found |=3D DL_OPT_PARAM_CMODE; + } else if (dl_argv_match(dl, "default") && + (o_all & DL_OPT_PARAM_SET_DEFAULT)) { + dl_arg_inc(dl); + o_found |=3D DL_OPT_PARAM_SET_DEFAULT; } else if (dl_argv_match(dl, "snapshot") && (o_all & DL_OPT_REGION_SNAPSHOT_ID)) { dl_arg_inc(dl); @@ -2672,6 +2677,8 @@ static void dl_opts_put(struct nlmsghdr *nlh, struct = dl *dl) if (opts->present & DL_OPT_PARAM_CMODE) mnl_attr_put_u8(nlh, DEVLINK_ATTR_PARAM_VALUE_CMODE, opts->cmode); + if (opts->present & DL_OPT_PARAM_SET_DEFAULT) + mnl_attr_put(nlh, DEVLINK_ATTR_PARAM_RESET_DEFAULT, 0, NULL); if (opts->present & DL_OPT_REGION_SNAPSHOT_ID) mnl_attr_put_u32(nlh, DEVLINK_ATTR_REGION_SNAPSHOT_ID, opts->region_snapshot_id); @@ -2839,7 +2846,7 @@ static void cmd_dev_help(void) pr_err(" [ inline-mode { none | link | netw= ork | transport } ]\n"); pr_err(" [ encap-mode { none | basic } ]\n"= ); pr_err(" devlink dev eswitch show DEV\n"); - pr_err(" devlink dev param set DEV name PARAMETER value VALUE cmode= { permanent | driverinit | runtime }\n"); + pr_err(" devlink dev param set DEV name PARAMETER [ value VALUE | d= efault ] cmode { permanent | driverinit | runtime }\n"); pr_err(" devlink dev param show [DEV name PARAMETER]\n"); pr_err(" devlink dev reload DEV [ netns { PID | NAME | ID } ]\n"); pr_err(" [ action { driver_reinit | fw_activ= ate } ] [ limit no_reset ]\n"); @@ -3504,7 +3511,7 @@ static const struct param_val_conv param_val_conv[] = =3D { =20 static int pr_out_param_value_print(const char *nla_name, int nla_type, struct nlattr *val_attr, bool conv_exists, - const char *label) + const char *label, bool flag_as_u8) { const char *vstr; int err; @@ -3562,7 +3569,11 @@ static int pr_out_param_value_print(const char *nla_= name, int nla_type, mnl_attr_get_str(val_attr)); break; case MNL_TYPE_FLAG: - print_bool(PRINT_ANY, label, "%s", val_attr); + if (flag_as_u8) + print_bool(PRINT_ANY, label, "%s", + mnl_attr_get_u8(val_attr)); + else + print_bool(PRINT_ANY, label, "%s", val_attr); break; } =20 @@ -3595,7 +3606,18 @@ static void pr_out_param_value(struct dl *dl, const = char *nla_name, conv_exists =3D param_val_conv_exists(param_val_conv, PARAM_VAL_CONV_LEN, nla_name); =20 - pr_out_param_value_print(nla_name, nla_type, val_attr, conv_exists, "valu= e"); + err =3D pr_out_param_value_print(nla_name, nla_type, val_attr, + conv_exists, "value", false); + if (err) + return; + + val_attr =3D nla_value[DEVLINK_ATTR_PARAM_VALUE_DEFAULT]; + if (val_attr) { + err =3D pr_out_param_value_print(nla_name, nla_type, val_attr, + conv_exists, "default", true); + if (err) + return; + } } =20 static void pr_out_param(struct dl *dl, struct nlattr **tb, bool array, @@ -3764,11 +3786,23 @@ static int cmd_dev_param_set(struct dl *dl) =20 err =3D dl_argv_parse(dl, DL_OPT_HANDLE | DL_OPT_PARAM_NAME | - DL_OPT_PARAM_VALUE | - DL_OPT_PARAM_CMODE, 0); + DL_OPT_PARAM_CMODE, + DL_OPT_PARAM_VALUE | DL_OPT_PARAM_SET_DEFAULT); if (err) return err; =20 + if ((dl->opts.present & DL_OPT_PARAM_VALUE) && + (dl->opts.present & DL_OPT_PARAM_SET_DEFAULT)) { + pr_err("Cannot specify both value and default\n"); + return -EINVAL; + } + + if (!(dl->opts.present & DL_OPT_PARAM_VALUE) && + !(dl->opts.present & DL_OPT_PARAM_SET_DEFAULT)) { + pr_err("Either value or default must be specified\n"); + return -EINVAL; + } + /* Get value type */ nlh =3D mnlu_gen_socket_cmd_prepare(&dl->nlg, DEVLINK_CMD_PARAM_GET, NLM_F_REQUEST | NLM_F_ACK); @@ -3783,6 +3817,14 @@ static int cmd_dev_param_set(struct dl *dl) return -ENOTSUP; } =20 + if (dl->opts.present & DL_OPT_PARAM_SET_DEFAULT) { + nlh =3D mnlu_gen_socket_cmd_prepare(&dl->nlg, DEVLINK_CMD_PARAM_SET, + 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); + } + nlh =3D mnlu_gen_socket_cmd_prepare(&dl->nlg, DEVLINK_CMD_PARAM_SET, NLM_F_REQUEST | NLM_F_ACK); dl_opts_put(nlh, dl); diff --git a/man/man8/devlink-dev.8 b/man/man8/devlink-dev.8 index d10b1f9a..ad65f6f8 100644 --- a/man/man8/devlink-dev.8 +++ b/man/man8/devlink-dev.8 @@ -45,8 +45,12 @@ devlink-dev \- devlink device configuration .I DEV .B name .I PARAMETER +[ .B value .I VALUE +| +.B default +] .BR cmode " { " runtime " | " driverinit " | " permanent " } " =20 .ti -8 @@ -159,7 +163,13 @@ Specify parameter name to set. =20 .TP .BI value " VALUE" -New value to set. +New value to set. Mutually exclusive with +.BR default . + +.TP +.B default +Restore parameter to its default value. Mutually exclusive with +.BR value . =20 .TP .BR cmode " { " runtime " | " driverinit " | " permanent " } " @@ -176,10 +186,13 @@ Configuration mode in which the new value is set. =20 .SS devlink dev param show - display devlink device supported configuratio= n parameters attributes =20 +.TP .B name .I PARAMETER Specify parameter name to show. If this argument is omitted all parameters supported by devlink devices ar= e listed. +When the kernel provides a default value for a parameter, it will be autom= atically displayed +in the output alongside the current value. =20 .SS devlink dev reload - perform hot reload of the driver. =20 @@ -309,7 +322,7 @@ Sets the eswitch mode of specified devlink device to sw= itchdev. .PP devlink dev param show pci/0000:01:00.0 name max_macs .RS 4 -Shows the parameter max_macs attributes. +Shows the parameter max_macs attributes. If a default value exists, it wil= l be displayed alongside the current value. .RE .PP devlink dev param set pci/0000:01:00.0 name internal_error_reset value tru= e cmode runtime @@ -317,6 +330,11 @@ devlink dev param set pci/0000:01:00.0 name internal_e= rror_reset value true cmod Sets the parameter internal_error_reset of specified devlink device to tru= e. .RE .PP +devlink dev param set pci/0000:01:00.0 name internal_error_reset default c= mode runtime +.RS 4 +Restores the parameter internal_error_reset of specified devlink device to= its default value. +.RE +.PP devlink dev reload pci/0000:01:00.0 .RS 4 Performs hot reload of specified devlink device. --=20 2.47.3