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 064F7A0540 for ; Wed, 6 Jul 2022 22:35:40 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F23EC4069D; Wed, 6 Jul 2022 22:35:39 +0200 (CEST) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mails.dpdk.org (Postfix) with ESMTP id 6C85440DF7 for ; Wed, 6 Jul 2022 22:35:38 +0200 (CEST) Received: by mail-wm1-f53.google.com with SMTP id be14-20020a05600c1e8e00b003a04a458c54so9587168wmb.3 for ; Wed, 06 Jul 2022 13:35:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IYkml4qEiOTw7KUSWTXZDMcdwZ03J8R+88CXDZfDs0c=; b=coAvIAhONClzlnFp6qNU0rvw3iEV24PM6HLJiLVQQUCKtwn7Zaufp03cG/0q8+spJB yUYEEvXZNZgaNHg9asTA7MucdSJ8T576XCkku+Q8SgNgB8E5FsQcG4LCf7FegjH6jUDw fBubxPvjCljP3/PzaPcqMse/HbKLflOdHdAAy8DhA8FnKae7tSMrcgnkPODLijimuPb2 2FIH0fGymycjVtUnVqByZeKhysi6HPf0fdPwtjuZhZQOvGTqQeL7K+z8/qdE4p2NmCGq D7jxO810FATOYLlF9SOhbGx51RRDEe0EtA1VIw60f4Vgb+BqWtUFVM2x5CCHXAr4Tdc0 Lq1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IYkml4qEiOTw7KUSWTXZDMcdwZ03J8R+88CXDZfDs0c=; b=lVfCHlraLSgW28F6mG0Fbk2ROJuC1IyvQF2Q6Y3Ct3eUCKrBDWqc8c4FBw/SVCCrUG fHwuRoYBobDnF7HOn+6f7FPcbaZy/f/Ww6MNKt5dlIt/wugXqLaUUQScuUekccbCdbfw uS4CF6DLXY8JvpKnzJa8UgYvJCj6fYO9eh5lwpsWm9dvBJW87FJyfbLcERSORckKNi87 1MAZlWYTjNeamKIVBDEjbi0H2g/Wyda1tTj1U/N3nV8SZfEVP+n5sqgAuP4YIcOR+fY+ 3WE9KwhS8/4MzEPv3wuQbsS0ZmuYCx40NN2b+vXhwAuzKebOknum/iQB1l+1nZPb5cuF 7vMw== X-Gm-Message-State: AJIora8bVajlSyXW9RJ1osdStorUvlFCMmb2TNgQKm4VG407n6uKsZf4 mF8FWtMC+WPYaWf45Z3AC10KNbIj20EmhQ== X-Google-Smtp-Source: AGRyM1tJUU2WoAUHZoF8PNDiB2r53n/AEpw8me+UnPuTkp1pKhdLccNWUZHIkcUlyTtwCTuk8a56KA== X-Received: by 2002:a05:600c:4fc8:b0:3a1:99cf:7fe with SMTP id o8-20020a05600c4fc800b003a199cf07femr438933wmq.142.1657139738093; Wed, 06 Jul 2022 13:35:38 -0700 (PDT) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id s12-20020a05600c384c00b003a2c7bf0497sm515839wmr.16.2022.07.06.13.35.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Jul 2022 13:35:37 -0700 (PDT) From: luca.boccassi@gmail.com To: Long Li Cc: Stephen Hemminger , dpdk stable Subject: patch 'net/netvsc: fix vmbus device reference in multi-process' has been queued to stable release 21.11.2 Date: Wed, 6 Jul 2022 21:34:45 +0100 Message-Id: <20220706203506.3422496-10-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220706203506.3422496-1-luca.boccassi@gmail.com> References: <20220628151938.2278711-26-ktraynor@redhat.com> <20220706203506.3422496-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 21.11.2 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/08/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/3287afa5e81416f0fc06e860c0e5ebfc860790d1 Thanks. Luca Boccassi --- >From 3287afa5e81416f0fc06e860c0e5ebfc860790d1 Mon Sep 17 00:00:00 2001 From: Long Li Date: Wed, 29 Jun 2022 16:29:44 -0700 Subject: [PATCH] net/netvsc: fix vmbus device reference in multi-process [ 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 Acked-by: Stephen Hemminger --- 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 1bca147e12..658303bc27 100644 --- a/drivers/bus/vmbus/private.h +++ b/drivers/bus/vmbus/private.h @@ -74,6 +74,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 0a357d3645..787139c0b2 100644 --- a/drivers/net/netvsc/hn_ethdev.c +++ b/drivers/net/netvsc/hn_ethdev.c @@ -1169,8 +1169,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 a29ac18ff4..b90280c9ff 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 bf33bb031e..7a3bd523a5 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 416c042a27..98a3b83033 100644 --- a/drivers/net/netvsc/hn_var.h +++ b/drivers/net/netvsc/hn_var.h @@ -147,7 +147,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; @@ -156,7 +156,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.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-06 21:07:53.916097388 +0100 +++ 0010-net-netvsc-fix-vmbus-device-reference-in-multi-proce.patch 2022-07-06 21:07:53.539518631 +0100 @@ -1 +1 @@ -From 7b1a614dcbe2017f1984be28a01efabcd7fed8b8 Mon Sep 17 00:00:00 2001 +From 3287afa5e81416f0fc06e860c0e5ebfc860790d1 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7b1a614dcbe2017f1984be28a01efabcd7fed8b8 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -163 +164 @@ -index 1afc14f280..909c07a4ab 100644 +index bf33bb031e..7a3bd523a5 100644 @@ -166 +167 @@ -@@ -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 +176 @@ -@@ -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 +187 @@ -@@ -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,