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 25657468E4 for ; Thu, 12 Jun 2025 23:09:46 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2003942E45; Thu, 12 Jun 2025 23:09:46 +0200 (CEST) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mails.dpdk.org (Postfix) with ESMTP id 88D3042E45 for ; Thu, 12 Jun 2025 23:09:45 +0200 (CEST) Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-3a50fc7ac4dso974698f8f.0 for ; Thu, 12 Jun 2025 14:09:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749762585; x=1750367385; 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=tZHLB30GhlhBqjaARO2rH3D5FQ4a+elwTA9QNu/S4as=; b=ICZczkb0lfZDJ87VZYAqli9e5AtwG/pzvYyWs7X0+EnG1FRT+HTBnxgi9UpcQ1S/+Q d+L1Oq3eyfTGTjyQLFgmXfsPwak9wWRGwIaFW5SHQZzDcl7BCSXIiwR2bQ+vaiopP7qt 7cSXZUx5OJL0Y7nLgNdnLqDPSU8swECC9gEQSIUzee3j9gfWw8+FVEITg3LpdjrnxqB3 MPDrQvSQLeyG4NAWN30a/QTNsejE/kL+686DNSSs0DOM+UErIkGlsNvi9uYNlgfQpjKP I9KJnpVHlcjTUV5CpNMksBucSAuOSHoD7TwNYvH131g132tNYmfhYnuiKxLLnQKLo1Iw jPrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749762585; x=1750367385; 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=tZHLB30GhlhBqjaARO2rH3D5FQ4a+elwTA9QNu/S4as=; b=KcI5QErss3nL7BH4BAmC+oORxomUojvMlMcAgEE45ApYmC6xvBWZFsk8z1wnDHaWV5 /Rw3qKBr+pa5TdFlr4ipglNUNblpt6qFXZ6vA/BdHXR+/SKKt/Y3zWF6a7lpkTArtt2k w0B66+tz2yucrW3+A/4SVgYa7EsgRbxuneUOSJ56VWZ79JAolByDUnQD9cyOPcw0+lLd b8xfqHDE9cKy1LKz4Xsc7AF1jzUuC1b8nVHQHbAJ9x47qy5jgEtaDpSWFDOUhFfrd07d v/5xru/kkHlpV2cIPYcULfesZ0IfgazvWdGaWTwYPSXVXhg5vexSjGojDubjCjFjj4wz PfTw== X-Gm-Message-State: AOJu0YxxoXgQWx7R+UxPe6glyiPGm11Fc/nBP40d6nFCCO/bzERRfzS9 gtH5tC/VHqM6FNO9+RClK1c8tiRpYU+3kID2ae8aaB1HuTonctk11VPQohvveZYR X-Gm-Gg: ASbGncu4j5cRCbh2tCjQ0CxQWVAv58GEE8yNyMdnYO2vn3uiolJsGrsdNQLzIDctcia uPPQgYgRBKIbXRCmxBhZF+jwfQfMPwSdJMaKb/cVKVJtOrwoVjN74T8VDrbewS+x0jB/7d1S7L1 Njj6i249kaiNR6sBJPi7wnJHOC93s1NF4R1f55sQLQFrm+QNeGJRufBLBxHc7KBs3yhulKprPLf uxaXwgx2cndGOraQxCrSvyrLnDVwvArF2FHCuj/yiYxt0k3X8jlf1M4Ne6CNhdytRa6ALSAbg9Z m8BOIyM24EHAaKA47qu6r7sy1o+VkwibCMqOywQSCio4Q7FSJZ+K076SOYVSZG0HlfKb X-Google-Smtp-Source: AGHT+IFSgSpTOvQtUYI5LhiZ/+oZCdcA11/M9OKDGrvXXMiERRFDQ5K0/aigw1tpbhvkYtINJ3fx/g== X-Received: by 2002:a05:6000:2312:b0:3a5:1f2:68f3 with SMTP id ffacd0b85a97d-3a56871781amr580149f8f.46.1749762585018; Thu, 12 Jun 2025 14:09:45 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:f2df:571a:ae4c:bef2]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3a568b08d3csm378831f8f.65.2025.06.12.14.09.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Jun 2025 14:09:44 -0700 (PDT) From: luca.boccassi@gmail.com To: Long Li Cc: dpdk stable Subject: patch 'bus/vmbus: use Hyper-V page size' has been queued to stable release 22.11.9 Date: Thu, 12 Jun 2025 22:06:55 +0100 Message-ID: <20250612210733.2506558-38-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/2da70953f668415fb325af744a5eff15b612dfc3 Thanks. Luca Boccassi --- >From 2da70953f668415fb325af744a5eff15b612dfc3 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 e2475a642d..879cbd5bbf 100644 --- a/drivers/bus/vmbus/bus_vmbus_driver.h +++ b/drivers/bus/vmbus/bus_vmbus_driver.h @@ -14,6 +14,10 @@ extern "C" { #include #include +#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 @@ -268,7 +268,7 @@ 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 @@ -201,7 +201,7 @@ 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.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-12 22:06:25.291881223 +0100 +++ 0038-bus-vmbus-use-Hyper-V-page-size.patch 2025-06-12 22:06:23.858044384 +0100 @@ -1 +1 @@ -From 30f24d33f33bbb29b1fba32b01e8c8d77400a5d5 Mon Sep 17 00:00:00 2001 +From 2da70953f668415fb325af744a5eff15b612dfc3 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 30f24d33f33bbb29b1fba32b01e8c8d77400a5d5 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index bc394208de..0a56275437 100644 +index e2475a642d..879cbd5bbf 100644 @@ -26,3 +27,3 @@ -@@ -14,6 +14,10 @@ - extern "C" { - #endif +@@ -14,6 +14,10 @@ extern "C" { + #include + #include