patch 'net/netvsc: fix vmbus device reference in multi-process' has been queued to stable release 20.11.6
Xueming Li
xuemingl at nvidia.com
Wed Jul 20 10:21:25 CEST 2022
Hi,
FYI, your patch has been queued to stable release 20.11.6
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/22/22. 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/steevenlee/dpdk
This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/0a3411605f9ea69e8c26facb3ac0b1ee5fa08517
Thanks.
Xueming Li <xuemingl at nvidia.com>
---
>From 0a3411605f9ea69e8c26facb3ac0b1ee5fa08517 Mon Sep 17 00:00:00 2001
From: Long Li <longli at microsoft.com>
Date: Wed, 29 Jun 2022 16:29:44 -0700
Subject: [PATCH] net/netvsc: fix vmbus device reference in multi-process
Cc: Xueming Li <xuemingl at nvidia.com>
[ upstream commit 7b1a614dcbe2017f1984be28a01efabcd7fed8b8 ]
The vmbus device is allocated via "calloc" before the EAL memory is
initialized. The secondary process can't reference the vmbus device as
it is not mapped correctly in the shared memory region.
Replace all references to the vmbus device (and its contents) with the
pointers/contents set by the primary process.
Fixes: 4e9c73e96e ("net/netvsc: add Hyper-V network device")
Signed-off-by: Long Li <longli at microsoft.com>
Acked-by: Stephen Hemminger <stephen at networkplumber.org>
---
drivers/bus/vmbus/private.h | 2 ++
drivers/bus/vmbus/vmbus_channel.c | 15 +++++++--------
drivers/net/netvsc/hn_ethdev.c | 4 ++--
drivers/net/netvsc/hn_nvs.c | 14 +++++++-------
drivers/net/netvsc/hn_rxtx.c | 8 ++++----
drivers/net/netvsc/hn_var.h | 4 ++--
6 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/drivers/bus/vmbus/private.h b/drivers/bus/vmbus/private.h
index 74ef948282..5b8b01b808 100644
--- a/drivers/bus/vmbus/private.h
+++ b/drivers/bus/vmbus/private.h
@@ -77,6 +77,8 @@ struct vmbus_channel {
uint16_t relid;
uint16_t subchannel_id;
uint8_t monitor_id;
+
+ struct vmbus_mon_page *monitor_page;
};
#define VMBUS_MAX_CHANNELS 64
diff --git a/drivers/bus/vmbus/vmbus_channel.c b/drivers/bus/vmbus/vmbus_channel.c
index 119b9b367e..9bd01679c3 100644
--- a/drivers/bus/vmbus/vmbus_channel.c
+++ b/drivers/bus/vmbus/vmbus_channel.c
@@ -27,7 +27,7 @@ vmbus_sync_set_bit(volatile uint32_t *addr, uint32_t mask)
}
static inline void
-vmbus_set_monitor(const struct rte_vmbus_device *dev, uint32_t monitor_id)
+vmbus_set_monitor(const struct vmbus_channel *channel, uint32_t monitor_id)
{
uint32_t *monitor_addr, monitor_mask;
unsigned int trigger_index;
@@ -35,15 +35,14 @@ vmbus_set_monitor(const struct rte_vmbus_device *dev, uint32_t monitor_id)
trigger_index = monitor_id / HV_MON_TRIG_LEN;
monitor_mask = 1u << (monitor_id % HV_MON_TRIG_LEN);
- monitor_addr = &dev->monitor_page->trigs[trigger_index].pending;
+ monitor_addr = &channel->monitor_page->trigs[trigger_index].pending;
vmbus_sync_set_bit(monitor_addr, monitor_mask);
}
static void
-vmbus_set_event(const struct rte_vmbus_device *dev,
- const struct vmbus_channel *chan)
+vmbus_set_event(const struct vmbus_channel *chan)
{
- vmbus_set_monitor(dev, chan->monitor_id);
+ vmbus_set_monitor(chan, chan->monitor_id);
}
/*
@@ -81,7 +80,6 @@ rte_vmbus_set_latency(const struct rte_vmbus_device *dev,
void
rte_vmbus_chan_signal_tx(const struct vmbus_channel *chan)
{
- const struct rte_vmbus_device *dev = chan->device;
const struct vmbus_br *tbr = &chan->txbr;
/* Make sure all updates are done before signaling host */
@@ -91,7 +89,7 @@ rte_vmbus_chan_signal_tx(const struct vmbus_channel *chan)
if (tbr->vbr->imask)
return;
- vmbus_set_event(dev, chan);
+ vmbus_set_event(chan);
}
@@ -218,7 +216,7 @@ void rte_vmbus_chan_signal_read(struct vmbus_channel *chan, uint32_t bytes_read)
if (write_sz <= pending_sz)
return;
- vmbus_set_event(chan->device, chan);
+ vmbus_set_event(chan);
}
int rte_vmbus_chan_recv(struct vmbus_channel *chan, void *data, uint32_t *len,
@@ -325,6 +323,7 @@ int vmbus_chan_create(const struct rte_vmbus_device *device,
chan->subchannel_id = subid;
chan->relid = relid;
chan->monitor_id = monitor_id;
+ chan->monitor_page = device->monitor_page;
*new_chan = chan;
err = vmbus_uio_map_rings(chan);
diff --git a/drivers/net/netvsc/hn_ethdev.c b/drivers/net/netvsc/hn_ethdev.c
index 49f954305d..3826d66b7e 100644
--- a/drivers/net/netvsc/hn_ethdev.c
+++ b/drivers/net/netvsc/hn_ethdev.c
@@ -980,8 +980,8 @@ eth_hn_dev_init(struct rte_eth_dev *eth_dev)
}
hv->vmbus = vmbus;
- hv->rxbuf_res = &vmbus->resource[HV_RECV_BUF_MAP];
- hv->chim_res = &vmbus->resource[HV_SEND_BUF_MAP];
+ hv->rxbuf_res = vmbus->resource[HV_RECV_BUF_MAP];
+ hv->chim_res = vmbus->resource[HV_SEND_BUF_MAP];
hv->port_id = eth_dev->data->port_id;
hv->latency = HN_CHAN_LATENCY_NS;
hv->rx_copybreak = HN_RXCOPY_THRESHOLD;
diff --git a/drivers/net/netvsc/hn_nvs.c b/drivers/net/netvsc/hn_nvs.c
index 8d20c1e88d..4a2797bf8e 100644
--- a/drivers/net/netvsc/hn_nvs.c
+++ b/drivers/net/netvsc/hn_nvs.c
@@ -193,11 +193,11 @@ hn_nvs_conn_rxbuf(struct hn_data *hv)
* Connect RXBUF to NVS.
*/
conn.type = NVS_TYPE_RXBUF_CONN;
- conn.gpadl = hv->rxbuf_res->phys_addr;
+ conn.gpadl = hv->rxbuf_res.phys_addr;
conn.sig = NVS_RXBUF_SIG;
PMD_DRV_LOG(DEBUG, "connect rxbuff va=%p gpad=%#" PRIx64,
- hv->rxbuf_res->addr,
- hv->rxbuf_res->phys_addr);
+ hv->rxbuf_res.addr,
+ hv->rxbuf_res.phys_addr);
error = hn_nvs_execute(hv, &conn, sizeof(conn),
&resp, sizeof(resp),
@@ -308,17 +308,17 @@ hn_nvs_conn_chim(struct hn_data *hv)
struct hn_nvs_chim_conn chim;
struct hn_nvs_chim_connresp resp;
uint32_t sectsz;
- unsigned long len = hv->chim_res->len;
+ unsigned long len = hv->chim_res.len;
int error;
/* Connect chimney sending buffer to NVS */
memset(&chim, 0, sizeof(chim));
chim.type = NVS_TYPE_CHIM_CONN;
- chim.gpadl = hv->chim_res->phys_addr;
+ chim.gpadl = hv->chim_res.phys_addr;
chim.sig = NVS_CHIM_SIG;
PMD_DRV_LOG(DEBUG, "connect send buf va=%p gpad=%#" PRIx64,
- hv->chim_res->addr,
- hv->chim_res->phys_addr);
+ hv->chim_res.addr,
+ hv->chim_res.phys_addr);
error = hn_nvs_execute(hv, &chim, sizeof(chim),
&resp, sizeof(resp),
diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c
index 44a8eb4c0e..fe4ccd1c3e 100644
--- a/drivers/net/netvsc/hn_rxtx.c
+++ b/drivers/net/netvsc/hn_rxtx.c
@@ -582,7 +582,7 @@ static void hn_rxpkt(struct hn_rx_queue *rxq, struct hn_rx_bufinfo *rxb,
* Use refcount to handle multiple packets in same
* receive buffer section.
*/
- rxbuf = hv->rxbuf_res->addr;
+ rxbuf = hv->rxbuf_res.addr;
iova = rte_mem_virt2iova(rxbuf) + RTE_PTR_DIFF(data, rxbuf);
shinfo = &rxb->shinfo;
@@ -765,8 +765,8 @@ hn_nvs_handle_rxbuf(struct rte_eth_dev *dev,
{
const struct vmbus_chanpkt_rxbuf *pkt;
const struct hn_nvs_hdr *nvs_hdr = buf;
- uint32_t rxbuf_sz = hv->rxbuf_res->len;
- char *rxbuf = hv->rxbuf_res->addr;
+ uint32_t rxbuf_sz = hv->rxbuf_res.len;
+ char *rxbuf = hv->rxbuf_res.addr;
unsigned int i, hlen, count;
struct hn_rx_bufinfo *rxb;
@@ -1266,7 +1266,7 @@ hn_try_txagg(struct hn_data *hv, struct hn_tx_queue *txq,
if (txd->chim_index == NVS_CHIM_IDX_INVALID)
return NULL;
- chim = (uint8_t *)hv->chim_res->addr
+ chim = (uint8_t *)hv->chim_res.addr
+ txd->chim_index * hv->chim_szmax;
txq->agg_txd = txd;
diff --git a/drivers/net/netvsc/hn_var.h b/drivers/net/netvsc/hn_var.h
index bd874c6b4d..3d3429c1a2 100644
--- a/drivers/net/netvsc/hn_var.h
+++ b/drivers/net/netvsc/hn_var.h
@@ -119,7 +119,7 @@ struct hn_data {
uint32_t link_status;
uint32_t link_speed;
- struct rte_mem_resource *rxbuf_res; /* UIO resource for Rx */
+ struct rte_mem_resource rxbuf_res; /* UIO resource for Rx */
uint32_t rxbuf_section_cnt; /* # of Rx sections */
uint32_t rx_copybreak;
uint32_t rx_extmbuf_enable;
@@ -128,7 +128,7 @@ struct hn_data {
uint64_t rss_offloads;
rte_spinlock_t chim_lock;
- struct rte_mem_resource *chim_res; /* UIO resource for Tx */
+ struct rte_mem_resource chim_res; /* UIO resource for Tx */
struct rte_bitmap *chim_bmap; /* Send buffer map */
void *chim_bmem;
uint32_t tx_copybreak;
--
2.35.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2022-07-20 15:01:01.388175206 +0800
+++ 0056-net-netvsc-fix-vmbus-device-reference-in-multi-proce.patch 2022-07-20 15:00:58.801000350 +0800
@@ -1 +1 @@
-From 7b1a614dcbe2017f1984be28a01efabcd7fed8b8 Mon Sep 17 00:00:00 2001
+From 0a3411605f9ea69e8c26facb3ac0b1ee5fa08517 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 7b1a614dcbe2017f1984be28a01efabcd7fed8b8 ]
@@ -14 +16,0 @@
-Cc: stable at dpdk.org
@@ -28 +30 @@
-index 1bca147e12..658303bc27 100644
+index 74ef948282..5b8b01b808 100644
@@ -31 +33 @@
-@@ -74,6 +74,8 @@ struct vmbus_channel {
+@@ -77,6 +77,8 @@ struct vmbus_channel {
@@ -107 +109 @@
-index 0a357d3645..787139c0b2 100644
+index 49f954305d..3826d66b7e 100644
@@ -110 +112 @@
-@@ -1169,8 +1169,8 @@ eth_hn_dev_init(struct rte_eth_dev *eth_dev)
+@@ -980,8 +980,8 @@ eth_hn_dev_init(struct rte_eth_dev *eth_dev)
@@ -122 +124 @@
-index a29ac18ff4..b90280c9ff 100644
+index 8d20c1e88d..4a2797bf8e 100644
@@ -163 +165 @@
-index 1afc14f280..909c07a4ab 100644
+index 44a8eb4c0e..fe4ccd1c3e 100644
@@ -166 +168 @@
-@@ -580,7 +580,7 @@ static void hn_rxpkt(struct hn_rx_queue *rxq, struct hn_rx_bufinfo *rxb,
+@@ -582,7 +582,7 @@ static void hn_rxpkt(struct hn_rx_queue *rxq, struct hn_rx_bufinfo *rxb,
@@ -175 +177 @@
-@@ -763,8 +763,8 @@ hn_nvs_handle_rxbuf(struct rte_eth_dev *dev,
+@@ -765,8 +765,8 @@ hn_nvs_handle_rxbuf(struct rte_eth_dev *dev,
@@ -186 +188 @@
-@@ -1264,7 +1264,7 @@ hn_try_txagg(struct hn_data *hv, struct hn_tx_queue *txq,
+@@ -1266,7 +1266,7 @@ hn_try_txagg(struct hn_data *hv, struct hn_tx_queue *txq,
@@ -196 +198 @@
-index 416c042a27..98a3b83033 100644
+index bd874c6b4d..3d3429c1a2 100644
@@ -199 +201 @@
-@@ -147,7 +147,7 @@ struct hn_data {
+@@ -119,7 +119,7 @@ struct hn_data {
@@ -208 +210 @@
-@@ -156,7 +156,7 @@ struct hn_data {
+@@ -128,7 +128,7 @@ struct hn_data {
More information about the stable
mailing list