From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 435CEA04B1; Tue, 10 Nov 2020 15:11:20 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A7BDD592B; Tue, 10 Nov 2020 15:10:07 +0100 (CET) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id 5E53E5AB2 for ; Tue, 10 Nov 2020 15:10:05 +0100 (CET) Received: by mail-wr1-f65.google.com with SMTP id 23so12798441wrc.8 for ; Tue, 10 Nov 2020 06:10:05 -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=HTXbh7Ub/iHi3FEJwT30SL5Hx75g1i2v+GfXB88JyUA=; b=ChkEJMd5hXHIpLSvhuCM3WzurAep9aLJACajQDdHtB0lUdx6mJWPXiEGBTxu2nctgR kQD7/fyTqlQ0cEQubNhYGVTrPITfE1L8QK9fuo98gkrdJ06PwSmA3mcIwue5RC1DH/Qp ALcsGk1mK8svWvAR1waLcqBgO9Egwy2cWzIWN26Bt8FEE9grmqvP5IdEjYXGx8iodE4t nvo/gL1iwwraTI0zsLtAF8PQNjovl1ZMrdqwVZd/u6oadpQADOBrJcKpAUBP65YgbSZY ViX+Atpd32kqupvib0fb3X83E7sbV+MvFT9tI+j9CbaCiKzVVWGv2CDH2IwlcaW2K4Px ELUg== 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=HTXbh7Ub/iHi3FEJwT30SL5Hx75g1i2v+GfXB88JyUA=; b=ORmjVrN0UwaKH+nLUfw5Pj4j5/8anJE9Z4HeS7ofPckW3pKTIDZcLlRGDyvWty0cpe sdqivMZkvmgA8wLd3lCt9r5iZfObgWigWuO04E8g5hnFYieWe+PW+Cn+cAKPedxxBp45 iykBZXnrpEr7KIBEdd4jekKZwLapTS7lgfhVol21E/VJfZ0HU5BX1oorG51mTDdFXx5A ydpe8FU316+t2SC/3/5KwPRN7U6R06P+z3qIe5bIrdD+or0iuRu3m5RNSpQ6yZ5Rsc3M vpmOvoP4H4y8/QEhqSRXIPtbxOPc7ftqn+5gyo0vy8wNbGX7ZLgrhL75PqzUO1TTX+Sz HT1w== X-Gm-Message-State: AOAM531hg/s95tDfoD75cdgCftTohYQeZjMsZ1yDZ6kWTiWiai6rbijW q25i1s927aLiU7dJkzB+8FnEOQ== X-Google-Smtp-Source: ABdhPJxnAAMEJpXtdN67/EmY8wPg1Io4Te+/z8ZnsLuPS7i7WzI8uXWSmrjXhKguyphHmaAmhNOp8g== X-Received: by 2002:a5d:42c9:: with SMTP id t9mr10559780wrr.13.1605017404169; Tue, 10 Nov 2020 06:10:04 -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 y187sm3112158wmg.33.2020.11.10.06.10.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 06:10:03 -0800 (PST) From: Maxime Leroy To: Matan Azrad , Shahaf Shuler , Viacheslav Ovsiienko Cc: dev@dpdk.org Date: Tue, 10 Nov 2020 15:09:38 +0100 Message-Id: <20201110140938.15046-5-maxime.leroy@6wind.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201110140938.15046-1-maxime.leroy@6wind.com> References: <20201110140938.15046-1-maxime.leroy@6wind.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH 4/4] mlx5: re-add support of rx_queue_count for mlx5_rx_burst_mprq 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" The commit 014a6936008b ("Revert "net/mlx5: fix Rx queue count calculation"")' has removed the support of rx_queue_count for mlx5_rx_burst_mprq. This commit has been revert because the fixes done on rx_queue_count computation was wrong. Anyway, it's still true that the Rx queue count calculation is same for any rx burts method since CQ handling is the same for regular, vectorized, and multi-packet Rx queues. Signed-off-by: Maxime Leroy --- drivers/net/mlx5/mlx5_rxtx.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c index 2cabd650..db3c6100 100644 --- a/drivers/net/mlx5/mlx5_rxtx.c +++ b/drivers/net/mlx5/mlx5_rxtx.c @@ -492,7 +492,7 @@ rx_queue_count(struct mlx5_rxq_data *rxq) used += n; cqe = &(*rxq->cqes)[cq_ci & cqe_cnt]; } - used = RTE_MIN(used * sges_n, 1U << rxq->elts_n); + used = RTE_MIN(used * sges_n, cqe_cnt); return used; } @@ -515,7 +515,8 @@ mlx5_rx_descriptor_status(void *rx_queue, uint16_t offset) container_of(rxq, struct mlx5_rxq_ctrl, rxq); struct rte_eth_dev *dev = ETH_DEV(rxq_ctrl->priv); - if (dev->rx_pkt_burst != mlx5_rx_burst) { + if (dev->rx_pkt_burst == NULL || + dev->rx_pkt_burst == removed_rx_burst) { rte_errno = ENOTSUP; return -rte_errno; } -- 2.27.0