Google Git
Sign in
android/kernel/common.git/refs/heads/android15-6.6-desktop
commit
f2ce5ec8fb4f5ed596a874173a078253f820411e
[log] [tgz]
author
Dmytro Maluka <dmaluka@google.com>
Mon Oct 13 17:37:44 2025 +0000
committer
Dmytro Maluka <dmaluka@google.com>
Tue Nov 04 09:36:38 2025 -0800
tree
66984faf843010f576de644ec3ee5515cff72810
parent
7e5b112c65b33776ef0ed269191de12087c80f92 [diff]
ANDROID: virtio_balloon: x86/pkvm: Force disabling balloon for pVMs

pKVM on x86 does not support memory relinquish for protected VMs yet.
So prevent successful initialization of virtio-balloon when running in a
protected VM on x86, to prevent runtime issues caused by it.

In newer kernels we shall leverage the virtio_balloon_hyp_ops
infrastructure (the ->page_relinquish_disallowed() callback) for that.
But in 6.6-desktop, for simplicity, just hardcode the pkvm x86-specific
check in the balloon driver.

Bug: 438723514
Bug: 416305513
Test: no virtio-balloon device in microdroid pVM
Upstream-Task: 402758258

Change-Id: I668d9e9379a4e9cd88efb119eca3ee553ae5bc72
Signed-off-by: Dmytro Maluka <dmaluka@google.com>
1 file changed
tree: 66984faf843010f576de644ec3ee5515cff72810
  1. android/
  2. arch/
  3. block/
  4. certs/
  5. chromeos/
  6. crypto/
  7. Documentation/
  8. drivers/
  9. fs/
  10. include/
  11. init/
  12. io_uring/
  13. ipc/
  14. kernel/
  15. lib/
  16. LICENSES/
  17. mm/
  18. net/
  19. rust/
  20. samples/
  21. scripts/
  22. security/
  23. sound/
  24. tools/
  25. usr/
  26. virt/
  27. .bazelignore
  28. .clang-format
  29. .cocciconfig
  30. .get_maintainer.ignore
  31. .gitattributes
  32. .gitignore
  33. .mailmap
  34. .rustfmt.toml
  35. abi.bzl
  36. build-kernel.sh
  37. BUILD.bazel
  38. build.config.aarch64
  39. build.config.allmodconfig
  40. build.config.allmodconfig.aarch64
  41. build.config.allmodconfig.arm
  42. build.config.allmodconfig.x86_64
  43. build.config.amlogic
  44. build.config.arm
  45. build.config.common
  46. build.config.constants
  47. build.config.crashdump
  48. build.config.crashdump.aarch64
  49. build.config.crashdump.x86_64
  50. build.config.db845c
  51. build.config.gki
  52. build.config.gki.aarch64
  53. build.config.gki.aarch64.fips140
  54. build.config.gki.x86_64
  55. build.config.gki_kasan
  56. build.config.gki_kasan.aarch64
  57. build.config.gki_kasan.x86_64
  58. build.config.gki_kprobes
  59. build.config.gki_kprobes.aarch64
  60. build.config.gki_kprobes.x86_64
  61. build.config.khwasan
  62. build.config.kunit.aarch64
  63. build.config.kunit.x86_64
  64. build.config.microdroid
  65. build.config.microdroid.aarch64
  66. build.config.microdroid.x86_64
  67. build.config.rockpi4
  68. build.config.x86_64
  69. COPYING
  70. CPPLINT.cfg
  71. CREDITS
  72. DIR_METADATA
  73. Kbuild
  74. Kconfig
  75. Kconfig.ext
  76. MAINTAINERS
  77. Makefile
  78. modules.bzl
  79. OWNERS
  80. PRESUBMIT.cfg
  81. README
  82. README.md
  83. unblocked_terms.txt
README.md

How do I submit patches to Android Common Kernels

  1. BEST: Make all of your changes to upstream Linux. If appropriate, backport to the stable releases. These patches will be merged automatically in the corresponding common kernels. If the patch is already in upstream Linux, post a backport of the patch that conforms to the patch requirements below.

    • Do not send patches upstream that contain only symbol exports. To be considered for upstream Linux, additions of EXPORT_SYMBOL_GPL() require an in-tree modular driver that uses the symbol -- so include the new driver or changes to an existing driver in the same patchset as the export.
    • When sending patches upstream, the commit message must contain a clear case for why the patch is needed and beneficial to the community. Enabling out-of-tree drivers or functionality is not a persuasive case.

  2. LESS GOOD: Develop your patches out-of-tree (from an upstream Linux point-of-view). Unless these are fixing an Android-specific bug, these are very unlikely to be accepted unless they have been coordinated with kernel-team@android.com. If you want to proceed, post a patch that conforms to the patch requirements below.

Common Kernel patch requirements

  • All patches must conform to the Linux kernel coding standards and pass scripts/checkpatch.pl
  • Patches shall not break gki_defconfig or allmodconfig builds for arm, arm64, x86, x86_64 architectures (see https://source.android.com/setup/build/building-kernels)
  • If the patch is not merged from an upstream branch, the subject must be tagged with the type of patch: UPSTREAM:, BACKPORT:, FROMGIT:, FROMLIST:, or ANDROID:.
  • All patches must have a Change-Id: tag (see https://gerrit-review.googlesource.com/Documentation/user-changeid.html)
  • If an Android bug has been assigned, there must be a Bug: tag.
  • All patches must have a Signed-off-by: tag by the author and the submitter

Additional requirements are listed below based on patch type

Requirements for backports from mainline Linux: UPSTREAM:, BACKPORT:

  • If the patch is a cherry-pick from Linux mainline with no changes at all
    • tag the patch subject with UPSTREAM:.
    • add upstream commit information with a (cherry picked from commit ...) line
    • Example:
      • if the upstream commit message is
        important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>
  • then Joe Smith would upload the patch for the common kernel as
        UPSTREAM: important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>

        Bug: 135791357
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        (cherry picked from commit c31e73121f4c1ec41143423ac6ce3ce6dafdcec1)
        Signed-off-by: Joe Smith <joe.smith@foo.org>
  • If the patch requires any changes from the upstream version, tag the patch with BACKPORT: instead of UPSTREAM:.
    • use the same tags as UPSTREAM:
    • add comments about the changes under the (cherry picked from commit ...) line
    • Example:
        BACKPORT: important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>

        Bug: 135791357
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        (cherry picked from commit c31e73121f4c1ec41143423ac6ce3ce6dafdcec1)
        [joe: Resolved minor conflict in drivers/foo/bar.c ]
        Signed-off-by: Joe Smith <joe.smith@foo.org>

Requirements for other backports: FROMGIT:, FROMLIST:,

  • If the patch has been merged into an upstream maintainer tree, but has not yet been merged into Linux mainline
    • tag the patch subject with FROMGIT:
    • add info on where the patch came from as (cherry picked from commit <sha1> <repo> <branch>). This must be a stable maintainer branch (not rebased, so don't use linux-next for example).
    • if changes were required, use BACKPORT: FROMGIT:
    • Example:
      • if the commit message in the maintainer tree is
        important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>
  • then Joe Smith would upload the patch for the common kernel as
        FROMGIT: important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>

        Bug: 135791357
        (cherry picked from commit 878a2fd9de10b03d11d2f622250285c7e63deace
         https://git.kernel.org/pub/scm/linux/kernel/git/foo/bar.git test-branch)
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        Signed-off-by: Joe Smith <joe.smith@foo.org>
  • If the patch has been submitted to LKML, but not accepted into any maintainer tree
    • tag the patch subject with FROMLIST:
    • add a Link: tag with a link to the submittal on lore.kernel.org
    • add a Bug: tag with the Android bug (required for patches not accepted into a maintainer tree)
    • if changes were required, use BACKPORT: FROMLIST:
    • Example:
        FROMLIST: important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>

        Bug: 135791357
        Link: https://lore.kernel.org/lkml/20190619171517.GA17557@someone.com/
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        Signed-off-by: Joe Smith <joe.smith@foo.org>
  • If a patch has been submitted to the community, but rejected, do NOT use the FROMLIST: tag to try to hide this fact. Use the ANDROID: tag as described below as this must be considered as an Android-specific submission, not an upstream submission as the community will not accept these changes as-is.

Requirements for Android-specific patches: ANDROID:

  • If the patch is fixing a bug to Android-specific code
    • tag the patch subject with ANDROID:
    • add a Fixes: tag that cites the patch with the bug
    • Example:
        ANDROID: fix android-specific bug in foobar.c

        This is the detailed description of the important fix

        Fixes: 1234abcd2468 ("foobar: add cool feature")
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        Signed-off-by: Joe Smith <joe.smith@foo.org>
  • If the patch is a new feature
    • tag the patch subject with ANDROID:
    • add a Bug: tag with the Android bug (required for android-specific features)