{"id":1296574,"url":"http://patchwork.ozlabs.org/api/patches/1296574/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20200523004049.34832-10-saeedm@mellanox.com/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/projects/7/?format=json","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":"<20200523004049.34832-10-saeedm@mellanox.com>","list_archive_url":null,"date":"2020-05-23T00:40:45","name":"[net,09/13] net/mlx5: Don't maintain a case of del_sw_func being null","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"4c961abbc244a8254fbb2a1082fc869476c9bf41","submitter":{"id":65299,"url":"http://patchwork.ozlabs.org/api/people/65299/?format=json","name":"Saeed Mahameed","email":"saeedm@mellanox.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20200523004049.34832-10-saeedm@mellanox.com/mbox/","series":[{"id":178808,"url":"http://patchwork.ozlabs.org/api/series/178808/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=178808","date":"2020-05-23T00:40:36","name":"[net,01/13] net/mlx5: Add command entry handling completion","version":1,"mbox":"http://patchwork.ozlabs.org/series/178808/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1296574/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1296574/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming-netdev@ozlabs.org","Delivered-To":"patchwork-incoming-netdev@ozlabs.org","Authentication-Results":["ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=23.128.96.18; helo=vger.kernel.org;\n envelope-from=netdev-owner@vger.kernel.org; receiver=)","ozlabs.org;\n dmarc=pass (p=none dis=none) header.from=mellanox.com","ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.a=rsa-sha256\n header.s=selector1 header.b=NOVou8dq;\n\tdkim-atps=neutral","davemloft.net; dkim=none (message not signed)\n header.d=none;davemloft.net; dmarc=none action=none header.from=mellanox.com;"],"Received":["from vger.kernel.org (vger.kernel.org [23.128.96.18])\n\tby ozlabs.org (Postfix) with ESMTP id 49TPgY2KL7z9sRY\n\tfor ;\n Sat, 23 May 2020 10:41:45 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n id S2387508AbgEWAlo (ORCPT\n );\n Fri, 22 May 2020 20:41:44 -0400","from mail-eopbgr40071.outbound.protection.outlook.com\n ([40.107.4.71]:51206\n \"EHLO EUR03-DB5-obe.outbound.protection.outlook.com\"\n rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP\n id S2387497AbgEWAln (ORCPT );\n Fri, 22 May 2020 20:41:43 -0400","from VI1PR05MB5102.eurprd05.prod.outlook.com (2603:10a6:803:5e::23)\n by VI1PR05MB5391.eurprd05.prod.outlook.com (2603:10a6:803:95::25) with\n Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3021.24; Sat, 23 May\n 2020 00:41:30 +0000","from VI1PR05MB5102.eurprd05.prod.outlook.com\n ([fe80::2405:4594:97a:13c]) by VI1PR05MB5102.eurprd05.prod.outlook.com\n ([fe80::2405:4594:97a:13c%2]) with mapi id 15.20.3021.026; Sat, 23 May 2020\n 00:41:30 +0000","from smtp.office365.com (73.15.39.150) by\n BYAPR08CA0042.namprd08.prod.outlook.com (2603:10b6:a03:117::19) with\n Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3021.23 via Frontend\n Transport; Sat, 23 May 2020 00:41:28 +0000"],"ARC-Seal":"i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=ju/afazYbCrHs7O6kMN7H3qWx7h6gbQRd3uhspvAQ+b7E+r4py/gnjY1BTgsB/TeISNKyivn4jqQgSgPyX9Nv63Socdywn/klgbPC8HNCINJe5M2IVwLqlqJyPyDiwO9Ry5zgfRHIXfQC72FjFrk2bK0tvrclAZF2w0vQWv+V6DNCGak0Qp53ok4USuYfsShNMENitWsladuO4kr/V5rwx5hbSBqhsD8FOqVDfNI8Etx3rcRuJjJ+Bzj0ToCbFQQWd12q0LbATuZ6DhPyjIuRKPxhl18XdgCu06gLI1gg8cP3IYOXDVNpkiO1A7kxDUPueyVOrHnVf8mnt/b++A1fQ==","ARC-Message-Signature":"i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector9901;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=Tisdp2kKEjcPdwndjVqNvIo7NnR7vIS7+SxhQ0rSZT0=;\n b=nQlpVy5FkHiKnpY7JoCKZd2XvVLFCoxuRYktXYwfUT1QWNhS25UYOYUQ6bFEhw4yhhCpJV1Wi0OZH50n9jP9yrvlko0bc6qCB93BiR46nd6pMo0mlFNOzTpEJS43ECNNef5nLMgSoFrlfcEn5VM+DxDtAuJve7gkzuapxvprg3cJYXaTYinGW+/5yRDTi9XG2X0XAbTTXcrYs94YdzM3SK+tD2DWzLqKXzLQBxb9NFuSofWx7ypd33qzlwr7QHBbMpntEza/x8soBv9E4+CEH0pgZ9UGEJhS0yaPJ4EMMJHHaAcYCZbHAhnTl/djuxEszGdqnvIPDtRdiHG+D5KPJA==","ARC-Authentication-Results":"i=1; mx.microsoft.com 1; spf=pass\n smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com;\n dkim=pass header.d=mellanox.com; arc=none","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com;\n s=selector1;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=Tisdp2kKEjcPdwndjVqNvIo7NnR7vIS7+SxhQ0rSZT0=;\n b=NOVou8dqkFFMzPcLyTbkN5729hxI+OpiSNMZCZhqKbujTWycNZvATLxux5CyuZp0ZXFM7yiNMQGWZbWf5Inl56a8VuXf+WYeFt4su3RSakH4D7xYBB2csdg7IFzQ/cNhHpC8s3dtAzVnpjUrpGwg6ri8CuLa0WXGtRvpdRIH66M=","From":"Saeed Mahameed ","To":"\"David S. Miller\" , kuba@kernel.org","Cc":"netdev@vger.kernel.org, Roi Dayan ,\n Mark Bloch ,\n Paul Blakey ,\n Saeed Mahameed ","Subject":"[net 09/13] net/mlx5: Don't maintain a case of del_sw_func being null","Date":"Fri, 22 May 2020 17:40:45 -0700","Message-Id":"<20200523004049.34832-10-saeedm@mellanox.com>","X-Mailer":["git-send-email 2.25.4","git-send-email 2.25.4"],"In-Reply-To":"<20200523004049.34832-1-saeedm@mellanox.com>","References":"<20200523004049.34832-1-saeedm@mellanox.com>","Content-Transfer-Encoding":"8bit","Content-Type":"text/plain","X-ClientProxiedBy":"BYAPR08CA0042.namprd08.prod.outlook.com\n (2603:10b6:a03:117::19) To VI1PR05MB5102.eurprd05.prod.outlook.com\n (2603:10a6:803:5e::23)","MIME-Version":"1.0","X-MS-Exchange-MessageSentRepresentingType":"1","X-Originating-IP":"[73.15.39.150]","X-MS-PublicTrafficType":"Email","X-MS-Office365-Filtering-HT":"Tenant","X-MS-Office365-Filtering-Correlation-Id":"02b8838b-ab77-4f60-be1b-08d7feb208b6","X-MS-TrafficTypeDiagnostic":"VI1PR05MB5391:","X-MS-Exchange-Transport-Forked":"True","X-Microsoft-Antispam-PRVS":"\n ","X-MS-Oob-TLC-OOBClassifiers":"OLM:4502;","X-Forefront-PRVS":"0412A98A59","X-MS-Exchange-SenderADCheck":"1","X-Microsoft-Antispam":"BCL:0;","X-Microsoft-Antispam-Message-Info":"\n Ia6sx6pjZ7ROwhfEET+fcOgEfdCCbQquHzHCGQHV9IpWFdYSkChk91eGqt8gRgiPL9Y3m0YDXryOVX3uU0Jjpnzz9cxmcNPuYIOjLziO1AtmFkPK9CbyBRHdfGfZS34tAu1G2UBoUEK+jsdT8iYX7l9M9jsfnOLSWmwaXt+pXqpQGxzrr5KOZHa086nXWoDSAmteid+i3e00r9krhmEUV3UJy1fpNIvT9xA9ZqTKo0i9I4mIw+qqjv1/M6ii0JYhzc16KWwJfvTV03mk21RT8XZhJw6WX4aTcXPx5fp8zhLF1kSi3FCQ/IXErSn2Id6vrsrf92C7mnG7a/XXKfvXrM2Q79gFxd2ZojF5y4AjvX79J/0BZBYnkr5W3ijaPQ9A","X-Forefront-Antispam-Report":"\n CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR05MB5102.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(346002)(376002)(366004)(396003)(39860400002)(136003)(1076003)(8676002)(2616005)(956004)(4326008)(52116002)(186003)(26005)(16526019)(478600001)(6666004)(86362001)(6506007)(6512007)(107886003)(36756003)(316002)(5660300002)(8936002)(6486002)(66946007)(54906003)(66476007)(2906002)(66556008)(54420400002);DIR:OUT;SFP:1101;","X-MS-Exchange-AntiSpam-MessageData":"\n le/rj7bpETFYrV3BOFIzg54/lFthYnA3xQiKRKKxLX6bq5bqFSLUC84090sokY9we+FJg7NFjm/QXUuqkS90eRJNuw01FiHjBCYues6fOUjg97o5zVhFMyzAYInuvPEpfm6ihcpVRjmA66M2C451n4SLknQJUFbpmUhbADipuEz40qCOMVXfKTm/M+QME12GTOYVFdDCNCgHumdbYECc84llVVgiUO6AEkkKS0bRYw+zHthxfP5+YJzP2WIaz4dnt5dXAGYmlYMpPzRwJVcSkzfJ+AmtY3jmcc5nXbqnX/6pVS/Wy6hTjwT4raPbaKJ/GCYr1L99/mINI7MR738eV5wunrz/PMbjuSfHyh26C4MjzdEN/H2t/hCXe9vnIxlah05Bs2Go5jkNc9RXp+yMHO1wQiTEy2EPeUCNq1Mj5YrlWgvWPEDet+OTO+rWUJHFDMYj6Sa7dGAHMa0mHjCtr16s6J1KwNwzLbecQzZW9zQ=","X-OriginatorOrg":"Mellanox.com","X-MS-Exchange-CrossTenant-Network-Message-Id":"\n 02b8838b-ab77-4f60-be1b-08d7feb208b6","X-MS-Exchange-CrossTenant-OriginalArrivalTime":"23 May 2020 00:41:30.2410\n (UTC)","X-MS-Exchange-CrossTenant-FromEntityHeader":"Hosted","X-MS-Exchange-CrossTenant-Id":"a652971c-7d2e-4d9b-a6a4-d149256f461b","X-MS-Exchange-CrossTenant-MailboxType":"HOSTED","X-MS-Exchange-CrossTenant-UserPrincipalName":"\n +kIQ8Rnjh7kTuMGYe1RoyQ5SHosySSVyMxoymtFlFe5AS+AvbrayoJdd7S+4rI75JXWF5CarPGd2GDUlUDBZrQ==","X-MS-Exchange-Transport-CrossTenantHeadersStamped":"VI1PR05MB5391","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: Roi Dayan \n\nAdd del_sw_func cb for root ns. Now there is no need to\nmaintain a case of del_sw_func being null when freeing the node.\n\nFixes: 2cc43b494a6c (\"net/mlx5_core: Managing root flow table\")\nSigned-off-by: Roi Dayan \nReviewed-by: Mark Bloch \nReviewed-by: Paul Blakey \nSigned-off-by: Saeed Mahameed \n---\n .../net/ethernet/mellanox/mlx5/core/fs_core.c | 17 +++++++++--------\n 1 file changed, 9 insertions(+), 8 deletions(-)","diff":"diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c\nindex 8f62bfcf57af..02d0f94eaaad 100644\n--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c\n+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c\n@@ -346,14 +346,10 @@ static void tree_put_node(struct fs_node *node, bool locked)\n \t\tif (parent_node) {\n \t\t\tdown_write_ref_node(parent_node, locked);\n \t\t\tlist_del_init(&node->list);\n-\t\t\tif (node->del_sw_func)\n-\t\t\t\tnode->del_sw_func(node);\n-\t\t\tup_write_ref_node(parent_node, locked);\n-\t\t} else if (node->del_sw_func) {\n-\t\t\tnode->del_sw_func(node);\n-\t\t} else {\n-\t\t\tkfree(node);\n \t\t}\n+\t\tnode->del_sw_func(node);\n+\t\tif (parent_node)\n+\t\t\tup_write_ref_node(parent_node, locked);\n \t\tnode = NULL;\n \t}\n \tif (!node && parent_node)\n@@ -2352,6 +2348,11 @@ static int init_root_tree(struct mlx5_flow_steering *steering,\n \treturn 0;\n }\n \n+static void del_sw_root_ns(struct fs_node *node)\n+{\n+\tkfree(node);\n+}\n+\n static struct mlx5_flow_root_namespace\n *create_root_ns(struct mlx5_flow_steering *steering,\n \t\tenum fs_flow_table_type table_type)\n@@ -2378,7 +2379,7 @@ static struct mlx5_flow_root_namespace\n \tns = &root_ns->ns;\n \tfs_init_namespace(ns);\n \tmutex_init(&root_ns->chain_lock);\n-\ttree_init_node(&ns->node, NULL, NULL);\n+\ttree_init_node(&ns->node, NULL, del_sw_root_ns);\n \ttree_add_node(&ns->node, NULL);\n \n \treturn root_ns;\n","prefixes":["net","09/13"]}