From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D8964A0C50 for ; Mon, 12 Jul 2021 16:29:39 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C7FC64119E; Mon, 12 Jul 2021 16:29:39 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2082.outbound.protection.outlook.com [40.107.236.82]) by mails.dpdk.org (Postfix) with ESMTP id 68EC540685; Mon, 12 Jul 2021 16:29:37 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OZbdh3RuulqKKLjtnt6CzmIPVxorKz8QIja1wzIHcxHOraCPjG9GaR9ODu5ieDMnHWocprOwwsWk2dRt/czPVpZAdrKfGR4336vra3qGNxshV0naemTZ8x4VF/H/tLPLujgQ6iCM1m/nrDfMmEPbE+N6n2J/ZvV1XsFTP8iW0bEoLYPbJRCZOEztqD3U6/EnkrPXl5qwP1Dp8t6QIzI1OcRg+XbX6P/chch/qDqff7S+1BbcNtgMPCT+Dbud2wbP0E1B4fOEcv7mhp5pjOJFDCdcLNniDLyVFrl8On8gJ3CXPb9OXvgrKMxuyIe1GCSHoSITDJtdSN1PLLL536RlXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HtxEheyXlt+oVGuk3SL86hhwfGoX88D0eJkyYjmh6aI=; b=dbUq+O571RGHA0WjSxJDad4T6+HnJxAVmqAkIPr4QLvTDw6UqOpmknpNQFP3lb4QtbV5kDE9HgQMZgf62Ilt9TyjOCCRP4jask8IsDj2UopdxIgIblaTISKoPXGfAO4b6m3OVkJfFKvVEFPHumgUejDnL2Wec06GPMYuyOqQJnJ84hgl+KW6rDXen3OIBiv8HfxEZmf1m5i8NokSxAJJ9941rOnBwgHvabzMvAgzW2ZrQAEFVx4jgvy+ldUcqwkElyQtX8DEgLCmL5PkcS+bv+OvNe5xeIAA8LzAQZxDbhOSAD/QzsQldbmJfF8Qx4352I+R2dNxZM3L9w6rgQJj/Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HtxEheyXlt+oVGuk3SL86hhwfGoX88D0eJkyYjmh6aI=; b=eEWtTaGXRZeZaz6QwJ3wli0rHe1hXdSSotYyc8NGnGLqeqBs0aYkgtG8Vx4j2Km2whO3bvo6oSoXpliLnxXQWtC+Acrj4SMmecMQXipOc0ruxoqotAu948kcq0Y4DCnHIpRKjMJoWEJxElhREVkW1AgWgcfo+luJFh2VftyE8fWgwkhXHk7fKYCMngfnQZbbAydSnxcliq2rWcfZ0Ns8KIyBW0/1k43+dDbwRSfLgfzG5eCOF/uZ9hYzZT21LQ8Jp6wblnCeXlVv4n4qKZcjAYrvrdfSCGtgvoasZkdvucX/wEvEfX1iRIULvRuY3yLFxWhoQUguya3GgOaHEavb0g== Received: from MWHPR08CA0053.namprd08.prod.outlook.com (2603:10b6:300:c0::27) by BN6PR1201MB0050.namprd12.prod.outlook.com (2603:10b6:405:4e::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4308.25; Mon, 12 Jul 2021 14:29:36 +0000 Received: from CO1NAM11FT059.eop-nam11.prod.protection.outlook.com (2603:10b6:300:c0:cafe::f0) by MWHPR08CA0053.outlook.office365.com (2603:10b6:300:c0::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4308.20 via Frontend Transport; Mon, 12 Jul 2021 14:29:35 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by CO1NAM11FT059.mail.protection.outlook.com (10.13.174.160) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4308.20 via Frontend Transport; Mon, 12 Jul 2021 14:29:35 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 12 Jul 2021 14:29:23 +0000 From: Alexander Kozyrev To: CC: , , , , Date: Mon, 12 Jul 2021 17:29:10 +0300 Message-ID: <20210712142910.314572-1-akozyrev@nvidia.com> X-Mailer: git-send-email 2.18.2 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3cfeb1ff-1df0-4eca-bfdf-08d94541791a X-MS-TrafficTypeDiagnostic: BN6PR1201MB0050: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ab5viWVdAaTg6FlNiHxOKQ7j+45yqgsIbI2togCHTcjwTHZLy7N73VOpKzXvMYvxPobG4levXQp7NcNXkQDsjoZbodKjCE0SB9c7uMBvwPyHosrGJU0/g98tKMcj/MGPCSWPGkrtNy6kQL/jCNH0Np/2caUHNDMG/n78rGDaChf8mtSic/niFYd4WtNyWLpjvlOG0rAQ5K0oNimAExbAHR7Fvnx2u3HUDBA31AXsDaJRNCpb1Cj7ytqz0CxCut+QJW1/yCdoQo7VLOpNu8Rt5h40VCNDHh2Q5uB9NjqQYnVEkqS6Hh35VKHVqM0QBs8aXex6BaoTVNe7PgyMcN45TG7EtXvKEazR/9hy8ZcaGB1orEIse+8icjgalZvBKPVd1QBtr9TrmsDRd0PdVKfdj0AMEH7zqYydgd7e4esoaF7XaRSbvM2dZFAYgfTLXFqhVBndFB0IeF+kGz4SEfl9WuKXCG2vUTKjk4ODApV3TlNXHiQxyYY2sjpurHTrfa8ozA5RA7kvFFlXxXT4THs7Etztubc9YTqX9QlfM6A0jYx6OMzk9c2ivXJfn077jun7W0Cx9ObBs9JXcL6gQtULWv2Y2xubzFsFTLF3Ou9VmA+OYzdcTkzRGFiwuqfvceqCxLcLKO6bnx3dkSeZAGgrHVDrr/VUX3kGp+L8IXiZ5Bd2vRir7hg/04DT+eM5yka9K3ef0I6+/d4mPwZx0uuQ6iK9OU58KeaHTJ/pFTMFFTI= X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(39860400002)(396003)(376002)(346002)(136003)(36840700001)(46966006)(83380400001)(7696005)(450100002)(6666004)(4326008)(26005)(47076005)(36860700001)(82740400003)(36756003)(55016002)(8676002)(6286002)(5660300002)(2906002)(8936002)(70586007)(36906005)(107886003)(6916009)(316002)(70206006)(86362001)(54906003)(426003)(356005)(7636003)(186003)(16526019)(478600001)(336012)(82310400003)(2616005)(34020700004)(1076003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2021 14:29:35.0866 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3cfeb1ff-1df0-4eca-bfdf-08d94541791a X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT059.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR1201MB0050 Subject: [dpdk-stable] [PATCH] net/mlx5: fix threshold for mbuf replenishment in MPRQ X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" The replenishment scheme for the vectorized MPRQ Rx burst aims to improve the cache locality by allocating new mbufs only when there are almost no mbufs left: one burst gap between allocated and consumed indexes. This gap is not big enough to accommodate a corner case when we have a very aggressive CQE compression with up to 4 regular CQEs and 64 zipped CQEs at the end. Need to keep in mind this case and extend the replenishment threshold by MLX5_VPMD_DESCS_PER_LOOP (4) to avoid mbuf overflow. Fixes: 5fc2e5c27d6 ("net/mlx5: fix mbuf overflow in vectorized MPRQ") Cc: stable@dpdk.org Signed-off-by: Alexander Kozyrev Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_rxtx_vec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_rxtx_vec.c b/drivers/net/mlx5/mlx5_rxtx_vec.c index d5af2d91ff..e22ab665df 100644 --- a/drivers/net/mlx5/mlx5_rxtx_vec.c +++ b/drivers/net/mlx5/mlx5_rxtx_vec.c @@ -152,7 +152,8 @@ mlx5_rx_mprq_replenish_bulk_mbuf(struct mlx5_rxq_data *rxq) unsigned int i; if (n >= rxq->rq_repl_thresh && - rxq->elts_ci - rxq->rq_pi <= rxq->rq_repl_thresh) { + rxq->elts_ci - rxq->rq_pi <= + (uint32_t)rxq->rq_repl_thresh + MLX5_VPMD_DESCS_PER_LOOP) { MLX5_ASSERT(n >= MLX5_VPMD_RXQ_RPLNSH_THRESH(elts_n)); MLX5_ASSERT(MLX5_VPMD_RXQ_RPLNSH_THRESH(elts_n) > MLX5_VPMD_DESCS_PER_LOOP); -- 2.18.2