Google GitGoogle Git
Sign in
android-kvm/linux/refs/tags/pkvm-7.1-rwlock
commit
1753754f102391b0041c1a59197a75a04697e77e
[log]
author
Will Deacon <willdeacon@google.com>
Fri Jun 30 19:40:19 2023 +0100
committer
Fuad Tabba <tabba@google.com>
Fri Jul 10 02:59:59 2026 +0100
tree
efcd5e65461fd74c7728c68ca4bf10b6b6eb5072
parent
a0e96aac91ab0b39856a1461efdca6ae140ae550 [diff]
BACKPORT: ANDROID: KVM: arm64: Convert pKVM 'vm_table_lock' to an rwlock

Convert 'vm_table_lock' from a spinlock to an rwlock so that walks of
the table are not serialising, allowing different 'hyp_vcpu' structures
to be loaded concurrently.

The conversion is mostly straighforward, although a cmpxchg() is needed
to ensure that the same 'hyp_vcpu' cannot be loaded on two physical CPUs
simultaneously.

Cc: Fuad Tabba <tabba@google.com>

Bug: 458241298
Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Will Deacon <willdeacon@google.com>
Signed-off-by: Fuad Tabba <tabba@google.com>
Change-Id: Iea2f61f26afd535837c0923d4320b2beeab01109
(cherry picked from commit 4f1b201bef3e4dbb6be6e30fb7f74ca90a0545fb)
[tabba@: Carry-rebased onto the pkvm_core base (rwlock onto the base's
 hyp_spinlock + hyp_alloc VM model). Folded 7ccb443b (atomic
 refcount: base pkvm_hyp_vm_ref_inc/dec made atomic via
 hyp_refcount_inc/dec, required once load takes the read lock
 and put runs lockless) and 13e878 (__pkvm_start_teardown_vm
 read->write lock, is_dying race). Base-only vm_table_lock
 sites the A17 parent lacked: mem_protect.c
 __pkvm_host_force_reclaim_page_guest -> read;
 pkvm_vcpu_init_psci and get_pkvm_unref_hyp_vm_locked -> write
 assert; get_vm_by_handle assert dropped (mixed read/write,
 unexpressible under the rwlock API, absent on ack);
 teardown_selftest_vm -> write. Kept base
 smp_load_acquire(vcpus[]).]
Signed-off-by: Fuad Tabba <tabba@google.com>
4 files changed
tree: efcd5e65461fd74c7728c68ca4bf10b6b6eb5072
  1. arch/
  2. bazel/
  3. block/
  4. certs/
  5. crypto/
  6. Documentation/
  7. drivers/
  8. fs/
  9. gki/
  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. .clang-format
  28. .clippy.toml
  29. .cocciconfig
  30. .editorconfig
  31. .get_maintainer.ignore
  32. .gitattributes
  33. .gitignore
  34. .mailmap
  35. .pylintrc
  36. .rustfmt.toml
  37. BUILD.bazel
  38. build.log
  39. COPYING
  40. CREDITS
  41. Kbuild
  42. Kconfig
  43. Kconfig.ext
  44. MAINTAINERS
  45. Makefile
  46. npvm_boot.log
  47. OWNERS
  48. OWNERS_DrNo
  49. pkvm_selftest.log
  50. pvm_boot.log
  51. README
  52. README.md
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
    • if applicable, prefer to cherry-pick the commit from the corresponding LTS branch.
    • append new signature tags (e.g. Bug:, Change-Id:, etc.) at the end to keep the chronological order.
    • 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 branch on a tree which is normally merged into Linus‘s tree and is not rebased. For example, don’t use linux-next which is rebased and never directly merged into Linus‘s tree, but you can use SHAs from net or net-next, which are merged into Linus’s tree at various points in the release.
    • 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)

Requirements for revert patches:

  • Add a reason for the revert
  • Do not delete or modify the revert information that is generated when using git revert
  • If modifications have been made after creating the revert, include a list of these in the commit message
  • Example:
        Revert "ANDROID: fix android-specific bug in foobar.c"

        This reverts commit a57a7913f53e34c8a8d905444b126b3316146e69.

        Reason for revert: Breaks a lot of internal tests

        Additional modifications: Resolved merge conflicts

        Bug: 135791357
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        Signed-off-by: Joe Smith <joe.smith@foo.org>