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 46DCE468E4 for ; Thu, 12 Jun 2025 23:09:48 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 425E442DD9; Thu, 12 Jun 2025 23:09:48 +0200 (CEST) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mails.dpdk.org (Postfix) with ESMTP id B548342DD9 for ; Thu, 12 Jun 2025 23:09:46 +0200 (CEST) Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-3a51481a598so888796f8f.3 for ; Thu, 12 Jun 2025 14:09:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749762586; x=1750367386; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1WSrKQpLsp/LvldcDNLmTmw0iym3CanNCtI2/J7kea8=; b=fyAvJ7tZmJOsA/sgQPvFn/f7PKDeYW8iJY7VlIKy0q7gHg8IDfLoE38RssFqXYLyI/ pKXk2Frx71usVtXXsnH4b0q4yAXUPJmGPjL3/r7H/pvi8FXpCk2Q3SfKYrieP2unlC2j jot8dEKOVs/sRwxZ9WKcK0e6neVkhGpWUjTJ8KnrgDSzDLS8JgNBn7ehNyYTOIb8K882 IeVq4XRCtGrdq4uLOjQeYH+rohPYeMvAJ3wxLLn/28zEoKurBYAp39p+DBPZRh7JKm/b vE5MESteyvU4yfe5A/YbEo+jDi02eURPYDpCU7wt0o9sfWP450Z10oUS7wqky5FmoSXl 7S9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749762586; x=1750367386; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1WSrKQpLsp/LvldcDNLmTmw0iym3CanNCtI2/J7kea8=; b=N/wyutSEDgrR5QQJP02ut2YfA6PJcNzh0K9mtOrd0I9rQIo8hyJzVSc2RzOH6CTFCd 4FWxejSkzSrq5p1SCKODrKQHQsTJKilU/q0DvC7y48LSMG2zv4x2YV2uaha951WHue0q 2FuU7I/+tPhuWEdIlIEU4pXloXDwf6BheCCtXGCOxYbdf8oBjUx/F31qHnX5bWf6xJKm kiRgq2IKwkLG3/4ynRpLpBR7OtQ8qKa3GvYz1hWK/mYx9ynH74hLV0j0872jf7+oAdAY O9kbqhIGJxjaNcnnx01yA7pYkzv3RQVGIJslgPbGUCRMxA1OyYxnX+5yEeOUycQ7l+5M 5nhw== X-Gm-Message-State: AOJu0Yz3Cl8D9Aeo7D1vxTuDoH0KNzIRufljSFGS8/YOZa4Y76Fr8H/2 98STZC1YkfX3xwOZNoQp82kN3bbVVDoo+SwlKOSsFP4TWcRgf0rYK1macP6lYGe4 X-Gm-Gg: ASbGnctDqYoK9DNslUlTZSJvJjdYGQz02ESo5zMjepBK6NXum15xo6Ac9S6ZMirEKqJ JoB6+mK4dWgMpEO4Cb2Kf7m9pwjbZKSQ7KTzJmeogMAxVqaBHuznq2s7cPDH/8IfdZH6BFP1wTI yZC1JjmKBBN/+NOyPWTDE0JBUzJf4q/xmp3FbKhsPZ9q0mcdmrn/RQBdZejiihi/YkP02jWJOSk UO4KU3HsgYVuTaA7f4LqS43Lx3PxexGEoYSej0R3zrIBQmpBX424/dr530XHVMdAglwz/2PcyYK l8ZYVQCH8ZVfxeClGmuCKp7wXodYWGS3OsMuHAWlWi63qex1Ik/BCW3wY5EjgMdmgTcI X-Google-Smtp-Source: AGHT+IHUlDWuw36vXWHqS2+GMVu0zXv8NhU6SbCsoP3/PlzOqcri6MIclgG5BRg9Wi+paaB/PE9tUw== X-Received: by 2002:a05:6000:40c9:b0:3a4:f5f6:b4ab with SMTP id ffacd0b85a97d-3a56875d6d8mr570302f8f.30.1749762586229; Thu, 12 Jun 2025 14:09:46 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:f2df:571a:ae4c:bef2]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3a568b79f45sm352788f8f.101.2025.06.12.14.09.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Jun 2025 14:09:45 -0700 (PDT) From: luca.boccassi@gmail.com To: Long Li Cc: dpdk stable Subject: patch 'net/netvsc: use Hyper-V page size' has been queued to stable release 22.11.9 Date: Thu, 12 Jun 2025 22:06:56 +0100 Message-ID: <20250612210733.2506558-39-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250612210733.2506558-1-luca.boccassi@gmail.com> References: <20250612210733.2506558-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 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/632a9feb6ea69c37e794e16219655748ace0c35f Thanks. Luca Boccassi --- >From 632a9feb6ea69c37e794e16219655748ace0c35f Mon Sep 17 00:00:00 2001 From: Long Li Date: Fri, 18 Apr 2025 12:32:50 -0700 Subject: [PATCH] net/netvsc: use Hyper-V page size [ upstream commit 2e81551053fcfc7d57b8907a2a8720805298d723 ] The driver should always use Hyper-V page size for implementing RNDIS and calculating PFN (Page Frame Number) for communicating with Hyper-V VSP. It should not use system page size as it may be different to the Hyper-V page size. Fixes: 4e9c73e96e83 ("net/netvsc: add Hyper-V network device") Signed-off-by: Long Li --- drivers/net/netvsc/hn_rndis.c | 14 +++++++------- drivers/net/netvsc/hn_rxtx.c | 16 ++++++++-------- drivers/net/netvsc/hn_var.h | 4 ---- 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/drivers/net/netvsc/hn_rndis.c b/drivers/net/netvsc/hn_rndis.c index fe36274df8..0ac02e98b2 100644 --- a/drivers/net/netvsc/hn_rndis.c +++ b/drivers/net/netvsc/hn_rndis.c @@ -67,7 +67,7 @@ hn_rndis_rid(struct hn_data *hv) static void *hn_rndis_alloc(size_t size) { - return rte_zmalloc("RNDIS", size, rte_mem_page_size()); + return rte_zmalloc("RNDIS", size, HYPERV_PAGE_SIZE); } #ifdef RTE_LIBRTE_NETVSC_DEBUG_DUMP @@ -265,17 +265,17 @@ static int hn_nvs_send_rndis_ctrl(struct vmbus_channel *chan, return -EINVAL; } - if (unlikely(reqlen > rte_mem_page_size())) { + if (unlikely(reqlen > HYPERV_PAGE_SIZE)) { PMD_DRV_LOG(ERR, "RNDIS request %u greater than page size", reqlen); return -EINVAL; } - sg.page = addr / rte_mem_page_size(); - sg.ofs = addr & PAGE_MASK; + sg.page = addr / HYPERV_PAGE_SIZE; + sg.ofs = addr & HYPERV_PAGE_MASK; sg.len = reqlen; - if (sg.ofs + reqlen > rte_mem_page_size()) { + if (sg.ofs + reqlen > HYPERV_PAGE_SIZE) { PMD_DRV_LOG(ERR, "RNDIS request crosses page boundary"); return -EINVAL; } @@ -480,7 +480,7 @@ hn_rndis_query(struct hn_data *hv, uint32_t oid, return -ENOMEM; comp_len = sizeof(*comp) + odlen; - comp = rte_zmalloc("QUERY", comp_len, rte_mem_page_size()); + comp = rte_zmalloc("QUERY", comp_len, HYPERV_PAGE_SIZE); if (!comp) { error = -ENOMEM; goto done; @@ -737,7 +737,7 @@ hn_rndis_set(struct hn_data *hv, uint32_t oid, const void *data, uint32_t dlen) int error; reqlen = sizeof(*req) + dlen; - req = rte_zmalloc("RNDIS_SET", reqlen, rte_mem_page_size()); + req = rte_zmalloc("RNDIS_SET", reqlen, HYPERV_PAGE_SIZE); if (!req) return -ENOMEM; diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c index 080cab4464..f87bc8aaa0 100644 --- a/drivers/net/netvsc/hn_rxtx.c +++ b/drivers/net/netvsc/hn_rxtx.c @@ -1443,10 +1443,10 @@ static unsigned int hn_get_slots(const struct rte_mbuf *m) while (m) { unsigned int size = rte_pktmbuf_data_len(m); - unsigned int offs = rte_mbuf_data_iova(m) & PAGE_MASK; + unsigned int offs = rte_mbuf_data_iova(m) & HYPERV_PAGE_MASK; - slots += (offs + size + rte_mem_page_size() - 1) / - rte_mem_page_size(); + slots += (offs + size + HYPERV_PAGE_SIZE - 1) / + HYPERV_PAGE_SIZE; m = m->next; } @@ -1461,13 +1461,13 @@ static unsigned int hn_fill_sg(struct vmbus_gpa *sg, while (m) { rte_iova_t addr = rte_mbuf_data_iova(m); - unsigned int page = addr / rte_mem_page_size(); - unsigned int offset = addr & PAGE_MASK; + unsigned int page = addr / HYPERV_PAGE_SIZE; + unsigned int offset = addr & HYPERV_PAGE_MASK; unsigned int len = rte_pktmbuf_data_len(m); while (len > 0) { unsigned int bytes = RTE_MIN(len, - rte_mem_page_size() - offset); + HYPERV_PAGE_SIZE - offset); sg[segs].page = page; sg[segs].ofs = offset; @@ -1510,8 +1510,8 @@ static int hn_xmit_sg(struct hn_tx_queue *txq, addr = txq->tx_rndis_iova + ((char *)txd->rndis_pkt - (char *)txq->tx_rndis); - sg[0].page = addr / rte_mem_page_size(); - sg[0].ofs = addr & PAGE_MASK; + sg[0].page = addr / HYPERV_PAGE_SIZE; + sg[0].ofs = addr & HYPERV_PAGE_MASK; sg[0].len = RNDIS_PACKET_MSG_OFFSET_ABS(hn_rndis_pktlen(txd->rndis_pkt)); segs = 1; diff --git a/drivers/net/netvsc/hn_var.h b/drivers/net/netvsc/hn_var.h index 98a3b83033..c37bac01f8 100644 --- a/drivers/net/netvsc/hn_var.h +++ b/drivers/net/netvsc/hn_var.h @@ -31,10 +31,6 @@ #define HN_RX_EXTMBUF_ENABLE 0 -#ifndef PAGE_MASK -#define PAGE_MASK (rte_mem_page_size() - 1) -#endif - struct hn_data; struct hn_txdesc; -- 2.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-12 22:06:25.326468510 +0100 +++ 0039-net-netvsc-use-Hyper-V-page-size.patch 2025-06-12 22:06:23.862044468 +0100 @@ -1 +1 @@ -From 2e81551053fcfc7d57b8907a2a8720805298d723 Mon Sep 17 00:00:00 2001 +From 632a9feb6ea69c37e794e16219655748ace0c35f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2e81551053fcfc7d57b8907a2a8720805298d723 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index b2dae6474a..24723ff842 100644 +index fe36274df8..0ac02e98b2 100644 @@ -76 +77 @@ -index 9d3948e03d..c79d971904 100644 +index 080cab4464..f87bc8aaa0 100644 @@ -79 +80 @@ -@@ -1431,10 +1431,10 @@ static unsigned int hn_get_slots(const struct rte_mbuf *m) +@@ -1443,10 +1443,10 @@ static unsigned int hn_get_slots(const struct rte_mbuf *m) @@ -93 +94 @@ -@@ -1449,13 +1449,13 @@ static unsigned int hn_fill_sg(struct vmbus_gpa *sg, +@@ -1461,13 +1461,13 @@ static unsigned int hn_fill_sg(struct vmbus_gpa *sg, @@ -110 +111 @@ -@@ -1498,8 +1498,8 @@ static int hn_xmit_sg(struct hn_tx_queue *txq, +@@ -1510,8 +1510,8 @@ static int hn_xmit_sg(struct hn_tx_queue *txq, @@ -122 +123 @@ -index 0f638bc5fd..f946b3d8ef 100644 +index 98a3b83033..c37bac01f8 100644