From patchwork Mon Nov 16 17:02:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Leroy X-Patchwork-Id: 84246 X-Patchwork-Delegate: rasland@nvidia.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id C13A8A04B5; Mon, 16 Nov 2020 18:03:51 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 664F6C8E2; Mon, 16 Nov 2020 18:03:19 +0100 (CET) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by dpdk.org (Postfix) with ESMTP id EE682C8E0 for ; Mon, 16 Nov 2020 18:03:16 +0100 (CET) Received: by mail-wm1-f67.google.com with SMTP id m125so12997738wmm.3 for ; Mon, 16 Nov 2020 09:03:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OHBPQG64PdSbZ+6LmUhnAHI0X3IiTo0eS1xFol2yX2Y=; b=RDqg7lCzl4D410tjoj9/Or4ksSxmDbFhOfDPvgCYFMHXS/oQl+rrBC6ldp9hwl9vgP Nj/41mgNPbWt3a8FTedX2PwnSMG/ZyO1qCHl4gDgcCGPusVmTrZD3NZr/OeQkMQvmgp3 0aa1XXT7V+t4KhkKLaRL/B8N2UCdD2jXNATkiayVAUYHqIvRcnAEGdRjsRcJk4IceasH gXe2VR0Xbw9RX9BGagypzWcIV2WTACYRF2bKtOXTzNvFaZw5O9yJBJP7rwf5wrKHxqmd ZBDB5wJC5BVp0+93Ebp43gq56T2rEVwTLnnZFFmbp9UBYV5gBaJMckRj5+gAg0kta0Yq aIJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OHBPQG64PdSbZ+6LmUhnAHI0X3IiTo0eS1xFol2yX2Y=; b=DeL89w8Lpz7hJ5b4wTa/dnb0ycdWfMSWngOHpYC7aitrXTdx419o9YjBXPPjSxF+96 LzY0cXWQLk/BtsiGfMNWnUPTmoVAZxTfLqPpOoieUQY1Mjzh3IhgxYmlqlhFuTDye01Q jTcM0e4hml4+dJC1Ch3ZPuUrxcJD9r+VxVFyObctk1rJ6qfqGH09cBIvWzYqp+Uggx5z 2iCK9mP3IpQBBA+B2RLz0LVVc7LlCQaRmqwOs1ltnWm3H3PNDbs9wnmhC/Ptln9Tl1Rd L9uQkG4vwcpbXG5Kmy7SPCHb+zFmuGz3iiiCUx7H//GnfYZQ+lbG3GEU/64Rl2gGLRPw lgwA== X-Gm-Message-State: AOAM531sK30+ZL8a4VDqrWmtRgPc1GuHUfLHRTxZ81VuI/Xv1XI/EA5Y 4XVyvamqxVsmlpYMJa2XZkuBhA== X-Google-Smtp-Source: ABdhPJxAhNPipjTbyZuChn7afFxODSS7CI6irqxqrgWP1dc67Iz8iF52LWe3YRJ2o5R4ExJwnQ+BHQ== X-Received: by 2002:a05:600c:290a:: with SMTP id i10mr16855199wmd.187.1605546195731; Mon, 16 Nov 2020 09:03:15 -0800 (PST) Received: from bolet.dev.6wind.com. (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id l13sm24570935wrm.24.2020.11.16.09.03.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:03:15 -0800 (PST) From: Maxime Leroy To: Matan Azrad , Shahaf Shuler , Viacheslav Ovsiienko , Olivier Matz Cc: dev@dpdk.org, Didier Pallard Date: Mon, 16 Nov 2020 18:02:58 +0100 Message-Id: <20201116170258.18583-3-maxime.leroy@6wind.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201116170258.18583-1-maxime.leroy@6wind.com> References: <20201116170258.18583-1-maxime.leroy@6wind.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v3 2/2] net/mlx5: fix Rx descriptor status returned value 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" From: Didier Pallard Three bugs in rx_queue_count function: - One entry may contain several segments, so 'used' must be multiplied by number of segments per entry to properly reflect the queue usage. - The number of cqes is equals to (1U << rxq->elts_n) - 1 in non mqrt mode. The range returned by rx_queue_count should be the number of entries used in queue, so it ranges from 0 to max number of entries in queue, not this number minus one. - For MQRT mode, we need to take acount of the number of strd. Fixes: 8788fec1f269 ("net/mlx5: implement descriptor status API") Signed-off-by: Didier Pallard Signed-off-by: Maxime Leroy Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_rxtx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c index 2733dcd3..2ecf901f 100644 --- a/drivers/net/mlx5/mlx5_rxtx.c +++ b/drivers/net/mlx5/mlx5_rxtx.c @@ -463,6 +463,9 @@ rx_queue_count(struct mlx5_rxq_data *rxq) struct rxq_zip *zip = &rxq->zip; volatile struct mlx5_cqe *cqe; const unsigned int cqe_n = (1 << rxq->cqe_n); + const unsigned int sges_n = (1 << rxq->sges_n); + const unsigned int elts_n = (1 << rxq->elts_n); + const unsigned int strd_n = (1 << rxq->strd_num_n); const unsigned int cqe_cnt = cqe_n - 1; unsigned int cq_ci, used; @@ -488,7 +491,7 @@ rx_queue_count(struct mlx5_rxq_data *rxq) used += n; cqe = &(*rxq->cqes)[cq_ci & cqe_cnt]; } - used = RTE_MIN(used, cqe_n); + used = RTE_MIN(used * sges_n, elts_n * strd_n); return used; }