From: luca.boccassi@gmail.com
To: Long Li <longli@microsoft.com>
Cc: dpdk stable <stable@dpdk.org>
Subject: patch 'bus/vmbus: align ring buffer data to page boundary' has been queued to stable release 22.11.9
Date: Thu, 12 Jun 2025 22:06:54 +0100 [thread overview]
Message-ID: <20250612210733.2506558-37-luca.boccassi@gmail.com> (raw)
In-Reply-To: <20250612210733.2506558-1-luca.boccassi@gmail.com>
Hi,
FYI, your patch has been queued to stable release 22.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/14/25. 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/bluca/dpdk-stable
This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/bd19d0b8ddf448274260edc43761924e8831c738
Thanks.
Luca Boccassi
---
From bd19d0b8ddf448274260edc43761924e8831c738 Mon Sep 17 00:00:00 2001
From: Long Li <longli@microsoft.com>
Date: Fri, 18 Apr 2025 12:32:47 -0700
Subject: [PATCH] bus/vmbus: align ring buffer data to page boundary
[ upstream commit c54fa45817932057dd8f275fa1b8e4dcaede7813 ]
The ring buffer data region always starts at the system page boundary
after ring buffer head. The current code assumes the system page size is
4k. This is not always correct.
Fix this by using system page size for addressing ring buffer data.
Fixes: 831dba47bd36 ("bus/vmbus: add Hyper-V virtual bus support")
Signed-off-by: Long Li <longli@microsoft.com>
---
drivers/bus/vmbus/rte_vmbus_reg.h | 9 +++------
drivers/bus/vmbus/vmbus_bufring.c | 9 ++++++---
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/bus/vmbus/rte_vmbus_reg.h b/drivers/bus/vmbus/rte_vmbus_reg.h
index a17ce40763..6257774f29 100644
--- a/drivers/bus/vmbus/rte_vmbus_reg.h
+++ b/drivers/bus/vmbus/rte_vmbus_reg.h
@@ -100,14 +100,11 @@ struct vmbus_bufring {
uint32_t value;
} feature_bits;
- /* Pad it to rte_mem_page_size() so that data starts on page boundary */
- uint8_t reserved2[4028];
-
/*
- * Ring data starts here + RingDataStartOffset
- * !!! DO NOT place any fields below this !!!
+ * This is the end of ring buffer head. The ring buffer data is system
+ * page aligned and starts at rte_mem_page_size() from the beginning
+ * of this structure
*/
- uint8_t data[];
} __rte_packed;
/*
diff --git a/drivers/bus/vmbus/vmbus_bufring.c b/drivers/bus/vmbus/vmbus_bufring.c
index c78619dc44..fcb97287dc 100644
--- a/drivers/bus/vmbus/vmbus_bufring.c
+++ b/drivers/bus/vmbus/vmbus_bufring.c
@@ -36,7 +36,10 @@ void vmbus_br_setup(struct vmbus_br *br, void *buf, unsigned int blen)
{
br->vbr = buf;
br->windex = br->vbr->windex;
- br->dsize = blen - sizeof(struct vmbus_bufring);
+
+ /* The ring buffer data starts at the 2nd page of the ring buffer */
+ RTE_VERIFY(blen > rte_mem_page_size());
+ br->dsize = blen - rte_mem_page_size();
}
/*
@@ -72,7 +75,7 @@ static inline uint32_t
vmbus_txbr_copyto(const struct vmbus_br *tbr, uint32_t windex,
const void *src0, uint32_t cplen)
{
- uint8_t *br_data = tbr->vbr->data;
+ uint8_t *br_data = (uint8_t *)tbr->vbr + rte_mem_page_size();
uint32_t br_dsize = tbr->dsize;
const uint8_t *src = src0;
@@ -170,7 +173,7 @@ static inline uint32_t
vmbus_rxbr_copyfrom(const struct vmbus_br *rbr, uint32_t rindex,
void *dst0, size_t cplen)
{
- const uint8_t *br_data = rbr->vbr->data;
+ const uint8_t *br_data = (uint8_t *)rbr->vbr + rte_mem_page_size();
uint32_t br_dsize = rbr->dsize;
uint8_t *dst = dst0;
--
2.47.2
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2025-06-12 22:06:25.258591068 +0100
+++ 0037-bus-vmbus-align-ring-buffer-data-to-page-boundary.patch 2025-06-12 22:06:23.858044384 +0100
@@ -1 +1 @@
-From c54fa45817932057dd8f275fa1b8e4dcaede7813 Mon Sep 17 00:00:00 2001
+From bd19d0b8ddf448274260edc43761924e8831c738 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c54fa45817932057dd8f275fa1b8e4dcaede7813 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index 54a26d12bd..fb7e3043ec 100644
+index a17ce40763..6257774f29 100644
@@ -25 +26 @@
-@@ -100,14 +100,11 @@ struct __rte_packed_begin vmbus_bufring {
+@@ -100,14 +100,11 @@ struct vmbus_bufring {
@@ -40 +41 @@
- } __rte_packed_end;
+ } __rte_packed;
next prev parent reply other threads:[~2025-06-12 21:09 UTC|newest]
Thread overview: 125+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-12 21:06 patch 'net/i40e/base: remove unused variables' " luca.boccassi
2025-06-12 21:06 ` patch 'ci: bump tested distributions in GHA' " luca.boccassi
2025-06-12 21:06 ` patch 'net/fm10k/base: fix compilation warnings' " luca.boccassi
2025-06-12 21:06 ` patch 'net/ixgbe/base: correct definition of endianness macro' " luca.boccassi
2025-06-12 21:06 ` patch 'net/ixgbe/base: fix compilation warnings' " luca.boccassi
2025-06-12 21:06 ` patch 'net/i40e/base: fix unused value " luca.boccassi
2025-06-12 21:06 ` patch 'net/i40e/base: fix compiler " luca.boccassi
2025-06-12 21:06 ` patch 'acl: fix build with GCC 15 on aarch64' " luca.boccassi
2025-06-12 21:06 ` patch 'eal/linux: improve ASLR check' " luca.boccassi
2025-06-12 21:06 ` patch 'net/e1000: fix xstats name' " luca.boccassi
2025-06-12 21:06 ` patch 'net/e1000: fix EEPROM dump' " luca.boccassi
2025-06-12 21:06 ` patch 'net/ixgbe: fix port mask default value in filter' " luca.boccassi
2025-06-12 21:06 ` patch 'net/e1000: fix igb Tx queue offloads capability' " luca.boccassi
2025-06-12 21:06 ` patch 'vhost/crypto: fix cipher data length' " luca.boccassi
2025-06-12 21:06 ` patch 'crypto/virtio: fix cipher data source " luca.boccassi
2025-06-12 21:06 ` patch 'app/crypto-perf: fix AAD offset alignment' " luca.boccassi
2025-06-12 21:06 ` patch 'crypto/qat: fix out-of-place header bytes in AEAD raw API' " luca.boccassi
2025-06-12 21:06 ` patch 'crypto/qat: fix out-of-place chain/cipher/auth headers' " luca.boccassi
2025-06-12 21:06 ` patch 'net/mlx5: fix header modify action on group 0' " luca.boccassi
2025-06-12 21:06 ` patch 'net/mlx5: validate GTP PSC QFI width' " luca.boccassi
2025-06-12 21:06 ` patch 'net/mlx5: fix counter service cleanup on init failure' " luca.boccassi
2025-06-12 21:06 ` patch 'net/mlx5: remove unsupported flow meter action in HWS' " luca.boccassi
2025-06-12 21:06 ` patch 'net/mlx5: fix maximal queue size query' " luca.boccassi
2025-06-12 21:06 ` patch 'net/mlx5: align PF and VF/SF MAC address handling' " luca.boccassi
2025-06-12 21:06 ` patch 'app/testpmd: fix RSS hash key update' " luca.boccassi
2025-06-12 21:06 ` patch 'net/af_xdp: fix use after free in zero-copy Tx' " luca.boccassi
2025-06-12 21:06 ` patch 'net/hns3: fix integer overflow in interrupt unmap' " luca.boccassi
2025-06-12 21:06 ` patch 'net/hns3: fix memory leak on failure' " luca.boccassi
2025-06-12 21:06 ` patch 'net/hns3: fix extra wait for link up' " luca.boccassi
2025-06-12 21:06 ` patch 'net/hns3: fix memory leak for indirect flow action' " luca.boccassi
2025-06-12 21:06 ` patch 'net/hns3: fix interrupt rollback' " luca.boccassi
2025-06-12 21:06 ` patch 'net/hns3: fix divide by zero' " luca.boccassi
2025-06-12 21:06 ` patch 'net/hns3: fix resources release on reset' " luca.boccassi
2025-06-12 21:06 ` patch 'net/qede: fix use after free' " luca.boccassi
2025-06-12 21:06 ` patch 'bus/fslmc: " luca.boccassi
2025-06-12 21:06 ` patch 'net/null: fix packet copy' " luca.boccassi
2025-06-12 21:06 ` luca.boccassi [this message]
2025-06-12 21:06 ` patch 'bus/vmbus: use Hyper-V page size' " luca.boccassi
2025-06-12 21:06 ` patch 'net/netvsc: " luca.boccassi
2025-06-12 21:06 ` patch 'net/netvsc: add stats counters from VF' " luca.boccassi
2025-06-12 21:06 ` patch 'app/testpmd: relax number of TCs in DCB command' " luca.boccassi
2025-06-12 21:06 ` patch 'net/mana: check vendor ID when probing RDMA device' " luca.boccassi
2025-06-12 21:07 ` patch 'net/hns3: fix CRC data segment' " luca.boccassi
2025-06-12 21:07 ` patch 'net/tap: fix qdisc add failure handling' " luca.boccassi
2025-06-12 21:07 ` patch 'net/mlx5: fix VLAN stripping on hairpin queue' " luca.boccassi
2025-06-12 21:07 ` patch 'mem: fix lockup on address space shortage' " luca.boccassi
2025-06-12 21:07 ` patch 'test/malloc: improve resiliency' " luca.boccassi
2025-06-12 21:07 ` patch 'trace: fix overflow in per-lcore trace buffer' " luca.boccassi
2025-06-12 21:07 ` patch 'common/cnxk: fix E-tag pattern parsing' " luca.boccassi
2025-06-12 21:07 ` patch 'common/cnxk: fix CQ tail drop' " luca.boccassi
2025-06-12 21:07 ` patch 'net/cnxk: fix descriptor count update on reconfig' " luca.boccassi
2025-06-12 21:07 ` patch 'ethdev: fix error struct in flow configure' " luca.boccassi
2025-06-12 21:07 ` patch 'net/ice/base: fix integer overflow' " luca.boccassi
2025-06-12 21:07 ` patch 'net/ice/base: fix typo in device ID description' " luca.boccassi
2025-06-12 21:07 ` patch 'common/dpaax: fix PDCP key command race condition' " luca.boccassi
2025-06-12 21:07 ` patch 'common/dpaax: fix PDCP AES only 12-bit SN' " luca.boccassi
2025-06-12 21:07 ` patch 'crypto/virtio: add request check on request side' " luca.boccassi
2025-06-12 21:07 ` patch 'crypto/virtio: fix driver cleanup' " luca.boccassi
2025-06-12 21:07 ` patch 'ethdev: keep promiscuous/allmulti value before disabling' " luca.boccassi
2025-06-12 21:07 ` patch 'eal: fix return value of lcore role' " luca.boccassi
2025-06-12 21:07 ` patch 'eal: warn if no lcore is available' " luca.boccassi
2025-06-12 21:07 ` patch 'bus: cleanup device lists' " luca.boccassi
2025-06-12 21:07 ` patch 'eal/linux: unregister alarm callback before free' " luca.boccassi
2025-06-12 21:07 ` patch 'eal/freebsd: " luca.boccassi
2025-06-12 21:07 ` patch 'bus/pci/bsd: fix device existence check' " luca.boccassi
2025-06-17 18:38 ` Jake Freeland
2025-06-12 21:07 ` patch 'power/intel_uncore: fix crash closing uninitialized driver' " luca.boccassi
2025-06-12 21:07 ` patch 'pcapng: fix null dereference in close' " luca.boccassi
2025-06-12 21:07 ` patch 'net/mlx5: avoid setting kernel MTU if not needed' " luca.boccassi
2025-06-12 21:07 ` patch 'net/mlx5: fix hypervisor detection in VLAN workaround' " luca.boccassi
2025-06-12 21:07 ` patch 'net/hns3: check requirement for hardware GRO' " luca.boccassi
2025-06-12 21:07 ` patch 'net/hns3: allow Tx vector when fast free not enabled' " luca.boccassi
2025-06-12 21:07 ` patch 'net/hns3: allow Rx vector mode with VLAN filter' " luca.boccassi
2025-06-30 12:25 ` patch 'common/mlx5: fix extraction of auxiliary device name' " luca.boccassi
2025-06-30 12:25 ` patch 'net/mlx5: fix crash on age query with indirect conntrack' " luca.boccassi
2025-07-02 15:32 ` Khadem Ullah
2025-07-03 11:57 ` Khadem Ullah
2025-06-30 12:25 ` patch 'net/mlx5: fix WQE size calculation for Tx queue' " luca.boccassi
2025-06-30 12:25 ` patch 'net/ixgbe: fix indentation' " luca.boccassi
2025-06-30 12:25 ` patch 'net/ice: fix querying RSS hash for DCF' " luca.boccassi
2025-06-30 12:25 ` patch 'net/iavf: fix VLAN strip setting after enabling filter' " luca.boccassi
2025-06-30 12:25 ` patch 'common/cnxk: fix null pointer checks' " luca.boccassi
2025-06-30 12:25 ` patch 'vhost: search virtqueues driver data in read-only area' " luca.boccassi
2025-06-30 12:25 ` patch 'net/virtio: fix check of threshold for Tx freeing' " luca.boccassi
2025-07-04 12:01 ` Maxime Coquelin
2025-07-04 13:13 ` Luca Boccassi
2025-06-30 12:25 ` patch 'eal/unix: fix log message for madvise failure' " luca.boccassi
2025-06-30 12:25 ` patch 'common/cnxk: fix qsize in CPT iq enable' " luca.boccassi
2025-06-30 12:25 ` patch 'crypto/qat: fix out-of-place chain/cipher/auth headers' " luca.boccassi
2025-06-30 12:25 ` patch 'examples/ipsec-secgw: fix crash with IPv6' " luca.boccassi
2025-06-30 12:25 ` patch 'examples/ipsec-secgw: fix crash in event vector mode' " luca.boccassi
2025-06-30 12:25 ` patch 'test/crypto: fix auth and cipher case IV length' " luca.boccassi
2025-06-30 12:25 ` patch 'test/crypto: set to null after freeing operation' " luca.boccassi
2025-06-30 12:25 ` patch 'crypto/openssl: include private exponent in RSA session' " luca.boccassi
2025-06-30 12:25 ` patch 'test/crypto: fix RSA decrypt validation' " luca.boccassi
2025-06-30 12:25 ` patch 'event/dlb2: fix dequeue with CQ depth <= 16' " luca.boccassi
2025-06-30 12:25 ` patch 'event/dlb2: fix validaton of LDB port COS ID arguments' " luca.boccassi
2025-06-30 12:25 ` patch 'event/dlb2: fix num single link ports for DLB2.5' " luca.boccassi
2025-06-30 12:25 ` patch 'event/dlb2: fix default credits based on HW version' " luca.boccassi
2025-06-30 12:25 ` patch 'app/eventdev: fix number of releases sent during cleanup' " luca.boccassi
2025-07-14 15:10 ` patch 'net/txgbe: fix ntuple filter parsing' " luca.boccassi
2025-07-14 15:10 ` patch 'net/txgbe: fix raw pattern match for FDIR rule' " luca.boccassi
2025-07-14 15:10 ` patch 'net/txgbe: fix packet type for FDIR filter' " luca.boccassi
2025-07-14 15:10 ` patch 'net/txgbe: fix to create FDIR filter for SCTP packet' " luca.boccassi
2025-07-14 15:11 ` patch 'net/txgbe: fix FDIR perfect mode for IPv6' " luca.boccassi
2025-07-14 15:11 ` patch 'net/txgbe: fix reserved extra FDIR headroom' " luca.boccassi
2025-07-14 15:11 ` patch 'net/txgbe: fix MAC control frame forwarding' " luca.boccassi
2025-07-14 15:11 ` patch 'net/ngbe: " luca.boccassi
2025-07-14 15:11 ` patch 'net/txgbe: fix device statistics' " luca.boccassi
2025-07-14 15:11 ` patch 'net/ngbe: " luca.boccassi
2025-07-14 15:11 ` patch 'net/txgbe: restrict VLAN strip configuration on VF' " luca.boccassi
2025-07-14 15:11 ` patch 'net/txgbe: add LRO flag in mbuf when enabled' " luca.boccassi
2025-07-14 15:11 ` patch 'net/hns3: fix queue TC configuration on VF' " luca.boccassi
2025-07-14 15:11 ` patch 'net/bonding: avoid RSS RETA update in flow isolation mode' " luca.boccassi
2025-07-14 15:11 ` patch 'net/iavf: fix VLAN strip disabling for ADQ v2 capability' " luca.boccassi
2025-07-14 15:11 ` patch 'net/i40e: fix RSS on plain IPv4' " luca.boccassi
2025-07-14 15:11 ` patch 'bus/auxiliary: fix crash in cleanup' " luca.boccassi
2025-07-14 15:11 ` patch 'net/mlx5: fix masked indirect age action validation' " luca.boccassi
2025-07-14 15:11 ` patch 'examples/multi_process: fix ports cleanup on exit' " luca.boccassi
2025-08-04 6:36 ` Maayan Kashani
2025-07-14 15:11 ` patch 'examples/ntb: check more heap allocations' " luca.boccassi
2025-07-14 15:11 ` patch 'examples/ipsec-secgw: fix number of queue pairs' " luca.boccassi
2025-07-22 13:35 ` patch 'examples/multi_process: revert ports cleanup on exit' " luca.boccassi
2025-07-22 13:35 ` patch 'doc: remove reference to deprecated --use-device option' " luca.boccassi
2025-07-22 13:35 ` patch 'eal: add description of service corelist in usage' " luca.boccassi
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=20250612210733.2506558-37-luca.boccassi@gmail.com \
--to=luca.boccassi@gmail.com \
--cc=longli@microsoft.com \
--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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).