From nobody Sun Feb 8 21:28:13 2026 Received: from CY3PR05CU001.outbound.protection.outlook.com (mail-westcentralusazon11013058.outbound.protection.outlook.com [40.93.201.58]) (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 89A3331B837; Sun, 25 Jan 2026 11:33:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.201.58 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769340820; cv=fail; b=Wdh3gfMGNeRtPkvftwkgTY/rrB1MYXek/cvhRaUN/noyMAz69VYVmwWtI3Lp8B6iTcUv3+NoNbuiic1dpDDp10FNtitd5DTO6hQyOFl67GeMrznN6iNY8KwiU43wY0D2uceSyMbHv1/y3E9YiejSgL5Bibc6pY00vUfrNHtHSsw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769340820; c=relaxed/simple; bh=TBBL/9zN5XNWzSPvyHzPEb/ZVP9l2pYJ8H7ynfwFuo0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=kup/QtpjOQqvCEnzOhjmk1T+QkPImI64FBRoPRZTm9o3JiSr5623HreydFsD0MFQIjoVD7iu+JIY/Yp1w8jBY9bL4lNDq6QhDmNvXjlQY4h6dOO66OmBoJgs5xbsZYbeLHXL/bNyvzWsmpmTtbwsEqX38A4s9vagp7D0aW4c7u8= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=tdlUnVv8; arc=fail smtp.client-ip=40.93.201.58 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="tdlUnVv8" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=pbumYp13wld7CIXG9Ym/LYFdSZ9m26ZAHInX+5tQg8a4RoIozu/dUE54YZ8Frs8QFfz5AylnA7ritKd5bosWOQ6ryZNMZJNPaNARitUTzEgJx6iSk1PAwT2LwTzmwukeOrNhYb6z4DgB/JLQ0tzJBEyWYmz76TC9YpPgui9DfNMUJTWbk17I/LcGD7ejt+0g3oeEZNCAJItpWfImuI2mWHL25l7cOU/5ffHJR5/bH5R8hPZlyExGGUJUruLzQALNFn/UlLd8HcsQuRd2qaKHs87uzOrSvpapCqJIumhP/03BQiAes/E8ZdzyMAzfwKumGfl8ixBARbGwQONaBACbIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Z2jnNr4jE4J1dtxqxPLs6HGYhdwE31Xh5QdgwgR8Eko=; b=OM+6HAEDrMQuvE9ftHcLX4Yv/ot9Y1mzrUGlgd2qPLtBwW2TNJ6rzzYwqaeZ0GddFkygja7JILXmQqL+l8ryeOL4ChuUotuyOxQOapQBpxLUkuOv+5fmj43PiJ/ixZ4NrgtYqAdNMA+lALrIX5ogW6Fh6zLlJfVEZg0/RmdXBV20bvyA0FXdaI7RnFRBIVr8/Rva1aVX7XDwJOBgryuE5Qn8rYadhYFemtmjhCrATPxUeTH67HERi1cV94z4NmJZ0rW3vmddP+lZVmk3JrbhtAg0vfMQZopVb+5TzYdwkUMide2/l4697ZYjQNAIpEWGr9sSpW2g40UFJMHtYYXbdg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=google.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Z2jnNr4jE4J1dtxqxPLs6HGYhdwE31Xh5QdgwgR8Eko=; b=tdlUnVv8LrpHXWIos2rlcMZOweLcpcNn5Tb1Tf6PJDQ3+iokomFQoNpuXxJ/9xZ+UsZj4L/0hbDTSjjH2DArxVU9DbuSM60Ys2Hf6KLDvlKr1g3EEa3Y0Sk6P4+x5KoO/vkmgeC9pZ7MAn9cnL78vdfsDlkAsQMYyYgUPNhaBeANSQXMkanfKoLXlNDyTQYWT/Y0kcrK9ek0+OWQ2VZtALeYS3FJTrposzIMVE2JRQJOfX9LeewpBziAAgceWg4f5RKkmFlWeLDHAoPfqHwImFrdVS4IoN4Jf4skaFQvNyKHRdpOGbsM3EvqzfVFWLCZ9PM1HlKY5SvwaLPr8+wuHg== Received: from BN9PR03CA0298.namprd03.prod.outlook.com (2603:10b6:408:f5::33) by PH0PR12MB999087.namprd12.prod.outlook.com (2603:10b6:510:38f::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9542.14; Sun, 25 Jan 2026 11:33:35 +0000 Received: from BN2PEPF000044A6.namprd04.prod.outlook.com (2603:10b6:408:f5:cafe::e0) by BN9PR03CA0298.outlook.office365.com (2603:10b6:408:f5::33) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9542.15 via Frontend Transport; Sun, 25 Jan 2026 11:33:39 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BN2PEPF000044A6.mail.protection.outlook.com (10.167.243.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9564.3 via Frontend Transport; Sun, 25 Jan 2026 11:33:34 +0000 Received: from rnnvmail202.nvidia.com (10.129.68.7) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Sun, 25 Jan 2026 03:33:25 -0800 Received: from rnnvmail201.nvidia.com (10.129.68.8) by rnnvmail202.nvidia.com (10.129.68.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Sun, 25 Jan 2026 03:33:24 -0800 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.129.68.8) with Microsoft SMTP Server id 15.2.2562.20 via Frontend Transport; Sun, 25 Jan 2026 03:33:19 -0800 From: Tariq Toukan To: Eric Dumazet , Jakub Kicinski , Paolo Abeni , Andrew Lunn , "David S. Miller" CC: Donald Hunter , Jiri Pirko , Jonathan Corbet , Saeed Mahameed , "Leon Romanovsky" , Tariq Toukan , Mark Bloch , , , , , Gal Pressman , Moshe Shemesh , Carolina Jubran , Cosmin Ratiu , Jiri Pirko , Randy Dunlap , Simon Horman , Krzysztof Kozlowski Subject: [PATCH net-next V6 07/14] devlink: Add parent dev to devlink API Date: Sun, 25 Jan 2026 13:31:56 +0200 Message-ID: <1769340723-14199-8-git-send-email-tariqt@nvidia.com> X-Mailer: git-send-email 2.8.0 In-Reply-To: <1769340723-14199-1-git-send-email-tariqt@nvidia.com> References: <1769340723-14199-1-git-send-email-tariqt@nvidia.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN2PEPF000044A6:EE_|PH0PR12MB999087:EE_ X-MS-Office365-Filtering-Correlation-Id: fc586489-8790-4f8c-22fe-08de5c059340 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|376014|7416014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?hpNTJed5pwDg1YBiseKHBHcBrNXtOeaCkFDFsEVlehnaUpXke7wDQOUEyOBN?= =?us-ascii?Q?15MZAIBCsuplQgLiv4QON2DnLkFvkuK6smx1Py4k29IAt6blGzG1z3IMFjxP?= =?us-ascii?Q?f2ShJo7BRxpCrNLy7ZwX+bhgR0mERt8FuRt65k1RIhAKhjTBcMD7O3nz78Yx?= =?us-ascii?Q?bMyf7ugO71RTewgj59A9Iah+34cju5KftW7rfhIn/sQ/K5RBrC2ed7qZyrIJ?= =?us-ascii?Q?JNeJTT0GR+RjmH38hIoB78CQ0IxwiveltvNRYosgA4HKttlDbklZirMtBHgf?= =?us-ascii?Q?CwWToTT4at/y1IwdjodervfqnkskJadI/6YF+hcRlrBIU+PQLFw7PJaARFxk?= =?us-ascii?Q?Kppk7s8PJOsWPajWOECdqWm9BkuXeBpHU50BsWX6TJRcbe3Cqkv44EBz9mvF?= =?us-ascii?Q?QHMvGom4wjKqffRsr5uuNoPwT1N9/uUhsOzBDgleSZ68FZ/NchSbT0cGmB3z?= =?us-ascii?Q?v0tmjtMdVELuXN7JD1zPSSCIpasfnfpp2Tg4ZSUav8yADKvTBG7m+JPQ7iSm?= =?us-ascii?Q?Nw+49N0Afbu9Z31LuGbtrk2VUF6jZPIyGPV/eat/S37B9Fv9kfz/+4WLhnZL?= =?us-ascii?Q?10xmIjHr4ex7EdliNL3GmVxLY0AEJTNxw9B3bJLltpWguxRqC44gvVEZz97/?= =?us-ascii?Q?prrqRFXKPHLuAgQV4nsFEgEmL8E25Y6Ff1Io1QSZpQnBfHcrx6vgtxdlhsRh?= =?us-ascii?Q?CeYzxRT/1MaLB8vyGbJLRp+StUua2bIveuzlVR7KhH+rjfAHC20Ns+Hzi7z4?= =?us-ascii?Q?lcYNt2GE7pIt1SndyHR7tdEdpH9NJIox8dFrejjTwfCJfycA8ftiXpz5teMf?= =?us-ascii?Q?bHr6R61Qd2B+pCTG427jMt14TvtK8AYvh3aTM40Rj0TYEt9jSNZPX1uiPH/q?= =?us-ascii?Q?r0nVI/5VjEJQYUyAjKCsgaU6QE+54hpXSTVYAkWrQU2iw0te/lks2mfsFHP9?= =?us-ascii?Q?e4zlDhGtx4KyiP+QGyM9X2jI7JWJaKGazvLrHGlhlgybElFWVPSS+jnIQHH1?= =?us-ascii?Q?V6SIQZmiHgjTFAMWmRJqtoM/L8Nl2Q3z5C8O/T/PWUeoPUfLYTRSPi0+r1xp?= =?us-ascii?Q?7RLH+pwaYcOIo6Q57LhUnFnSFIl5re4RZ1IrdtbKgM3du0jzPBu9y1bbYrA4?= =?us-ascii?Q?K5CugP3/YDl7mrSzuGsHhK7ZQ9iwls48UuOjo6NdstJ/us+xsDsY4K4Ie8/1?= =?us-ascii?Q?FPHH/6vm9Geomy1rs/V9B5rQQ1AxEvfWDuIyASMSz/xx6Z5bb2CUxahcot9I?= =?us-ascii?Q?VF4gCu1/q+7/DrMJa+ehbAKK0YBpHmuaIxZHNaWScbq9KXAhSHBsVItOlU6l?= =?us-ascii?Q?dsj6YonbOPmLPKeI6/Ry3pe53vdDQRojBTL+HtRsuMIu7lxWbTovkDSVFjlM?= =?us-ascii?Q?X5gHch2kDlLsVBBMKSBNhdA1Q89/GrY0BlZKQyLDlQijrc7BbTO0yf6UW6ZX?= =?us-ascii?Q?KERo4SmHZbkpW1570+ZqsYfp6zfTL1Pe3AxUdYIJ1WVvtn630nlEV/8Spz8s?= =?us-ascii?Q?KZwvz1Mo8IAkVjXSbOgiWdg8OD1kYwRnyFHwrRVMkNY6LUxZFKs6Ztw02rfH?= =?us-ascii?Q?EgOK4JPgJVy94XiCDocyQ1iFQsi55IT33qqkBMWzLByCwgnWJvUeDFIfAKB6?= =?us-ascii?Q?7NOpv8AmA48VVQ4emjwX42MFOHqLx69Ympau5B3gqJLds2SIoghyVLni3u23?= =?us-ascii?Q?A24q/w=3D=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.160;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge1.nvidia.com;CAT:NONE;SFS:(13230040)(1800799024)(36860700013)(376014)(7416014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2026 11:33:34.6433 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fc586489-8790-4f8c-22fe-08de5c059340 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.160];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN2PEPF000044A6.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB999087 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Cosmin Ratiu Upcoming changes to the rate commands need the parent devlink specified. This change adds a nested 'parent-dev' attribute to the API and helpers to obtain and put a reference to the parent devlink instance in info->user_ptr[1]. To avoid deadlocks, the parent devlink is unlocked before obtaining the main devlink instance that is the target of the request. A reference to the parent is kept until the end of the request to avoid it suddenly disappearing. This means that this reference is of limited use without additional protection. Signed-off-by: Cosmin Ratiu Reviewed-by: Carolina Jubran Reviewed-by: Jiri Pirko Signed-off-by: Tariq Toukan --- Documentation/netlink/specs/devlink.yaml | 12 +++++ include/uapi/linux/devlink.h | 2 + net/devlink/devl_internal.h | 2 + net/devlink/netlink.c | 67 ++++++++++++++++++++++-- net/devlink/netlink_gen.c | 5 ++ net/devlink/netlink_gen.h | 8 +++ 6 files changed, 91 insertions(+), 5 deletions(-) diff --git a/Documentation/netlink/specs/devlink.yaml b/Documentation/netli= nk/specs/devlink.yaml index 837112da6738..a8fd0a815c0d 100644 --- a/Documentation/netlink/specs/devlink.yaml +++ b/Documentation/netlink/specs/devlink.yaml @@ -867,6 +867,10 @@ attribute-sets: type: flag doc: Request restoring parameter to its default value. value: 183 + + - name: parent-dev + type: nest + nested-attributes: dl-parent-dev - name: dl-dev-stats subset-of: devlink @@ -1289,6 +1293,14 @@ attribute-sets: Specifies the bandwidth share assigned to the Traffic Class. The bandwidth for the traffic class is determined in proportion to the sum of the shares of all configured clas= ses. + - + name: dl-parent-dev + subset-of: devlink + attributes: + - + name: bus-name + - + name: dev-name =20 operations: enum-model: directional diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h index e7d6b6d13470..94b8a4437bac 100644 --- a/include/uapi/linux/devlink.h +++ b/include/uapi/linux/devlink.h @@ -642,6 +642,8 @@ enum devlink_attr { DEVLINK_ATTR_PARAM_VALUE_DEFAULT, /* dynamic */ DEVLINK_ATTR_PARAM_RESET_DEFAULT, /* flag */ =20 + DEVLINK_ATTR_PARENT_DEV, /* nested */ + /* Add new attributes above here, update the spec in * Documentation/netlink/specs/devlink.yaml and re-generate * net/devlink/netlink_gen.c. diff --git a/net/devlink/devl_internal.h b/net/devlink/devl_internal.h index 8374c9cab6ce..3ca4cc8517cd 100644 --- a/net/devlink/devl_internal.h +++ b/net/devlink/devl_internal.h @@ -162,6 +162,8 @@ typedef int devlink_nl_dump_one_func_t(struct sk_buff *= msg, struct devlink * devlink_get_from_attrs_lock(struct net *net, struct nlattr **attrs, bool dev_lock); +struct devlink * +devlink_get_parent_from_attrs_lock(struct net *net, struct nlattr **attrs); =20 int devlink_nl_dumpit(struct sk_buff *msg, struct netlink_callback *cb, devlink_nl_dump_one_func_t *dump_one); diff --git a/net/devlink/netlink.c b/net/devlink/netlink.c index 593605c1b1ef..781758b8632c 100644 --- a/net/devlink/netlink.c +++ b/net/devlink/netlink.c @@ -12,6 +12,7 @@ #define DEVLINK_NL_FLAG_NEED_PORT BIT(0) #define DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT BIT(1) #define DEVLINK_NL_FLAG_NEED_DEV_LOCK BIT(2) +#define DEVLINK_NL_FLAG_OPTIONAL_PARENT_DEV BIT(3) =20 static const struct genl_multicast_group devlink_nl_mcgrps[] =3D { [DEVLINK_MCGRP_CONFIG] =3D { .name =3D DEVLINK_GENL_MCGRP_CONFIG_NAME }, @@ -206,19 +207,51 @@ devlink_get_from_attrs_lock(struct net *net, struct n= lattr **attrs, return ERR_PTR(-ENODEV); } =20 +struct devlink * +devlink_get_parent_from_attrs_lock(struct net *net, struct nlattr **attrs) +{ + struct nlattr *tb[DEVLINK_ATTR_DEV_NAME + 1]; + int err; + + if (!attrs[DEVLINK_ATTR_PARENT_DEV]) + return ERR_PTR(-EINVAL); + + err =3D nla_parse_nested(tb, DEVLINK_ATTR_DEV_NAME, + attrs[DEVLINK_ATTR_PARENT_DEV], + devlink_dl_parent_dev_nl_policy, NULL); + if (err) + return ERR_PTR(err); + + return devlink_get_from_attrs_lock(net, tb, false); +} + static int __devlink_nl_pre_doit(struct sk_buff *skb, struct genl_info *in= fo, u8 flags) { + bool parent_dev =3D flags & DEVLINK_NL_FLAG_OPTIONAL_PARENT_DEV; bool dev_lock =3D flags & DEVLINK_NL_FLAG_NEED_DEV_LOCK; + struct devlink *devlink, *parent_devlink =3D NULL; + struct net *net =3D genl_info_net(info); + struct nlattr **attrs =3D info->attrs; struct devlink_port *devlink_port; - struct devlink *devlink; int err; =20 - devlink =3D devlink_get_from_attrs_lock(genl_info_net(info), info->attrs, - dev_lock); - if (IS_ERR(devlink)) - return PTR_ERR(devlink); + if (parent_dev && attrs[DEVLINK_ATTR_PARENT_DEV]) { + parent_devlink =3D devlink_get_parent_from_attrs_lock(net, attrs); + if (IS_ERR(parent_devlink)) + return PTR_ERR(parent_devlink); + info->user_ptr[1] =3D parent_devlink; + /* Drop the parent devlink lock but don't release the reference. + * This will keep it alive until the end of the request. + */ + devl_unlock(parent_devlink); + } =20 + devlink =3D devlink_get_from_attrs_lock(net, attrs, dev_lock); + if (IS_ERR(devlink)) { + err =3D PTR_ERR(devlink); + goto parent_put; + } info->user_ptr[0] =3D devlink; if (flags & DEVLINK_NL_FLAG_NEED_PORT) { devlink_port =3D devlink_port_get_from_info(devlink, info); @@ -237,6 +270,9 @@ static int __devlink_nl_pre_doit(struct sk_buff *skb, s= truct genl_info *info, unlock: devl_dev_unlock(devlink, dev_lock); devlink_put(devlink); +parent_put: + if (parent_dev && parent_devlink) + devlink_put(parent_devlink); return err; } =20 @@ -265,6 +301,14 @@ int devlink_nl_pre_doit_port_optional(const struct gen= l_split_ops *ops, return __devlink_nl_pre_doit(skb, info, DEVLINK_NL_FLAG_NEED_DEVLINK_OR_P= ORT); } =20 +int devlink_nl_pre_doit_parent_dev_optional(const struct genl_split_ops *o= ps, + struct sk_buff *skb, + struct genl_info *info) +{ + return __devlink_nl_pre_doit(skb, info, + DEVLINK_NL_FLAG_OPTIONAL_PARENT_DEV); +} + static void __devlink_nl_post_doit(struct sk_buff *skb, struct genl_info *= info, u8 flags) { @@ -274,6 +318,11 @@ static void __devlink_nl_post_doit(struct sk_buff *skb= , struct genl_info *info, devlink =3D info->user_ptr[0]; devl_dev_unlock(devlink, dev_lock); devlink_put(devlink); + if ((flags & DEVLINK_NL_FLAG_OPTIONAL_PARENT_DEV) && + info->user_ptr[1]) { + devlink =3D info->user_ptr[1]; + devlink_put(devlink); + } } =20 void devlink_nl_post_doit(const struct genl_split_ops *ops, @@ -289,6 +338,14 @@ devlink_nl_post_doit_dev_lock(const struct genl_split_= ops *ops, __devlink_nl_post_doit(skb, info, DEVLINK_NL_FLAG_NEED_DEV_LOCK); } =20 +void +devlink_nl_post_doit_parent_dev_optional(const struct genl_split_ops *ops, + struct sk_buff *skb, + struct genl_info *info) +{ + __devlink_nl_post_doit(skb, info, DEVLINK_NL_FLAG_OPTIONAL_PARENT_DEV); +} + static int devlink_nl_inst_single_dumpit(struct sk_buff *msg, struct netlink_callback *cb, int flags, devlink_nl_dump_one_func_t *dump_one, diff --git a/net/devlink/netlink_gen.c b/net/devlink/netlink_gen.c index f4c61c2b4f22..6b691bdbf037 100644 --- a/net/devlink/netlink_gen.c +++ b/net/devlink/netlink_gen.c @@ -39,6 +39,11 @@ devlink_attr_param_type_validate(const struct nlattr *at= tr, } =20 /* Common nested types */ +const struct nla_policy devlink_dl_parent_dev_nl_policy[DEVLINK_ATTR_DEV_N= AME + 1] =3D { + [DEVLINK_ATTR_BUS_NAME] =3D { .type =3D NLA_NUL_STRING, }, + [DEVLINK_ATTR_DEV_NAME] =3D { .type =3D NLA_NUL_STRING, }, +}; + const struct nla_policy devlink_dl_port_function_nl_policy[DEVLINK_PORT_FN= _ATTR_CAPS + 1] =3D { [DEVLINK_PORT_FUNCTION_ATTR_HW_ADDR] =3D { .type =3D NLA_BINARY, }, [DEVLINK_PORT_FN_ATTR_STATE] =3D NLA_POLICY_MAX(NLA_U8, 1), diff --git a/net/devlink/netlink_gen.h b/net/devlink/netlink_gen.h index 2817d53a0eba..d4db82a00522 100644 --- a/net/devlink/netlink_gen.h +++ b/net/devlink/netlink_gen.h @@ -13,6 +13,7 @@ #include =20 /* Common nested types */ +extern const struct nla_policy devlink_dl_parent_dev_nl_policy[DEVLINK_ATT= R_DEV_NAME + 1]; extern const struct nla_policy devlink_dl_port_function_nl_policy[DEVLINK_= PORT_FN_ATTR_CAPS + 1]; extern const struct nla_policy devlink_dl_rate_tc_bws_nl_policy[DEVLINK_RA= TE_TC_ATTR_BW + 1]; extern const struct nla_policy devlink_dl_selftest_id_nl_policy[DEVLINK_AT= TR_SELFTEST_ID_FLASH + 1]; @@ -29,12 +30,19 @@ int devlink_nl_pre_doit_dev_lock(const struct genl_spli= t_ops *ops, int devlink_nl_pre_doit_port_optional(const struct genl_split_ops *ops, struct sk_buff *skb, struct genl_info *info); +int devlink_nl_pre_doit_parent_dev_optional(const struct genl_split_ops *o= ps, + struct sk_buff *skb, + struct genl_info *info); void devlink_nl_post_doit(const struct genl_split_ops *ops, struct sk_buff *skb, struct genl_info *info); void devlink_nl_post_doit_dev_lock(const struct genl_split_ops *ops, struct sk_buff *skb, struct genl_info *info); +void +devlink_nl_post_doit_parent_dev_optional(const struct genl_split_ops *ops, + struct sk_buff *skb, + struct genl_info *info); =20 int devlink_nl_get_doit(struct sk_buff *skb, struct genl_info *info); int devlink_nl_get_dumpit(struct sk_buff *skb, struct netlink_callback *cb= ); --=20 2.40.1