From patchwork Wed May 9 12:47:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Krawczyk X-Patchwork-Id: 39590 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 9C8DE1B663; Wed, 9 May 2018 14:47:45 +0200 (CEST) Received: from mail-lf0-f65.google.com (mail-lf0-f65.google.com [209.85.215.65]) by dpdk.org (Postfix) with ESMTP id 98BC31B641 for ; Wed, 9 May 2018 14:47:32 +0200 (CEST) Received: by mail-lf0-f65.google.com with SMTP id g12-v6so50760553lfb.10 for ; Wed, 09 May 2018 05:47:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=a3A8hYrNM/AY06mC3YrdBKxSuuy+Hy4ZPfqGNTSVO1g=; b=XUe2g9pX0Su4+4a+aK411HdC6uHjUA7I0B26RkId3nepB0+28zW1T8RVKzvK6HuygT LgEhbWUqcIzBxwzPMtTDHmGwQpLmP1eEMbF5vCwbx3DJdbJAIR0/7Wd12lVbwVZPmw18 Sanc/s9/n2PwWUT5UwGVnqvprBYGCM9DnhXV9f7EvHk9Pu+SKZVXoRa+YG6qSYMQ1NAo OIFrgmgGJozRQbxgYg7Dh35JkHQJVFko8JHLkFybFNSKYUC8WQvgS7GjpG980WXgu7mZ yzSY2ZpExrZ7I4LXSxMTool7ke2F7/yIOnV2CHVxUinJ83pYKXgaK6yk0lJH7SUIq6Fd U1ng== 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; bh=a3A8hYrNM/AY06mC3YrdBKxSuuy+Hy4ZPfqGNTSVO1g=; b=qjJV3WbrAfsFbwaok1q5TRyWAFQNRbXbzoeNr+n2PE6Wn5Y35ckkoc41HN+a6J4XUT d+ZZPD9wkMNyn8fieteqZeOnJ5eazND02LEl+LSUn5yz0tLkilPJfNcam2m+mkuBlLce 8z0nhufVgpizt8rkdUE8aVvH38SgiO+NxE+g5zxgoKToH9OxK93WbNsKGqRWZlUVxSqa b7tbpeBhMXg0QdlD30Tm8j2rbs0J0Mmyiy763K384HXWx9di2YHIKlhPQK6jwGo8UIoi IGR4AxVSFYQYM/NHfAsPDjWODsbrf01/7cSD21I0+vFVxbz6OTzGdfIwuyU923AcLxHt 9lpg== X-Gm-Message-State: ALQs6tCTcPdvEqzmHrMnI0t6JdqeAEkWlP0OEnt1vn8oNS08qIRHxlpe i4ouUPS8LjgqymCJ7Xofe1jaNCjAYcA= X-Google-Smtp-Source: AB8JxZqq5o5DShgshMAD6VqL3yFxip9GsOVcL0l+X5KhBYe1T7r1BwNQwWOraqVIvv1yq5iqx9KZbw== X-Received: by 2002:a19:164f:: with SMTP id m76-v6mr30448595lfi.27.1525870052272; Wed, 09 May 2018 05:47:32 -0700 (PDT) Received: from mkPC.semihalf.local (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id l10-v6sm5149258lja.62.2018.05.09.05.47.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 May 2018 05:47:31 -0700 (PDT) From: Michal Krawczyk To: Marcin Wojtas , Michal Krawczyk , Guy Tzalik , Evgeny Schemeilin Cc: dev@dpdk.org, matua@amazon.com, Rafal Kozik Date: Wed, 9 May 2018 14:47:07 +0200 Message-Id: <20180509124714.23305-8-mk@semihalf.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180509124714.23305-1-mk@semihalf.com> References: <20180509124714.23305-1-mk@semihalf.com> Subject: [dpdk-dev] [PATCH v1 17/24] net/ena: rework configuration of IO queue numbers 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: Rafal Kozik Move configuration of IO queue numbers to separate function and take into consideration max number of IO completion queues. Signed-off-by: Rafal Kozik Acked-by: Michal Krawczyk --- drivers/net/ena/ena_ethdev.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) -- 2.14.1 diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c index 885d96b59..3fabe196f 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c @@ -1510,6 +1510,24 @@ static void ena_timer_wd_callback(__rte_unused struct rte_timer *timer, } } +static int ena_calc_io_queue_num(__rte_unused struct ena_com_dev *ena_dev, + struct ena_com_dev_get_features_ctx *get_feat_ctx) +{ + int io_sq_num, io_cq_num, io_queue_num; + + io_sq_num = get_feat_ctx->max_queues.max_sq_num; + io_cq_num = get_feat_ctx->max_queues.max_cq_num; + + io_queue_num = RTE_MIN(io_sq_num, io_cq_num); + + if (unlikely(io_queue_num == 0)) { + RTE_LOG(ERR, PMD, "Number of IO queues should not be 0\n"); + return -EFAULT; + } + + return io_queue_num; +} + static int eth_ena_dev_init(struct rte_eth_dev *eth_dev) { struct rte_pci_device *pci_dev; @@ -1574,7 +1592,8 @@ static int eth_ena_dev_init(struct rte_eth_dev *eth_dev) adapter->wd_state = wd_state; ena_dev->tx_mem_queue_type = ENA_ADMIN_PLACEMENT_POLICY_HOST; - adapter->num_queues = get_feat_ctx.max_queues.max_sq_num; + adapter->num_queues = ena_calc_io_queue_num(ena_dev, + &get_feat_ctx); queue_size = ena_calc_queue_size(ena_dev, &tx_sgl_size, &get_feat_ctx); if ((queue_size <= 0) || (adapter->num_queues <= 0))