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 0819EA0093 for ; Tue, 19 May 2020 15:16:45 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id F2F231C1E4; Tue, 19 May 2020 15:16:44 +0200 (CEST) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 6F1A51D94F for ; Tue, 19 May 2020 15:16:43 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id s8so15865319wrt.9 for ; Tue, 19 May 2020 06:16:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BkP0RQ8PolGxOh5FN8OABIPHXjeKDmqksR5gVlkL0Os=; b=fk2a/uKRnICFapKI/g5LEUow5FNw6kuuG+5XcMMP8wU7dLLTtTQB+cZ8S57ZrL+85z tpt9YuH9UFyiQK2/eauG1hDP94FbtP1Woa8t0WGPS4KcUKUKg3jMmVQy5QF+BNMTWK9V VTBjperAK6n1IX1wj7pSTRzSY7ysyJpehDyvtdtM0PjUoTojU/YjZ5wXgCBKPQnryeHW 2veU0RfQP+hXIjpMkG9iOtQWkCop3pLlkvgWhP8YofnxuSKdO+df5CtavF+HlkiO4air qsvB1yJwa611vVLzs1d/sC5Fz0tjhrcEWLLolLjFG5TM3+8IVcDd0JcFfIG2l9K8YrUv Pggw== 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=BkP0RQ8PolGxOh5FN8OABIPHXjeKDmqksR5gVlkL0Os=; b=GZO3wkAj0TVn66NgRuTUFybUNaICCXnCtTNokpDYzUPG0juC7JVH+t6gPSBxTXnxM1 r61o/ih03TSGL4YAO17LYtGVhoooYyt/iQMwt7BzI/0dVER02q8+4cdz4X8nyZiEGraE exuMBOdkgGK1IydegfP7S2AdcChOSHJSWSScZX776AsOUv6f8Va0wtT0X5HDREBqqTFK VpQGlMT2cYWMYicQ4WQdiHtfefbfnNZLRJPDH7Ij3BX8utuQaNPIZ+jvQFGb23RZs7go OgAg9Ak/J0SRXabcjq94Pn9fcHcNZ7MsnDFfFP/eo7kO6UmGDHoyvH5KCUiA/tci3XSa leeA== X-Gm-Message-State: AOAM530oYRgHoV/4U3fxgcdt2chdlYN0kxFPr62Q78t43xfxMWFNDWXq TXmXQh6CpUj3mfLbmbNPvhDeY6efS1XJURlB X-Google-Smtp-Source: ABdhPJy6Yl+YPdCCQ/vnK3PsxxQbjpSfxp2d4RVOpAXJkW6izDtXLu6tuwkM631UcF80Sd/dDXrRmw== X-Received: by 2002:a5d:4b0f:: with SMTP id v15mr25297272wrq.162.1589894203167; Tue, 19 May 2020 06:16:43 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id i6sm4533424wmb.41.2020.05.19.06.16.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:16:42 -0700 (PDT) From: luca.boccassi@gmail.com To: Gaetan Rivet Cc: Ferruh Yigit , dpdk stable Date: Tue, 19 May 2020 14:05:41 +0100 Message-Id: <20200519130549.112823-206-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ring: fix device pointer on allocation' has been queued to stable release 19.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From 425b3ccd2d6454ce4bf30ee2aee000ff439b7892 Mon Sep 17 00:00:00 2001 From: Gaetan Rivet Date: Wed, 6 May 2020 20:09:49 +0200 Subject: [PATCH] net/ring: fix device pointer on allocation [ upstream commit 8459f5ab32211fb10bbfe388fa0e017475d8507c ] When a net_ring device is allocated, its device pointer is not set before calling rte_eth_dev_probing_finish, which is incorrect. The following: commit 96cb19521147 ("net/ring: use EAL APIs in PMD specific API") commit a6992e961050 ("net/ring: set ethernet device field") already fixed the same issue in 17.08, which was fine at the time. Adding the hook rte_eth_dev_probing_finish() however created this bug, as the eth_dev exposed when this hook is executed is expected to be complete. Remove the prior attempts to fix the issue in rte_pmd_ring_probe() and write the pointer properly in do_eth_dev_ring_create(). Fixes: fbe90cdd776c ("ethdev: add probing finish function") Signed-off-by: Gaetan Rivet Reviewed-by: Ferruh Yigit --- drivers/net/ring/rte_eth_ring.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c index 41acbc513d..f0fafa0c0d 100644 --- a/drivers/net/ring/rte_eth_ring.c +++ b/drivers/net/ring/rte_eth_ring.c @@ -246,6 +246,7 @@ static const struct eth_dev_ops ops = { static int do_eth_dev_ring_create(const char *name, + struct rte_vdev_device *vdev, struct rte_ring * const rx_queues[], const unsigned int nb_rx_queues, struct rte_ring *const tx_queues[], @@ -291,12 +292,15 @@ do_eth_dev_ring_create(const char *name, } /* now put it all together + * - store EAL device in eth_dev, * - store queue data in internals, * - store numa_node info in eth_dev_data * - point eth_dev_data to internals * - and point eth_dev structure to new eth_dev_data structure */ + eth_dev->device = &vdev->device; + data = eth_dev->data; data->rx_queues = rx_queues_local; data->tx_queues = tx_queues_local; @@ -408,7 +412,9 @@ rte_eth_from_ring(struct rte_ring *r) } static int -eth_dev_ring_create(const char *name, const unsigned int numa_node, +eth_dev_ring_create(const char *name, + struct rte_vdev_device *vdev, + const unsigned int numa_node, enum dev_action action, struct rte_eth_dev **eth_dev) { /* rx and tx are so-called from point of view of first port. @@ -438,7 +444,7 @@ eth_dev_ring_create(const char *name, const unsigned int numa_node, return -1; } - if (do_eth_dev_ring_create(name, rxtx, num_rings, rxtx, num_rings, + if (do_eth_dev_ring_create(name, vdev, rxtx, num_rings, rxtx, num_rings, numa_node, action, eth_dev) < 0) return -1; @@ -560,12 +566,12 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev) PMD_LOG(INFO, "Initializing pmd_ring for %s", name); if (params == NULL || params[0] == '\0') { - ret = eth_dev_ring_create(name, rte_socket_id(), DEV_CREATE, + ret = eth_dev_ring_create(name, dev, rte_socket_id(), DEV_CREATE, ð_dev); if (ret == -1) { PMD_LOG(INFO, "Attach to pmd_ring for %s", name); - ret = eth_dev_ring_create(name, rte_socket_id(), + ret = eth_dev_ring_create(name, dev, rte_socket_id(), DEV_ATTACH, ð_dev); } } else { @@ -574,19 +580,16 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev) if (!kvlist) { PMD_LOG(INFO, "Ignoring unsupported parameters when creatingrings-backed ethernet device"); - ret = eth_dev_ring_create(name, rte_socket_id(), + ret = eth_dev_ring_create(name, dev, rte_socket_id(), DEV_CREATE, ð_dev); if (ret == -1) { PMD_LOG(INFO, "Attach to pmd_ring for %s", name); - ret = eth_dev_ring_create(name, rte_socket_id(), + ret = eth_dev_ring_create(name, dev, rte_socket_id(), DEV_ATTACH, ð_dev); } - if (eth_dev) - eth_dev->device = &dev->device; - return ret; } @@ -597,7 +600,7 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev) if (ret < 0) goto out_free; - ret = do_eth_dev_ring_create(name, + ret = do_eth_dev_ring_create(name, dev, internal_args->rx_queues, internal_args->nb_rx_queues, internal_args->tx_queues, @@ -627,6 +630,7 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev) for (info->count = 0; info->count < info->total; info->count++) { ret = eth_dev_ring_create(info->list[info->count].name, + dev, info->list[info->count].node, info->list[info->count].action, ð_dev); @@ -635,7 +639,7 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev) PMD_LOG(INFO, "Attach to pmd_ring for %s", name); - ret = eth_dev_ring_create(name, + ret = eth_dev_ring_create(name, dev, info->list[info->count].node, DEV_ATTACH, ð_dev); @@ -644,9 +648,6 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev) } } - if (eth_dev) - eth_dev->device = &dev->device; - out_free: rte_kvargs_free(kvlist); rte_free(info); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:53.005060816 +0100 +++ 0206-net-ring-fix-device-pointer-on-allocation.patch 2020-05-19 14:04:44.592655188 +0100 @@ -1,8 +1,10 @@ -From 8459f5ab32211fb10bbfe388fa0e017475d8507c Mon Sep 17 00:00:00 2001 +From 425b3ccd2d6454ce4bf30ee2aee000ff439b7892 Mon Sep 17 00:00:00 2001 From: Gaetan Rivet Date: Wed, 6 May 2020 20:09:49 +0200 Subject: [PATCH] net/ring: fix device pointer on allocation +[ upstream commit 8459f5ab32211fb10bbfe388fa0e017475d8507c ] + When a net_ring device is allocated, its device pointer is not set before calling rte_eth_dev_probing_finish, which is incorrect. @@ -19,7 +21,6 @@ write the pointer properly in do_eth_dev_ring_create(). Fixes: fbe90cdd776c ("ethdev: add probing finish function") -Cc: stable@dpdk.org Signed-off-by: Gaetan Rivet Reviewed-by: Ferruh Yigit