From:   Volodymyr Mytnyk <volodymyr.mytnyk@plvision.eu>
To:     netdev@vger.kernel.org
Cc:     mickeyr@marvell.com, serhiy.pshyk@plvision.eu,
        taras.chornyi@plvision.eu, Volodymyr Mytnyk <vmytnyk@marvell.com>,
        Taras Chornyi <tchornyi@marvell.com>,
        "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Vladimir Oltean <vladimir.oltean@nxp.com>,
        Ioana Ciornei <ioana.ciornei@nxp.com>,
        linux-kernel@vger.kernel.org
Subject: [PATCH net] net: marvell: prestera: fix brige port operation
Date:   Wed, 17 Nov 2021 11:43:51 +0200
Message-Id: <1637142232-19344-1-git-send-email-volodymyr.mytnyk@plvision.eu>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?cN5Mjys0x3yGhUnna2Nl1pcw3/5kHGtaWOR2ZAftzjnVA7KuxRpCgEFslDEH?=
 =?us-ascii?Q?kz9cG2vIcUGiWyYR7YZ1JomC+BOa1qVKyqDt1E0kFi8bVAcZeXHriRVTku9h?=
 =?us-ascii?Q?7MAmy6q/Dwp0LS1NsYJ1Ppvt70jgeBvgi/VSSCaC/Q2iNZl2h5My5DXzyhGa?=
 =?us-ascii?Q?/e8Osavn11uf0POoKGPJzPc/l5HlhcAeutMz2FLdxb30cS58jwW71TBjkDnR?=
 =?us-ascii?Q?jynwZz6ljg13mw11zxpWaAbsGufiBsXssckk6cBNqk1cQ5wfeetyXQ9/dTSC?=
 =?us-ascii?Q?IacLiLvWjdDxSZhmHC1zbWbI/2BMI1Lp77ft1hXpkJp78TcKRoRyXeYq2S5M?=
 =?us-ascii?Q?6b3YBE1Xh8IYkTrP0A9zlYoJhQrvLA8vai4kBpeqCQ9gg8vJq6y3G2bTQEJQ?=
 =?us-ascii?Q?4ATc7oECsFKt0+hRH25jY8Le4c2X5839dXqCliUocP6LbsAIfF9r+701BMzU?=
 =?us-ascii?Q?a9DUC6OkF5h61QM2rbpNte1z481M+QP5dYMe2kF6wk/KsZE2Wy5B5uUJ2Fd7?=
 =?us-ascii?Q?oLaSL+IuXYr2TRJwyz67rGehx72ZACtxSGdYX9szLkNh+y8SyaxFA/F/xgdK?=
 =?us-ascii?Q?t6wTcOe+DnhbbYrDo44FTEr351utaS6B6QKHUcfDrLBQq6dISYoNj/fm6AP1?=
 =?us-ascii?Q?n0hp96vLrrA1IAWP18mkEY+SxKz7IDjCp90J9E4CzSH11mv3SDoikgFV1f0C?=
 =?us-ascii?Q?HMnIrQBsioY8RnTdC2VZxWLa/N6pT+hmkdnS7WsxgbH2TX2049djP4N9g6tn?=
 =?us-ascii?Q?dVajPv55ipErMSqkiZjIUhj/KR6e345UPp95ayqG4cMET2M12g47zWV9HMFK?=
 =?us-ascii?Q?6llByzblMiQ9Sc1QkW5ySEDM98raeCvIst/KBVntut1uHrOwdXpr8xjoZFXT?=
 =?us-ascii?Q?6EmS0cbhsyf4d+LDJym381ekR9YVGbj4WCoJJw+6zI7wwJlf4k+waqmzUn6f?=
 =?us-ascii?Q?GJzaXRJMC/NwazhoJ4uAWoN3gwpctv3uBk+kwKC1rrM/3GN+DwqEbMhympno?=
 =?us-ascii?Q?xcJhMIo2ZnBf5AeChUBo2tZFVCE+dUYLg0bZItJHcs084xA04qvnrsh8sFIs?=
 =?us-ascii?Q?HotVDFO9Sd4h6/0lzy3pdJX3F+eaJPhFxf4HMpe+2oaer+dwnId2lfPHO9yo?=
 =?us-ascii?Q?7pyeUTGYvutS+4UQVAP8WXLRq1h32PzYwQj6k7sP9dSgbwHOTDOACGe4TMOJ?=
 =?us-ascii?Q?xMV/wjYJGTPlItKFD5Itm/PdU4d+WUcXh6XxKbj0UXMqGYOumxQ/D8IpoiTj?=
 =?us-ascii?Q?2Us713IMt0kEmEDH9PBE4Ll4sJYRQDhpp44eDru5BRHyx8VsjGblzuPMaMol?=
 =?us-ascii?Q?ad2Zxx/I+i1hrg3n0O6vIEwyOtlB1eriLUW/hSuGifgN8ggWuEVjZMSs27t0?=
 =?us-ascii?Q?bjOzDhnNUgZU4gHv657jLgp6yBrntoqPOKOinWDbxz/UStOJJmOb4h6niI+1?=
 =?us-ascii?Q?lQvjG7xB747oHbWKDHgDHg0WlBHe2J7K3EEXPy+JUMVDDQnDl34KUnTXHnT8?=
 =?us-ascii?Q?YONQtfoTdEtVcnhuhha8r93QXyvptjIXyVKrmMtEOPObxxKV7s/aZIsmaBep?=
 =?us-ascii?Q?lawcMUjA8KPl9ieGaBQJFBOiTPUgH5VeSo4CW3uxTZMgXJc2GPLBqt6+GCtN?=
 =?us-ascii?Q?uEVsuIuFMZlzDsWp0iY0QDXjQ42MdqentGTgGu35Vok3aMi4J6tBtvXLwk7w?=
 =?us-ascii?Q?q57kpzxTpq+wQf+36+eAjNqzSHM=3D?=
X-OriginatorOrg: plvision.eu
X-MS-Exchange-CrossTenant-Network-Message-Id: fa9990a4-afe7-4430-5ef2-08d9a9aeece9
X-MS-Exchange-CrossTenant-AuthSource: VI1P190MB0734.EURP190.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Nov 2021 09:45:01.5718
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 03707b74-30f3-46b6-a0e0-ff0a7438c9c4
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 1wGIZjAqzc65+TYO96bNoFJoVrsE1Ko+F8h9nAyGmUMMinqMkLKTd4AICXoWrnyZAMj9Sum8bTyVtmlDG9cgy0KMN1lbWq56LlrcpYJV4SE=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1P190MB0989
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Volodymyr Mytnyk <vmytnyk@marvell.com>

- handle SWITCHDEV_BRPORT_[UN]OFFLOADED events for
  switchdev_bridge_port_offload to avoid fail return.
- fix error path handling in prestera_bridge_port_join to
  fix double free issue (see below).

Trace:
  Internal error: Oops: 96000044 [#1] SMP
  Modules linked in: prestera_pci prestera uio_pdrv_genirq
  CPU: 1 PID: 881 Comm: ip Not tainted 5.15.0 #1
  pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--)
  pc : prestera_bridge_destroy+0x2c/0xb0 [prestera]
  lr : prestera_bridge_port_join+0x2cc/0x350 [prestera]
  sp : ffff800011a1b0f0
  ...
  x2 : ffff000109ca6c80 x1 : dead000000000100 x0 : dead000000000122
   Call trace:
  prestera_bridge_destroy+0x2c/0xb0 [prestera]
  prestera_bridge_port_join+0x2cc/0x350 [prestera]
  prestera_netdev_port_event.constprop.0+0x3c4/0x450 [prestera]
  prestera_netdev_event_handler+0xf4/0x110 [prestera]
  raw_notifier_call_chain+0x54/0x80
  call_netdevice_notifiers_info+0x54/0xa0
  __netdev_upper_dev_link+0x19c/0x380

Fixes: 2f5dc00f7a3e ("net: bridge: switchdev: let drivers inform which bridge ports are offloaded")
Signed-off-by: Volodymyr Mytnyk <vmytnyk@marvell.com>
---
 drivers/net/ethernet/marvell/prestera/prestera_switchdev.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/marvell/prestera/prestera_switchdev.c b/drivers/net/ethernet/marvell/prestera/prestera_switchdev.c
index 3ce6ccd0f539..f1bc6699ec8b 100644
--- a/drivers/net/ethernet/marvell/prestera/prestera_switchdev.c
+++ b/drivers/net/ethernet/marvell/prestera/prestera_switchdev.c
@@ -497,8 +497,8 @@ int prestera_bridge_port_join(struct net_device *br_dev,
 
 	br_port = prestera_bridge_port_add(bridge, port->dev);
 	if (IS_ERR(br_port)) {
-		err = PTR_ERR(br_port);
-		goto err_brport_create;
+		prestera_bridge_put(bridge);
+		return PTR_ERR(br_port);
 	}
 
 	err = switchdev_bridge_port_offload(br_port->dev, port->dev, NULL,
@@ -519,8 +519,6 @@ int prestera_bridge_port_join(struct net_device *br_dev,
 	switchdev_bridge_port_unoffload(br_port->dev, NULL, NULL, NULL);
 err_switchdev_offload:
 	prestera_bridge_port_put(br_port);
-err_brport_create:
-	prestera_bridge_put(bridge);
 	return err;
 }
 
@@ -1123,6 +1121,9 @@ static int prestera_switchdev_blk_event(struct notifier_block *unused,
 						     prestera_netdev_check,
 						     prestera_port_obj_attr_set);
 		break;
+	case SWITCHDEV_BRPORT_OFFLOADED:
+	case SWITCHDEV_BRPORT_UNOFFLOADED:
+		return NOTIFY_DONE;
 	default:
 		err = -EOPNOTSUPP;
 	}
-- 
2.7.4