From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6B93BC2BA19 for ; Tue, 21 Apr 2020 08:47:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 42C312072D for ; Tue, 21 Apr 2020 08:47:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b="VdSpN6le" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728309AbgDUIrU (ORCPT ); Tue, 21 Apr 2020 04:47:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52186 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726691AbgDUIrU (ORCPT ); Tue, 21 Apr 2020 04:47:20 -0400 Received: from mail-lf1-x143.google.com (mail-lf1-x143.google.com [IPv6:2a00:1450:4864:20::143]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 36C25C061A10 for ; Tue, 21 Apr 2020 01:47:19 -0700 (PDT) Received: by mail-lf1-x143.google.com with SMTP id u10so10439819lfo.8 for ; Tue, 21 Apr 2020 01:47:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cumulusnetworks.com; s=google; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-language:content-transfer-encoding; bh=sGIJHh/puT6NxbufoFpsfxcnGoUe2JqTWxhpfJYWZlA=; b=VdSpN6leoifwtGtjB3IGgSy/AZ+Mo5F4Bd+mqGoCnHE/dKoMc6b+xU6PV3Mrcfm1Xl 7RX2TybRi+nrKN4IaMdvg6eux8iYv58gDxh6PjJ8L9yTfvtu2Y72us1ZJsnnbO8pSgQW v5OjFrZkaBe1/6g/wDNDdhIKnertxEyMqs2ss= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=sGIJHh/puT6NxbufoFpsfxcnGoUe2JqTWxhpfJYWZlA=; b=jxjaYu8vFjbLMBejJP8NP8oKPD1FHtq/bOEHt92+/DQfe3hGnQG9ubrguRKl1QuVjH YHuHvPOAQsP9Ure6W3ggLGGXlT55NK9Dq3Fs/j3aTmJftfYsTigs6Xco9j9HJ+7ayAt0 l6Pj+u2GyjkpI7a3noi2+udNNvU7EzWJ+X7ZwltuM1YhTgVfVf6xSnp6TTWB64L3BP9d Zxc7l6Uqyqm9MprVntfpgw9D84+9g6G3sLG+HntGmb1ZCfgFZ4xMecrRTPF/VfwYLZkw zvor3RQ/4/minx1epFoqqeurkjRPwBYt/GN6PR0tdIybTNtLDR1jzhZ6e8RKUsUUXYFs 1NCQ== X-Gm-Message-State: AGi0Pua5Qq8FFL5RTsh5NmyYu1QmrtHDhy5inr4l04qRkVVi0XyoOcg5 WwaIdiGxD2LQXu6VHKMrxVWikA== X-Google-Smtp-Source: APiQypIp+ogKAd8XLPsuyNcaf1ueDSdIbnt3T72uCftWix9EPz/LgOfEGyJFERgsfWE2wG6EPZBQPQ== X-Received: by 2002:ac2:5559:: with SMTP id l25mr13237048lfk.55.1587458837586; Tue, 21 Apr 2020 01:47:17 -0700 (PDT) Received: from [192.168.0.109] (84-238-136-197.ip.btc-net.bg. [84.238.136.197]) by smtp.gmail.com with ESMTPSA id h7sm1414259ljg.37.2020.04.21.01.47.15 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 21 Apr 2020 01:47:16 -0700 (PDT) Subject: Re: [PATCH net-next 10/13] bridge: mrp: Implement netlink interface to configure MRP To: Horatiu Vultur , davem@davemloft.net, jiri@resnulli.us, ivecera@redhat.com, kuba@kernel.org, roopa@cumulusnetworks.com, olteanv@gmail.com, andrew@lunn.ch, UNGLinuxDriver@microchip.com, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, bridge@lists.linux-foundation.org References: <20200420150947.30974-1-horatiu.vultur@microchip.com> <20200420150947.30974-11-horatiu.vultur@microchip.com> From: Nikolay Aleksandrov Message-ID: <4d989958-0c2b-69de-2015-1808e2ce94db@cumulusnetworks.com> Date: Tue, 21 Apr 2020 11:47:15 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 MIME-Version: 1.0 In-Reply-To: <20200420150947.30974-11-horatiu.vultur@microchip.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 20/04/2020 18:09, Horatiu Vultur wrote: > Implement netlink interface to configure MRP. The implementation > will do sanity checks over the attributes and then eventually call the MRP > interface. > > Signed-off-by: Horatiu Vultur > --- > net/bridge/br_mrp_netlink.c | 117 ++++++++++++++++++++++++++++++++++++ > 1 file changed, 117 insertions(+) > create mode 100644 net/bridge/br_mrp_netlink.c > > diff --git a/net/bridge/br_mrp_netlink.c b/net/bridge/br_mrp_netlink.c > new file mode 100644 > index 000000000000..0ff42e7c7f57 > --- /dev/null > +++ b/net/bridge/br_mrp_netlink.c > @@ -0,0 +1,117 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > + > +#include > + > +#include > +#include "br_private.h" > +#include "br_private_mrp.h" > + > +static const struct nla_policy br_mrp_policy[IFLA_BRIDGE_MRP_MAX + 1] = { > + [IFLA_BRIDGE_MRP_UNSPEC] = { .type = NLA_REJECT }, > + [IFLA_BRIDGE_MRP_INSTANCE] = { .type = NLA_EXACT_LEN, > + .len = sizeof(struct br_mrp_instance)}, > + [IFLA_BRIDGE_MRP_PORT_STATE] = { .type = NLA_U32 }, > + [IFLA_BRIDGE_MRP_PORT_ROLE] = { .type = NLA_EXACT_LEN, > + .len = sizeof(struct br_mrp_port_role)}, > + [IFLA_BRIDGE_MRP_RING_STATE] = { .type = NLA_EXACT_LEN, > + .len = sizeof(struct br_mrp_ring_state)}, > + [IFLA_BRIDGE_MRP_RING_ROLE] = { .type = NLA_EXACT_LEN, > + .len = sizeof(struct br_mrp_ring_role)}, > + [IFLA_BRIDGE_MRP_START_TEST] = { .type = NLA_EXACT_LEN, > + .len = sizeof(struct br_mrp_start_test)}, > +}; > + > +int br_mrp_parse(struct net_bridge *br, struct net_bridge_port *p, > + struct nlattr *attr, int cmd, struct netlink_ext_ack *extack) > +{ Note that "p" can be NULL here if br_afspec() was called for the bridge device. Some of the functions below dereference it without any checks and will deref a null ptr. > + struct nlattr *tb[IFLA_BRIDGE_MRP_MAX + 1]; > + int err; > + > + if (br->stp_enabled != BR_NO_STP) { > + NL_SET_ERR_MSG_MOD(extack, "MRP can't be enabled if STP is already enabled\n"); > + return -EINVAL; > + } > + > + err = nla_parse_nested(tb, IFLA_BRIDGE_MRP_MAX, attr, > + NULL, extack); > + if (err) > + return err; > + > + if (tb[IFLA_BRIDGE_MRP_INSTANCE]) { > + struct br_mrp_instance *instance = > + nla_data(tb[IFLA_BRIDGE_MRP_INSTANCE]); > + > + if (cmd == RTM_SETLINK) > + err = br_mrp_add(br, instance); > + else > + err = br_mrp_del(br, instance); > + if (err) > + return err; > + } > + > + if (tb[IFLA_BRIDGE_MRP_PORT_STATE]) { > + enum br_mrp_port_state_type state = > + nla_get_u32(tb[IFLA_BRIDGE_MRP_PORT_STATE]); > + > + err = br_mrp_set_port_state(p, state); > + if (err) > + return err; > + } > + > + if (tb[IFLA_BRIDGE_MRP_PORT_ROLE]) { > + struct br_mrp_port_role *role = > + nla_data(tb[IFLA_BRIDGE_MRP_PORT_ROLE]); > + > + err = br_mrp_set_port_role(p, role); > + if (err) > + return err; > + } > + > + if (tb[IFLA_BRIDGE_MRP_RING_STATE]) { > + struct br_mrp_ring_state *state = > + nla_data(tb[IFLA_BRIDGE_MRP_RING_STATE]); > + > + err = br_mrp_set_ring_state(br, state); > + if (err) > + return err; > + } > + > + if (tb[IFLA_BRIDGE_MRP_RING_ROLE]) { > + struct br_mrp_ring_role *role = > + nla_data(tb[IFLA_BRIDGE_MRP_RING_ROLE]); > + > + err = br_mrp_set_ring_role(br, role); > + if (err) > + return err; > + } > + > + if (tb[IFLA_BRIDGE_MRP_START_TEST]) { > + struct br_mrp_start_test *test = > + nla_data(tb[IFLA_BRIDGE_MRP_START_TEST]); > + > + err = br_mrp_start_test(br, test); > + if (err) > + return err; > + } > + > + return 0; > +} > + > +int br_mrp_port_open(struct net_device *dev, u8 loc) > +{ > + struct net_bridge_port *p; > + int err = 0; > + > + p = br_port_get_rcu(dev); > + if (!p) { > + err = -EINVAL; > + goto out; > + } > + > + p->loc = loc; > + br_ifinfo_notify(RTM_NEWLINK, NULL, p); > + > +out: > + return err; > +} > +EXPORT_SYMBOL(br_mrp_port_open); >