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 7F35442A8C for ; Tue, 9 May 2023 05:16:33 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7A051410D0; Tue, 9 May 2023 05:16:33 +0200 (CEST) Received: from mail-il1-f226.google.com (mail-il1-f226.google.com [209.85.166.226]) by mails.dpdk.org (Postfix) with ESMTP id 27A8B410D0 for ; Tue, 9 May 2023 05:16:32 +0200 (CEST) Received: by mail-il1-f226.google.com with SMTP id e9e14a558f8ab-334f64c91aeso5031965ab.2 for ; Mon, 08 May 2023 20:16:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1683602191; x=1686194191; h=cc:to:from:subject:message-id:date:from:to:cc:subject:date :message-id:reply-to; bh=XiqVthfTcQyDiHD157aH9Eq1ZwANAeZEubPj96btmMI=; b=UZqaLt7d53Uop/GIwAqwauDPV220LfT1dw7kpYuykzNstWzaI2MvtGDiA9TtqcFhOy RDWxse/c/8XSdrU34qRdeXSx/Jeh0M2IzUrXd1gJa3CoLiDe2z5XA3aTjYQh3GaVuM7U EwnS89SfldkL/AfaNl15p5c1xal3dia5nPdEs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683602191; x=1686194191; h=cc:to:from:subject:message-id:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XiqVthfTcQyDiHD157aH9Eq1ZwANAeZEubPj96btmMI=; b=J3QH7/JmUb/ymVS+OLVDIHmb+SkqLYuVWjkirDk1W30dkZ5mb2jOCMUmyDpvJoJ6Sd 39d//iIDJ2PtB+YxZHDgKKMuh5mAE0kHtiyLkQb7I0KcxDunBHRCCadnmMx6peyarmHf 00Nzgxrn7EBpYteaOh2XD2pcPwP8xXUf4SpqjsDN8pmY3cFECD50gbhXfcJMZMlcIo6B TpPaUZkY4hAcX8A0JgZ7Mq2/iqiWoGhfvicHoZcbG/TnfaGUi8mPqK+2O+TkGo8EqL/q Qs6WnlwB0HeUkDdu8Fekv8+RyFu2OIXD2MfDutyeUBE4uOkY6w7XT/KoKvGk9sEo3zg4 cvug== X-Gm-Message-State: AC+VfDyCP1xwsoRW+htbv9NUuG0mkFMihQPADmjYeKAuFJpAgMKcdhm4 YEt7p37PRtzTYOj2V27XBKxlAlvlkfEA65G5hszuq/KHTbgND3s22gAT8rykd9izYXW0W3aHhQ= = X-Google-Smtp-Source: ACHHUZ5MdW+B/0FZ7ucAac3SDr1wxzBq87BSwHigECVhHSUJT63iwn+u5yPJb09L4WLGCHrXaYkoFecRF0TW X-Received: by 2002:a92:cc4a:0:b0:335:9303:4346 with SMTP id t10-20020a92cc4a000000b0033593034346mr426282ilq.13.1683602191567; Mon, 08 May 2023 20:16:31 -0700 (PDT) Received: from postal.iol.unh.edu (postal.iol.unh.edu. [2606:4100:3880:1234::84]) by smtp-relay.gmail.com with ESMTPS id b24-20020a029a18000000b0040f93edec5esm571253jal.28.2023.05.08.20.16.31 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 May 2023 20:16:31 -0700 (PDT) X-Relaying-Domain: iol.unh.edu Date: Mon, 08 May 2023 20:16:31 -0700 (PDT) Message-ID: <6459bb0f.020a0220.70735.2f1cSMTPIN_ADDED_MISSING@mx.google.com> Received: from [172.17.0.2] (unknown [172.18.0.34]) by postal.iol.unh.edu (Postfix) with ESMTP id D1ADC605246B; Mon, 8 May 2023 23:16:30 -0400 (EDT) Subject: |WARNING| pw126779 [PATCH] net/gve: support queue start and stop operations From: dpdklab@iol.unh.edu To: test-report@dpdk.org Cc: dpdk-test-reports@iol.unh.edu Content-Type: text/plain X-BeenThere: test-report@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: automatic DPDK test reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: test-report-bounces@dpdk.org Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/126779 _apply patch failure_ Submitter: Junfeng Guo Date: Tuesday, May 09 2023 03:07:29 Applied on: CommitID:d03446724972d2a1bb645ce7f3e64f5ef0203d61 Apply patch set 126779 failed: Checking patch drivers/net/gve/gve_ethdev.c... error: while searching for: return 0; } static int gve_refill_pages(struct gve_rx_queue *rxq) { struct rte_mbuf *nmb; uint16_t i; int diag; diag = rte_pktmbuf_alloc_bulk(rxq->mpool, &rxq->sw_ring[0], rxq->nb_rx_desc); if (diag < 0) { for (i = 0; i < rxq->nb_rx_desc - 1; i++) { nmb = rte_pktmbuf_alloc(rxq->mpool); if (!nmb) break; rxq->sw_ring[i] = nmb; } if (i < rxq->nb_rx_desc - 1) return -ENOMEM; } rxq->nb_avail = 0; rxq->next_avail = rxq->nb_rx_desc - 1; for (i = 0; i < rxq->nb_rx_desc; i++) { if (rxq->is_gqi_qpl) { rxq->rx_data_ring[i].addr = rte_cpu_to_be_64(i * PAGE_SIZE); } else { if (i == rxq->nb_rx_desc - 1) break; nmb = rxq->sw_ring[i]; rxq->rx_data_ring[i].addr = rte_cpu_to_be_64(rte_mbuf_data_iova(nmb)); } } rte_write32(rte_cpu_to_be_32(rxq->next_avail), rxq->qrx_tail); return 0; } static int gve_refill_dqo(struct gve_rx_queue *rxq) { struct rte_mbuf *nmb; uint16_t i; int diag; diag = rte_pktmbuf_alloc_bulk(rxq->mpool, &rxq->sw_ring[0], rxq->nb_rx_desc); if (diag < 0) { rxq->stats.no_mbufs_bulk++; for (i = 0; i < rxq->nb_rx_desc - 1; i++) { nmb = rte_pktmbuf_alloc(rxq->mpool); if (!nmb) break; rxq->sw_ring[i] = nmb; } if (i < rxq->nb_rx_desc - 1) { rxq->stats.no_mbufs += rxq->nb_rx_desc - 1 - i; return -ENOMEM; } } for (i = 0; i < rxq->nb_rx_desc; i++) { if (i == rxq->nb_rx_desc - 1) break; nmb = rxq->sw_ring[i]; rxq->rx_ring[i].buf_addr = rte_cpu_to_le_64(rte_mbuf_data_iova_default(nmb)); rxq->rx_ring[i].buf_id = rte_cpu_to_le_16(i); } rxq->nb_rx_hold = 0; rxq->bufq_tail = rxq->nb_rx_desc - 1; rte_write32(rxq->bufq_tail, rxq->qrx_tail); return 0; } static int gve_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complete) { error: patch failed: drivers/net/gve/gve_ethdev.c:104 error: while searching for: } static int gve_dev_start(struct rte_eth_dev *dev) { uint16_t num_queues = dev->data->nb_tx_queues; struct gve_priv *priv = dev->data->dev_private; struct gve_tx_queue *txq; struct gve_rx_queue *rxq; uint16_t i; int err; priv->txqs = (struct gve_tx_queue **)dev->data->tx_queues; err = gve_adminq_create_tx_queues(priv, num_queues); if (err) { PMD_DRV_LOG(ERR, "failed to create %u tx queues.", num_queues); return err; } for (i = 0; i < num_queues; i++) { txq = priv->txqs[i]; txq->qtx_tail = &priv->db_bar2[rte_be_to_cpu_32(txq->qres->db_index)]; txq->qtx_head = &priv->cnt_array[rte_be_to_cpu_32(txq->qres->counter_index)]; rte_write32(rte_cpu_to_be_32(GVE_IRQ_MASK), txq->ntfy_addr); } num_queues = dev->data->nb_rx_queues; priv->rxqs = (struct gve_rx_queue **)dev->data->rx_queues; err = gve_adminq_create_rx_queues(priv, num_queues); if (err) { PMD_DRV_LOG(ERR, "failed to create %u rx queues.", num_queues); goto err_tx; } for (i = 0; i < num_queues; i++) { rxq = priv->rxqs[i]; rxq->qrx_tail = &priv->db_bar2[rte_be_to_cpu_32(rxq->qres->db_index)]; rte_write32(rte_cpu_to_be_32(GVE_IRQ_MASK), rxq->ntfy_addr); if (gve_is_gqi(priv)) err = gve_refill_pages(rxq); else err = gve_refill_dqo(rxq); if (err) { PMD_DRV_LOG(ERR, "Failed to refill for RX"); goto err_rx; } } dev->data->dev_started = 1; gve_link_update(dev, 0); return 0; err_rx: gve_stop_rx_queues(dev); err_tx: gve_stop_tx_queues(dev); return err; } static int error: patch failed: drivers/net/gve/gve_ethdev.c:208 Hunk #3 succeeded at 520 (offset 19 lines). error: while searching for: .tx_queue_setup = gve_tx_queue_setup_dqo, .rx_queue_release = gve_rx_queue_release_dqo, .tx_queue_release = gve_tx_queue_release_dqo, .link_update = gve_link_update, .stats_get = gve_dev_stats_get, .stats_reset = gve_dev_stats_reset, error: patch failed: drivers/net/gve/gve_ethdev.c:591 error: while searching for: if (gve_is_gqi(priv)) { eth_dev->dev_ops = &gve_eth_dev_ops; eth_dev->rx_pkt_burst = gve_rx_burst; eth_dev->tx_pkt_burst = gve_tx_burst; } else { eth_dev->dev_ops = &gve_eth_dev_ops_dqo; eth_dev->rx_pkt_burst = gve_rx_burst_dqo; eth_dev->tx_pkt_burst = gve_tx_burst_dqo; } eth_dev->data->mac_addrs = &priv->dev_addr; error: patch failed: drivers/net/gve/gve_ethdev.c:877 Checking patch drivers/net/gve/gve_ethdev.h... Hunk #1 succeeded at 321 (offset -46 lines). error: while searching for: uint16_t gve_tx_burst(void *txq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts); /* Below functions are used for DQO */ int error: patch failed: drivers/net/gve/gve_ethdev.h:379 error: while searching for: void gve_rx_queue_release_dqo(struct rte_eth_dev *dev, uint16_t qid); void gve_stop_tx_queues_dqo(struct rte_eth_dev *dev); error: patch failed: drivers/net/gve/gve_ethdev.h:397 error: while searching for: uint16_t gve_tx_burst_dqo(void *txq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts); #endif /* _GVE_ETHDEV_H_ */ error: patch failed: drivers/net/gve/gve_ethdev.h:409 Checking patch drivers/net/gve/gve_rx.c... Hunk #1 succeeded at 351 (offset -63 lines). Hunk #2 succeeded at 443 (offset -66 lines). Checking patch drivers/net/gve/gve_rx_dqo.c... error: drivers/net/gve/gve_rx_dqo.c: does not exist in index Checking patch drivers/net/gve/gve_tx.c... Hunk #2 succeeded at 714 (offset -3 lines). Checking patch drivers/net/gve/gve_tx_dqo.c... error: drivers/net/gve/gve_tx_dqo.c: does not exist in index Applying patch drivers/net/gve/gve_ethdev.c with 4 rejects... Rejected hunk #1. Rejected hunk #2. Hunk #3 applied cleanly. Rejected hunk #4. Rejected hunk #5. Applying patch drivers/net/gve/gve_ethdev.h with 3 rejects... Hunk #1 applied cleanly. Rejected hunk #2. Rejected hunk #3. Rejected hunk #4. Applied patch drivers/net/gve/gve_rx.c cleanly. Applied patch drivers/net/gve/gve_tx.c cleanly. hint: Use 'git am --show-current-patch' to see the failed patch diff a/drivers/net/gve/gve_ethdev.c b/drivers/net/gve/gve_ethdev.c (rejected hunks) @@ -104,81 +104,6 @@ gve_dev_configure(struct rte_eth_dev *dev) return 0; } -static int -gve_refill_pages(struct gve_rx_queue *rxq) -{ - struct rte_mbuf *nmb; - uint16_t i; - int diag; - - diag = rte_pktmbuf_alloc_bulk(rxq->mpool, &rxq->sw_ring[0], rxq->nb_rx_desc); - if (diag < 0) { - for (i = 0; i < rxq->nb_rx_desc - 1; i++) { - nmb = rte_pktmbuf_alloc(rxq->mpool); - if (!nmb) - break; - rxq->sw_ring[i] = nmb; - } - if (i < rxq->nb_rx_desc - 1) - return -ENOMEM; - } - rxq->nb_avail = 0; - rxq->next_avail = rxq->nb_rx_desc - 1; - - for (i = 0; i < rxq->nb_rx_desc; i++) { - if (rxq->is_gqi_qpl) { - rxq->rx_data_ring[i].addr = rte_cpu_to_be_64(i * PAGE_SIZE); - } else { - if (i == rxq->nb_rx_desc - 1) - break; - nmb = rxq->sw_ring[i]; - rxq->rx_data_ring[i].addr = rte_cpu_to_be_64(rte_mbuf_data_iova(nmb)); - } - } - - rte_write32(rte_cpu_to_be_32(rxq->next_avail), rxq->qrx_tail); - - return 0; -} - -static int -gve_refill_dqo(struct gve_rx_queue *rxq) -{ - struct rte_mbuf *nmb; - uint16_t i; - int diag; - - diag = rte_pktmbuf_alloc_bulk(rxq->mpool, &rxq->sw_ring[0], rxq->nb_rx_desc); - if (diag < 0) { - rxq->stats.no_mbufs_bulk++; - for (i = 0; i < rxq->nb_rx_desc - 1; i++) { - nmb = rte_pktmbuf_alloc(rxq->mpool); - if (!nmb) - break; - rxq->sw_ring[i] = nmb; - } - if (i < rxq->nb_rx_desc - 1) { - rxq->stats.no_mbufs += rxq->nb_rx_desc - 1 - i; - return -ENOMEM; - } - } - - for (i = 0; i < rxq->nb_rx_desc; i++) { - if (i == rxq->nb_rx_desc - 1) - break; - nmb = rxq->sw_ring[i]; - rxq->rx_ring[i].buf_addr = rte_cpu_to_le_64(rte_mbuf_data_iova_default(nmb)); - rxq->rx_ring[i].buf_id = rte_cpu_to_le_16(i); - } - - rxq->nb_rx_hold = 0; - rxq->bufq_tail = rxq->nb_rx_desc - 1; - - rte_write32(rxq->bufq_tail, rxq->qrx_tail); - - return 0; -} - static int gve_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complete) { @@ -208,65 +133,68 @@ gve_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complete) } static int -gve_dev_start(struct rte_eth_dev *dev) +gve_start_queues(struct rte_eth_dev *dev) { - uint16_t num_queues = dev->data->nb_tx_queues; struct gve_priv *priv = dev->data->dev_private; - struct gve_tx_queue *txq; - struct gve_rx_queue *rxq; + uint16_t num_queues; uint16_t i; - int err; + int ret; + num_queues = dev->data->nb_tx_queues; priv->txqs = (struct gve_tx_queue **)dev->data->tx_queues; - err = gve_adminq_create_tx_queues(priv, num_queues); - if (err) { - PMD_DRV_LOG(ERR, "failed to create %u tx queues.", num_queues); - return err; - } - for (i = 0; i < num_queues; i++) { - txq = priv->txqs[i]; - txq->qtx_tail = - &priv->db_bar2[rte_be_to_cpu_32(txq->qres->db_index)]; - txq->qtx_head = - &priv->cnt_array[rte_be_to_cpu_32(txq->qres->counter_index)]; - - rte_write32(rte_cpu_to_be_32(GVE_IRQ_MASK), txq->ntfy_addr); - } + ret = gve_adminq_create_tx_queues(priv, num_queues); + if (ret != 0) { + PMD_DRV_LOG(ERR, "Failed to create %u tx queues.", num_queues); + return ret; + } + for (i = 0; i < num_queues; i++) + if (gve_tx_queue_start(dev, i) != 0) { + PMD_DRV_LOG(ERR, "Fail to start Tx queue %d", i); + goto err_tx; + } num_queues = dev->data->nb_rx_queues; priv->rxqs = (struct gve_rx_queue **)dev->data->rx_queues; - err = gve_adminq_create_rx_queues(priv, num_queues); - if (err) { - PMD_DRV_LOG(ERR, "failed to create %u rx queues.", num_queues); + ret = gve_adminq_create_rx_queues(priv, num_queues); + if (ret != 0) { + PMD_DRV_LOG(ERR, "Failed to create %u rx queues.", num_queues); goto err_tx; } for (i = 0; i < num_queues; i++) { - rxq = priv->rxqs[i]; - rxq->qrx_tail = - &priv->db_bar2[rte_be_to_cpu_32(rxq->qres->db_index)]; - - rte_write32(rte_cpu_to_be_32(GVE_IRQ_MASK), rxq->ntfy_addr); - if (gve_is_gqi(priv)) - err = gve_refill_pages(rxq); + ret = gve_rx_queue_start(dev, i); else - err = gve_refill_dqo(rxq); - if (err) { - PMD_DRV_LOG(ERR, "Failed to refill for RX"); + ret = gve_rx_queue_start_dqo(dev, i); + if (ret != 0) { + PMD_DRV_LOG(ERR, "Fail to start Rx queue %d", i); goto err_rx; } } - dev->data->dev_started = 1; - gve_link_update(dev, 0); - return 0; err_rx: gve_stop_rx_queues(dev); err_tx: gve_stop_tx_queues(dev); - return err; + return ret; +} + +static int +gve_dev_start(struct rte_eth_dev *dev) +{ + int ret; + + ret = gve_start_queues(dev); + if (ret != 0) { + PMD_DRV_LOG(ERR, "Failed to start queues"); + return ret; + } + + dev->data->dev_started = 1; + gve_link_update(dev, 0); + + return 0; } static int @@ -591,6 +523,10 @@ static const struct eth_dev_ops gve_eth_dev_ops_dqo = { .tx_queue_setup = gve_tx_queue_setup_dqo, .rx_queue_release = gve_rx_queue_release_dqo, .tx_queue_release = gve_tx_queue_release_dqo, + .rx_queue_start = gve_rx_queue_start_dqo, + .tx_queue_start = gve_tx_queue_start_dqo, + .rx_queue_stop = gve_rx_queue_stop_dqo, + .tx_queue_stop = gve_tx_queue_stop_dqo, .link_update = gve_link_update, .stats_get = gve_dev_stats_get, .stats_reset = gve_dev_stats_reset, @@ -877,12 +813,12 @@ gve_dev_init(struct rte_eth_dev *eth_dev) if (gve_is_gqi(priv)) { eth_dev->dev_ops = &gve_eth_dev_ops; - eth_dev->rx_pkt_burst = gve_rx_burst; - eth_dev->tx_pkt_burst = gve_tx_burst; + gve_set_rx_function(eth_dev); + gve_set_tx_function(eth_dev); } else { eth_dev->dev_ops = &gve_eth_dev_ops_dqo; - eth_dev->rx_pkt_burst = gve_rx_burst_dqo; - eth_dev->tx_pkt_burst = gve_tx_burst_dqo; + gve_set_rx_function_dqo(eth_dev); + gve_set_tx_function_dqo(eth_dev); } eth_dev->data->mac_addrs = &priv->dev_addr; diff a/drivers/net/gve/gve_ethdev.h b/drivers/net/gve/gve_ethdev.h (rejected hunks) @@ -379,6 +391,12 @@ gve_rx_burst(void *rxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts); uint16_t gve_tx_burst(void *txq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts); +void +gve_set_rx_function(struct rte_eth_dev *dev); + +void +gve_set_tx_function(struct rte_eth_dev *dev); + /* Below functions are used for DQO */ int @@ -397,6 +415,18 @@ gve_tx_queue_release_dqo(struct rte_eth_dev *dev, uint16_t qid); void gve_rx_queue_release_dqo(struct rte_eth_dev *dev, uint16_t qid); +int +gve_rx_queue_start_dqo(struct rte_eth_dev *dev, uint16_t rx_queue_id); + +int +gve_tx_queue_start_dqo(struct rte_eth_dev *dev, uint16_t tx_queue_id); + +int +gve_rx_queue_stop_dqo(struct rte_eth_dev *dev, uint16_t rx_queue_id); + +int +gve_tx_queue_stop_dqo(struct rte_eth_dev *dev, uint16_t tx_queue_id); + void gve_stop_tx_queues_dqo(struct rte_eth_dev *dev); @@ -409,4 +439,10 @@ gve_rx_burst_dqo(void *rxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts); uint16_t gve_tx_burst_dqo(void *txq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts); +void +gve_set_rx_function_dqo(struct rte_eth_dev *dev); + +void +gve_set_tx_function_dqo(struct rte_eth_dev *dev); + #endif /* _GVE_ETHDEV_H_ */ https://lab.dpdk.org/results/dashboard/patchsets/26199/ UNH-IOL DPDK Community Lab