Ingest several minor upstream patches#438
Merged
lorelei-sakai merged 8 commits intodm-vdo:mainfrom Apr 13, 2026
Merged
Conversation
This ingests the vdo portion of upstream commit
92a8b224b833 ("lib/min_heap: introduce non-inline
versions of min heap API functions"). This was
applied manually because we don't track the Kconfig
except in the overlay tool directory.
Signed-off-by: Matthew Sakai <msakai@redhat.com>
To support the latest vdo min_heap changes, update our fake min_heap.[ch] with the latest version from the kernel. This version has been stable since about kernel 6.13, which is old enough we don't need to bother doing version checks. Also remove version checks related to min_heap from repair.c and slab-depot.c, and add a blank line to the former that got added when upstreaming previously. Signed-off-by: Matthew Sakai <msakai@redhat.com>
Replace the swp function pointer in the min_heap_callbacks of dm-vdo with NULL, allowing direct usage of the default builtin swap implementation. This modification simplifies the code and improves performance by removing unnecessary function indirection. Link: https://lkml.kernel.org/r/20241020040200.939973-7-visitorckw@gmail.com Signed-off-by: Kuan-Wei Chiu <visitorckw@gmail.com> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Arnaldo Carvalho de Melo <acme@kernel.org> Cc: Ching-Chun (Jim) Huang <jserv@ccns.ncku.edu.tw> Cc: Coly Li <colyli@suse.de> Cc: Ian Rogers <irogers@google.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Jonathan Corbet <corbet@lwn.net> Cc: Kent Overstreet <kent.overstreet@linux.dev> Cc: "Liang, Kan" <kan.liang@linux.intel.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Matthew Sakai <msakai@redhat.com> Cc: Matthew Wilcox (Oracle) <willy@infradead.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Matthew Sakai <msakai@redhat.com>
dm-vdo docs currently has no explicit title heading but instead there
are multiple section headings as top-level heading. As such, these
sections are rendered as titles and inflates number of entries in the
toctree index.
Promote the first section heading ("dm-vdo") to title heading.
Fixes: 04bf7ac646ab ("dm: add documentation for dm-vdo target")
Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Matthew Sakai <msakai@redhat.com>
There is no function advance_compression_stage(). But advance_data_vio_compression_stage() does iterate through the values of the data_vio_compression_stage enum, so it seems to be what was intended. Signed-off-by: Julia Lawall <Julia.Lawall@inria.fr> Signed-off-by: Mikulas Patocka <mpatocka@redhat.com> Signed-off-by: Matthew Sakai <msakai@redhat.com>
There is a spelling mistake in a vdo_log_error message. Fix it. Signed-off-by: Colin Ian King <colin.i.king@gmail.com> Signed-off-by: Mikulas Patocka <mpatocka@redhat.com> Signed-off-by: Matthew Sakai <msakai@redhat.com>
Use the typed random integer helpers instead of get_random_bytes() when filling a single integer variable. The helpers return the value directly, require no pointer or size argument, and better express intent. Signed-off-by: David Carlier <devnexen@gmail.com> Signed-off-by: Matthew Sakai <msakai@redhat.com>
This supports the previous upstream patch. Signed-off-by: Matthew Sakai <msakai@redhat.com>
github-actions
bot
added
untested
private build running
public build running
private build done
private testing running
public build done
public testing running
private testing done
public testing done
and removed
untested
private build running
public build running
private testing running
public testing running
labels
raeburn
approved these changes
Apr 13, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is an attempt to reduce skew between vdo-devel and dm-linux repositories, and the upstream kernel.
The first two patches pull in some kernel updates related to min_heap required by the third commit, commits 3-7 are small patches applied upstream that we haven't ingested yet, and patch 8 is another userspace adjustment to support patch 7.