From patchwork Sat Feb 16 04:55:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1043378 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="XxpCmzVL"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 441dCZ0SFcz9s4Z for ; Sat, 16 Feb 2019 15:57:14 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2394607AbfBPE4H (ORCPT ); Fri, 15 Feb 2019 23:56:07 -0500 Received: from mail-ot1-f65.google.com ([209.85.210.65]:35236 "EHLO mail-ot1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726305AbfBPE4G (ORCPT ); Fri, 15 Feb 2019 23:56:06 -0500 Received: by mail-ot1-f65.google.com with SMTP id z19so20225696otm.2; Fri, 15 Feb 2019 20:56:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uGQEeKs0wF3WsHP8KjXvQrPiN22+b85NexF3bnAlxpE=; b=XxpCmzVLVsxBd3x3MTABjyCfOsgnHW8mxlpLQxxw+cj4fNt3Zg6/qoRk9965QW5gXd xfkSRccVcJTxtkkc9jd26H0K89M8QetBORO90/EvlM6Esmk22DdiXlAMisy6Zh4PCnDP TvgqAYJHEyVRHzWSr/ztgEOZ8c/X40UGFDGMhsr3FLh9AOPlvyD0pQoD0MQpZkURP8qY XLR/8qhi0c0WDC4QgFIAA7RjOuIoS+nC8q/c/gthRkVvCO9dW+CZvGnWCClP0KHTiYX0 cw5SlLoZimUy2wImNtE7WFkZuTCgNY6jiq1JHbN5IPMqOoWcSVA8Gj49oeOszCRyb8Uq u7Vg== 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:mime-version:content-transfer-encoding; bh=uGQEeKs0wF3WsHP8KjXvQrPiN22+b85NexF3bnAlxpE=; b=m1Iyfmy5EMmlRBMniryNA5r3u2aJ5HuaLrgAJ6KIWFu61Lq2jf+uibt1Bnwqq8YiQt 1/drSdsP/tGrZv1X0vIHp5s3seXrtpoWTzfHG6+KrHACq4KhBvB91jDwHALBNsIRv7Hm PSU6k82yLrB0UHKj875H/Gf2P/pfGSpT1iKeBAgF7zRGb/Lq1tJB7ydbdbZFLaSAdT/U SUbzlpnD6QmngYkmsk10gJ/MNTH/5kVYdtWByko5YrBsrESfvGfKQaJKLfhR3wj1lHys qNtR2jyFb2hFcLdafpLj7PVgukpd9GVIOtTtE9c1jJwFv38VQFFFXamwUG93j43HK74y eJBQ== X-Gm-Message-State: AHQUAuYRY/fnGSTcb7wJIJ3ue+fNs0EIaMQIVOTLn0Q/NMNKGTNDAuYb 17KKejGJXKNz20si5Ffxi9eObAmU X-Google-Smtp-Source: AHgI3IaFg0JUDWysdNjBaFbOg8x1b9298AJeP9v/EAIIkmkYtfFHtc5l+4uKc2O1DSUHnip5FJOxXw== X-Received: by 2002:aca:dec4:: with SMTP id v187mr8323834oig.92.1550292965170; Fri, 15 Feb 2019 20:56:05 -0800 (PST) Received: from localhost.localdomain (ip68-228-73-187.oc.oc.cox.net. [68.228.73.187]) by smtp.gmail.com with ESMTPSA id j88sm3209480otj.47.2019.02.15.20.56.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Feb 2019 20:56:04 -0800 (PST) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , idosch@mellanox.com, linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org, bridge@lists.linux-foundation.org, jiri@mellanox.com, andrew@lunn.ch, vivien.didelot@gmail.com Subject: [PATCH net-next v3 1/9] Documentation: networking: switchdev: Update port parent ID section Date: Fri, 15 Feb 2019 20:55:48 -0800 Message-Id: <20190216045556.3514-2-f.fainelli@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190216045556.3514-1-f.fainelli@gmail.com> References: <20190216045556.3514-1-f.fainelli@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Update the section about switchdev drivers having to implement a switchdev_port_attr_get() function to return SWITCHDEV_ATTR_ID_PORT_PARENT_ID since that is no longer valid after commit bccb30254a4a ("net: Get rid of SWITCHDEV_ATTR_ID_PORT_PARENT_ID"). Fixes: bccb30254a4a ("net: Get rid of SWITCHDEV_ATTR_ID_PORT_PARENT_ID") Signed-off-by: Florian Fainelli --- Documentation/networking/switchdev.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Documentation/networking/switchdev.txt b/Documentation/networking/switchdev.txt index f3244d87512a..2842f63ad47b 100644 --- a/Documentation/networking/switchdev.txt +++ b/Documentation/networking/switchdev.txt @@ -92,11 +92,11 @@ device. Switch ID ^^^^^^^^^ -The switchdev driver must implement the switchdev op switchdev_port_attr_get -for SWITCHDEV_ATTR_ID_PORT_PARENT_ID for each port netdev, returning the same -physical ID for each port of a switch. The ID must be unique between switches -on the same system. The ID does not need to be unique between switches on -different systems. +The switchdev driver must implement the net_device operation +ndo_get_port_parent_id for each port netdev, returning the same physical ID +for each port of a switch. The ID must be unique between switches on the same +system. The ID does not need to be unique between switches on different +systems. The switch ID is used to locate ports on a switch and to know if aggregated ports belong to the same switch. From patchwork Sat Feb 16 04:55:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1043376 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="BCMNWxM5"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 441dCM1vqxz9s4Z for ; Sat, 16 Feb 2019 15:57:03 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403897AbfBPE4N (ORCPT ); Fri, 15 Feb 2019 23:56:13 -0500 Received: from mail-ot1-f66.google.com ([209.85.210.66]:34754 "EHLO mail-ot1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2394617AbfBPE4I (ORCPT ); Fri, 15 Feb 2019 23:56:08 -0500 Received: by mail-ot1-f66.google.com with SMTP id 98so20238997oty.1; Fri, 15 Feb 2019 20:56:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hWVdHii8ckcvI1Css/ppCdD5B7yTXb8aPWmds2fbqAc=; b=BCMNWxM5zaaINeR/+8ZVcbNv5XBD/+MqdBwzZC6Y+Y3j7uPrNsnlA7xqY2YbsizSpT 5x/onSuYPJhbCdfs7Voc+XmulP4h3GkduZngv9lxoLFQ68fYVw/6N19J/DE+Mq+aYl1y M96TaWEwa9qrRJv5pSRfsuZD/fuaC1NSUPGVvSuXKpJbADC1H4e4rfncGKfL2S8Douy4 iKTwNBipSujejKAfq3Zq/x2+u7ee/RrZUjLkdODVE7nztfZCE2trkFxFcWyGdQzEVFOY fwxIeHqNdAqi7BQ+588q4fI2Y5BW16KWrCFjLrMS/60pGSQPtKGkqYX0h8+5GhQsFdlZ k04Q== 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:mime-version:content-transfer-encoding; bh=hWVdHii8ckcvI1Css/ppCdD5B7yTXb8aPWmds2fbqAc=; b=mwzkitrdMdbW03hRifdo5mFXa7KxYpnHSGuqVN7GvL5OuLnZCrW3ZKqSKf6a1V/+5R PcwqmnBtQrfjU/gXlV4J9G7g7vd8sS0LW7a1g6oNlntvK3L1q3H7puzo9ZVRK+IRsT98 kjFyX/BdQgTbP2Ea1GFp8r72SAPXWOMsZpDajLpJYJzgdJsHALgQAbSPT9rXe72uIkcx cTxqcCB/1Qi9cQqFHb+zH+WLDDu8s6ik2W9kezAJavorvYgfRbQivqrIWHWhONi/FXet jnZZhyKFx3YWBRZAziMsQzOACgmdKJD2n5e5UL2JfyTabwJwphrauPkMd4RvSOUsrzpv ZJLw== X-Gm-Message-State: AHQUAubnDb0IkAHbRC99ChdHPrnt5yRmlfiSv+gcFFB0X+mJU4xcrLp+ 2V4QFhOb4E9yHiY3Aeul5gSeOsGJ X-Google-Smtp-Source: AHgI3IY1/SzNVXqKo6d9T3R0icCeRwnYWlSnrYqKcqDwzRXhEma6aW/eFbGmzOpUdDJu2gIWgyE3VQ== X-Received: by 2002:a05:6830:125a:: with SMTP id s26mr7162172otp.74.1550292967078; Fri, 15 Feb 2019 20:56:07 -0800 (PST) Received: from localhost.localdomain (ip68-228-73-187.oc.oc.cox.net. [68.228.73.187]) by smtp.gmail.com with ESMTPSA id j88sm3209480otj.47.2019.02.15.20.56.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Feb 2019 20:56:06 -0800 (PST) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , idosch@mellanox.com, linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org, bridge@lists.linux-foundation.org, jiri@mellanox.com, andrew@lunn.ch, vivien.didelot@gmail.com Subject: [PATCH net-next v3 2/9] switchdev: Add SWITCHDEV_PORT_ATTR_SET, SWITCHDEV_PORT_ATTR_GET Date: Fri, 15 Feb 2019 20:55:49 -0800 Message-Id: <20190216045556.3514-3-f.fainelli@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190216045556.3514-1-f.fainelli@gmail.com> References: <20190216045556.3514-1-f.fainelli@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In preparation for allowing switchdev enabled drivers to veto specific attribute settings from within the context of the caller, introduce a new switchdev notifier type for port attributes. Suggested-by: Ido Schimmel Signed-off-by: Florian Fainelli --- include/net/switchdev.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/net/switchdev.h b/include/net/switchdev.h index 5e87b54c5dc5..b8becabbef38 100644 --- a/include/net/switchdev.h +++ b/include/net/switchdev.h @@ -143,6 +143,9 @@ enum switchdev_notifier_type { SWITCHDEV_VXLAN_FDB_ADD_TO_DEVICE, SWITCHDEV_VXLAN_FDB_DEL_TO_DEVICE, SWITCHDEV_VXLAN_FDB_OFFLOADED, + + SWITCHDEV_PORT_ATTR_SET, /* Blocking. */ + SWITCHDEV_PORT_ATTR_GET, /* Blocking. */ }; struct switchdev_notifier_info { @@ -165,6 +168,13 @@ struct switchdev_notifier_port_obj_info { bool handled; }; +struct switchdev_notifier_port_attr_info { + struct switchdev_notifier_info info; /* must be first */ + struct switchdev_attr *attr; + struct switchdev_trans *trans; + bool handled; +}; + static inline struct net_device * switchdev_notifier_info_to_dev(const struct switchdev_notifier_info *info) { From patchwork Sat Feb 16 04:55:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1043377 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="k5UbIQ13"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 441dCV3G12z9s7h for ; Sat, 16 Feb 2019 15:57:10 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404941AbfBPE5F (ORCPT ); Fri, 15 Feb 2019 23:57:05 -0500 Received: from mail-ot1-f68.google.com ([209.85.210.68]:39170 "EHLO mail-ot1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726305AbfBPE4K (ORCPT ); Fri, 15 Feb 2019 23:56:10 -0500 Received: by mail-ot1-f68.google.com with SMTP id n8so20165516otl.6; Fri, 15 Feb 2019 20:56:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wimd3qSTtcutL9MgW1a48UHpmMTASo5reWM4eIi7Glc=; b=k5UbIQ13VqZ3BL2ym1HzyqN8gelLKnUG1ahX+KmacsaMxbdj+Wahazyx1y2S56kpG/ VPxkISx+s2VkfDcg4FBfIzEcQI5MDP8pmE9av23YaK9fn/GxW/zN9ag7pKHEvpmaNe49 FLHsS1EhLorSo1ZFkoqd3BH3t6YW2nUPEf+CSHj0pWUHYAQGs3YwaGWO6j5vhLt6Hntq /5Uyvkp9tgV5ujbv9bqZvFDtPRGhqPNUSy1/F3MjAL5Mc7VaFZdiVxrxnFwK2vy9aedA 9L8f/fDrqET1lEtQlKx56ZMh70qefIQDh1X1eNkpAYd3Sr2Cd0hEE0F0QCvYs9gm9Ft+ FvtQ== 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:mime-version:content-transfer-encoding; bh=wimd3qSTtcutL9MgW1a48UHpmMTASo5reWM4eIi7Glc=; b=fp31/5siBaCsb/pSdpGJveIl/KCY7UzBZKHDDWUp/MSSTYmoIjWHfneen+POAzj2Yg TtpvzQRO714nYaHhMGiBiSMd+fvY8MMCCLBtMx9Xd/KBCiq8LOvG7Nimr6qHjiBU9CLi rFMCNWzniwIF9labzO4duM3tJP2BQoKZR7Bw4n+ZcLAVx4IFxLTF0xmfuO9dv/BIMqd/ kYs31CBddJpfP1jxUf05HfhnjwTHzWDaAsUzmeDRt5qC8Rsqt98HtKghz/gENydBSPPw 7YEIHU9fX9+5e1ahoM+2CTzOLxDDuNc1F9FJt5YwuPUu501RWd2NCZuVOyLWwaWMX9U2 yCDQ== X-Gm-Message-State: AHQUAubwjTJxqWs55t2pFsOW8g+FHaBM8dERxwaWG1wB2VBj2fohHgg4 JYCtJsbinLdfOC/x5UJu32yokaYM X-Google-Smtp-Source: AHgI3IbN5K6rg8C4KXh23U9xpdfLnDucm9nfyRIgk0JlsRf8jZk9O2zryzBM7V8c3BP+WXNRVio0YQ== X-Received: by 2002:a9d:6d19:: with SMTP id o25mr7678341otp.351.1550292968888; Fri, 15 Feb 2019 20:56:08 -0800 (PST) Received: from localhost.localdomain (ip68-228-73-187.oc.oc.cox.net. [68.228.73.187]) by smtp.gmail.com with ESMTPSA id j88sm3209480otj.47.2019.02.15.20.56.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Feb 2019 20:56:08 -0800 (PST) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , idosch@mellanox.com, linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org, bridge@lists.linux-foundation.org, jiri@mellanox.com, andrew@lunn.ch, vivien.didelot@gmail.com Subject: [PATCH net-next v3 3/9] rocker: Handle SWITCHDEV_PORT_ATTR_GET/SET Date: Fri, 15 Feb 2019 20:55:50 -0800 Message-Id: <20190216045556.3514-4-f.fainelli@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190216045556.3514-1-f.fainelli@gmail.com> References: <20190216045556.3514-1-f.fainelli@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Following patches will change the way we communicate getting or setting a port's attribute and use a blocking notifier to perform those tasks. Prepare rocker to support receiving notifier events targeting SWITCHDEV_PORT_ATTR_GET/SET and simply translate that into the existing rocker_port_attr_{set,get} calls. Signed-off-by: Florian Fainelli --- drivers/net/ethernet/rocker/rocker_main.c | 24 +++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/drivers/net/ethernet/rocker/rocker_main.c b/drivers/net/ethernet/rocker/rocker_main.c index 66f72f8c46e5..591008c8fa74 100644 --- a/drivers/net/ethernet/rocker/rocker_main.c +++ b/drivers/net/ethernet/rocker/rocker_main.c @@ -2835,6 +2835,27 @@ rocker_switchdev_port_obj_event(unsigned long event, struct net_device *netdev, return notifier_from_errno(err); } +static int +rocker_switchdev_port_attr_event(unsigned long event, struct net_device *netdev, + struct switchdev_notifier_port_attr_info + *port_attr_info) +{ + int err = -EOPNOTSUPP; + + switch (event) { + case SWITCHDEV_PORT_ATTR_SET: + err = rocker_port_attr_set(netdev, port_attr_info->attr, + port_attr_info->trans); + break; + case SWITCHDEV_PORT_ATTR_GET: + err = rocker_port_attr_get(netdev, port_attr_info->attr); + break; + } + + port_attr_info->handled = true; + return notifier_from_errno(err); +} + static int rocker_switchdev_blocking_event(struct notifier_block *unused, unsigned long event, void *ptr) { @@ -2847,6 +2868,9 @@ static int rocker_switchdev_blocking_event(struct notifier_block *unused, case SWITCHDEV_PORT_OBJ_ADD: case SWITCHDEV_PORT_OBJ_DEL: return rocker_switchdev_port_obj_event(event, dev, ptr); + case SWITCHDEV_PORT_ATTR_SET: + case SWITCHDEV_PORT_ATTR_GET: + return rocker_switchdev_port_attr_event(event, dev, ptr); } return NOTIFY_DONE; From patchwork Sat Feb 16 04:55:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1043370 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="TO/B0s9t"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 441dBZ3Jjrz9sCh for ; Sat, 16 Feb 2019 15:56:22 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404209AbfBPE4P (ORCPT ); Fri, 15 Feb 2019 23:56:15 -0500 Received: from mail-ot1-f66.google.com ([209.85.210.66]:44648 "EHLO mail-ot1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2394643AbfBPE4M (ORCPT ); Fri, 15 Feb 2019 23:56:12 -0500 Received: by mail-ot1-f66.google.com with SMTP id g1so20099802otj.11; Fri, 15 Feb 2019 20:56:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bK6KJ8PbptzY6Cxty2elvsR4uDi55jXHgyWEWfvoolA=; b=TO/B0s9tQc1H7B9aD1PXwx/igb/dq+E+rL+tpEKjJXWduMWiW2Ft3S2+UPpIm/wFWu nfX87pj8aew0tTw3Tzsykl1KcJoeHok370bvbB+davuFfcmvdCzgidtCI20lQfDsjV15 cOizoUAp9R3Qb5iu4mrxZZ/bG/dRdeuuPIe4Cb+3ADxfpPUZcjaA87kTb+u8c3L9oDGK uX+iyFeTOtgqe7TwoDxsmv5igeWxN/X78uhBT/7rFhGId5VVsoMpfOsQ0AzMkjQ/HC4U IzTL3AR1xCEPa3EK8blsnRbzbOzu8sTZNh+38m3/ec7ywq6YQ4gaZ9hORYN8lO/ZGGLw 6dVg== 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:mime-version:content-transfer-encoding; bh=bK6KJ8PbptzY6Cxty2elvsR4uDi55jXHgyWEWfvoolA=; b=EocQHHqzUYSlwklXonpPS6NtpzdOU8DKVaMJoESTU7sxPMCk3SOiMNIIEVjx9hmLqy ch0/jS7hkgCVjVbXgXYkhrEq3pSu8paYMnR0Bt6esVWpfh0b7/QgqpPnWYYUGNBtrNhB gP4S/ytcsjogGsLaND+upTJEgXOTrc1o5QtxKAGQLIhrHubwdNICUp1AEIMlU3DwYMo0 UZ1j2NDtmkG+b0nltYoebZDwoiNKG+R0S3ecWi55BpLm51wNrTU2XzrMGF0235NMDViK wPZLsk8UP2Zu38Une5phq0vGy4uEznFNKMkxc1/HbhxyuZbo6QuwBW+UWWHAXE9MRyEo Dnsw== X-Gm-Message-State: AHQUAuZZq04Vgm7cgXQbULAlVxYRsbkL/MmekXuMZZrQuHvnNMonb2/E uySrJNBtOeNUKXpjwqO1r9OYfHVJ X-Google-Smtp-Source: AHgI3IaGy/BnT8tPXgegzohYuF+GJA6uGOBqb0cDwQU2HFz8xWMEsl7ZaDQAedeBsbIfauSp1GbAyg== X-Received: by 2002:aca:4d49:: with SMTP id a70mr8047290oib.135.1550292970762; Fri, 15 Feb 2019 20:56:10 -0800 (PST) Received: from localhost.localdomain (ip68-228-73-187.oc.oc.cox.net. [68.228.73.187]) by smtp.gmail.com with ESMTPSA id j88sm3209480otj.47.2019.02.15.20.56.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Feb 2019 20:56:10 -0800 (PST) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , idosch@mellanox.com, linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org, bridge@lists.linux-foundation.org, jiri@mellanox.com, andrew@lunn.ch, vivien.didelot@gmail.com Subject: [PATCH net-next v3 4/9] mlxsw: spectrum_switchdev: Handle SWITCHDEV_PORT_ATTR_GET/SET Date: Fri, 15 Feb 2019 20:55:51 -0800 Message-Id: <20190216045556.3514-5-f.fainelli@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190216045556.3514-1-f.fainelli@gmail.com> References: <20190216045556.3514-1-f.fainelli@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Following patches will change the way we communicate getting or setting a port's attribute and use a blocking notifier to perform those tasks. Prepare mlxsw to support receiving notifier events targeting SWITCHDEV_PORT_ATTR_GET/SET and simply translate that into the existing mlxsw_sp_port_attr_{set,get} calls. Signed-off-by: Florian Fainelli --- .../mellanox/mlxsw/spectrum_switchdev.c | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c index 95e37de3e48f..c6d7bb70e8f2 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c @@ -3443,6 +3443,26 @@ mlxsw_sp_switchdev_handle_vxlan_obj_del(struct net_device *vxlan_dev, } } +static int +mlxsw_sp_switchdev_port_attr_event(unsigned long event, struct net_device *dev, + struct switchdev_notifier_port_attr_info *port_attr_info) +{ + int err = -EOPNOTSUPP; + + switch (event) { + case SWITCHDEV_PORT_ATTR_SET: + err = mlxsw_sp_port_attr_set(dev, port_attr_info->attr, + port_attr_info->trans); + break; + case SWITCHDEV_PORT_ATTR_GET: + err = mlxsw_sp_port_attr_get(dev, port_attr_info->attr); + break; + } + + port_attr_info->handled = true; + return notifier_from_errno(err); +} + static int mlxsw_sp_switchdev_blocking_event(struct notifier_block *unused, unsigned long event, void *ptr) { @@ -3466,6 +3486,9 @@ static int mlxsw_sp_switchdev_blocking_event(struct notifier_block *unused, mlxsw_sp_port_dev_check, mlxsw_sp_port_obj_del); return notifier_from_errno(err); + case SWITCHDEV_PORT_ATTR_SET: + case SWITCHDEV_PORT_ATTR_GET: + return mlxsw_sp_switchdev_port_attr_event(event, dev, ptr); } return NOTIFY_DONE; From patchwork Sat Feb 16 04:55:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1043375 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="YFGn89vU"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 441dCH4N13z9s9G for ; Sat, 16 Feb 2019 15:56:59 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2394643AbfBPE4y (ORCPT ); Fri, 15 Feb 2019 23:56:54 -0500 Received: from mail-ot1-f68.google.com ([209.85.210.68]:39174 "EHLO mail-ot1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2403987AbfBPE4N (ORCPT ); Fri, 15 Feb 2019 23:56:13 -0500 Received: by mail-ot1-f68.google.com with SMTP id n8so20165646otl.6; Fri, 15 Feb 2019 20:56:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mF0clASfsS+m8euYRGx6YKoVXE9ceDzoQVGxi2l5BWo=; b=YFGn89vUvVsfPxvmLts9a6/QqTx599AR0R9V2aeo45jm/odT2FJDqDfbGzJtWIBqwP 2xcuPkRlwuiisCfrKgRcrHX1EDJw3LZ1rZb4K0t65gtZwp0Ks+ssFRkcOyX5+kQaDSTX QUXSGUBRa2483elu9SBGwQHNxlXBIqUhmgg7ATQjOe6nGdrbCQkf8/uaHb7l9pJNED2V dt/S7olxRGSeL5qnSqUGPiP3dCgYodTx9APORX62qkf6zdWcTu855jj3CXkt8S+YkzZx Ru1adCgBJxkNsUKJL4m3ZKVz9iV/PP+roGxXEAgNPDx5q2IwdZQSCnEfQFOdW53DP5lz oNeA== 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:mime-version:content-transfer-encoding; bh=mF0clASfsS+m8euYRGx6YKoVXE9ceDzoQVGxi2l5BWo=; b=R2Xo94jI+6WmcLlGWVj/pyj+gTl9uC9V21nFCErd/Zl+chbSH2FEg+bdXiGtpC1N41 79u2BzMa7M6stKgxZqJwnZVAB03k3MUGKGj3Pg0GNYPit17XNnq2Et/g6ek+tARMZVrN FcktqXekzklFNirRVTbrUgOFD8jje3M+7vyfTq83+ZT+Ukcy4LyN8i2c69kQyEo/R9ka hQjQ9Xf1K5dDToEo81++41Oqbu5NbYV+CxslXR1xBBiK4MVCQYs6N9fRRPMaeIIo/abu c5m+7jbib7ZHk9CtgM2cnJHiX880qe52cRwWT2z8WObkikr42LuGkGaYpmJOZqpOdOoM 0pGA== X-Gm-Message-State: AHQUAuZpW2ykR2lcumfs8o2YR4UQwYYGgGX5ARDx2gt24KOWA13aAXk8 JsNgkDubqA48TqdPbdAro444QvlH X-Google-Smtp-Source: AHgI3IZs9RcYfUnCeBl7AEecpPhkSothh3fXDl2YMsUlhtf2r8Pcot8cf0WUD6b0PLJsjx0bTSyQ2Q== X-Received: by 2002:aca:b302:: with SMTP id c2mr7463649oif.144.1550292972643; Fri, 15 Feb 2019 20:56:12 -0800 (PST) Received: from localhost.localdomain (ip68-228-73-187.oc.oc.cox.net. [68.228.73.187]) by smtp.gmail.com with ESMTPSA id j88sm3209480otj.47.2019.02.15.20.56.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Feb 2019 20:56:11 -0800 (PST) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , idosch@mellanox.com, linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org, bridge@lists.linux-foundation.org, jiri@mellanox.com, andrew@lunn.ch, vivien.didelot@gmail.com Subject: [PATCH net-next v3 5/9] net: mscc: ocelot: Handle SWITCHDEV_PORT_ATTR_GET/SET Date: Fri, 15 Feb 2019 20:55:52 -0800 Message-Id: <20190216045556.3514-6-f.fainelli@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190216045556.3514-1-f.fainelli@gmail.com> References: <20190216045556.3514-1-f.fainelli@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Following patches will change the way we communicate getting or setting a port's attribute and use a blocking notifier to perform those tasks. Prepare ocelot to support receiving notifier events targeting SWITCHDEV_PORT_ATTR_GET/SET and simply translate that into the existing ocelot_port_attr_{set,get} calls. Signed-off-by: Florian Fainelli --- drivers/net/ethernet/mscc/ocelot.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c index 195306d05bcd..850a49033a30 100644 --- a/drivers/net/ethernet/mscc/ocelot.c +++ b/drivers/net/ethernet/mscc/ocelot.c @@ -1582,6 +1582,24 @@ struct notifier_block ocelot_netdevice_nb __read_mostly = { }; EXPORT_SYMBOL(ocelot_netdevice_nb); +static int +ocelot_switchdev_port_attr_event(unsigned long event, + struct net_device *netdev, + struct switchdev_notifier_port_attr_info *port_attr_info) +{ + int err = -EOPNOTSUPP; + + switch (event) { + case SWITCHDEV_PORT_ATTR_SET: + err = ocelot_port_attr_set(netdev, port_attr_info->attr, + port_attr_info->trans); + break; + } + + port_attr_info->handled = true; + return notifier_from_errno(err); +} + static int ocelot_switchdev_blocking_event(struct notifier_block *unused, unsigned long event, void *ptr) { @@ -1600,6 +1618,9 @@ static int ocelot_switchdev_blocking_event(struct notifier_block *unused, ocelot_netdevice_dev_check, ocelot_port_obj_del); return notifier_from_errno(err); + case SWITCHDEV_PORT_ATTR_SET: + case SWITCHDEV_PORT_ATTR_GET: /* fallthrough */ + return ocelot_switchdev_port_attr_event(event, dev, ptr); } return NOTIFY_DONE; From patchwork Sat Feb 16 04:55:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1043371 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ahoaNyqh"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 441dBb1Dmgz9s9G for ; Sat, 16 Feb 2019 15:56:23 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404672AbfBPE4T (ORCPT ); Fri, 15 Feb 2019 23:56:19 -0500 Received: from mail-ot1-f66.google.com ([209.85.210.66]:35246 "EHLO mail-ot1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404104AbfBPE4Q (ORCPT ); Fri, 15 Feb 2019 23:56:16 -0500 Received: by mail-ot1-f66.google.com with SMTP id z19so20225988otm.2; Fri, 15 Feb 2019 20:56:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9fkZ8Pbunho/ROChBNcoRtJbkTRL9WKmA1WtJKIo9O4=; b=ahoaNyqhdWq5zT6UXmmAu7audKOPLLdh29zLeLuaCPcvb92C213qlB9ba0nR9FOQZm oabUHCgWTb9FHDdsn1U7Mj+QHRCr8ujGF9sM7iinBJvmQD4lQqQ3ywuEdbX+UgjQeiEx 2DMflfz360cqvF1F18DDXkzErMF8QblEKDEhE8BvfVEKuiWoJA4RPvzA9ZZ7WE9pAx3y qzqKnnThLvw0s2rz7IfN9X/z9n/xxK1Ye0ZM9DGSHS7rDoTOvo0qC0pNpMYdpninX4nb SGZbnxvmrKrCdbiFG+/W88rhWID8hmgjYZB2JhOLJDMDPQkWuiRQrBj6E7Ez7TyD5NiR nmAw== 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:mime-version:content-transfer-encoding; bh=9fkZ8Pbunho/ROChBNcoRtJbkTRL9WKmA1WtJKIo9O4=; b=tqWoKlXz1hqBgU+d0HRXD6eCvh0vG8kTkV2Av+Oe9XLdYsxX8t/g13tQNeofQt2Qlm QD8gQ0ElrhuxYPWNLyHQ/bk1TXQWgKZNmsGvHcmHWBVT+ldeYTetITcK77oLCaGACcPz aH1AL2kkrCWPfARpY56zPeq1n7qqrb9lmCnylJSFQB4rQ2mHfts489wDyQ31wiHT1HdD a062zd646FbsmN6aLdyXgcROxUdlW8Sg2CUwAUaae0gx5J/xafnjs1JMzymgl01uulbS NGDwP7OsvXHI3s4GIwgkz3ytOiVjgEjRnVSGMtMqkJQMsovKw7WNtFOn5Wz6y9cQRX7R Aq8A== X-Gm-Message-State: AHQUAubjrRM0XCBxQQutEz+1ch5PwNI+uzAkEyjCaoF3z9ffZa9/BEwL lLSff+sD4tQuNyWXoc/qJFG+k1z+ X-Google-Smtp-Source: AHgI3IY/eN9TT4i4imrq4jRrUw7QzRdnG9vI4Bc2/X9VzDno7g7vLr6TYfJD8KVkor/6MpkeK/BPQQ== X-Received: by 2002:a05:6808:24c:: with SMTP id m12mr6777539oie.174.1550292974493; Fri, 15 Feb 2019 20:56:14 -0800 (PST) Received: from localhost.localdomain (ip68-228-73-187.oc.oc.cox.net. [68.228.73.187]) by smtp.gmail.com with ESMTPSA id j88sm3209480otj.47.2019.02.15.20.56.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Feb 2019 20:56:13 -0800 (PST) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , idosch@mellanox.com, linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org, bridge@lists.linux-foundation.org, jiri@mellanox.com, andrew@lunn.ch, vivien.didelot@gmail.com Subject: [PATCH net-next v3 6/9] staging: fsl-dpaa2: ethsw: Handle SWITCHDEV_PORT_ATTR_GET/SET Date: Fri, 15 Feb 2019 20:55:53 -0800 Message-Id: <20190216045556.3514-7-f.fainelli@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190216045556.3514-1-f.fainelli@gmail.com> References: <20190216045556.3514-1-f.fainelli@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Following patches will change the way we communicate getting or setting a port's attribute and use a blocking notifier to perform those tasks. Prepare ethsw to support receiving notifier events targeting SWITCHDEV_PORT_ATTR_GET/SET and simply translate that into the existing swdev_port_attr_{set,get} calls. Signed-off-by: Florian Fainelli --- drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/drivers/staging/fsl-dpaa2/ethsw/ethsw.c b/drivers/staging/fsl-dpaa2/ethsw/ethsw.c index e559f4c25cf7..bc9e7de07200 100644 --- a/drivers/staging/fsl-dpaa2/ethsw/ethsw.c +++ b/drivers/staging/fsl-dpaa2/ethsw/ethsw.c @@ -1111,6 +1111,27 @@ ethsw_switchdev_port_obj_event(unsigned long event, struct net_device *netdev, return notifier_from_errno(err); } +static int +ethsw_switchdev_port_attr_event(unsigned long event, + struct net_device *netdev, + struct switchdev_notifier_port_attr_info *port_attr_info) +{ + int err = -EOPNOTSUPP; + + switch (event) { + case SWITCHDEV_PORT_ATTR_SET: + err = swdev_port_attr_set(netdev, port_attr_info->attr, + port_attr_info->trans); + break; + case SWITCHDEV_PORT_ATTR_GET: + err = swdev_port_attr_get(netdev, port_attr_info->attr); + break; + } + + port_attr_info->handled = true; + return notifier_from_errno(err); +} + static int port_switchdev_blocking_event(struct notifier_block *unused, unsigned long event, void *ptr) { @@ -1123,6 +1144,9 @@ static int port_switchdev_blocking_event(struct notifier_block *unused, case SWITCHDEV_PORT_OBJ_ADD: /* fall through */ case SWITCHDEV_PORT_OBJ_DEL: return ethsw_switchdev_port_obj_event(event, dev, ptr); + case SWITCHDEV_PORT_ATTR_SET: + case SWITCHDEV_PORT_ATTR_GET: + return ethsw_switchdev_port_attr_event(event, dev, ptr); } return NOTIFY_DONE; From patchwork Sat Feb 16 04:55:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1043374 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="FcFaSHh9"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 441dC12tYPz9s4Z for ; Sat, 16 Feb 2019 15:56:45 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404762AbfBPE4U (ORCPT ); Fri, 15 Feb 2019 23:56:20 -0500 Received: from mail-ot1-f67.google.com ([209.85.210.67]:37602 "EHLO mail-ot1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404346AbfBPE4R (ORCPT ); Fri, 15 Feb 2019 23:56:17 -0500 Received: by mail-ot1-f67.google.com with SMTP id b3so20175503otp.4; Fri, 15 Feb 2019 20:56:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=H+qa45j97TVXUzWcSqT4ciJ6lwUcGt6+aO3V+0751xI=; b=FcFaSHh9GTusYG+TxIBEfPP25fgaQVjrVPxE4xneUPe9kaMtoa45ca1d09nX0ZSChU EWLx6yStLRi052xJOtfnTNKSqZT5cZPMUAkyGjCOvC2WVbVzYGxLlqXENxDCt2bwIv6o 1Hu/78xUt7xYcPWZGn0kCI+0x5+T6j23BVsjvtxwGkDuPdsz790atD0uHMJ23V0s8jBN ftlCeqrb/V+lNmTp6DW+2hYob/pIPwIbz1/M9Ksh2mFkYInAW2mfPGysazZXPEhnqzHw Hx8TJ1/rLzJV4qcHl6PWnc3wODy6Un9uRJHJN8ZnoxOrTSz7vrdUSHuO0zSxHPZfUfG0 eO+Q== 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:mime-version:content-transfer-encoding; bh=H+qa45j97TVXUzWcSqT4ciJ6lwUcGt6+aO3V+0751xI=; b=Z9r4g1Ewg7Kyfy7NCtVDNzxsRhyidJ+DuqfX0Qsl2jg5F2udjJokHs1jsuX9Qtrpjf +CvBJmn0I0w6mkhzttXeonKqcJKCLJo3Xb7w8Dgu9u5gh7ufDxftPjeTtdvD4WkIaaUJ 3Wpt3VyahmSD5KHdXNmWCQfXPW07Vx/yFZNNzX30f/Gb1vPr6M3efA0GBDCSrQkwnydU lcr55FDikG4L3g0KjAar6a4nVUmtnnJCMUrdXiZv6pkhslVsSLAzJTJq+pOKswnRc4Dq R03J2pKe7n+qwM5FhvxAetVMyktZYn0BOIHOTpCMwKG9ggggITd2cT6Z6Wy9DgPXbz6C U4dQ== X-Gm-Message-State: AHQUAuboy7jPxfHWTvRJDgBu9WAcDzosaOmUDa2w/lsQ1caCpD1H9YWz 0WJyWNTZL5LnqcrC7HVFGXQVs6DZ X-Google-Smtp-Source: AHgI3IZbDt57Dg//m55tm8qpuXwdHI+Qci1WZBGucHnjUCHMiC263dNrgrKHHTvOczI6WgHW/zgrcg== X-Received: by 2002:aca:cd0c:: with SMTP id d12mr8099580oig.49.1550292976354; Fri, 15 Feb 2019 20:56:16 -0800 (PST) Received: from localhost.localdomain (ip68-228-73-187.oc.oc.cox.net. [68.228.73.187]) by smtp.gmail.com with ESMTPSA id j88sm3209480otj.47.2019.02.15.20.56.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Feb 2019 20:56:15 -0800 (PST) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , idosch@mellanox.com, linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org, bridge@lists.linux-foundation.org, jiri@mellanox.com, andrew@lunn.ch, vivien.didelot@gmail.com Subject: [PATCH net-next v3 7/9] net: dsa: Handle SWITCHDEV_PORT_ATTR_GET/SET Date: Fri, 15 Feb 2019 20:55:54 -0800 Message-Id: <20190216045556.3514-8-f.fainelli@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190216045556.3514-1-f.fainelli@gmail.com> References: <20190216045556.3514-1-f.fainelli@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Following patches will change the way we communicate getting or setting a port's attribute and use a blocking notifier to perform those tasks. Prepare DSA to support receiving notifier events targeting SWITCHDEV_PORT_ATTR_GET/SET and simply translate that into the existing dsa_slave_port_attr_{set,get} calls. Signed-off-by: Florian Fainelli --- net/dsa/slave.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 2e5e7c04821b..2a14a38f5f93 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -1558,6 +1558,27 @@ dsa_slave_switchdev_port_obj_event(unsigned long event, return notifier_from_errno(err); } +static int +dsa_slave_switchdev_port_attr_event(unsigned long event, + struct net_device *netdev, + struct switchdev_notifier_port_attr_info *port_attr_info) +{ + int err = -EOPNOTSUPP; + + switch (event) { + case SWITCHDEV_PORT_ATTR_SET: + err = dsa_slave_port_attr_set(netdev, port_attr_info->attr, + port_attr_info->trans); + break; + case SWITCHDEV_PORT_ATTR_GET: + err = dsa_slave_port_attr_get(netdev, port_attr_info->attr); + break; + } + + port_attr_info->handled = true; + return notifier_from_errno(err); +} + static int dsa_slave_switchdev_blocking_event(struct notifier_block *unused, unsigned long event, void *ptr) { @@ -1570,6 +1591,9 @@ static int dsa_slave_switchdev_blocking_event(struct notifier_block *unused, case SWITCHDEV_PORT_OBJ_ADD: /* fall through */ case SWITCHDEV_PORT_OBJ_DEL: return dsa_slave_switchdev_port_obj_event(event, dev, ptr); + case SWITCHDEV_PORT_ATTR_SET: /* fallthrough */ + case SWITCHDEV_PORT_ATTR_GET: + return dsa_slave_switchdev_port_attr_event(event, dev, ptr); } return NOTIFY_DONE; From patchwork Sat Feb 16 04:55:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1043373 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="W1XJOaYQ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 441dBy34FBz9s4Z for ; Sat, 16 Feb 2019 15:56:42 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404841AbfBPE4V (ORCPT ); Fri, 15 Feb 2019 23:56:21 -0500 Received: from mail-ot1-f65.google.com ([209.85.210.65]:43056 "EHLO mail-ot1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404671AbfBPE4U (ORCPT ); Fri, 15 Feb 2019 23:56:20 -0500 Received: by mail-ot1-f65.google.com with SMTP id n71so20122484ota.10; Fri, 15 Feb 2019 20:56:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ifXkdhN3Db+p5XK7EE964Sj4BgFX95LGnnu/9MTO3AQ=; b=W1XJOaYQ+Gsgi6lQkh4kw6lQw02nDIat48i6PqsN+TBuxOgWmbPJzRxB7LWmY0aKUP +0zPpzWN79KnuEng2KiVcpFc0+llB1sw39TNsKCT8xUs+WhBg2TNRhth9t6iZcTJJrjD 3LcRUxFuHT7ulf4Y1N0AVW6y9l0vm8hm1BiLam0+eX/6ieN7a13Oqh95uGihFGLovWaT XTwRutTulVZnQcFHAjeDRtVuzV0r5+rDE+bMjVUcIat1kdYOb96BZ5y8JKzlcslbMiYt udng80c7sTOO9TL7xiwneSBs39+8zGjDDHUo9SnNuZbU6A6eHX3Q93SBCButZSpMtIGL HM5A== 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:mime-version:content-transfer-encoding; bh=ifXkdhN3Db+p5XK7EE964Sj4BgFX95LGnnu/9MTO3AQ=; b=lsfc4wecdSbAucan8o3J9cABLKgjjyLluEKMEUf4HG/t2GvwyCJixoigCBeI/SkG7W af1i8gQEm5eDGneR4xlcD1ZuHsdt82o6AzcK4pp+7Bg6D8lCrsYD20tkX8gmCWakCzyt +SXpReZedkoDsXamJAz2RepyOf/HsjvrFIuzb7TXbenv9TtFWlOXH5s+TQmXe9TrRrKJ v+Uyk53S+RycemePL1kJWLtvIxVx8QOk9f+z94URbCEJljXRRO2Xw0xTl8DxvVjjEx5u 2uaPVXW6KI4HhLwjnvZporNpeD4ocgp58S+Xr3/FOAVaIEIuNbF4Bdh7s79OYGvwPaAG u7nw== X-Gm-Message-State: AHQUAuaerIxdWs4VWxFq84MAroZXyIuMRd93q0C7ea6yPhHuID8vMHAo XaUesRDE5wQ/J956bKc7Aow5uM3B X-Google-Smtp-Source: AHgI3IYcUSmJh5rEbgaxxOZQy0jtbIz13axowprhialaHP/7rXYC+lzAmx9hTYWnNxwm6v3ZkVLdJg== X-Received: by 2002:a9d:64c1:: with SMTP id n1mr8017247otl.175.1550292978395; Fri, 15 Feb 2019 20:56:18 -0800 (PST) Received: from localhost.localdomain (ip68-228-73-187.oc.oc.cox.net. [68.228.73.187]) by smtp.gmail.com with ESMTPSA id j88sm3209480otj.47.2019.02.15.20.56.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Feb 2019 20:56:17 -0800 (PST) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , idosch@mellanox.com, linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org, bridge@lists.linux-foundation.org, jiri@mellanox.com, andrew@lunn.ch, vivien.didelot@gmail.com Subject: [PATCH net-next v3 8/9] net: switchdev: Replace port attr get/set SDO with a notification Date: Fri, 15 Feb 2019 20:55:55 -0800 Message-Id: <20190216045556.3514-9-f.fainelli@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190216045556.3514-1-f.fainelli@gmail.com> References: <20190216045556.3514-1-f.fainelli@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Drop switchdev_ops.switchdev_port_attr_get and _set. Drop the uses of this field from all clients, which were migrated to use switchdev notification in the previous patches. Add a new function switchdev_port_attr_notify() that sends the switchdev notifications SWITCHDEV_PORT_ATTR_GET and _SET. Update switchdev_port_attr_get() to dispatch to this new function. Drop __switchdev_port_attr_set() and update switchdev_port_attr_set() likewise. Signed-off-by: Florian Fainelli --- net/switchdev/switchdev.c | 107 +++++++++++++------------------------- 1 file changed, 37 insertions(+), 70 deletions(-) diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c index 7e1357db33d7..8fc3db2179f5 100644 --- a/net/switchdev/switchdev.c +++ b/net/switchdev/switchdev.c @@ -174,81 +174,31 @@ static int switchdev_deferred_enqueue(struct net_device *dev, return 0; } -/** - * switchdev_port_attr_get - Get port attribute - * - * @dev: port device - * @attr: attribute to get - */ -int switchdev_port_attr_get(struct net_device *dev, struct switchdev_attr *attr) +static int switchdev_port_attr_notify(enum switchdev_notifier_type nt, + struct net_device *dev, + struct switchdev_attr *attr, + struct switchdev_trans *trans) { - const struct switchdev_ops *ops = dev->switchdev_ops; - struct net_device *lower_dev; - struct list_head *iter; - struct switchdev_attr first = { - .id = SWITCHDEV_ATTR_ID_UNDEFINED - }; - int err = -EOPNOTSUPP; + int err; + int rc; - if (ops && ops->switchdev_port_attr_get) - return ops->switchdev_port_attr_get(dev, attr); + struct switchdev_notifier_port_attr_info attr_info = { + .attr = attr, + .trans = trans, + .handled = false, + }; - if (attr->flags & SWITCHDEV_F_NO_RECURSE) + rc = call_switchdev_blocking_notifiers(nt, dev, &attr_info.info, NULL); + err = notifier_to_errno(rc); + if (err) { + WARN_ON(!attr_info.handled); return err; - - /* Switch device port(s) may be stacked under - * bond/team/vlan dev, so recurse down to get attr on - * each port. Return -ENODATA if attr values don't - * compare across ports. - */ - - netdev_for_each_lower_dev(dev, lower_dev, iter) { - err = switchdev_port_attr_get(lower_dev, attr); - if (err) - break; - if (first.id == SWITCHDEV_ATTR_ID_UNDEFINED) - first = *attr; - else if (memcmp(&first, attr, sizeof(*attr))) - return -ENODATA; - } - - return err; -} -EXPORT_SYMBOL_GPL(switchdev_port_attr_get); - -static int __switchdev_port_attr_set(struct net_device *dev, - const struct switchdev_attr *attr, - struct switchdev_trans *trans) -{ - const struct switchdev_ops *ops = dev->switchdev_ops; - struct net_device *lower_dev; - struct list_head *iter; - int err = -EOPNOTSUPP; - - if (ops && ops->switchdev_port_attr_set) { - err = ops->switchdev_port_attr_set(dev, attr, trans); - goto done; - } - - if (attr->flags & SWITCHDEV_F_NO_RECURSE) - goto done; - - /* Switch device port(s) may be stacked under - * bond/team/vlan dev, so recurse down to set attr on - * each port. - */ - - netdev_for_each_lower_dev(dev, lower_dev, iter) { - err = __switchdev_port_attr_set(lower_dev, attr, trans); - if (err) - break; } -done: - if (err == -EOPNOTSUPP && attr->flags & SWITCHDEV_F_SKIP_EOPNOTSUPP) - err = 0; + if (!attr_info.handled) + return -EOPNOTSUPP; - return err; + return 0; } static int switchdev_port_attr_set_now(struct net_device *dev, @@ -267,7 +217,9 @@ static int switchdev_port_attr_set_now(struct net_device *dev, */ trans.ph_prepare = true; - err = __switchdev_port_attr_set(dev, attr, &trans); + err = switchdev_port_attr_notify(SWITCHDEV_PORT_ATTR_SET, + dev, (struct switchdev_attr *)attr, + &trans); if (err) { /* Prepare phase failed: abort the transaction. Any * resources reserved in the prepare phase are @@ -286,7 +238,9 @@ static int switchdev_port_attr_set_now(struct net_device *dev, */ trans.ph_prepare = false; - err = __switchdev_port_attr_set(dev, attr, &trans); + err = switchdev_port_attr_notify(SWITCHDEV_PORT_ATTR_SET, + dev, (struct switchdev_attr *)attr, + &trans); WARN(err, "%s: Commit of attribute (id=%d) failed.\n", dev->name, attr->id); switchdev_trans_items_warn_destroy(dev, &trans); @@ -338,6 +292,19 @@ int switchdev_port_attr_set(struct net_device *dev, } EXPORT_SYMBOL_GPL(switchdev_port_attr_set); +/** + * switchdev_port_attr_get - Get port attribute + * + * @dev: port device + * @attr: attribute to get + */ +int switchdev_port_attr_get(struct net_device *dev, struct switchdev_attr *attr) +{ + return switchdev_port_attr_notify(SWITCHDEV_PORT_ATTR_GET, dev, + attr, NULL); +} +EXPORT_SYMBOL_GPL(switchdev_port_attr_get); + static size_t switchdev_obj_size(const struct switchdev_obj *obj) { switch (obj->id) { From patchwork Sat Feb 16 04:55:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1043372 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="syy7jg9G"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 441dBv2bWyz9s4Z for ; Sat, 16 Feb 2019 15:56:39 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404918AbfBPE4e (ORCPT ); Fri, 15 Feb 2019 23:56:34 -0500 Received: from mail-ot1-f67.google.com ([209.85.210.67]:44656 "EHLO mail-ot1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404822AbfBPE4W (ORCPT ); Fri, 15 Feb 2019 23:56:22 -0500 Received: by mail-ot1-f67.google.com with SMTP id g1so20100102otj.11; Fri, 15 Feb 2019 20:56:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QW8JcZ/TMANYKU0mM+jgd96HI5ojM+/g32zST3rPVL4=; b=syy7jg9GM6fd4oTgxnZPA2NGAcRLF8DnLR2RS+mHqvy0ETielG5GbkSj3a7dDS01rg oQIQ9h0/qJSAghCRic1gIcSGjBLjQVEe5rOEPwYnNVYXWwOk5odDXIxffd2jwQJNIDl0 NS81UfJmQUaDzaJjeIiIMaLYbm+z47tHQuUIP6Q/BHtAiowcwV9B0/8L7gCrhA6JLJec Grcx6T0CaTboOsULHVy7L9rlghp0HQF/OVpdAbBUJqsObTNUjRo1sKkFpCH+HuXKZm64 If5lrl+wB8tF/kBd9TsjC+9W8oiL7qkRPxFnPDEXNcZ3XUrWXm4/lDYui0dMD4QSk3i4 +mdw== 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:mime-version:content-transfer-encoding; bh=QW8JcZ/TMANYKU0mM+jgd96HI5ojM+/g32zST3rPVL4=; b=tRo831mjHoOmyhHrIz4nDMEk6AMp4NTmuO4NXvQYbAFN8EyOv+wstBfm+o18E667eh afx2kCkzc4+8OdSB9ksLVQZKnLM0ana4OBNLdcdIUgeUGySewvjcbiAH3QoO4E3bVhlV tBqSf0r8DRSuZQme54sdMcvUi1baHV4YFF417gCPr1sDIcgdcv7IgEv7/V6tLEci7zyV Hb+f7eTHyPIuvZEZV8bMcGoVKSRiSqiOs+0WtK9Xy82peuYjkZ6R7SNRDhHTJFU8tNAk pt1Go5mxUcDEYMZsKy0HtxdwRx4IscXSH0IplAjnLrGUQI6XJUOfgFaEFaRwI+wBDGtG 5AuQ== X-Gm-Message-State: AHQUAub0NynHjCyAqMLrGGsDok92UO2tA6AOMmJKV0TrikXPQBADzI7c aO7IhhWoYI57O4bnb7Neb6mZOtpY X-Google-Smtp-Source: AHgI3IaWB7IpbYAgoWxEKYFlz8rIjy0angHNLZgCgkJ4YdzrR0P38zbVuf2eCQPRqI8zgrh1WlLzqQ== X-Received: by 2002:a9d:6c96:: with SMTP id c22mr5539554otr.38.1550292980320; Fri, 15 Feb 2019 20:56:20 -0800 (PST) Received: from localhost.localdomain (ip68-228-73-187.oc.oc.cox.net. [68.228.73.187]) by smtp.gmail.com with ESMTPSA id j88sm3209480otj.47.2019.02.15.20.56.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Feb 2019 20:56:19 -0800 (PST) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , idosch@mellanox.com, linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org, bridge@lists.linux-foundation.org, jiri@mellanox.com, andrew@lunn.ch, vivien.didelot@gmail.com Subject: [PATCH net-next v3 9/9] net: Remove switchdev_ops Date: Fri, 15 Feb 2019 20:55:56 -0800 Message-Id: <20190216045556.3514-10-f.fainelli@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190216045556.3514-1-f.fainelli@gmail.com> References: <20190216045556.3514-1-f.fainelli@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Now that we have converted all possible callers to using a switchdev notifier for attributes we do not have a need for implementing switchdev_ops anymore, and this can be removed from all drivers the net_device structure. Signed-off-by: Florian Fainelli --- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 12 ------------ drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 2 -- .../mellanox/mlxsw/spectrum_switchdev.c | 13 ------------- drivers/net/ethernet/mscc/ocelot.c | 5 ----- drivers/net/ethernet/rocker/rocker_main.c | 6 ------ drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 6 ------ include/linux/netdevice.h | 3 --- include/net/switchdev.h | 18 ------------------ net/dsa/slave.c | 6 ------ 9 files changed, 71 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c index 7c9745cecbbd..619965abab43 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c @@ -3220,7 +3220,6 @@ static int mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port, } mlxsw_sp_port->default_vlan = mlxsw_sp_port_vlan; - mlxsw_sp_port_switchdev_init(mlxsw_sp_port); mlxsw_sp->ports[local_port] = mlxsw_sp_port; err = register_netdev(dev); if (err) { @@ -3237,7 +3236,6 @@ static int mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port, err_register_netdev: mlxsw_sp->ports[local_port] = NULL; - mlxsw_sp_port_switchdev_fini(mlxsw_sp_port); mlxsw_sp_port_vlan_destroy(mlxsw_sp_port_vlan); err_port_vlan_create: err_port_pvid_set: @@ -3280,7 +3278,6 @@ static void mlxsw_sp_port_remove(struct mlxsw_sp *mlxsw_sp, u8 local_port) mlxsw_core_port_clear(mlxsw_sp->core, local_port, mlxsw_sp); unregister_netdev(mlxsw_sp_port->dev); /* This calls ndo_stop */ mlxsw_sp->ports[local_port] = NULL; - mlxsw_sp_port_switchdev_fini(mlxsw_sp_port); mlxsw_sp_port_vlan_flush(mlxsw_sp_port, true); mlxsw_sp_port_nve_fini(mlxsw_sp_port); mlxsw_sp_tc_qdisc_fini(mlxsw_sp_port); @@ -4001,12 +3998,6 @@ static int mlxsw_sp_init(struct mlxsw_core *mlxsw_core, goto err_span_init; } - err = mlxsw_sp_switchdev_init(mlxsw_sp); - if (err) { - dev_err(mlxsw_sp->bus_info->dev, "Failed to initialize switchdev\n"); - goto err_switchdev_init; - } - err = mlxsw_sp_counter_pool_init(mlxsw_sp); if (err) { dev_err(mlxsw_sp->bus_info->dev, "Failed to init counter pool\n"); @@ -4077,8 +4068,6 @@ static int mlxsw_sp_init(struct mlxsw_core *mlxsw_core, err_afa_init: mlxsw_sp_counter_pool_fini(mlxsw_sp); err_counter_pool_init: - mlxsw_sp_switchdev_fini(mlxsw_sp); -err_switchdev_init: mlxsw_sp_span_fini(mlxsw_sp); err_span_init: mlxsw_sp_lag_fini(mlxsw_sp); @@ -4141,7 +4130,6 @@ static void mlxsw_sp_fini(struct mlxsw_core *mlxsw_core) mlxsw_sp_nve_fini(mlxsw_sp); mlxsw_sp_afa_fini(mlxsw_sp); mlxsw_sp_counter_pool_fini(mlxsw_sp); - mlxsw_sp_switchdev_fini(mlxsw_sp); mlxsw_sp_span_fini(mlxsw_sp); mlxsw_sp_lag_fini(mlxsw_sp); mlxsw_sp_buffers_fini(mlxsw_sp); diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h index ceebc91f4f1d..82e3e6dc81a1 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h @@ -375,8 +375,6 @@ u32 mlxsw_sp_bytes_cells(const struct mlxsw_sp *mlxsw_sp, u32 bytes); /* spectrum_switchdev.c */ int mlxsw_sp_switchdev_init(struct mlxsw_sp *mlxsw_sp); void mlxsw_sp_switchdev_fini(struct mlxsw_sp *mlxsw_sp); -void mlxsw_sp_port_switchdev_init(struct mlxsw_sp_port *mlxsw_sp_port); -void mlxsw_sp_port_switchdev_fini(struct mlxsw_sp_port *mlxsw_sp_port); int mlxsw_sp_rif_fdb_op(struct mlxsw_sp *mlxsw_sp, const char *mac, u16 fid, bool adding); void diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c index c6d7bb70e8f2..fafd582c2fdc 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c @@ -1957,11 +1957,6 @@ static struct mlxsw_sp_port *mlxsw_sp_lag_rep_port(struct mlxsw_sp *mlxsw_sp, return NULL; } -static const struct switchdev_ops mlxsw_sp_port_switchdev_ops = { - .switchdev_port_attr_get = mlxsw_sp_port_attr_get, - .switchdev_port_attr_set = mlxsw_sp_port_attr_set, -}; - static int mlxsw_sp_bridge_8021q_port_join(struct mlxsw_sp_bridge_device *bridge_device, struct mlxsw_sp_bridge_port *bridge_port, @@ -3576,11 +3571,3 @@ void mlxsw_sp_switchdev_fini(struct mlxsw_sp *mlxsw_sp) kfree(mlxsw_sp->bridge); } -void mlxsw_sp_port_switchdev_init(struct mlxsw_sp_port *mlxsw_sp_port) -{ - mlxsw_sp_port->dev->switchdev_ops = &mlxsw_sp_port_switchdev_ops; -} - -void mlxsw_sp_port_switchdev_fini(struct mlxsw_sp_port *mlxsw_sp_port) -{ -} diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c index 850a49033a30..21c73a0355d4 100644 --- a/drivers/net/ethernet/mscc/ocelot.c +++ b/drivers/net/ethernet/mscc/ocelot.c @@ -1324,10 +1324,6 @@ static int ocelot_port_obj_del(struct net_device *dev, return ret; } -static const struct switchdev_ops ocelot_port_switchdev_ops = { - .switchdev_port_attr_set = ocelot_port_attr_set, -}; - static int ocelot_port_bridge_join(struct ocelot_port *ocelot_port, struct net_device *bridge) { @@ -1654,7 +1650,6 @@ int ocelot_probe_port(struct ocelot *ocelot, u8 port, dev->netdev_ops = &ocelot_port_netdev_ops; dev->ethtool_ops = &ocelot_ethtool_ops; - dev->switchdev_ops = &ocelot_port_switchdev_ops; dev->hw_features |= NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_RXFCS; dev->features |= NETIF_F_HW_VLAN_CTAG_FILTER; diff --git a/drivers/net/ethernet/rocker/rocker_main.c b/drivers/net/ethernet/rocker/rocker_main.c index 591008c8fa74..16f045b06c55 100644 --- a/drivers/net/ethernet/rocker/rocker_main.c +++ b/drivers/net/ethernet/rocker/rocker_main.c @@ -2147,11 +2147,6 @@ static int rocker_port_obj_del(struct net_device *dev, return err; } -static const struct switchdev_ops rocker_port_switchdev_ops = { - .switchdev_port_attr_get = rocker_port_attr_get, - .switchdev_port_attr_set = rocker_port_attr_set, -}; - struct rocker_fib_event_work { struct work_struct work; union { @@ -2605,7 +2600,6 @@ static int rocker_probe_port(struct rocker *rocker, unsigned int port_number) rocker_port_dev_addr_init(rocker_port); dev->netdev_ops = &rocker_port_netdev_ops; dev->ethtool_ops = &rocker_port_ethtool_ops; - dev->switchdev_ops = &rocker_port_switchdev_ops; netif_tx_napi_add(dev, &rocker_port->napi_tx, rocker_port_poll_tx, NAPI_POLL_WEIGHT); netif_napi_add(dev, &rocker_port->napi_rx, rocker_port_poll_rx, diff --git a/drivers/staging/fsl-dpaa2/ethsw/ethsw.c b/drivers/staging/fsl-dpaa2/ethsw/ethsw.c index bc9e7de07200..44831990239c 100644 --- a/drivers/staging/fsl-dpaa2/ethsw/ethsw.c +++ b/drivers/staging/fsl-dpaa2/ethsw/ethsw.c @@ -932,11 +932,6 @@ static int swdev_port_obj_del(struct net_device *netdev, return err; } -static const struct switchdev_ops ethsw_port_switchdev_ops = { - .switchdev_port_attr_get = swdev_port_attr_get, - .switchdev_port_attr_set = swdev_port_attr_set, -}; - /* For the moment, only flood setting needs to be updated */ static int port_bridge_join(struct net_device *netdev, struct net_device *upper_dev) @@ -1466,7 +1461,6 @@ static int ethsw_probe_port(struct ethsw_core *ethsw, u16 port_idx) SET_NETDEV_DEV(port_netdev, dev); port_netdev->netdev_ops = ðsw_port_ops; port_netdev->ethtool_ops = ðsw_port_ethtool_ops; - port_netdev->switchdev_ops = ðsw_port_switchdev_ops; /* Set MTU limits */ port_netdev->min_mtu = ETH_MIN_MTU; diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 1fb733f38a47..a747456b9d23 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -1836,9 +1836,6 @@ struct net_device { #endif const struct net_device_ops *netdev_ops; const struct ethtool_ops *ethtool_ops; -#ifdef CONFIG_NET_SWITCHDEV - const struct switchdev_ops *switchdev_ops; -#endif #ifdef CONFIG_NET_L3_MASTER_DEV const struct l3mdev_ops *l3mdev_ops; #endif diff --git a/include/net/switchdev.h b/include/net/switchdev.h index b8becabbef38..e9aa920aba57 100644 --- a/include/net/switchdev.h +++ b/include/net/switchdev.h @@ -113,21 +113,6 @@ void *switchdev_trans_item_dequeue(struct switchdev_trans *trans); typedef int switchdev_obj_dump_cb_t(struct switchdev_obj *obj); -/** - * struct switchdev_ops - switchdev operations - * - * @switchdev_port_attr_get: Get a port attribute (see switchdev_attr). - * - * @switchdev_port_attr_set: Set a port attribute (see switchdev_attr). - */ -struct switchdev_ops { - int (*switchdev_port_attr_get)(struct net_device *dev, - struct switchdev_attr *attr); - int (*switchdev_port_attr_set)(struct net_device *dev, - const struct switchdev_attr *attr, - struct switchdev_trans *trans); -}; - enum switchdev_notifier_type { SWITCHDEV_FDB_ADD_TO_BRIDGE = 1, SWITCHDEV_FDB_DEL_TO_BRIDGE, @@ -229,7 +214,6 @@ int switchdev_handle_port_obj_del(struct net_device *dev, int (*del_cb)(struct net_device *dev, const struct switchdev_obj *obj)); -#define SWITCHDEV_SET_OPS(netdev, ops) ((netdev)->switchdev_ops = (ops)) #else static inline void switchdev_deferred_process(void) @@ -322,8 +306,6 @@ switchdev_handle_port_obj_del(struct net_device *dev, return 0; } -#define SWITCHDEV_SET_OPS(netdev, ops) do {} while (0) - #endif #endif /* _LINUX_SWITCHDEV_H_ */ diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 2a14a38f5f93..236b6a72dba3 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -1057,11 +1057,6 @@ static const struct net_device_ops dsa_slave_netdev_ops = { .ndo_get_port_parent_id = dsa_slave_get_port_parent_id, }; -static const struct switchdev_ops dsa_slave_switchdev_ops = { - .switchdev_port_attr_get = dsa_slave_port_attr_get, - .switchdev_port_attr_set = dsa_slave_port_attr_set, -}; - static struct device_type dsa_type = { .name = "dsa", }; @@ -1321,7 +1316,6 @@ int dsa_slave_create(struct dsa_port *port) eth_hw_addr_inherit(slave_dev, master); slave_dev->priv_flags |= IFF_NO_QUEUE; slave_dev->netdev_ops = &dsa_slave_netdev_ops; - slave_dev->switchdev_ops = &dsa_slave_switchdev_ops; slave_dev->min_mtu = 0; slave_dev->max_mtu = ETH_MAX_MTU; SET_NETDEV_DEVTYPE(slave_dev, &dsa_type);