ANDROID: GKI: 4/23 KMI update

Set KMI_GENERATION=2 for 4/23 KMI update

Leaf changes summary: 1198 artifacts changed (26 filtered out)
Changed leaf types summary: 7 (26 filtered out) leaf types changed
Removed/Changed/Added functions summary: 0 Removed, 1183 Changed, 0 Added function
Removed/Changed/Added variables summary: 0 Removed, 8 Changed, 0 Added variable

1183 functions with some sub-type change:

  [C] 'function block_device* I_BDEV(inode*)' at block_dev.c:52:1 has some sub-type changes:
    CRC (modversions) changed from 0x9ab352e1 to 0x23b43085

  [C] 'function void __ClearPageMovable(page*)' at compaction.c:120:1 has some sub-type changes:
    CRC (modversions) changed from 0x6f8237 to 0x14c46062

  [C] 'function void __SetPageMovable(page*, address_space*)' at compaction.c:112:1 has some sub-type changes:
    CRC (modversions) changed from 0x6bec55bf to 0xb866bb01

  ... 1180 omitted; 1183 symbols have only CRC changes

8 Changed variables:

  [C] 'net init_net' was changed at net_namespace.c:46:1:
    CRC (modversions) changed from 0x2e03ea02 to 0x10970b4c
    type of variable changed:
      type size hasn't changed
      there are data member changes:
        type 'struct netns_xfrm' of 'net::xfrm' changed:
          type size hasn't changed
          1 data member insertion:
            'seqcount_t xfrm_state_hash_generation', at offset 6688 (in bits) at xfrm.h:76:1
          there are data member changes:
            'spinlock_t xfrm_policy_lock' offset changed (by +32 bits)
            'mutex xfrm_cfg_mutex' offset changed (by +64 bits)
          3286 impacted interfaces
      3286 impacted interfaces

  [C] 'neigh_table arp_tbl' was changed at arp.c:152:1:
    CRC (modversions) changed from 0xa08b4c33 to 0x78ed5f46

  [C] 'bio_set fs_bio_set' was changed at bio.c:47:1:
    CRC (modversions) changed from 0x53396123 to 0xf41927e8

  [C] 'task_struct init_task' was changed at init_task.c:58:1:
    CRC (modversions) changed from 0xb99110ee to 0xc0988756

  ... 4 omitted; 7 symbols have only CRC changes

'struct bio at blk_types.h:146:1' changed:
  type size changed from 1216 to 1280 (in bits)
  1 data member insertion:
    'u64 bi_iocost_cost', at offset 768 (in bits) at blk_types.h:175:1
  there are data member changes:
    2 ('bio_crypt_ctx* bi_crypt_context' .. 'bool bi_skip_dm_default_key') offsets changed (by +64 bits)
    anonymous data member 'union {}' offset changed from 840 to 904 (in bits) (by +64 bits)
    8 ('unsigned short int bi_vcnt' .. 'bio_vec bi_inline_vecs[]') offsets changed (by +64 bits)
  3286 impacted interfaces

'struct net at net_namespace.h:54:1' changed (indirectly):
  details were reported earlier

'struct netns_xfrm at xfrm.h:32:1' changed:
  details were reported earlier

'struct request at blkdev.h:133:1' changed:
  type size changed from 2368 to 2432 (in bits)
  1 data member insertion:
    'u64 alloc_time_ns', at offset 1408 (in bits) at blkdev.h:200:1
  there are data member changes:
    13 ('u64 start_time_ns' .. 'unsigned long int deadline') offsets changed (by +64 bits)
    anonymous data member 'union {__call_single_data csd; u64 fifo_time;}' offset changed from 1984 to 2048 (in bits) (by +64 bits)
    2 ('rq_end_io_fn* end_io' .. 'void* end_io_data') offsets changed (by +64 bits)
  3286 impacted interfaces

'struct request_queue at blkdev.h:400:1' changed:
  type size changed from 16448 to 16512 (in bits)
  1 data member insertion:
    'throtl_data* td', at offset 12032 (in bits) at blkdev.h:569:1
  there are data member changes:
    14 ('callback_head callback_head' .. 'u64 write_hints[5]') offsets changed (by +64 bits)
  3286 impacted interfaces

'struct ufs_dev_cmd at ufshcd.h:246:1' changed:
  type size changed from 1024 to 832 (in bits)
  1 data member deletion:
    'wait_queue_head_t tag_wq', at offset 384 (in bits) at ufshcd.h:250:1
  there are data member changes:
    'ufs_query query' offset changed (by -192 bits)
  8 impacted interfaces

'struct ufs_hba at ufshcd.h:580:1' changed:
  type size changed from 33088 to 33728 (in bits)
  4 data member deletions:
    'unsigned long int lrb_in_use', at offset 1408 (in bits) at ufshcd.h:615:1
    'wait_queue_head_t tm_tag_wq', at offset 2368 (in bits) at ufshcd.h:730:1
    'unsigned long int tm_condition', at offset 2560 (in bits) at ufshcd.h:731:1
    'unsigned long int tm_slots_in_use', at offset 2624 (in bits) at ufshcd.h:732:1
  2 data member insertions:
    'request_queue* cmd_queue', at offset 576 (in bits) at ufshcd.h:591:1
    'request_queue* tmf_queue', at offset 3456 (in bits) at ufshcd.h:726:1
  there are data member changes:
    type 'typedef wait_queue_head_t' of 'ufs_hba::tm_wq' changed:
      entity changed from 'typedef wait_queue_head_t' to compatible type 'struct blk_mq_tag_set' at blk-mq.h:93:1
      type size changed from 192 to 1280 (in bits)
    and name of 'ufs_hba::tm_wq' changed to 'ufs_hba::tmf_tag_set' at ufshcd.h:725:1
    10 ('scsi_device* sdev_ufs_device' .. 'ufshcd_lrb* lrb') offsets changed (by +64 bits)
    19 ('uic_command* active_uic_cmd' .. 'bool silence_err_logs') offsets changed (by +832 bits)
    type 'struct ufs_dev_cmd' of 'ufs_hba::dev_cmd' changed, as reported earlier
    and offset changed from 15296 to 16128 (in bits) (by +832 bits)
    33 ('ktime_t last_dme_cmd_tstamp' .. 'u64 android_kabi_reserved4') offsets changed (by +640 bits)
  8 impacted interfaces

Bug: 186241007
Signed-off-by: Todd Kjos <tkjos@google.com>
Change-Id: I3ff9a4f1954a891825f6e3a7a3655459e7097549
2 files changed
tree: 55f472620fe203201edc6c0e8a4927010bcd231e
  1. android/
  2. arch/
  3. block/
  4. certs/
  5. crypto/
  6. Documentation/
  7. drivers/
  8. fs/
  9. include/
  10. init/
  11. ipc/
  12. kernel/
  13. lib/
  14. LICENSES/
  15. mm/
  16. net/
  17. samples/
  18. scripts/
  19. security/
  20. sound/
  21. tools/
  22. usr/
  23. virt/
  24. .clang-format
  25. .cocciconfig
  26. .get_maintainer.ignore
  27. .gitattributes
  28. .gitignore
  29. .mailmap
  30. build.config.aarch64
  31. build.config.allmodconfig
  32. build.config.allmodconfig.aarch64
  33. build.config.allmodconfig.arm
  34. build.config.allmodconfig.x86_64
  35. build.config.arm
  36. build.config.common
  37. build.config.db845c
  38. build.config.gki
  39. build.config.gki-debug.aarch64
  40. build.config.gki-debug.x86_64
  41. build.config.gki.aarch64
  42. build.config.gki.x86_64
  43. build.config.gki_kasan
  44. build.config.gki_kasan.aarch64
  45. build.config.gki_kasan.x86_64
  46. build.config.gki_kprobes
  47. build.config.gki_kprobes.aarch64
  48. build.config.gki_kprobes.x86_64
  49. build.config.hikey960
  50. build.config.x86_64
  51. COPYING
  52. CREDITS
  53. Kbuild
  54. Kconfig
  55. MAINTAINERS
  56. Makefile
  57. OWNERS
  58. README
  59. 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.

  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 script/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 ...) 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 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 ...) 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 c31e73121f4c1ec41143423ac6ce3ce6dafdcec1)
        [ 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
    • 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>

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)