From: Emerson Busson <emersonbusson@gmail.com>
To: mhklinux@outlook.com
Cc: kys@microsoft.com, haiyangz@microsoft.com, wei.liu@kernel.org,
decui@microsoft.com, andrew+netdev@lunn.ch, davem@davemloft.net,
edumazet@google.com, kuba@kernel.org, pabeni@redhat.com,
gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org,
linux-hyperv@vger.kernel.org, netdev@vger.kernel.org
Subject: [PATCH v2 05/14] hv: vmbus: add KUnit test for order-zero allocation fallback
Date: Wed, 7 Oct 2026 16:07:43 -0300 [thread overview]
Message-ID: <20261007190752.336426-6-emersonbusson@gmail.com> (raw)
In-Reply-To: <20261007190752.336426-1-emersonbusson@gmail.com>
Factor the order-descent allocation loop so KUnit can inject failures
for orders above zero while retaining a real order-zero allocation in
the test path. Also verify clean exhaustion when the order-zero attempt
fails.
The factoring keeps the per-order GFP policy of the loop it replaces.
Speculative attempts above order 0 still carry __GFP_COMP together with
__GFP_NORETRY | __GFP_NOWARN so they cannot OOM-kill, and the order-0
attempt is still the plain GFP_KERNEL | __GFP_ZERO final fallback that
is allowed to try harder. Reusing one gfp across the whole descent
would leave __GFP_NORETRY set on the order-0 attempt and silently
weaken that last resort.
The case joins the others in drivers/hv/vmbus_buffer_test.c, built
into the hv_vmbus object. vmbus_alloc_pages_with_fallback() and its
callback type are therefore declared in hyperv_vmbus.h instead of
staying static in channel.c. Nothing outside hv_vmbus links against
them, and no symbol is exported.
Signed-off-by: Emerson Busson <emersonbusson@gmail.com>
---
drivers/hv/channel.c | 56 ++++++++++++++++++++++----------
drivers/hv/hyperv_vmbus.h | 13 ++++++++
drivers/hv/vmbus_buffer_test.c | 58 ++++++++++++++++++++++++++++++++++
3 files changed, 111 insertions(+), 16 deletions(-)
diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
index 6a1bc9b17869..0c025a12808a 100644
--- a/drivers/hv/channel.c
+++ b/drivers/hv/channel.c
@@ -60,6 +60,31 @@ bool vmbus_buffer_lower_order(unsigned int *order)
return true;
}
+struct page *vmbus_alloc_pages_with_fallback(int nid, gfp_t gfp,
+ unsigned int *order,
+ vmbus_alloc_pages_fn alloc,
+ void *context)
+{
+ struct page *page;
+
+ do {
+ gfp_t try_gfp = gfp;
+
+ /*
+ * Use __GFP_NORETRY | __GFP_NOWARN to avoid OOM-killing,
+ * but try harder at order 0 since that is the final
+ * fallback.
+ * __GFP_COMP stores order information in the page folio.
+ */
+ if (*order)
+ try_gfp |= __GFP_COMP | __GFP_NORETRY | __GFP_NOWARN;
+
+ page = alloc(context, nid, try_gfp, *order);
+ if (page || !vmbus_buffer_lower_order(order))
+ return page;
+ } while (true);
+}
+
bool vmbus_buffer_should_free(const struct vmbus_buffer *buffer)
{
return !buffer->leak && !buffer->gpadl.leak &&
@@ -774,6 +799,14 @@ void vmbus_release_buffer(struct vmbus_buffer *buffer)
}
EXPORT_SYMBOL_GPL(vmbus_release_buffer);
+static struct page *vmbus_alloc_pages_node(void *context, int nid,
+ gfp_t gfp,
+ unsigned int order)
+{
+ (void)context;
+ return alloc_pages_node(nid, gfp, order);
+}
+
/**
* __vmbus_alloc_buffer - allocate host-visible, virtually-contiguous backing.
*
@@ -837,26 +870,17 @@ static void *__vmbus_alloc_buffer(struct vmbus_channel *channel,
while (remaining) {
struct page *page;
gfp_t gfp;
+ int nid;
order = vmbus_buffer_order(remaining, order);
- /*
- * Use __GFP_NORETRY | __GFP_NOWARN to avoid OOM-killing,
- * but try harder at order 0 since that is the final
- * fallback.
- * __GFP_COMP stores order information in the page folio.
- */
gfp = GFP_KERNEL | __GFP_ZERO;
- if (order)
- gfp |= __GFP_COMP | __GFP_NORETRY | __GFP_NOWARN;
-
- page = alloc_pages_node(cpu_to_node(channel->target_cpu),
- gfp, order);
- if (!page) {
- if (!vmbus_buffer_lower_order(&order))
- goto err;
- continue;
- }
+
+ nid = cpu_to_node(channel->target_cpu);
+ page = vmbus_alloc_pages_with_fallback(nid, gfp, &order,
+ vmbus_alloc_pages_node, NULL);
+ if (!page)
+ goto err;
ret = set_memory_decrypted((unsigned long)page_address(page),
1U << order);
diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
index bb585ac2ceac..e08c472041d5 100644
--- a/drivers/hv/hyperv_vmbus.h
+++ b/drivers/hv/hyperv_vmbus.h
@@ -563,6 +563,19 @@ unsigned int vmbus_buffer_order(unsigned long remaining,
bool vmbus_buffer_lower_order(unsigned int *order);
bool vmbus_buffer_should_free(const struct vmbus_buffer *buffer);
+/*
+ * Order-descent allocation, shared with vmbus_buffer_test.c so the
+ * cases can inject per-order failures. Defined in channel.c, built
+ * into the hv_vmbus object, never exported.
+ */
+typedef struct page *(*vmbus_alloc_pages_fn)(void *context, int nid,
+ gfp_t gfp,
+ unsigned int order);
+struct page *vmbus_alloc_pages_with_fallback(int nid, gfp_t gfp,
+ unsigned int *order,
+ vmbus_alloc_pages_fn alloc,
+ void *context);
+
/*
* GPADL post and response helpers, also shared with vmbus_buffer_test.c.
* Same deal as the sizing helpers above: defined in channel.c, built into
diff --git a/drivers/hv/vmbus_buffer_test.c b/drivers/hv/vmbus_buffer_test.c
index fbf7c4351d64..60fc526af1af 100644
--- a/drivers/hv/vmbus_buffer_test.c
+++ b/drivers/hv/vmbus_buffer_test.c
@@ -257,12 +257,70 @@ static void vmbus_gpadl_teardown_post_failure_test(struct kunit *test)
KUNIT_EXPECT_EQ(test, context.call_count, 1U);
}
+struct vmbus_buffer_page_alloc_test_context {
+ struct kunit *test;
+ unsigned int attempts;
+ unsigned int expected_order;
+ bool fail_order_zero;
+};
+
+static struct page *vmbus_buffer_test_alloc_page(void *context, int nid,
+ gfp_t gfp,
+ unsigned int order)
+{
+ struct vmbus_buffer_page_alloc_test_context *test_context = context;
+
+ (void)nid;
+ KUNIT_EXPECT_EQ(test_context->test, order,
+ test_context->expected_order);
+ test_context->attempts++;
+ if (test_context->expected_order)
+ test_context->expected_order--;
+
+ if (order)
+ return NULL;
+ if (test_context->fail_order_zero)
+ return NULL;
+
+ return alloc_pages(gfp, 0);
+}
+
+static void vmbus_buffer_order_zero_allocation_test(struct kunit *test)
+{
+ struct vmbus_buffer_page_alloc_test_context context = {
+ .test = test,
+ .expected_order = MAX_PAGE_ORDER,
+ };
+ struct page *page;
+ unsigned int order = MAX_PAGE_ORDER;
+
+ page = vmbus_alloc_pages_with_fallback(0, GFP_KERNEL, &order,
+ vmbus_buffer_test_alloc_page, &context);
+ KUNIT_ASSERT_NOT_NULL(test, page);
+ KUNIT_EXPECT_EQ(test, order, 0U);
+ KUNIT_EXPECT_EQ(test, context.expected_order, 0U);
+ KUNIT_EXPECT_EQ(test, context.attempts, (unsigned int)MAX_PAGE_ORDER + 1);
+ __free_pages(page, 0);
+
+ context.attempts = 0;
+ context.expected_order = MAX_PAGE_ORDER;
+ context.fail_order_zero = true;
+ order = MAX_PAGE_ORDER;
+ page = vmbus_alloc_pages_with_fallback(0, GFP_KERNEL, &order,
+ vmbus_buffer_test_alloc_page, &context);
+ KUNIT_EXPECT_PTR_EQ(test, page, NULL);
+ KUNIT_EXPECT_EQ(test, order, 0U);
+ KUNIT_EXPECT_EQ(test, context.expected_order, 0U);
+ KUNIT_EXPECT_EQ(test, context.attempts, (unsigned int)MAX_PAGE_ORDER + 1);
+}
+
static struct kunit_case vmbus_buffer_test_cases[] = {
KUNIT_CASE(vmbus_buffer_size_rounding_test),
KUNIT_CASE(vmbus_buffer_size_overflow_test),
KUNIT_CASE(vmbus_ring_fallback_order_zero_test),
KUNIT_CASE(vmbus_buffer_failed_teardown_leaks_test),
KUNIT_CASE(vmbus_buffer_partial_allocation_cleanup_test),
+ KUNIT_CASE(vmbus_buffer_order_zero_allocation_test),
KUNIT_CASE(vmbus_gpadl_post_failure_test),
KUNIT_CASE(vmbus_gpadl_post_success_test),
KUNIT_CASE(vmbus_gpadl_response_state_test),
--
2.43.0
next prev parent reply other threads:[~2026-10-07 19:08 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-07 19:07 [PATCH v2 0/14] hv: vmbus: make rings and host-visible buffers survive buddy fragmentation Emerson Busson
2026-10-07 19:07 ` [PATCH v2 01/14] hv: vmbus: convert ring backing through the chunk allocator Emerson Busson
2026-10-07 19:07 ` [PATCH v2 02/14] hv: vmbus: validate chunk buffer allocation and cleanup Emerson Busson
2026-10-08 21:17 ` kernel test robot
2026-10-07 19:07 ` [PATCH v2 03/14] uio: hv_generic: describe buffers for owned allocation Emerson Busson
2026-10-07 19:07 ` [PATCH v2 04/14] hv: vmbus: add KUnit tests for GPADL post failure injection Emerson Busson
2026-10-07 19:07 ` Emerson Busson [this message]
2026-10-07 19:07 ` [PATCH v2 06/14] hv: vmbus: cover all shared-page policy combinations Emerson Busson
2026-10-07 19:07 ` [PATCH v2 07/14] hv: vmbus: distinguish host rescind from local channel unload Emerson Busson
2026-10-07 19:07 ` [PATCH v2 08/14] hv: vmbus: retain backing until ownership and references clear Emerson Busson
2026-10-07 19:07 ` [PATCH v2 09/14] hv: use owned VMBus buffers in NetVSC and UIO Emerson Busson
2026-10-07 19:07 ` [PATCH v2 10/14] hv: vmbus: pin buffer pages across UIO mmap to close the reclaim race Emerson Busson
2026-10-08 16:49 ` kernel test robot
2026-10-08 17:51 ` Nathan Chancellor
2026-10-08 17:02 ` kernel test robot
2026-10-07 19:07 ` [PATCH v2 11/14] hv: vmbus: vmalloc requestor metadata Emerson Busson
2026-10-07 19:07 ` [PATCH v2 12/14] hv: netvsc: allocate RNDIS request descriptors with kvzalloc_obj() Emerson Busson
2026-10-07 19:07 ` [PATCH v2 13/14] hv: netvsc: handle a NULL request address on empty completions Emerson Busson
2026-10-07 19:07 ` [PATCH v2 14/14] hv: netvsc: use kvzalloc for device state Emerson Busson
2026-10-08 16:55 ` [PATCH v2 0/14] hv: vmbus: make rings and host-visible buffers survive buddy fragmentation Easwar Hariharan
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=20261007190752.336426-6-emersonbusson@gmail.com \
--to=emersonbusson@gmail.com \
--cc=andrew+netdev@lunn.ch \
--cc=davem@davemloft.net \
--cc=decui@microsoft.com \
--cc=edumazet@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=haiyangz@microsoft.com \
--cc=kuba@kernel.org \
--cc=kys@microsoft.com \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mhklinux@outlook.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=wei.liu@kernel.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