{"id":1296577,"url":"http://patchwork.ozlabs.org/api/patches/1296577/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20200523004049.34832-13-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-13-saeedm@mellanox.com>","list_archive_url":null,"date":"2020-05-23T00:40:48","name":"[net,12/13] net/mlx5e: CT: Correctly get flow rule","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"a04435d4c9f161b344544475a6bebb42e72849dc","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-13-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/1296577/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1296577/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=D6zsKeRH;\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 49TPgk2BMPz9sRY\n\tfor ;\n Sat, 23 May 2020 10:41:54 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n id S2387524AbgEWAlx (ORCPT\n );\n Fri, 22 May 2020 20:41:53 -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 S2387463AbgEWAlw (ORCPT );\n Fri, 22 May 2020 20:41:52 -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:36 +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:36 +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:35 +0000"],"ARC-Seal":"i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=XTiiqDgzdwKIfPsw6fL6wUI4kJ7fkO8U7fZrHYlzsbYqVADYuS82aqgrVOG2k6cTpYRe/OVLlAlcEXvcjYykfv0o+5FAGFZwXy961so7X5zFQFhz3Rai8lF4MciFV/9HqXpr6PTFVFJXsIRRK+YIMR9mvMIEOVwI+coXR4pYPpASHJENp96jN6i/M1BYO37nsK4OWHMPKsS6ekPU8k4E/fZFrybRvW7bpYpSUa4JfP4a5m8xybinF3HHCasNhbj/Zsbt/mgVFPaQ2ki7ykGDoon7clQqxsnNOCgTlhuUcAjFkCLFz/PUg3vI68/nQPowS0yKpO4VpwnoyyUHGgN94g==","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=HhBtJzEnAo2xU8X/jPL7D6Ch39OwtfNTd13jZYoaujs=;\n b=PNFxJfcDiq4l70+skcZJY5nEsnlWUKsvQfa7+ZobUHJikLmSP/XiBCMni3aV3hHIvwMPNCmAcPzlKmfXpPZk7hqD97UkNEVLeLRSjH5G034T1VIr3M5KEEeiSb3xx2JQ7xCs/c7FE3cM2TjZL7yXOyGChXthmbOQw/1bbji29/zIRwtRBtHrUWhVwkr47onsr5AoOJi5nDLe7Yr/Rs1j6Y2LXxBS88PTU7asNZwLBpr3EnPN0GCscNdq5vhynPiva9yfTvity46fcURxmKQG0XDeC2jPBr57lvWbGMxfd7iS2tX3GWpUd7Qk2E2Dq2VTcw1tw0nAf8cxYs1H73VuTQ==","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=HhBtJzEnAo2xU8X/jPL7D6Ch39OwtfNTd13jZYoaujs=;\n b=D6zsKeRHVMLsVuEG0QnWEe0lguAeLm3fAjIiLWtoULVDNoe+SzeMReBQzYN7i2zbWVX7qA6gVElgvJWQGXm7SqVdh+Uup/YPPYqlAIbXhw2VkL8SDF9DtYqBmj1LFuWrM582aJbZ1FGF9Bfc45wWvo2SDy17IFbSDwsmmdBng9E=","From":"Saeed Mahameed ","To":"\"David S. Miller\" , kuba@kernel.org","Cc":"netdev@vger.kernel.org, Roi Dayan ,\n Oz Shlomo ,\n Saeed Mahameed ","Subject":"[net 12/13] net/mlx5e: CT: Correctly get flow rule","Date":"Fri, 22 May 2020 17:40:48 -0700","Message-Id":"<20200523004049.34832-13-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":"40062619-34b5-4e34-f5f0-08d7feb20c99","X-MS-TrafficTypeDiagnostic":"VI1PR05MB5391:","X-MS-Exchange-Transport-Forked":"True","X-Microsoft-Antispam-PRVS":"\n ","X-MS-Oob-TLC-OOBClassifiers":"OLM:1468;","X-Forefront-PRVS":"0412A98A59","X-MS-Exchange-SenderADCheck":"1","X-Microsoft-Antispam":"BCL:0;","X-Microsoft-Antispam-Message-Info":"\n gHri5PqzN/BYCMX78paZtwmfdgkX4eRS5LejuYbDZ7sYqhK+vbkrx8NIyFklxokP2hqelXkqKSQkU/lVkcfmJpLh5egWRznpAyFZaP85rVk6DwjFEvzV9KA49KlLx87Ad706Wt3cbGujC2CYbINqow3rAyc24G9RAX9I2POi6UknyOpsbK4OGNe7ysX4hRLa4OlIpNFoT1KGOEzOq2w8aDGAPA5UcDoQ3W3tPKCAneZqlvku3aLSs3XYuQJILYGdYdxcLvsq5+ujZMS1h5nxHs6rIUt73UKeCqjlhl73NL9YsU2oiH4HBvPYANm4W4s9k8J2ovXbgoKN+9+pXlg07s5EwdDzx2p/wOAbQdPgINpsMfA5gVO74wGzbJ5FLUPC","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 SQk2yitR2Ec0NFsSNYx62WYBAytQiSn2jhdomiedYIevv7IBF7XKzhVv5PCJd0faTZvQ79+P6Oazaz1V63jujVWVcNZ579EEQpYaEEJ3Z3AKRe0uoInqydrJ+N2GBKE4My7cMYxK9xnimITwvdKu++Gi+xq1XSlsWEDJnLxa2afRWN5j4ZVsqz7bpzq/NSV1BsQyWAoYZjhkV0mxX1kMVQAyY1JbZwMhjmtIsqF52qazX4JavIxzBsHTDoOlhK3PA5yxJWlY1Y8kWHZgU5ZkTN8Dj3THfIqxcb0rXGJzkqFqagNvmtq016WFgKgtRBQs/Bm7Vat36J98RmbENoqWVXhTFE3m1ZMt7yIhEXZk6v30+8bHasd3rjnD0geuBbarCkSwlYst7u/k1/Qsn1GooqDtYTo7BX+lYEA7oX5YMmInK8vzlgKnKc5wKz7/y/+Lo8bbVvMhP5pVKN0BHOnxXoStDeb0pn/rHN2La3aRhQc=","X-OriginatorOrg":"Mellanox.com","X-MS-Exchange-CrossTenant-Network-Message-Id":"\n 40062619-34b5-4e34-f5f0-08d7feb20c99","X-MS-Exchange-CrossTenant-OriginalArrivalTime":"23 May 2020 00:41:36.7163\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 Yzf3qTI3XrUYgivvh+6ZeTbbYQGRUg129ZPgKghYLl7Wp+v3sDnOMOuGpkx4ZTcdQSg25RZH3Z5JzDD4gpDMXg==","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\nThe correct way is to us the flow_cls_offload_flow_rule() wrapper\ninstead of f->rule directly.\n\nFixes: 4c3844d9e97e (\"net/mlx5e: CT: Introduce connection tracking\")\nSigned-off-by: Roi Dayan \nReviewed-by: Oz Shlomo \nSigned-off-by: Saeed Mahameed \n---\n drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 5 +++--\n drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.h | 4 +++-\n 2 files changed, 6 insertions(+), 3 deletions(-)","diff":"diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c\nindex a172c5e39710..4eb305af0106 100644\n--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c\n+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c\n@@ -699,6 +699,7 @@ mlx5_tc_ct_parse_match(struct mlx5e_priv *priv,\n \t\t struct netlink_ext_ack *extack)\n {\n \tstruct mlx5_tc_ct_priv *ct_priv = mlx5_tc_ct_get_ct_priv(priv);\n+\tstruct flow_rule *rule = flow_cls_offload_flow_rule(f);\n \tstruct flow_dissector_key_ct *mask, *key;\n \tbool trk, est, untrk, unest, new;\n \tu32 ctstate = 0, ctstate_mask = 0;\n@@ -706,7 +707,7 @@ mlx5_tc_ct_parse_match(struct mlx5e_priv *priv,\n \tu16 ct_state, ct_state_mask;\n \tstruct flow_match_ct match;\n \n-\tif (!flow_rule_match_key(f->rule, FLOW_DISSECTOR_KEY_CT))\n+\tif (!flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_CT))\n \t\treturn 0;\n \n \tif (!ct_priv) {\n@@ -715,7 +716,7 @@ mlx5_tc_ct_parse_match(struct mlx5e_priv *priv,\n \t\treturn -EOPNOTSUPP;\n \t}\n \n-\tflow_rule_match_ct(f->rule, &match);\n+\tflow_rule_match_ct(rule, &match);\n \n \tkey = match.key;\n \tmask = match.mask;\ndiff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.h b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.h\nindex 091d305b633e..626f6c04882e 100644\n--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.h\n+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.h\n@@ -130,7 +130,9 @@ mlx5_tc_ct_parse_match(struct mlx5e_priv *priv,\n \t\t struct flow_cls_offload *f,\n \t\t struct netlink_ext_ack *extack)\n {\n-\tif (!flow_rule_match_key(f->rule, FLOW_DISSECTOR_KEY_CT))\n+\tstruct flow_rule *rule = flow_cls_offload_flow_rule(f);\n+\n+\tif (!flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_CT))\n \t\treturn 0;\n \n \tNL_SET_ERR_MSG_MOD(extack, \"mlx5 tc ct offload isn't enabled.\");\n","prefixes":["net","12/13"]}