From: Kevin Traynor <ktraynor@redhat.com> To: Gaetan Rivet <grive@u256.net> Cc: Ferruh Yigit <ferruh.yigit@intel.com>, dpdk stable <stable@dpdk.org> Subject: [dpdk-stable] patch 'net/ring: fix device pointer on allocation' has been queued to LTS release 18.11.9 Date: Fri, 5 Jun 2020 19:24:40 +0100 Message-ID: <20200605182525.22483-43-ktraynor@redhat.com> (raw) In-Reply-To: <20200605182525.22483-1-ktraynor@redhat.com> Hi, FYI, your patch has been queued to LTS release 18.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/10/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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/160d1b6410cd4db1ec84dba0038f377605741c4f Thanks. Kevin. --- From 160d1b6410cd4db1ec84dba0038f377605741c4f Mon Sep 17 00:00:00 2001 From: Gaetan Rivet <grive@u256.net> 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 <grive@u256.net> Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com> --- 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 452114d0c5..7298ee93e2 100644 --- a/drivers/net/ring/rte_eth_ring.c +++ b/drivers/net/ring/rte_eth_ring.c @@ -252,4 +252,5 @@ 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, @@ -297,4 +298,5 @@ 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 @@ -303,4 +305,6 @@ do_eth_dev_ring_create(const char *name, */ + eth_dev->device = &vdev->device; + data = eth_dev->data; data->rx_queues = rx_queues_local; @@ -412,5 +416,7 @@ 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) { @@ -442,5 +448,5 @@ eth_dev_ring_create(const char *name, const unsigned int numa_node, } - 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; @@ -563,10 +569,10 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev) 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); } @@ -577,5 +583,5 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev) 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) { @@ -583,11 +589,8 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev) "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; } @@ -600,5 +603,5 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev) 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, @@ -630,4 +633,5 @@ 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, @@ -638,5 +642,5 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev) "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, @@ -647,7 +651,4 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev) } - if (eth_dev) - eth_dev->device = &dev->device; - out_free: rte_kvargs_free(kvlist); -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-06-05 19:20:53.200289319 +0100 +++ 0043-net-ring-fix-device-pointer-on-allocation.patch 2020-06-05 19:20:50.820040586 +0100 @@ -1 +1 @@ -From 8459f5ab32211fb10bbfe388fa0e017475d8507c Mon Sep 17 00:00:00 2001 +From 160d1b6410cd4db1ec84dba0038f377605741c4f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8459f5ab32211fb10bbfe388fa0e017475d8507c ] + @@ -22 +23,0 @@ -Cc: stable@dpdk.org @@ -31 +32 @@ -index 41acbc513d..f0fafa0c0d 100644 +index 452114d0c5..7298ee93e2 100644 @@ -34 +35 @@ -@@ -247,4 +247,5 @@ static const struct eth_dev_ops ops = { +@@ -252,4 +252,5 @@ static const struct eth_dev_ops ops = { @@ -40 +41 @@ -@@ -292,4 +293,5 @@ do_eth_dev_ring_create(const char *name, +@@ -297,4 +298,5 @@ do_eth_dev_ring_create(const char *name, @@ -46 +47 @@ -@@ -298,4 +300,6 @@ do_eth_dev_ring_create(const char *name, +@@ -303,4 +305,6 @@ do_eth_dev_ring_create(const char *name, @@ -53 +54 @@ -@@ -409,5 +413,7 @@ rte_eth_from_ring(struct rte_ring *r) +@@ -412,5 +416,7 @@ rte_eth_from_ring(struct rte_ring *r) @@ -62 +63 @@ -@@ -439,5 +445,5 @@ eth_dev_ring_create(const char *name, const unsigned int numa_node, +@@ -442,5 +448,5 @@ eth_dev_ring_create(const char *name, const unsigned int numa_node, @@ -69 +70 @@ -@@ -561,10 +567,10 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev) +@@ -563,10 +569,10 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev) @@ -82 +83 @@ -@@ -575,5 +581,5 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev) +@@ -577,5 +583,5 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev) @@ -89 +90 @@ -@@ -581,11 +587,8 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev) +@@ -583,11 +589,8 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev) @@ -102 +103 @@ -@@ -598,5 +601,5 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev) +@@ -600,5 +603,5 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev) @@ -109 +110 @@ -@@ -628,4 +631,5 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev) +@@ -630,4 +633,5 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev) @@ -115 +116 @@ -@@ -636,5 +640,5 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev) +@@ -638,5 +642,5 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev) @@ -122 +123 @@ -@@ -645,7 +649,4 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev) +@@ -647,7 +651,4 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)
next prev parent reply other threads:[~2020-06-05 18:27 UTC|newest] Thread overview: 90+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-06-05 18:23 [dpdk-stable] patch 'app/testpmd: add parsing for QinQ VLAN headers' " Kevin Traynor 2020-06-05 18:23 ` [dpdk-stable] patch 'doc: fix log level example in Linux guide' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'eal: fix typo in endian conversion macros' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/avp: fix gcc 10 maybe-uninitialized warning' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'eal/x86: ignore gcc 10 stringop-overflow warnings' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'kvargs: fix invalid token parsing on FreeBSD' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'eal/ppc: fix build with gcc 9.3' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/i40e: fix flow director for ARP packets' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'doc: add i40e limitation for flow director' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/i40e: fix flush of flow director filter' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'vhost: fix peer close check' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'vhost: prevent zero-copy with incompatible client mode' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/softnic: fix memory leak for thread' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/softnic: fix resource leak for pipeline' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/octeontx: fix dangling pointer on init failure' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/mlx5: fix RSS enablement' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'eventdev: fix probe and remove for secondary process' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'event/dsw: avoid reusing previously recorded events' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'service: fix race condition for MT unsafe service' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'service: fix identification of service running on other lcore' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'service: remove rte prefix from static functions' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'remove references to private PCI probe function' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'examples/l2fwd-keepalive: fix mbuf pool size' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'mem: fix overflow on allocation' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'examples/eventdev: fix crash on exit' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'test/flow_classify: enable multi-sockets system' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'bbdev: fix doxygen comments' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'crypto/ccp: fix fd leak on probe failure' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'app/crypto-perf: fix display of sample test vector' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'crypto/qat: fix cipher descriptor for ZUC and SNOW' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'crypto/kasumi: fix extern declaration' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/failsafe: fix fd leak' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'app/testpmd: fix statistics after reset' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/netvsc: fix comment spelling' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'bus/vmbus: " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/ixgbe: fix link status synchronization on BSD' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/tap: fix crash in flow destroy' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/bnxt: fix FW version query' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'app/testpmd: fix memory failure handling for i40e DDP' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'bus/fslmc: fix dereferencing null pointer' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/dpaa2: fix 10G port negotiation' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'bus/fslmc: fix size of qman fq descriptor' " Kevin Traynor 2020-06-05 18:24 ` Kevin Traynor [this message] 2020-06-05 18:24 ` [dpdk-stable] patch 'net/mlx5: fix matching for UDP tunnels with Verbs' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/mlx4: fix drop queue error handling' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/mlx5: fix Tx queue release debug log timing' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'app: remove extra new line after link duplex' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'examples: " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'event/dsw: fix enqueue burst return value' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'app/eventdev: check Tx adapter service ID' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'crypto/caam_jr: fix check of file descriptors' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'crypto/caam_jr: fix IRQ functions return type' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'build: disable gcc 10 zero-length-bounds warning' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'eal: fix C++17 compilation' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/e1000: fix port hotplug for multi-process' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'doc: fix multicast filter feature announcement' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/ixgbe: fix statistics in flow control mode' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/qede: fix link state configuration' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/vmxnet3: handle bad host framing' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/qede: fix port reconfiguration' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/bnxt: fix error log for command timeout' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/bnxt: fix using RSS config struct' " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'app/testpmd: fix DCB set' " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'net/ixgbe/base: update copyright' " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'net/i40e/base: " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'pci: accept 32-bit domain numbers' " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'pci: reject negative values in PCI id' " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'kvargs: fix strcmp helper documentation' " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'mempool/dpaa2: install missing header with meson' " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'fix same typo in multiple places' " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'examples/kni: fix MTU change to setup Tx queue' " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'net/i40e: fix wild pointer' " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'net/i40e: fix queue related exception handling' " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'vhost: fix zero-copy server mode' " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'net/mvpp2: fix build with gcc 10' " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'examples/vm_power: drop Unix path limit redefinition' " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'doc: fix build with doxygen 1.8.18' " Kevin Traynor 2020-06-05 22:46 ` Thomas Monjalon 2020-06-10 14:48 ` Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'cryptodev: fix SHA-1 digest enum comment' " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'net/sfc/base: fix manual filter delete in EF10' " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'net/i40e: fix setting L2TAG' " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'net/iavf: " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'net/ixgbe: check driver type in MACsec API' " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'examples/kni: fix crash during MTU set' " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'examples/ip_pipeline: remove check of null response' " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'doc: add NASM installation steps' " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'doc: fix typo in contributors guide' " Kevin Traynor 2020-06-05 18:25 ` Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'doc: prefer https when pointing to dpdk.org' " Kevin Traynor
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200605182525.22483-43-ktraynor@redhat.com \ --to=ktraynor@redhat.com \ --cc=ferruh.yigit@intel.com \ --cc=grive@u256.net \ --cc=stable@dpdk.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
patches for DPDK stable branches This inbox may be cloned and mirrored by anyone: git clone --mirror https://inbox.dpdk.org/stable/0 stable/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 stable stable/ https://inbox.dpdk.org/stable \ stable@dpdk.org public-inbox-index stable Example config snippet for mirrors. Newsgroup available over NNTP: nntp://inbox.dpdk.org/inbox.dpdk.stable AGPL code for this site: git clone https://public-inbox.org/public-inbox.git