Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/809156/?format=api
{ "id": 809156, "url": "http://patchwork.ozlabs.org/api/patches/809156/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/patch/20170902214929.2890-11-jiri@resnulli.us/", "project": { "id": 7, "url": "http://patchwork.ozlabs.org/api/projects/7/?format=api", "name": "Linux network development", "link_name": "netdev", "list_id": "netdev.vger.kernel.org", "list_email": "netdev@vger.kernel.org", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20170902214929.2890-11-jiri@resnulli.us>", "list_archive_url": null, "date": "2017-09-02T21:49:18", "name": "[net-next,v2,10/21] mlxsw: spectrum_router: Support FID-less RIFs", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "3321bf6605199a148127b10ee12c8c0a7fdb63bb", "submitter": { "id": 15321, "url": "http://patchwork.ozlabs.org/api/people/15321/?format=api", "name": "Jiri Pirko", "email": "jiri@resnulli.us" }, "delegate": { "id": 34, "url": "http://patchwork.ozlabs.org/api/users/34/?format=api", "username": "davem", "first_name": "David", "last_name": "Miller", "email": "davem@davemloft.net" }, "mbox": "http://patchwork.ozlabs.org/project/netdev/patch/20170902214929.2890-11-jiri@resnulli.us/mbox/", "series": [ { "id": 1180, "url": "http://patchwork.ozlabs.org/api/series/1180/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/list/?series=1180", "date": "2017-09-02T21:49:08", "name": "mlxsw: Offloading GRE tunnels", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/1180/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/809156/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/809156/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<netdev-owner@vger.kernel.org>", "X-Original-To": "patchwork-incoming@ozlabs.org", "Delivered-To": "patchwork-incoming@ozlabs.org", "Authentication-Results": [ "ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=resnulli-us.20150623.gappssmtp.com\n\theader.i=@resnulli-us.20150623.gappssmtp.com\n\theader.b=\"OYoUZV8I\"; dkim-atps=neutral" ], "Received": [ "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xl8sh01svz9s8J\n\tfor <patchwork-incoming@ozlabs.org>;\n\tSun, 3 Sep 2017 07:50:00 +1000 (AEST)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752856AbdIBVt5 (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tSat, 2 Sep 2017 17:49:57 -0400", "from mail-wm0-f67.google.com ([74.125.82.67]:37224 \"EHLO\n\tmail-wm0-f67.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1752827AbdIBVtt (ORCPT\n\t<rfc822;netdev@vger.kernel.org>); Sat, 2 Sep 2017 17:49:49 -0400", "by mail-wm0-f67.google.com with SMTP id x189so3152533wmg.4\n\tfor <netdev@vger.kernel.org>; Sat, 02 Sep 2017 14:49:48 -0700 (PDT)", "from localhost (jirka.pirko.cz. [84.16.102.26])\n\tby smtp.gmail.com with ESMTPSA id\n\t76sm3814385wmf.0.2017.09.02.14.49.46\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tSat, 02 Sep 2017 14:49:46 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=resnulli-us.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=GVQJBnqAsF/y3j6+YOALDN2q2j/dI3pNfET28IATGzQ=;\n\tb=OYoUZV8I7VDG2oKuuJ/Ejce6dqfElNZSkPCfSl5OhESgWsJQ30nzFxQex2Ol9Lzbxx\n\toGS/mLORi9f5WYARifb4JYuY0V/UFNaWAQ8XdFIwXnRxNIArgYAPMz46iGRJY0yFEqCq\n\tiSNaVRajQPiwvcG4isPyNsZP4tw6UfX2cXC7U2ghb85RSQuYrN0gEybc175XL5N02ZRP\n\t6sPRQnb97YpxrtsvVwPuv2XzcFiMTNhZf7hhGSFjS8GpehEYoETHjpJkE0HfjQUVYMIG\n\tCiJUypXSNES4W8c//02z9HOWVzECCo9rWpoKnlSa4aaamxTqKTx41ArSfWwDDBk/575x\n\tmMJA==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=GVQJBnqAsF/y3j6+YOALDN2q2j/dI3pNfET28IATGzQ=;\n\tb=HCUfT0AWBKQdXA9jba8ZrlztoztJykBpsT0cXVCGHHkauTZSgp7qSmhkxQr7oEvbkk\n\tLOKwZa8cUFS5TnxAbwuwTkmy7ryc/B5aQ/byJTQGgrX6Gdip7HK3wr66oZEP9Z5v70tU\n\tIMyenly8hE0AMn32R+iVSOBXlX3yEwNk2Z7Wf8wrk50eEw+H24g1fnmKwNbSS3VxDIBJ\n\tpqNCMdBcxm3fm6f6CksTw2waeTvCUCK5mtfaMUWJhv+AlkqxcBPda2aUQSw2kSXvZi2J\n\t0oCEuLn+DejX9k/iy9mifAvOvmWR5MHqXnHHRjiFJtpJPz9GNbZLb70EQssM9ZWD19xC\n\tBjYg==", "X-Gm-Message-State": "AHPjjUhzlLpMuD3oAwAvV1TCehcTtTGq6kldXgBauiRqJTF+7AXKw3gi\n\ttPbC7UHnMfpJM7zIdOg=", "X-Google-Smtp-Source": "ADKCNb5Nne4XARSVCaOasi27PoTRzDxCUXhrqzj1tqBuPrvRm9maPLNRtwGa9g8qhU86pxGqSRFUlQ==", "X-Received": "by 10.28.35.22 with SMTP id j22mr1242241wmj.68.1504388987260;\n\tSat, 02 Sep 2017 14:49:47 -0700 (PDT)", "From": "Jiri Pirko <jiri@resnulli.us>", "To": "netdev@vger.kernel.org", "Cc": "davem@davemloft.net, petrm@mellanox.com, idosch@mellanox.com,\n\tmlxsw@mellanox.com", "Subject": "[patch net-next v2 10/21] mlxsw: spectrum_router: Support FID-less\n\tRIFs", "Date": "Sat, 2 Sep 2017 23:49:18 +0200", "Message-Id": "<20170902214929.2890-11-jiri@resnulli.us>", "X-Mailer": "git-send-email 2.9.3", "In-Reply-To": "<20170902214929.2890-1-jiri@resnulli.us>", "References": "<20170902214929.2890-1-jiri@resnulli.us>", "Sender": "netdev-owner@vger.kernel.org", "Precedence": "bulk", "List-ID": "<netdev.vger.kernel.org>", "X-Mailing-List": "netdev@vger.kernel.org" }, "content": "From: Petr Machata <petrm@mellanox.com>\n\nLoopback RIFs, which will be introduced in a follow-up patch, differ\nfrom other RIFs in that they do not have a FID associated with them.\n\nTo support this, demote FID allocation from mlxsw_sp_rif_create to\nconfigure op of the existing RIF types, and likewise the FID release\nfrom mlxsw_sp_rif_destroy to deconfigure op.\n\nSigned-off-by: Petr Machata <petrm@mellanox.com>\nReviewed-by: Ido Schimmel <idosch@mellanox.com>\nSigned-off-by: Jiri Pirko <jiri@mellanox.com>\n---\n .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 85 ++++++++++++++++------\n 1 file changed, 63 insertions(+), 22 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c\nindex f85d249..38477c5 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c\n+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c\n@@ -4444,9 +4444,9 @@ mlxsw_sp_rif_create(struct mlxsw_sp *mlxsw_sp,\n {\n \tu32 tb_id = l3mdev_fib_table(params->dev);\n \tconst struct mlxsw_sp_rif_ops *ops;\n+\tstruct mlxsw_sp_fid *fid = NULL;\n \tenum mlxsw_sp_rif_type type;\n \tstruct mlxsw_sp_rif *rif;\n-\tstruct mlxsw_sp_fid *fid;\n \tstruct mlxsw_sp_vr *vr;\n \tu16 rif_index;\n \tint err;\n@@ -4470,12 +4470,14 @@ mlxsw_sp_rif_create(struct mlxsw_sp *mlxsw_sp,\n \trif->mlxsw_sp = mlxsw_sp;\n \trif->ops = ops;\n \n-\tfid = ops->fid_get(rif);\n-\tif (IS_ERR(fid)) {\n-\t\terr = PTR_ERR(fid);\n-\t\tgoto err_fid_get;\n+\tif (ops->fid_get) {\n+\t\tfid = ops->fid_get(rif);\n+\t\tif (IS_ERR(fid)) {\n+\t\t\terr = PTR_ERR(fid);\n+\t\t\tgoto err_fid_get;\n+\t\t}\n+\t\trif->fid = fid;\n \t}\n-\trif->fid = fid;\n \n \tif (ops->setup)\n \t\tops->setup(rif, params);\n@@ -4484,22 +4486,15 @@ mlxsw_sp_rif_create(struct mlxsw_sp *mlxsw_sp,\n \tif (err)\n \t\tgoto err_configure;\n \n-\terr = mlxsw_sp_rif_fdb_op(mlxsw_sp, params->dev->dev_addr,\n-\t\t\t\t mlxsw_sp_fid_index(fid), true);\n-\tif (err)\n-\t\tgoto err_rif_fdb_op;\n-\n \tmlxsw_sp_rif_counters_alloc(rif);\n-\tmlxsw_sp_fid_rif_set(fid, rif);\n \tmlxsw_sp->router->rifs[rif_index] = rif;\n \tvr->rif_count++;\n \n \treturn rif;\n \n-err_rif_fdb_op:\n-\tops->deconfigure(rif);\n err_configure:\n-\tmlxsw_sp_fid_put(fid);\n+\tif (fid)\n+\t\tmlxsw_sp_fid_put(fid);\n err_fid_get:\n \tkfree(rif);\n err_rif_alloc:\n@@ -4520,12 +4515,11 @@ void mlxsw_sp_rif_destroy(struct mlxsw_sp_rif *rif)\n \n \tvr->rif_count--;\n \tmlxsw_sp->router->rifs[rif->rif_index] = NULL;\n-\tmlxsw_sp_fid_rif_set(fid, NULL);\n \tmlxsw_sp_rif_counters_free(rif);\n-\tmlxsw_sp_rif_fdb_op(mlxsw_sp, rif->dev->dev_addr,\n-\t\t\t mlxsw_sp_fid_index(fid), false);\n \tops->deconfigure(rif);\n-\tmlxsw_sp_fid_put(fid);\n+\tif (fid)\n+\t\t/* Loopback RIFs are not associated with a FID. */\n+\t\tmlxsw_sp_fid_put(fid);\n \tkfree(rif);\n \tmlxsw_sp_vr_put(vr);\n }\n@@ -4965,11 +4959,32 @@ static int mlxsw_sp_rif_subport_op(struct mlxsw_sp_rif *rif, bool enable)\n \n static int mlxsw_sp_rif_subport_configure(struct mlxsw_sp_rif *rif)\n {\n-\treturn mlxsw_sp_rif_subport_op(rif, true);\n+\tint err;\n+\n+\terr = mlxsw_sp_rif_subport_op(rif, true);\n+\tif (err)\n+\t\treturn err;\n+\n+\terr = mlxsw_sp_rif_fdb_op(rif->mlxsw_sp, rif->dev->dev_addr,\n+\t\t\t\t mlxsw_sp_fid_index(rif->fid), true);\n+\tif (err)\n+\t\tgoto err_rif_fdb_op;\n+\n+\tmlxsw_sp_fid_rif_set(rif->fid, rif);\n+\treturn 0;\n+\n+err_rif_fdb_op:\n+\tmlxsw_sp_rif_subport_op(rif, false);\n+\treturn err;\n }\n \n static void mlxsw_sp_rif_subport_deconfigure(struct mlxsw_sp_rif *rif)\n {\n+\tstruct mlxsw_sp_fid *fid = rif->fid;\n+\n+\tmlxsw_sp_fid_rif_set(fid, NULL);\n+\tmlxsw_sp_rif_fdb_op(rif->mlxsw_sp, rif->dev->dev_addr,\n+\t\t\t mlxsw_sp_fid_index(fid), false);\n \tmlxsw_sp_rif_subport_op(rif, false);\n }\n \n@@ -5028,8 +5043,17 @@ static int mlxsw_sp_rif_vlan_configure(struct mlxsw_sp_rif *rif)\n \tif (err)\n \t\tgoto err_fid_bc_flood_set;\n \n+\terr = mlxsw_sp_rif_fdb_op(rif->mlxsw_sp, rif->dev->dev_addr,\n+\t\t\t\t mlxsw_sp_fid_index(rif->fid), true);\n+\tif (err)\n+\t\tgoto err_rif_fdb_op;\n+\n+\tmlxsw_sp_fid_rif_set(rif->fid, rif);\n \treturn 0;\n \n+err_rif_fdb_op:\n+\tmlxsw_sp_fid_flood_set(rif->fid, MLXSW_SP_FLOOD_TYPE_BC,\n+\t\t\t mlxsw_sp_router_port(mlxsw_sp), false);\n err_fid_bc_flood_set:\n \tmlxsw_sp_fid_flood_set(rif->fid, MLXSW_SP_FLOOD_TYPE_MC,\n \t\t\t mlxsw_sp_router_port(mlxsw_sp), false);\n@@ -5040,9 +5064,13 @@ static int mlxsw_sp_rif_vlan_configure(struct mlxsw_sp_rif *rif)\n \n static void mlxsw_sp_rif_vlan_deconfigure(struct mlxsw_sp_rif *rif)\n {\n-\tstruct mlxsw_sp *mlxsw_sp = rif->mlxsw_sp;\n \tu16 vid = mlxsw_sp_fid_8021q_vid(rif->fid);\n+\tstruct mlxsw_sp *mlxsw_sp = rif->mlxsw_sp;\n+\tstruct mlxsw_sp_fid *fid = rif->fid;\n \n+\tmlxsw_sp_fid_rif_set(fid, NULL);\n+\tmlxsw_sp_rif_fdb_op(rif->mlxsw_sp, rif->dev->dev_addr,\n+\t\t\t mlxsw_sp_fid_index(fid), false);\n \tmlxsw_sp_fid_flood_set(rif->fid, MLXSW_SP_FLOOD_TYPE_BC,\n \t\t\t mlxsw_sp_router_port(mlxsw_sp), false);\n \tmlxsw_sp_fid_flood_set(rif->fid, MLXSW_SP_FLOOD_TYPE_MC,\n@@ -5087,8 +5115,17 @@ static int mlxsw_sp_rif_fid_configure(struct mlxsw_sp_rif *rif)\n \tif (err)\n \t\tgoto err_fid_bc_flood_set;\n \n+\terr = mlxsw_sp_rif_fdb_op(rif->mlxsw_sp, rif->dev->dev_addr,\n+\t\t\t\t mlxsw_sp_fid_index(rif->fid), true);\n+\tif (err)\n+\t\tgoto err_rif_fdb_op;\n+\n+\tmlxsw_sp_fid_rif_set(rif->fid, rif);\n \treturn 0;\n \n+err_rif_fdb_op:\n+\tmlxsw_sp_fid_flood_set(rif->fid, MLXSW_SP_FLOOD_TYPE_BC,\n+\t\t\t mlxsw_sp_router_port(mlxsw_sp), false);\n err_fid_bc_flood_set:\n \tmlxsw_sp_fid_flood_set(rif->fid, MLXSW_SP_FLOOD_TYPE_MC,\n \t\t\t mlxsw_sp_router_port(mlxsw_sp), false);\n@@ -5099,9 +5136,13 @@ static int mlxsw_sp_rif_fid_configure(struct mlxsw_sp_rif *rif)\n \n static void mlxsw_sp_rif_fid_deconfigure(struct mlxsw_sp_rif *rif)\n {\n-\tstruct mlxsw_sp *mlxsw_sp = rif->mlxsw_sp;\n \tu16 fid_index = mlxsw_sp_fid_index(rif->fid);\n+\tstruct mlxsw_sp *mlxsw_sp = rif->mlxsw_sp;\n+\tstruct mlxsw_sp_fid *fid = rif->fid;\n \n+\tmlxsw_sp_fid_rif_set(fid, NULL);\n+\tmlxsw_sp_rif_fdb_op(rif->mlxsw_sp, rif->dev->dev_addr,\n+\t\t\t mlxsw_sp_fid_index(fid), false);\n \tmlxsw_sp_fid_flood_set(rif->fid, MLXSW_SP_FLOOD_TYPE_BC,\n \t\t\t mlxsw_sp_router_port(mlxsw_sp), false);\n \tmlxsw_sp_fid_flood_set(rif->fid, MLXSW_SP_FLOOD_TYPE_MC,\n", "prefixes": [ "net-next", "v2", "10/21" ] }