From patchwork Tue Feb 13 12:31:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shahaf Shuler X-Patchwork-Id: 35146 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 45FAD1B1C1; Tue, 13 Feb 2018 13:32:14 +0100 (CET) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0043.outbound.protection.outlook.com [104.47.2.43]) by dpdk.org (Postfix) with ESMTP id 4F4061B1B6; Tue, 13 Feb 2018 13:32:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=dUTD3WDqA0dEzlwFdECCE0RvbxB2Goa0ryqlIk8MVzk=; b=OlNqPwwpbbNSk/x61mUutGkoMyAKCV+mDLuEjrAXxd5HLWu7pORJI1Ug0c76aFvNStkRtrb0YZsJmFj6UciLvAVfR3RgLcYNu/FCaohRZ7L9sCEwa46AgrFar761apwFlyY3wAeS6LfHj2uvmAZJGBgekp2Y2SKIVTpT5fmxuX4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=shahafs@mellanox.com; Received: from mellanox.com (141.226.120.58) by DB6PR05MB3144.eurprd05.prod.outlook.com (2603:10a6:6:1a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.485.10; Tue, 13 Feb 2018 12:32:08 +0000 From: Shahaf Shuler To: adrien.mazarguil@6wind.com, nelio.laranjeiro@6wind.com, yskoh@mellanox.com, thomas@monjalon.net Cc: dev@dpdk.org, rasland@mellanox.com, stable@dpdk.org Date: Tue, 13 Feb 2018 14:31:55 +0200 Message-Id: <20180213123155.44183-1-shahafs@mellanox.com> X-Mailer: git-send-email 2.12.0 MIME-Version: 1.0 X-Originating-IP: [141.226.120.58] X-ClientProxiedBy: LO2P265CA0050.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:60::14) To DB6PR05MB3144.eurprd05.prod.outlook.com (2603:10a6:6:1a::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: de42065a-c0c2-43a9-088f-08d572ddccf7 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:DB6PR05MB3144; X-Microsoft-Exchange-Diagnostics: 1; DB6PR05MB3144; 3:DI6x4IEsXnVK/9hFenyUtCKik5QgrT7ce8CIaxvMgLsAO3tcoJiMJ8x2l/imYpVMT5Fn5Un4a3N9JPuFZkL0NEar9ms8naMMJT0mjWnihAhjbq4Uh28B5NqSjbZatykrrS9T+TDEmEqpPsnsFTyoqDSZPBqAvUo9M2myt0GFJFRGWcH46z55ria388E2Xek5UBE6KMhwl4CGTHc5Nw4H7K+QcLEotTXkbUPUtHG58gEYqh+EPZzcXrJ1CdQ19K/g; 25:cDptitYunxhL53N2WSFiRWuevJWoM14gc0cMPWC2GUM5MhQTV+s0VtY/bIBdaHucPhimFUjWEpMz0pTWD7dExP3r5EVALx7aST5YYX4JdNtNAD0fvaC6NPnhMXYbLwSphI73t5YMgsVBMmQtAnHfQwNX4sYhaDfAfmvGtLIIzp/pZOxIE/el4ms8E5lquSmvuaWZkrF2kB/IT0K/p9SGsBYPf2brj91akYci5A14BdviyifOepicuARtby7iHXun6qZqIYghKcuwYryOUK5+ygPadA6zIBgP+jCk1i/DqAUmwu0beLDxI+Mgg0e82JhGVxvBlm+F2Fg/j7DoWW84Mg==; 31:4kx6F5GiEnXzL3JcJ7Xj545jc7ZBHE4VrupGwvd27ExN4WU+SDVQ9PY6zBwgegytuAKugWshnOLkYulWuea4tkqT/OuS1oT831YY2jjVISHEOx+cMqA+pCnA14ImW0KdkRIdxaiFEK83tu20dgf+GY0VU2tqtrHuv3N5hFzb7wxNp/JmpoojU4m0If+OeL3WCdzAGPZIM+uhzC6huyekvTk2A5x5NAy/oBBA0npRKQE= X-MS-TrafficTypeDiagnostic: DB6PR05MB3144: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; DB6PR05MB3144; 20:RWTpdqHGGfNpIYnCUoYk8sTQvJ6N3z8cyOy6c5yuiquPUHgkcy85oKhb2WPxeS90AFqbxn1csENfoNGmJlZlSg5ZW01ljHc4s9m7KD4KwcFZKDcSZyuZbHorx+XZe2U0iP1ZTHV7pjZ71r0I3l7SNZRfYPRFw0lnzm04Xa3STfTLQ0Fv3LrCkvPMGWtQXc9ubOjR30pr2uYBmtMgTimP+fHiRmnajWlofjHJB3OvV4TauR9kVo6NNsrTHg8gO7jr+7hbeu1N2m3/Dq/+RmtJhN5JScvpETHk22hN2tm28CI2NpdRDqbHmYgPdMehpIYT0EA1yIhEWh8j/3zOqnbjfP559WXfBHwK1BHE+cY7aS+7Nc/Sd/KdaFg/032G7+9Iy1kzzEY5bFJprH4SNmUfAkHcaB+TL7L7enhNewybuAC2p/QbbWmX2E/2h6EQYZEuK0MfPbcx0307oyOsQXlBRH3tj6hJMI5Zw6xtYZbj62/GyD+B0zeuDtWtm6Q2IslP; 4:8kbRvz+0yY2+fOYhQxUCgsrksqFPDG1vEBc97cN0PECAFZg/ubFiXruYUGpzlSu6CUT0ZcJuv6ekdMlU4FTV2YAZAzD49gEZWdjlcKKez5+qrs9LajKEX28mUCEJZLlRhi4ydUUL2/25de8Y6WX/YgEeBbuI/BwQoYG5TY9pTbyCDP5SXNTBMJ163Xd6WMK3cuUH2G280VvSDcexCekR4+irVLGeMtUnUNQ41fc/ni42775fK95uYqimHw+bPWgcWiKnN6aEKmFBpkjOBIFUGQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3002001)(3231101)(2400082)(944501161)(6055026)(6041288)(20161123558120)(20161123562045)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:DB6PR05MB3144; BCL:0; PCL:0; RULEID:; SRVR:DB6PR05MB3144; X-Forefront-PRVS: 0582641F53 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(366004)(39380400002)(376002)(39860400002)(346002)(199004)(189003)(53936002)(25786009)(86362001)(51416003)(48376002)(105586002)(50226002)(68736007)(16526019)(8936002)(21086003)(5660300001)(52116002)(3846002)(55016002)(7696005)(316002)(386003)(97736004)(47776003)(26005)(478600001)(66066001)(2906002)(16586007)(36756003)(186003)(59450400001)(106356001)(1857600001)(81166006)(69596002)(6666003)(8676002)(50466002)(1076002)(81156014)(6116002)(4326008)(7736002)(305945005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR05MB3144; H:mellanox.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB6PR05MB3144; 23:fguBYYK8G9pBvKi0gGYVI7u/WzAh9gbHmnhlHB48A?= qo3dAPeNGGWXlir1K0+aZJcpZ+Wre9PKwUDS1jGmAoIJQUPjqC8guY77lvktLAYAsE85XknVJia7lsBxdEdyQ1gmCefnGAAxV8DFKM1epk8sVUV9kQRnfiwEbymLCx5hibShJ0tD4B2JutVreJ1DqvRaAIwGVoNy8Y9mZTVE6jwIOeg5NvqYNnYFXRJ6MWdQFd3ZG2Sgj1o59w8UreOiHnuLsUogflfxL7UbIjhz/rs+XUCnqSV677Iuei4VfYD4mqJMzPg7ArFK535so+jm3MAuew9L9mkwHp0wuuDfOjlPl5NzsoLYhkegXzChUaEy1Tw/uk3jeIijnq32QPdMgMFGV/YPgxDTAsZX6bAhEcL6YQl1FSaZ98JAFjR0nzac6q9QcGot1zedlO7R6L/o8uk72ZpToIMWz/xzoSGrzwsF3LBzr7N9K6V2br4qcObCcHW5hoOaa5awRSvM5UdTu0bEkG38jSx7abiY5P5FfZtJqsv3Nm1S+d9yBcDo1cGoGX4cLpkJCGF5161os5VDYVdNEo+FqcyIFfKHp31X2OiXfakkxFyLaV8LmxRMqoXx354Ho/AlF584tdN3tD9sqn7l4JsEyKUOmYq4sXKXz6Pze10y4rGN/CpPnvhQsApvbBSB/ws4GxPNwq2JhZMPz/K6C96b4MKt5G50GZ2RGMcSBkklwKqBaqyTIdZhQtM8W20tyy4NQuY0Jovupb/DKjtq83Jr8vi9HxVI14LZKf6vNilNHSVhB1OQDPrQs4UwGdUxTU1k8+mxpK8N3tsKlEwXbjkJmB0CHeP2GZZfkucy57h8+fV3tLzpj3db1btYbdjxfDWyp9KyHpq67Woh2d6ebZk4ZsHKkh0NqJNNMEALzu990tWioGRlV6ddOPKPQJXRpRkE8Ec7jBmFb4YuXTPQ3mkB0L8qeDIg93m3Goh47Ni4JlpWjaNkdl5vQNjCk/hZbozQHxRVvdEPKCzQblxVf3urU5CQSPJ2Ziqd7DLfXVcbZlcTSHKi8ND+vUQCGIE7QYOvwF4SyJ8m3hHy5Vk+2Z3KYtmUUxujOVnsh31AnXz5PO1tiwgJCqFgirWJ9njcoZilxKfq6qWnLglTxiW X-Microsoft-Exchange-Diagnostics: 1; DB6PR05MB3144; 6:f+UrS9PTzsk/kJzGQFBoWXs4ltn8MOISxO8N+SgzUGeB/JAjsKR7wi+sYHkIVFxHB4clXOKftsiWYtgRWIkGO2rnPp8nZkgGVsWXUCUtGhKoJ8lmTLG6C6DAA+/w7FL+tbU1LNVB2zZigrucrbjOeOSY9mKLHnLlUFRy+vLZ2PVk5xBvAMgC5nHGdtrlk35JaRmhn76qfN9CC1ePXlE/r7B0/7T3xBn0VBjG3B41hvdb4GbM3y4iopN5I7SaZ3mQN2lrK97VWnmjAjLFHJcvDiyjFnLAlm65//RN25IAkaZD0+eLyheZ7GmsmnEY98ynNcqxi3iM2EMLZkx8CHUoZrcdKN05y6rzRaIzLr9nPkw=; 5:J8JF7WruqhiV0+EMvV1CqjY0snRz5bELt/hpe4Y4zTWcqaKrSx1rikvGELsq17rT+i3k98bsK3MnVAWaGwN5SAP80t/8Fvh0FLkRXtf4xK6BTMWZAP0VtzZ96RMxw50HMclO5qGq0ClosCQpwE3mYGgkSa15YAMH0tGHS7MKbqI=; 24:+cdoyZZI8RXF7cLkIjvAw2aJcN5RuaCqYWfJ5cWf2BODQvqihj19Udqwx4C/IHDETLSGJnNUTpLYwYDIr9bstH19jxL/iDJh5uhth2W7FAw=; 7:L6lhIhqhbSWMRNAwMLOpe9FCucQ0ZvmhCiC2/8g4r/7coqR0sEp+imE3xjchxwYsI1NZ2w5fPL+X5uKs5tgBHU363iCABQf9wiGHFIgx6HshM20fqeHvbxB6hk7d64offmsvYZEpckW42iv8XIPR5Sl+JnKCF+kE1L6vtC5kSKU4X200jNSjECZlWTRuGjhCKdaIpQtofwcvdTZEIdsxHSG+F40ks4DM2Q2uSOigM/mv+7OznE7bBTP5H60K8iBo SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Feb 2018 12:32:08.6904 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: de42065a-c0c2-43a9-088f-08d572ddccf7 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR05MB3144 Subject: [dpdk-dev] [PATCH] net/mlx5: revert multicast rule Verbs flow type X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This is to revert the following commits: commit da646bd93888 ("net/mlx5: fix all multi verification code position") commit 0a40a1363a4d ("net/mlx5: fix flow type for allmulti rules") The last one introduced a bug in the following diff: @ -1262,6 +1274,7 @@ struct ibv_spec_header { eth.val.ether_type &= eth.mask.ether_type; } mlx5_flow_create_copy(parser, ð, eth_size); + parser->allmulti = eth.val.dst_mac[0] & 1; return 0; } As broadcast rules will be considered of type allmulti as well. The patch was originally intended to enable VF to receive all multicast traffic by using the IBV_FLOW_ATTR_MC_DEFAULT flow type. Since the support was removed from the kernel there is no point with fixing this issue, hence the revert. Cc: nelio.laranjeiro@6wind.com Cc: rasland@mellanox.com Cc: stable@dpdk.org Signed-off-by: Shahaf Shuler Acked-by: Nelio Laranjeiro --- drivers/net/mlx5/mlx5_flow.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index f88ece123..323dab723 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -391,7 +391,6 @@ static const struct mlx5_flow_items mlx5_flow_items[] = { /** Structure to pass to the conversion function. */ struct mlx5_flow_parse { uint32_t inner; /**< Set once VXLAN is encountered. */ - uint32_t allmulti:1; /**< Set once allmulti dst MAC is encountered. */ uint32_t create:1; /**< Whether resources should remain after a validate. */ uint32_t drop:1; /**< Target is a drop queue. */ @@ -1128,17 +1127,6 @@ priv_flow_convert(struct priv *priv, attr->priority + hash_rxq_init[parser->layer].flow_priority; } - if (parser->allmulti && - parser->layer == HASH_RXQ_ETH) { - for (i = 0; i != hash_rxq_init_n; ++i) { - if (!parser->queue[i].ibv_attr) - continue; - if (parser->queue[i].ibv_attr->num_of_specs != 1) - break; - parser->queue[i].ibv_attr->type = - IBV_FLOW_ATTR_MC_DEFAULT; - } - } exit_free: /* Only verification is expected, all resources should be released. */ if (!parser->create) { @@ -1246,7 +1234,6 @@ mlx5_flow_create_eth(const struct rte_flow_item *item, eth.val.ether_type &= eth.mask.ether_type; } mlx5_flow_create_copy(parser, ð, eth_size); - parser->allmulti = eth.val.dst_mac[0] & 1; return 0; }