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 8DC5B46BAE for ; Fri, 18 Jul 2025 21:34:53 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 86B9640E4C; Fri, 18 Jul 2025 21:34:53 +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 B4B8040611 for ; Fri, 18 Jul 2025 21:34:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752867292; 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=vGyUyA4T6UYIswhzaO+/eq5JoJzL6BBTQLpuYCQ4+Yk=; b=Onc/LAC30hBQgfHrGUbTwcq4cIFnNIx0zccPCbBO4AL/kbhB29n4XlQ+FiCU1GDN0ZDUuR 0j3NBLBN8VFL2mNv7s0hq80V+auqXUuixYPXAf3uVY6LBhtnHIPceyT1V32sIq1TVQRau2 Zyx4fz9+PPgnT0kEgfkmq5J5RnQRkqk= Received: from mx-prod-mc-02.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-22-cCzafqrtODiELZXr2M-CwA-1; Fri, 18 Jul 2025 15:34:50 -0400 X-MC-Unique: cCzafqrtODiELZXr2M-CwA-1 X-Mimecast-MFC-AGG-ID: cCzafqrtODiELZXr2M-CwA_1752867289 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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2F2371956087; Fri, 18 Jul 2025 19:34:49 +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 0137E180045B; Fri, 18 Jul 2025 19:34:47 +0000 (UTC) From: Kevin Traynor To: Long Li Cc: dpdk stable Subject: patch 'bus/vmbus: use Hyper-V page size' has been queued to stable release 24.11.3 Date: Fri, 18 Jul 2025 20:29:48 +0100 Message-ID: <20250718193247.1008129-54-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: 6ooDHA1VsjznrcYgk9IT1kypU9cRukrYbjqYxsTe8XE_1752867289 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/2b5eef54f9d941101d20b4894bb09e858687d2de Thanks. Kevin --- >From 2b5eef54f9d941101d20b4894bb09e858687d2de Mon Sep 17 00:00:00 2001 From: Long Li Date: Fri, 18 Apr 2025 12:32:48 -0700 Subject: [PATCH] bus/vmbus: use Hyper-V page size [ upstream commit 30f24d33f33bbb29b1fba32b01e8c8d77400a5d5 ] Hyper-V uses 4k page size, regardless of the system page size used. Define Hyper-V page size for use in drivers. The interrupt and monitor pages mapped from Hyper-V via kernel are always 4k in sizes. Use Hyper-V page size to map them. Fixes: 831dba47bd36 ("bus/vmbus: add Hyper-V virtual bus support") Signed-off-by: Long Li --- drivers/bus/vmbus/bus_vmbus_driver.h | 4 ++++ drivers/bus/vmbus/linux/vmbus_uio.c | 2 +- drivers/bus/vmbus/vmbus_common_uio.c | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/bus/vmbus/bus_vmbus_driver.h b/drivers/bus/vmbus/bus_vmbus_driver.h index bc394208de..0a56275437 100644 --- a/drivers/bus/vmbus/bus_vmbus_driver.h +++ b/drivers/bus/vmbus/bus_vmbus_driver.h @@ -15,4 +15,8 @@ extern "C" { #endif +#define HYPERV_PAGE_SHIFT 12 +#define HYPERV_PAGE_SIZE (1 << HYPERV_PAGE_SHIFT) +#define HYPERV_PAGE_MASK (HYPERV_PAGE_SIZE - 1) + struct vmbus_channel; struct vmbus_mon_page; diff --git a/drivers/bus/vmbus/linux/vmbus_uio.c b/drivers/bus/vmbus/linux/vmbus_uio.c index 26edef342d..d4522f2e21 100644 --- a/drivers/bus/vmbus/linux/vmbus_uio.c +++ b/drivers/bus/vmbus/linux/vmbus_uio.c @@ -269,5 +269,5 @@ static int vmbus_uio_map_subchan(const struct rte_vmbus_device *dev, file_size = sb.st_size; - if (file_size == 0 || (file_size & (rte_mem_page_size() - 1))) { + if (file_size == 0 || (file_size & (HYPERV_PAGE_SIZE - 1))) { VMBUS_LOG(ERR, "incorrect size %s: %zu", ring_path, file_size); diff --git a/drivers/bus/vmbus/vmbus_common_uio.c b/drivers/bus/vmbus/vmbus_common_uio.c index 4d4613513c..13289cd9a4 100644 --- a/drivers/bus/vmbus/vmbus_common_uio.c +++ b/drivers/bus/vmbus/vmbus_common_uio.c @@ -202,5 +202,5 @@ vmbus_uio_map_resource(struct rte_vmbus_device *dev) dev->int_page = (uint32_t *)((char *)uio_res->maps[HV_INT_PAGE_MAP].addr - + (rte_mem_page_size() >> 1)); + + (HYPERV_PAGE_SIZE >> 1)); dev->monitor_page = uio_res->maps[HV_MON_PAGE_MAP].addr; return 0; -- 2.50.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-18 20:29:12.959621474 +0100 +++ 0054-bus-vmbus-use-Hyper-V-page-size.patch 2025-07-18 20:29:10.934907343 +0100 @@ -1 +1 @@ -From 30f24d33f33bbb29b1fba32b01e8c8d77400a5d5 Mon Sep 17 00:00:00 2001 +From 2b5eef54f9d941101d20b4894bb09e858687d2de Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 30f24d33f33bbb29b1fba32b01e8c8d77400a5d5 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org