From patchwork Thu Oct 5 21:37:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yongseok Koh X-Patchwork-Id: 29781 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 459EB1B22A; Thu, 5 Oct 2017 23:37:56 +0200 (CEST) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0043.outbound.protection.outlook.com [104.47.0.43]) by dpdk.org (Postfix) with ESMTP id 2F2141B216; Thu, 5 Oct 2017 23:37:54 +0200 (CEST) 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=t3pyr7g2IHHY1yxOWYaAuZZhF1srY5OwkD+J2QI5Wjs=; b=EqFeeyXRy/8y0tQvtkqc8N3tG9xgUxw0YIuW89PtQ+VFNMIStmTbNR9zt1q6pTKFeknmbrZeJDuIiE5BnWole6yODg2g0lvRFVjvB6etDpdDVZXBEomAPrSQU/Ac82SMYkJuJFWmZSF8js60zE3sFAsmXtBrFhWEKpa8TjJ0X94= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; Received: from mellanox.com (209.116.155.178) by HE1PR0501MB2044.eurprd05.prod.outlook.com (2603:10a6:3:35::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Thu, 5 Oct 2017 21:37:49 +0000 From: Yongseok Koh To: adrien.mazarguil@6wind.com, nelio.laranjeiro@6wind.com Cc: martin.weiser@allegro-packets.com, dev@dpdk.org, Yongseok Koh , stable@dpdk.org Date: Thu, 5 Oct 2017 14:37:29 -0700 Message-Id: <20171005213729.26326-1-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 X-Originating-IP: [209.116.155.178] X-ClientProxiedBy: DM5PR13CA0064.namprd13.prod.outlook.com (2603:10b6:3:117::26) To HE1PR0501MB2044.eurprd05.prod.outlook.com (2603:10a6:3:35::22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4dca87cf-0852-4cff-0f47-08d50c395426 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(48565401081)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:HE1PR0501MB2044; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0501MB2044; 3:Own5j3tD7e7tYnMmqb5aJBlfumktV095zOkEQzZlmFiKQq7eq/fjhl61QuhTmvk4kuk8y9bjj4XJGQ9W97h1lhsPKU+0Uul5Y5109ho4trG+quC+wL/MVXQI39w95hgMKLK/5e5Glr4IWQuWle4aHKgEkNup7IIdnoqQ+v0nlaQNrtLMfWPva3JGoY68B0hXejF7UBBPDUAqoCzcyvNmDUYPft884gMiAazQphfFkW6TCIfQOrUrSWdZ8l9sHq+Y; 25:2sL63qQKeJHAHIjWnx4cpOX7RtdYj1fshGiXXkov6J1hg/aHclVfsvWcDdPdhz/wI5TIcSPNgdYs1TxI7+1amgxMVSZ2a1oNowYCQWcBQjljJ10+PAD4XbggkEiJ6vUygfmgV1vtT6od1s3vbXNMeTcgm00VSUz/hhq11SJ5RVbQIx9ktXVNN4goSf5FRlS60IPEynzazVjhfrOJpnaTdwuEOYs63gf3OOIipgHijIgAsuXbGe8Putpm/+SPIsG94CmY0Cc0H8R2KV2lXIsyma9VH37tq5qSnSKXPRHa1s/kLtPUufrKyb3TN1zO8W20UgqeyoAyeG5VM7cq4X4bpA==; 31:ugcH+aegstihiGa2gJFLuJ7FZUlmMVmPVPAOtkRAZzo753n21muEgs9n7ftWKzLc2L4sy9CFDPL56OmsrInrd7amTRdZRSfstjP/OO56cC7fs5XBZDnuTPzLJjQG/vLWRIs7k1lKNTr2i2SQyztVBh5QHu2r6wXN/x9WWAQEmmNgyM2mcdwiDH0nr6QKyflm7+nU0H3SPCWaDHcYUJ4z2Uv3R8KPqHxiR4eKVJ7OSAI= X-MS-TrafficTypeDiagnostic: HE1PR0501MB2044: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; HE1PR0501MB2044; 20:DFJ/RkYb3Yu+4y64yuqNMZgwi7NJHuhEvjf+ni4CEtDwvsKksXKYPodNmUbeaG2IalHCguQUBSWaIjlAoehdPHgBmnrnMKVU8VT1ceqCkQyZeUPmgyRxCYJ8sBhheY3TQgKimdYJxKVTzRxFjj1li+3DN0Lksuk7nS9U4iTkGSgCPMvmmVWbPpevF03B6Y4gF/9+uoT/PU/fZZizFWgWhvdNNGLBqZxzI+5zKYk4mQL0FO1FFyzqmi3u1VRUrf1GWA9T0+/CE5KVngKelRKHD2aP9f8dbPBRruZwmCBj+Kvkn+jmOVzIkcWXxSnOEX5JKsCVg3bJcjIxlG08YKFehX5ayCQdlFcoJhL2b/KdC18xjdp33TDRLA8ewF9fRmf7DIsuS4JzmciKQwM5FDeLsj5xHRyA/pa0QRxJOBrwbAgyJs6pKbvA/cJOOtS1W8yephSkq+e9UWT8vH60D5c5/OAmxPy2dRJBf4j9Vo9iRAmRNfbPdeMHa6Wm6QUjzD7c; 4:Zde3tEiT+vQ6eRZSKIss1gWb1z651ofFCkk39PnDNMI3AeJIIueag+PT4aGJslNKLNBYFwSI0BmjvpJgmyfntTNRTeVuJ0J8Y+R30yZ330bN+Zfet+r5VjvbpYvugd1eWC723FBZH+b3CGF23ye5xLybwkWvdjDVyaE85Ma89YFwJInxqGjdshDVtBncWaS14xUeXl5KhgTliDs6JN+Cm/Ux8aIuDMpmBYnQQ0m20QXaB+0/uedEf6+BAwhmqV8Z X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(3002001)(100000703101)(100105400095)(93006095)(93001095)(10201501046)(6055026)(6041248)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123560025)(20161123562025)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:HE1PR0501MB2044; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:HE1PR0501MB2044; X-Forefront-PRVS: 04519BA941 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(346002)(39860400002)(376002)(189002)(199003)(305945005)(36756003)(5003940100001)(7736002)(16586007)(50226002)(8676002)(81166006)(5660300001)(48376002)(81156014)(8936002)(50466002)(25786009)(86362001)(69596002)(16526018)(68736007)(55016002)(316002)(189998001)(53936002)(50986999)(6116002)(21086003)(478600001)(3846002)(4326008)(33646002)(66066001)(101416001)(105586002)(106356001)(47776003)(6666003)(1076002)(97736004)(2906002); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR0501MB2044; H:mellanox.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A: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; HE1PR0501MB2044; 23:Oivhh1hdgh1qHvihhgbYT43bYNCy2e4VRnqtqN6?= CR+t4q9nVo54zEUXsgQWqBf+ET1q5O3DJnseZP8juNfp7DevBQ7Fz8+HIagKiRkCFmGOVFkKO84UQh/fCNnyh5ZPAjzqo6GQ7ObbpF8PpncN+y0rsSlHy8A0Ckz+ED4sj/5ZZqXEKJD/rvuBSfidu+7/59+KyUm/68j8rL5u1IXt2i8UShKZ8Bo/zNi7snbtH13fkTP6KoPRE1K8KdDY3bwhP84XM3fJbYlzw02cxCSYglNnY7Y7dNrTZWdPRSZ0MMGbWbLHibjhUDHrPIV5vCsvfrsEHOesWfRPJTAcDouZm+PWte61T951d8u9VqFXDkIJjX19rUZkx9Ejny8OIdTpn3vJ1G40qUqBLJw1LbQTqnXhUcNwvv8VMuBfZ/udKMGV4POp9N3vp28OBd1uRAm8DzlOic4uT1kqNsCKpMx5XIoK9VsRvIFDVuy3JGkovO8vt+iQxxI1TjPwdJ4xCsPs02GMor9OUaQTU8SPLDE8r3h+535CFOpL4alAXDEUDXv78ceF04nQwVijx2vVAdX4lUgSM8wRsYY2wL3CpyYmfw1mCZhf9RaTWs+YcFPESK3XAy1heg0t57MS8QkLYw2UK6cl+JaLb6TlaYHdk0eNCdd0vLpPocYpqwTBEZimk8SYVmHJEUQgKGVUWq+ldt9CE5fUzH9MdKwM/0RchnBqNn2KEI57xfLHrM4V/aC/0BsFZ/OrLhD8SQ06GzLIRbhvBhsi+slfduQUDAEwlFUeEcAeaG3VMDzx4ybDmiKPyp8FopTeVn4/c2fnLhKGYQepEsjvvbt3He5qI0M7/BglS1mE/P6yrTTHVGRquUemSyhWgURIFD28nU4wpRYw86bPP/WPt3EfhmUnQG5niG2niOhNljfvIygRgkooJE9O90wfQ+lmPqjCc+mmfG880DSLbWffjocWZa+/qcz3Vc5Ywdp4LMBXNrgE3MtxGwXGeut5TA0cYM7a1e5h2LP11Cwk57rbp+0HFROzil6QbQrMEqH0hic13m46mUpRHev/8pTI= X-Microsoft-Exchange-Diagnostics: 1; HE1PR0501MB2044; 6:t7pxStvE3GCTidiKIs1Ec1J2GEsalyifT/oDKMPWroR1prYC8rvZDeb0kLfPsXQaSaQB/CROHeBe+jXkTMprz5NpHPxqanMNuT1k4On6E1GB0rMj+DxWCn9Hxoe/uFMbSAE9hVGoZH51a0G7oYKHzQyzx02Tykr7/WLX9+S8g14yNRrpNhP0B7pipjVRkhfPql/rbNRqfkwt4vanelj8BjUXeQFuiGlGLA45RIddjVTVz+O6QWsiajtw6wF80LpIAKHnrjyUrnLUOqtsSMPLQNz6WolH5AWlkhfA6AQSwUC8UkvkanrbL93wESGCDJlfnejQGlnlo9DWvwQodIcskA==; 5:pimp8umZC4OohZsgmQs4KNbY/ihdgKlIDI2/UIkrPywT63liTDTksoKmOU14twvNS984N/IhiaRocTIHfo8TLDNPV9b5HPrVebdw6fCY9Nc7DvDDwvx29tO5Hg6+fkKlkd8nO405rMn+dYlAEOgGYg==; 24:fQeOo0IutGqSBGxu8ZmJgbICEWDAFPw+lyTTv4JJjDpLYNqUUmSPIdoPuuJlXFGkQISzDjFq+DvW1cRBPHLv94Ait7j5GYddp3YyYhQKgsE=; 7:dgKvomOECaLjxJWRr4pINREoVXE2FouccVmKQcOVLbOd6NHCWb10QNukCD1wb95XslT/6akfpK0dKmBunJowigafueJF9SSQuSMkPoSLK2q8nJhbWcuKsLzL8nsFTTkU5YhuNMdM0vX+2QjU7UQHJ7C2nsfvSAbOj1rnBLWmqqyhv6DZm9DouoQJI0pof7m+rhKBT4oV+szlUbHq57a47kX9T317EgBAQ1QvZApHfng= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Oct 2017 21:37:49.2398 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0501MB2044 Subject: [dpdk-dev] [PATCH] net/mlx5: fix overflow of Rx SW ring 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" If vectorized Rx burst is short of mbufs in replenishment, Rx SW ring can overflow as the Rx burst handles 4 packets in a loop. This is because the function fills SW ring and its mbufs first and checks validity of each completion later. So, there should be some buffer slots at the tail of the ring to protect mbufs which are already owned by application. Fixes: 6cb559d67b83 ("net/mlx5: add vectorized Rx/Tx burst for x86") Cc: stable@dpdk.org Reported-by: Martin Weiser Signed-off-by: Yongseok Koh --- drivers/net/mlx5/mlx5_rxtx_vec_sse.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_sse.c b/drivers/net/mlx5/mlx5_rxtx_vec_sse.c index 20ea38ef9..6d337ecd3 100644 --- a/drivers/net/mlx5/mlx5_rxtx_vec_sse.c +++ b/drivers/net/mlx5/mlx5_rxtx_vec_sse.c @@ -640,6 +640,13 @@ rxq_cq_decompress_v(struct mlx5_rxq_data *rxq, RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, hash) != offsetof(struct rte_mbuf, rx_descriptor_fields1) + 12); /* + * Not to overflow elts array. Decompress next time after mbuf + * replenishment. + */ + if (unlikely(mcqe_n + MLX5_VPMD_DESCS_PER_LOOP > + (uint16_t)(rxq->rq_ci - rxq->cq_ci))) + return; + /* * A. load mCQEs into a 128bit register. * B. store rearm data to mbuf. * C. combine data from mCQEs with rx_descriptor_fields1. @@ -1029,8 +1036,10 @@ rxq_burst_v(struct mlx5_rxq_data *rxq, struct rte_mbuf **pkts, uint16_t pkts_n) } elts_idx = rxq->rq_pi & q_mask; elts = &(*rxq->elts)[elts_idx]; - /* Not to overflow pkts array. */ - pkts_n = RTE_ALIGN_FLOOR(pkts_n - rcvd_pkt, MLX5_VPMD_DESCS_PER_LOOP); + pkts_n = RTE_MIN(pkts_n - rcvd_pkt, + (uint16_t)(rxq->rq_ci - rxq->cq_ci)); + /* Not to overflow pkts/elts array. */ + pkts_n = RTE_ALIGN_FLOOR(pkts_n, MLX5_VPMD_DESCS_PER_LOOP); /* Not to cross queue end. */ pkts_n = RTE_MIN(pkts_n, q_n - elts_idx); if (!pkts_n)