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 AFC7D46BAE for ; Fri, 18 Jul 2025 21:34:56 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A97BC40E2E; Fri, 18 Jul 2025 21:34:56 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id C180340B8F for ; Fri, 18 Jul 2025 21:34:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752867295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+5PBdML5R36jMelG3Kxtfnpttmn+nVawoBHL6aoybkU=; b=NDCCRGnoC4nFihKT2VhnfoMsbmB32ficV2vc3edl03V7uzYOuYT7HnfcJMsSX8crUzeItx ucWq1Hslux3BgNv6smXWOHjNekpDy6asP4HowEAygcLtkCdOJ8C8CWIBDnuzwAUCVPNBV+ SCTfVZy4RyTcVmD9tynaofR90+lmHPA= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-88-OZxYkRpSO_-PhoL5jT8J0Q-1; Fri, 18 Jul 2025 15:34:51 -0400 X-MC-Unique: OZxYkRpSO_-PhoL5jT8J0Q-1 X-Mimecast-MFC-AGG-ID: OZxYkRpSO_-PhoL5jT8J0Q_1752867291 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 157DF19560B0; Fri, 18 Jul 2025 19:34:51 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.40]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id BF4A9180045B; Fri, 18 Jul 2025 19:34:49 +0000 (UTC) From: Kevin Traynor To: Long Li Cc: dpdk stable Subject: patch 'net/netvsc: use Hyper-V page size' has been queued to stable release 24.11.3 Date: Fri, 18 Jul 2025 20:29:49 +0100 Message-ID: <20250718193247.1008129-55-ktraynor@redhat.com> In-Reply-To: <20250718193247.1008129-1-ktraynor@redhat.com> References: <20250718193247.1008129-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: gJBb53x_zHQoPUXv2tVj43BOGlWOZPd8FQ2KQblPIO8_1752867291 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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 24.11.3 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/23/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/81d20aba32a4500746cc9714c61163d92d9b62ff Thanks. Kevin --- >From 81d20aba32a4500746cc9714c61163d92d9b62ff 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 b2dae6474a..24723ff842 100644 --- a/drivers/net/netvsc/hn_rndis.c +++ b/drivers/net/netvsc/hn_rndis.c @@ -68,5 +68,5 @@ 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); } @@ -266,5 +266,5 @@ static int hn_nvs_send_rndis_ctrl(struct vmbus_channel *chan, } - 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); @@ -272,9 +272,9 @@ static int hn_nvs_send_rndis_ctrl(struct vmbus_channel *chan, } - 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; @@ -481,5 +481,5 @@ hn_rndis_query(struct hn_data *hv, uint32_t oid, 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; @@ -738,5 +738,5 @@ hn_rndis_set(struct hn_data *hv, uint32_t oid, const void *data, uint32_t dlen) 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 9d3948e03d..c79d971904 100644 --- a/drivers/net/netvsc/hn_rxtx.c +++ b/drivers/net/netvsc/hn_rxtx.c @@ -1432,8 +1432,8 @@ 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; } @@ -1450,11 +1450,11 @@ 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; @@ -1499,6 +1499,6 @@ static int hn_xmit_sg(struct hn_tx_queue *txq, ((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 0f638bc5fd..f946b3d8ef 100644 --- a/drivers/net/netvsc/hn_var.h +++ b/drivers/net/netvsc/hn_var.h @@ -32,8 +32,4 @@ #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.50.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-18 20:29:12.990431325 +0100 +++ 0055-net-netvsc-use-Hyper-V-page-size.patch 2025-07-18 20:29:10.936907349 +0100 @@ -1 +1 @@ -From 2e81551053fcfc7d57b8907a2a8720805298d723 Mon Sep 17 00:00:00 2001 +From 81d20aba32a4500746cc9714c61163d92d9b62ff Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2e81551053fcfc7d57b8907a2a8720805298d723 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org