From patchwork Tue Oct 10 14:04:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yongseok Koh X-Patchwork-Id: 30058 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 17FB61B2C0; Tue, 10 Oct 2017 16:04:24 +0200 (CEST) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30078.outbound.protection.outlook.com [40.107.3.78]) by dpdk.org (Postfix) with ESMTP id BB9F91B2BF; Tue, 10 Oct 2017 16:04:22 +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=vya0ONDLgjXSgnEOovn3n+qmrPBOyWCuLq65nfAjxy4=; b=Jev98btxsJ8VtUK93f4xxqsNwmFoD5nXaqK3UImAqsbTMGJZHzqBsROjdSXyZBgR3+wnVbFJcbyLfDFhuGGECmqwkqj+qKbnx6Lon/6jSKp0gb3eYAPMENAivoybxeeEO8JPD1ZMZDSI1Cf8zkZssx7/e9FPh3C824rxS0Tisdo= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; Received: from mellanox.com (209.116.155.178) by VI1PR0501MB2048.eurprd05.prod.outlook.com (2603:10a6:800:36::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Tue, 10 Oct 2017 14:04:18 +0000 From: Yongseok Koh To: adrien.mazarguil@6wind.com, nelio.laranjeiro@6wind.com Cc: dev@dpdk.org, Yongseok Koh , stable@dpdk.org Date: Tue, 10 Oct 2017 07:04:02 -0700 Message-Id: <8beeef1f03eadc02d67e86c002a40c1fc56d6c55.1507644171.git.yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171006221948.24238-1-yskoh@mellanox.com> References: <20171006221948.24238-1-yskoh@mellanox.com> MIME-Version: 1.0 X-Originating-IP: [209.116.155.178] X-ClientProxiedBy: CY4PR03CA0090.namprd03.prod.outlook.com (2603:10b6:910:4d::31) To VI1PR0501MB2048.eurprd05.prod.outlook.com (2603:10a6:800:36::22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9bc541f0-db34-4487-4a88-08d50fe7ccf9 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(48565401081)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:VI1PR0501MB2048; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2048; 3:ZcC43RqJWeAqD6qCI+Aou/demJ03zgRvZwmqx/ofUnfy+u1lYmnT5xEobfZ3AVTR/wvRj65p5hvDr5dmFQq7mXNBmFx7bVwq/FoiS7OLHJHvzpMRwNwU25x/tDoRV33+yAQnGm3Nqw+jRPL6dmfGnxdjZRzboEnv48Lp3bchZPiUWINkzgtuXZ1iH1MMMw2c/HHW2zY9kHVEfQIAvy8bi/D5/VFQGrVsE9bfZJcmXn2leDc8NK9qtLtmBw3xeSud; 25:lLsptxjaWYy6WF1EwHjP3CRlq7Ai70pFZVGeYC5Acns4NTLVRHzhz1NZXwMIJ9grNgQf2zqfQ2bnp0wNfftFSX1RmPkuSWa74BP2t1FS0RBvmlC6+bbqgN7lP4dE7erUg2Z3Cu67jtxpeEPdhKv0TgIkDzNOynaCDj169koCa1KeExuuknWdUPuBq2IWcyBdACpfZTcgTnjBCibVygxHs/+h/mywvN116TPMSotYAgYQQsxS/A6PC8YDZNDV2bVaws5TnnbnxfZDRHM/It4fwuwK8jHlDkZgxAojqjg/Z+pwXvn+4QVtMLj/yDOHktok7yx4QVivk3g5WpzH7/EjDg==; 31:4H6Un25n4DgADQE2+3goLkNfwRYzbwkggGF7ePpPCGTBiEy7vaIehBdkSvRAD6GumCLgrrx0q+n7kpvHHmnLlMOQFeqefk+qdWLFTMDrbY6oTzmtVGVU4tAuAVurGvQrBaWJIfcJtWZ1jad+x4qvtcBmEcSj4Go54K3QcEGELw8FHcCSd/Oq8v1DaEhBR5SN5b59pzrZ5XYx5gNYUpT/SfwpH/20ubCLmglwm7OQEyI= X-MS-TrafficTypeDiagnostic: VI1PR0501MB2048: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2048; 20:2DqubSJVbYWTLaL0r9RjDE2xZCs/qN31A/6mG+/jynIvrn4HALBXC/mXUhEAXAc2M9jLvKUCWxGPyFmh7zrNomiImeNJpppmfXvnmhnjCH8Y9UMnBaOcUuctoCfGy8pD3w6y4TQP5wYKz7R29t11aWgqwPLZv0O4kRQRD2do3bAxDneCauEDYkyJiTlstxNK0f5rcmvV+siKOnwSvJAqbCSeQlZHMPossD+3Qpu0H1VcBv8iNFPSwMPI/Lx8R0h5DSWHtRXbMiOTlD7werbtgwg81JALxGeUTeKn3ckQZqjiA6XF37wnbd5vFTAe+IyqGh7zLhUxnf2y7w330bp3ogmwLI2fn71c/WMCiq6MjGDwK40N6iRibEsDTth+a0P9FyIniAFSwXjSSSd78Jn2MJcR8JAPb00Gm8iJ07p/PSix7y1LRTeX1ujehQwP1DB0W5iIH6ta/cEL7IWC81ihI6ktO1p5I1VAVJHCivPtljyqHKML0LbTA3xoT9G5imVK; 4:KgpJOqM8zmrMCanzbuoxKsAzzrwEXMLGyZ/GRXrbR8XAyD0BjUcgX1jY8qfVBKgxk6ifLmGYLPmhp44I1CE1ixomWS5lBDBpAwpzxfS0wUrcMfH3ApeyrE81yk+xOE+RtPgWImUF6J2pq6V7acyH9XR3g2TTL/gtQ2vFhWjjxxB4DYUVK9b0JyFP+3rn4H2bJIsD8AEwDf72evKLsMjEHeJaR4cGv40ZUyTAD/oja5m2fF1sDBF7iwealPonW8UqvJERq8G7kZoNlxGQJvFFs6G/7rGP7vbuV31c7QZLuT8= X-Exchange-Antispam-Report-Test: UriScan:(788757137089); 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)(10201501046)(3002001)(100000703101)(100105400095)(93006095)(93001095)(6055026)(6041248)(20161123555025)(20161123564025)(20161123560025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:VI1PR0501MB2048; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:VI1PR0501MB2048; X-Forefront-PRVS: 04569283F9 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(346002)(376002)(39860400002)(189002)(199003)(48376002)(316002)(25786009)(6116002)(105586002)(97736004)(53936002)(81156014)(5003940100001)(81166006)(55016002)(106356001)(69596002)(2906002)(50466002)(21086003)(76176999)(101416001)(16526018)(575784001)(5660300001)(33646002)(47776003)(189998001)(68736007)(2950100002)(86362001)(6666003)(50986999)(478600001)(8676002)(50226002)(16586007)(4326008)(7736002)(8936002)(305945005)(36756003)(3846002)(66066001)(118296001); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0501MB2048; 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; VI1PR0501MB2048; 23:AVkCUymrZGBOVM35sN6aRgVEPN32ulXz3G5R5Vv?= kicM0UCg6X6CDR6qXT03h/wbD8VCHaFLqVKXXNUO9PqHqrQTAF0aabUmXoYiIQa89WJGuaro315csnOwNa5Z/N0Z9XOuVuo7sqgeiDSwDJGYhZRfGcj9zKUVTXNfIcAIkyfnt8ayWzVYt24UHY8Ivxk2Wj/heAuFTx7N1+cIZGeYbDjbXKBnxXUmV6Khjuf2dihx9Z7HuzTd5wHRtEXbKvPKTGoBb5CMkC44TS6b8DtH9TGhimDI3dMtjKnuINKBHDjo8c+dExiGUdtGND2xhP962/crrt8N+L3o+tZpIucfjsbXQ/+LyXxqcq5TJMU+pZw7Z3O+7XpE0o5BzIPqqvgsoJVjdV9hlkI8kUKt+Hbk1yCF207rlcbgrOY5CkAMbHAIxXUvYr7d1v1TaZbp7LovGUujEy0QcXoLfU6QbtPzMr1rU+6KvPl9zGNbr6G/ULQFE+NQG6Nq6+AXZSOB6jJV82mmpE7/+X403KcwuqGOAlKmH3lO2FncL8xCcKy7QXIkjdRBwCTT1vFssBqhDjHpCe6MCoQUXVC2ZHTtvZ2OkbwJFNzhiQAZladf4pc0B/7qgiKsPjP8nyCVC8HrS4FvuG17/F0Lx4tKJqWX0oh7FCQzNNmvVBn3qJcDR/bZK+3Zei2rUo79g+KQj3u53E72EZWlA+xp/ujOfHdrbckEXAtmHewxgJndevzA9li7ruk2AZGN0tp1URbM7oDZlklKcGwc7SZaM2pQLYkztiCRTGgUmQk/VYygByMEFnoqf9f1IeUsVgnLwjvzMaYCDwvd1Z3V68auzVh4opY4Cryb7oxG+KZ3I4bZ2w8nzFsT/BT6ZI2ToUiSvNJPOc2I47q4SAdk5psdzo11nsc97fl4lEb/iepHH3A/aYkxGp8D+GRhrjOpM/dv6z8WadjreLpBSdXq5tiSEkgLTxuzj663nfrLlcIA5YSomjVSKrs1RhivuvkSyf8E44BskvKCEk+14OVGSNAqO37L4SyzeJmFR77quhkVwk6TwJc6K1MTaJMSHEbz4qRt2BreU2eh7+3qDC7tcx98ytCSFq2W+FrF/sJlM/rm+utKKJcZWWe6nqec= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2048; 6:jCp7FtBM6Qcs5nhGLJVT1gAT1bSZ2Ed3cyM96O+OTQtTRLd21rnq5+gYvAJbQh+fUeoPQ3e+K9kCa9zIHC3Ef7dqcaLWYYK2pYRksaj3oRPMN40AOgArfPYkDLY+jyt1bALZ+EY5yaWvwLb5MNr5oil3iEeDlvVCdJNOFi4qSRGgslel85hSTlSMvR2RU8UdEUbm7/KHdJyUW4WGY48sj2SKmCp7H03L3ivCURmd356zVPUJj4w2UBj5nyD/aw3+WiUIGz6hHNy7Mp2FW6NVE2Y4Un6au4PybxKsX+HMt1cJuVNeWQC4DuHuMSc4ZNCYbFGnRugiitVNmB1lP1Iuyw==; 5:SqIH9n0w8U8gMX9j4cB5m/3UwYBtIiSpPK7zImsqRMAmjGwSJXCI322VqfFYVZ+VoeOHuxn4D87lSD+dOlcAiZ6qK7C7OWwDHpv/I7ayDfaYrNPUi8KoTnU4sI46CfFF28o4iBQ8c2zMx1p26bynpGeJmQAvTaPK3yPdUMdnHEc=; 24:ZnZCUvnWteIVqUXxnO06ZmQlvVKQqPETnkLNJZtBHtrd6zd70wjoG2QcPj19P+RVPT9sBmSdgRqy0h/V73TflgM78UvDje8GBHPykuwvVbU=; 7:t6u12B8sAZu0xRd4xJCJUoK5XwT+MSIdm9o6ZLjGQuw0dwh0x08fDSeQIGVD7Ihf68k2HQ8Oo8V/Abz3c3uYikiZdTCbvHd3Ghp8wwL4vCfhpENkiGlkZkE3yglTLs01t6DIGgmlNZRX0wYUMZaIIpE22nc6TaDbxJ6wEcpgV2kzFMncANwSLh3HJ72uVrWYQHV5yknp4x7DMEg6sQODUaA/A6XDBd+FTAjzk9eVV5Q= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2017 14:04:18.1513 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0501MB2048 Subject: [dpdk-dev] [PATCH v3] net/mlx5: fix deadlock due to buffered slots in 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" When replenishing Rx ring, there're always buffered slots reserved between consumed entries and HW owned entries. These have to be filled with fake mbufs to protect from possible overflow rather than optimistically expecting successful replenishment which can cause deadlock with small-sized queue. Fixes: fc048bd52cb7 ("net/mlx5: fix overflow of Rx SW ring") Cc: stable@dpdk.org Reported-by: Martin Weiser Signed-off-by: Yongseok Koh Tested-by: Martin Weiser --- v3: * Rebased on top of dpdk-next-net/master v2: * Replace vector st/ld with regular assignment as performance gain is negligible for the short loop. This is to make the function shareable with ARM NEON. drivers/net/mlx5/mlx5_rxtx_vec.h | 6 +++++- drivers/net/mlx5/mlx5_rxtx_vec_neon.h | 13 ++----------- drivers/net/mlx5/mlx5_rxtx_vec_sse.h | 13 ++----------- 3 files changed, 9 insertions(+), 23 deletions(-) diff --git a/drivers/net/mlx5/mlx5_rxtx_vec.h b/drivers/net/mlx5/mlx5_rxtx_vec.h index 426169037..1f08ed0b2 100644 --- a/drivers/net/mlx5/mlx5_rxtx_vec.h +++ b/drivers/net/mlx5/mlx5_rxtx_vec.h @@ -101,7 +101,7 @@ mlx5_rx_replenish_bulk_mbuf(struct mlx5_rxq_data *rxq, uint16_t n) { const uint16_t q_n = 1 << rxq->elts_n; const uint16_t q_mask = q_n - 1; - const uint16_t elts_idx = rxq->rq_ci & q_mask; + uint16_t elts_idx = rxq->rq_ci & q_mask; struct rte_mbuf **elts = &(*rxq->elts)[elts_idx]; volatile struct mlx5_wqe_data_seg *wq = &(*rxq->wqes)[elts_idx]; unsigned int i; @@ -119,6 +119,10 @@ mlx5_rx_replenish_bulk_mbuf(struct mlx5_rxq_data *rxq, uint16_t n) wq[i].addr = rte_cpu_to_be_64((uintptr_t)elts[i]->buf_addr + RTE_PKTMBUF_HEADROOM); rxq->rq_ci += n; + /* Prevent overflowing into consumed mbufs. */ + elts_idx = rxq->rq_ci & q_mask; + for (i = 0; i < MLX5_VPMD_DESCS_PER_LOOP; ++i) + (*rxq->elts)[elts_idx + i] = &rxq->fake_mbuf; rte_io_wmb(); *rxq->rq_db = rte_cpu_to_be_32(rxq->rq_ci); } diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h index 6dd18b619..86b37d5c6 100644 --- a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h +++ b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h @@ -446,13 +446,6 @@ rxq_cq_decompress_v(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cq, }; /* - * 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. @@ -778,10 +771,8 @@ 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]; - 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 overflow pkts array. */ + pkts_n = RTE_ALIGN_FLOOR(pkts_n - rcvd_pkt, MLX5_VPMD_DESCS_PER_LOOP); /* Not to cross queue end. */ pkts_n = RTE_MIN(pkts_n, q_n - elts_idx); if (!pkts_n) diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_sse.h b/drivers/net/mlx5/mlx5_rxtx_vec_sse.h index 88c5d75fa..c2142d7ca 100644 --- a/drivers/net/mlx5/mlx5_rxtx_vec_sse.h +++ b/drivers/net/mlx5/mlx5_rxtx_vec_sse.h @@ -437,13 +437,6 @@ rxq_cq_decompress_v(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cq, #endif /* - * 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. @@ -764,10 +757,8 @@ 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]; - 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 overflow pkts array. */ + pkts_n = RTE_ALIGN_FLOOR(pkts_n - rcvd_pkt, MLX5_VPMD_DESCS_PER_LOOP); /* Not to cross queue end. */ pkts_n = RTE_MIN(pkts_n, q_n - elts_idx); if (!pkts_n)