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=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT 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 751A7C43381 for ; Tue, 26 Mar 2019 12:03:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3A35A2075E for ; Tue, 26 Mar 2019 12:03:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=resnulli-us.20150623.gappssmtp.com header.i=@resnulli-us.20150623.gappssmtp.com header.b="SrfYtXka" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731507AbfCZMDV (ORCPT ); Tue, 26 Mar 2019 08:03:21 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:44627 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731495AbfCZMDT (ORCPT ); Tue, 26 Mar 2019 08:03:19 -0400 Received: by mail-wr1-f66.google.com with SMTP id y7so9899860wrn.11 for ; Tue, 26 Mar 2019 05:03:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=sji86DUQM6iZLdbSXOS+b8Tg1xAEsT9kv4yTZbC55+Y=; b=SrfYtXka4/Ffj8/116Xp9fVnAdovpyVmhQHgfcqHbFuNYP6yx5ANs95UculTudDO/3 7I6kvdmiACUaKza4xFgdeaLRerXr7ouniKBrpSGcF3nBMXWPh/DwQoRiDHub8+7M8y8N 6tMC1TKW7xQnkIDltpXLN5bO0dbjPANwtFhaA480zLqv64CMsM7oAI3WsTgdFNqVydQn extFjyx+M8dFh2bKCg1PBjK6hR4Qmn0JzwNIMF/GseB9JLrou5/0+1vyHiHsK6JI8phK A8yiaO3PRfDoNcKVUffP8FHShRQSF5SDpb7rbHRJC65XsVxscW63YmppGmbaccr2mzdn xDnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=sji86DUQM6iZLdbSXOS+b8Tg1xAEsT9kv4yTZbC55+Y=; b=SIHYGPW876tYkmjKgmiDOYA3oPalKscdMky6HDcUkSpusKZ8sHiVmwU8dzAnRxEEq+ r+B727sf0t27R7P4+ElHxq8jvl1waOcxUNxdEbpOKD/Wq0wYkX1VsEqJpqbWvpkNjpPA zNuL4ISrsmW5FBptJKRPE09zDsrbc4tv9piQx2fKxWak83Dk6DCvDMWvs8lvXN1Y05Qu mNaWmrVA5Ay0Xu+zj4cIJL3FhZxOdMYp4rnHNdtZ2oOdDc4YYJWi9P0ti41yYxww9mSU dInN9ZOgFfoHYILoTOUI2/HfSyFfuEkT3h6NJoG/e4R9tfmhHWGbqZs8QSGqPTLfIW+q JfUA== X-Gm-Message-State: APjAAAVFge3WpW1Ji7yVNBRDBuYZVZSF8nO/SSPPzLUJAgVK4OaUex/c rGa0frDnYeX4cW8Pw6zwZ/xVHPhoijY= X-Google-Smtp-Source: APXvYqw9DdOZFHgD7GS2AGrf0nd9OJrGwrb26QAJ3gPmHuPgDmcj9E9oDztJ+Gg2hbaffAGXErk+KA== X-Received: by 2002:adf:f984:: with SMTP id f4mr17477507wrr.97.1553601796782; Tue, 26 Mar 2019 05:03:16 -0700 (PDT) Received: from localhost (mail.chocen-mesto.cz. [85.163.43.2]) by smtp.gmail.com with ESMTPSA id x17sm44285217wrd.95.2019.03.26.05.03.16 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 26 Mar 2019 05:03:16 -0700 (PDT) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, mlxsw@mellanox.com, idosch@mellanox.com, jakub.kicinski@netronome.com, f.fainelli@gmail.com, andrew@lunn.ch, vivien.didelot@gmail.com, michael.chan@broadcom.com Subject: [patch net-next v2 08/12] dsa: implement ndo_get_devlink_port Date: Tue, 26 Mar 2019 13:03:03 +0100 Message-Id: <20190326120307.2953-9-jiri@resnulli.us> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190326120307.2953-1-jiri@resnulli.us> References: <20190326120307.2953-1-jiri@resnulli.us> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiri Pirko In order for devlink compat functions to work, implement ndo_get_devlink_port. Legacy slaves does not have devlink port instances created for themselves. Signed-off-by: Jiri Pirko --- v1->v2: - new patch --- net/dsa/dsa_priv.h | 1 + net/dsa/legacy.c | 2 +- net/dsa/slave.c | 48 ++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 48 insertions(+), 3 deletions(-) diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h index 093b7d145eb1..688c765cd1db 100644 --- a/net/dsa/dsa_priv.h +++ b/net/dsa/dsa_priv.h @@ -176,6 +176,7 @@ void dsa_port_link_unregister_of(struct dsa_port *dp); extern const struct dsa_device_ops notag_netdev_ops; void dsa_slave_mii_bus_init(struct dsa_switch *ds); int dsa_slave_create(struct dsa_port *dp); +int dsa_slave_create_legacy(struct dsa_port *dp); void dsa_slave_destroy(struct net_device *slave_dev); int dsa_slave_suspend(struct net_device *slave_dev); int dsa_slave_resume(struct net_device *slave_dev); diff --git a/net/dsa/legacy.c b/net/dsa/legacy.c index cb42939db776..f9a1f9c4a58c 100644 --- a/net/dsa/legacy.c +++ b/net/dsa/legacy.c @@ -197,7 +197,7 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, if (!dsa_is_user_port(ds, i)) continue; - ret = dsa_slave_create(&ds->ports[i]); + ret = dsa_slave_create_legacy(&ds->ports[i]); if (ret < 0) netdev_err(master, "[%d]: can't create dsa slave device for port %d(%s): %d\n", index, i, cd->port_names[i], ret); diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 093eef6f2599..46c98cb8a2b5 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -1096,6 +1096,38 @@ int dsa_legacy_fdb_del(struct ndmsg *ndm, struct nlattr *tb[], return dsa_port_fdb_del(dp, addr, vid); } +static struct devlink_port *dsa_slave_get_devlink_port(struct net_device *dev) +{ + struct dsa_port *dp = dsa_slave_to_port(dev); + + return &dp->devlink_port; +} + +static const struct net_device_ops dsa_slave_netdev_ops_legacy = { + .ndo_open = dsa_slave_open, + .ndo_stop = dsa_slave_close, + .ndo_start_xmit = dsa_slave_xmit, + .ndo_change_rx_flags = dsa_slave_change_rx_flags, + .ndo_set_rx_mode = dsa_slave_set_rx_mode, + .ndo_set_mac_address = dsa_slave_set_mac_address, + .ndo_fdb_add = dsa_legacy_fdb_add, + .ndo_fdb_del = dsa_legacy_fdb_del, + .ndo_fdb_dump = dsa_slave_fdb_dump, + .ndo_do_ioctl = dsa_slave_ioctl, + .ndo_get_iflink = dsa_slave_get_iflink, +#ifdef CONFIG_NET_POLL_CONTROLLER + .ndo_netpoll_setup = dsa_slave_netpoll_setup, + .ndo_netpoll_cleanup = dsa_slave_netpoll_cleanup, + .ndo_poll_controller = dsa_slave_poll_controller, +#endif + .ndo_get_phys_port_name = dsa_slave_get_phys_port_name, + .ndo_setup_tc = dsa_slave_setup_tc, + .ndo_get_stats64 = dsa_slave_get_stats64, + .ndo_get_port_parent_id = dsa_slave_get_port_parent_id, + .ndo_vlan_rx_add_vid = dsa_slave_vlan_rx_add_vid, + .ndo_vlan_rx_kill_vid = dsa_slave_vlan_rx_kill_vid, +}; + static const struct net_device_ops dsa_slave_netdev_ops = { .ndo_open = dsa_slave_open, .ndo_stop = dsa_slave_close, @@ -1119,6 +1151,7 @@ static const struct net_device_ops dsa_slave_netdev_ops = { .ndo_get_port_parent_id = dsa_slave_get_port_parent_id, .ndo_vlan_rx_add_vid = dsa_slave_vlan_rx_add_vid, .ndo_vlan_rx_kill_vid = dsa_slave_vlan_rx_kill_vid, + .ndo_get_devlink_port = dsa_slave_get_devlink_port, }; static struct device_type dsa_type = { @@ -1355,7 +1388,8 @@ static void dsa_slave_notify(struct net_device *dev, unsigned long val) call_dsa_notifiers(val, dev, &rinfo.info); } -int dsa_slave_create(struct dsa_port *port) +static int __dsa_slave_create(struct dsa_port *port, + const struct net_device_ops *netdev_ops) { const struct dsa_port *cpu_dp = port->cpu_dp; struct net_device *master = cpu_dp->master; @@ -1380,7 +1414,7 @@ int dsa_slave_create(struct dsa_port *port) slave_dev->ethtool_ops = &dsa_slave_ethtool_ops; eth_hw_addr_inherit(slave_dev, master); slave_dev->priv_flags |= IFF_NO_QUEUE; - slave_dev->netdev_ops = &dsa_slave_netdev_ops; + slave_dev->netdev_ops = netdev_ops; slave_dev->min_mtu = 0; slave_dev->max_mtu = ETH_MAX_MTU; SET_NETDEV_DEVTYPE(slave_dev, &dsa_type); @@ -1434,6 +1468,16 @@ int dsa_slave_create(struct dsa_port *port) return ret; } +int dsa_slave_create(struct dsa_port *port) +{ + return __dsa_slave_create(port, &dsa_slave_netdev_ops); +} + +int dsa_slave_create_legacy(struct dsa_port *port) +{ + return __dsa_slave_create(port, &dsa_slave_netdev_ops_legacy); +} + void dsa_slave_destroy(struct net_device *slave_dev) { struct dsa_port *dp = dsa_slave_to_port(slave_dev); -- 2.17.2