From patchwork Tue Nov 17 11:26:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Leroy X-Patchwork-Id: 84269 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 91D6AA04DB; Tue, 17 Nov 2020 12:27:33 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 99588C8B2; Tue, 17 Nov 2020 12:27:22 +0100 (CET) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by dpdk.org (Postfix) with ESMTP id 687CC37B0 for ; Tue, 17 Nov 2020 12:27:21 +0100 (CET) Received: by mail-wr1-f67.google.com with SMTP id d12so22762240wrr.13 for ; Tue, 17 Nov 2020 03:27:21 -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=vMCnc/1tFsVP8Qd+rcwb7LVDrrSJzHqzDQKu78Zh8y8=; b=DVJXnPQTTE//UOcwurqnk0z5O1kcL4ouDQuMEod3g4veuNA6dVcqRYknkX4Sjo9juE LJRAxmeGLY4bza2X8OpU1F04G1Dp/pdorDxRhNwKyH0L/to2+u++7jeU8lHAi3zslCcj +/0z871TouS0Z51GtZ1uIo2bsejm4LOEGi65UPfzt9g9RKRT3Wycjs8PNrxdgZUW/a6M n++D2YpteAWgglmTnJQyJEbArQJRSjB+BoiwBzq8VkGZ9ELEqpSiG/eXrMGs69I7JcI2 DXI6SGKDpSfs54Z53VHcwKYJyIIocQY+GJRcKfDWqnwGDFGLaxSQR7Vg3NoUwEpLskur 7gig== 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=vMCnc/1tFsVP8Qd+rcwb7LVDrrSJzHqzDQKu78Zh8y8=; b=Cz8lNlSObaiP61WEPA8BbY64uzllHpUIW42FIucZWc8sgh8Vk5MxiGL5BVBHWAnyoO 7wMkXTVmuPi6MMpbtVQX3nTWF+tNlQd4nu6wrCwghzF23+wIkawPYc995NVnLWYH3jKr w0MEteSXjOBFNfdAtvjYppWE5VPvvihfOlWDMpDpid4eYI7FiVjALSWwq3t7ANplega+ fzMsQ5CSakHg/PmTSJttoAjBbq+SaphmrLYFH8MZ509e/4BAC7+N+TDaJgPl4Sa7bYWC Kv+EsQ107fcZ22aq1FAJIVWUexVDJc6XtzH54UvLZVqzXTR5TE0nSsqUukLViBSU7N3G cvbA== X-Gm-Message-State: AOAM532ijZ1nAJmWtR3rYg3Xdi8nGCr6AEpHm3UmBO1gnZEjwdzThQSV c6y8DhBivU1NaDUEy5AT7t5Fcw== X-Google-Smtp-Source: ABdhPJwNfoeM3HGOeTG62O7qR5bbwE3fA+JaAEro91kdh96Larsm/i7KFSnavf7QfJClOR0kS7z/pA== X-Received: by 2002:a5d:54c7:: with SMTP id x7mr25156169wrv.359.1605612440136; Tue, 17 Nov 2020 03:27:20 -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 o17sm3136265wmd.34.2020.11.17.03.27.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2020 03:27:19 -0800 (PST) From: Maxime Leroy To: Matan Azrad , Shahaf Shuler , Viacheslav Ovsiienko , Olivier Matz Cc: dev@dpdk.org, Didier Pallard Date: Tue, 17 Nov 2020 12:26:47 +0100 Message-Id: <20201117112648.29725-3-maxime.leroy@6wind.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201117112648.29725-1-maxime.leroy@6wind.com> References: <20201117112648.29725-1-maxime.leroy@6wind.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v4 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 SPRQ 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 MPRQ mode, we need to take into account 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; }