Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d3e5b23 authored by Terence Tritton's avatar Terence Tritton Committed by Terence Tritton (xWF)
Browse files

ANDROID: ABI: Cuttlefish Symbol update 



android11-5.4 is broken on Cuttlefish aarch64 because of the use of
blk_mq_quiesce_queue_nowait in virtio_blk.ko.

The following steps were used to update the cuttlefish symbol list.

$ BUILD_CONFIG=common/build.config.gki.aarch64 build/build.sh
$ BUILD_CONFIG=common-modules/virtual-\
    device/build.config.cuttlefish.aarch64 build/build.sh
$ build/abi/extract_symbols out/android11-5.4/dist/ --whitelist \
        common/android/abi_gki_aarch64_cuttlefish --additions-only
$ BUILD_CONFIG=common/build.config.gki.aarch64 build/build_abi.sh \
        --update --print-report

Change-Id: I01fac6926d4362c00cbd212091ab7d4fa98b885c
Bug: 391465004
Signed-off-by: default avatarTerry Tritton <ttritton@google.com>
parent c1ccccc7

android/abi_gki_aarch64.xml

+13 −0
Original line number Diff line number Diff line
@@ -426,6 +426,7 @@ 
      <elf-symbol name='blk_mq_map_queues' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x4d4d7b79'/>

      <elf-symbol name='blk_mq_pci_map_queues' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x172bf3dd'/>

      <elf-symbol name='blk_mq_quiesce_queue' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x30c051ed'/>

      <elf-symbol name='blk_mq_quiesce_queue_nowait' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x5ece1e60'/>

      <elf-symbol name='blk_mq_request_completed' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x309f9f91'/>

      <elf-symbol name='blk_mq_requeue_request' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x864789e7'/>

      <elf-symbol name='blk_mq_rq_cpu' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xc2ae6990'/>
@@ -37447,6 +37448,10 @@ 
        <parameter type-id='e7d2a5fc' name='q' filepath='block/blk-mq.c' line='192' column='1'/>

        <return type-id='48b5725f'/>

      </function-decl>

      <function-decl name='blk_mq_quiesce_queue_nowait' mangled-name='blk_mq_quiesce_queue_nowait' filepath='block/blk-mq.c' line='219' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='blk_mq_quiesce_queue_nowait'>

        <parameter type-id='e7d2a5fc' name='q' filepath='block/blk-mq.c' line='219' column='1'/>

        <return type-id='48b5725f'/>

      </function-decl>

      <function-decl name='blk_mq_alloc_request_hctx' mangled-name='blk_mq_alloc_request_hctx' filepath='block/blk-mq.c' line='446' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='blk_mq_alloc_request_hctx'>

        <parameter type-id='e7d2a5fc' name='q' filepath='block/blk-mq.c' line='446' column='1'/>

        <parameter type-id='f0981eeb' name='op' filepath='block/blk-mq.c' line='447' column='1'/>
@@ -149383,6 +149388,14 @@ 
          <var-decl name='ancestor_ids' type-id='1fdc7fa6' visibility='default' filepath='include/linux/cgroup-defs.h' line='498' column='1'/>

        </data-member>

      </class-decl>

      <union-decl name='rcu_special' size-in-bits='32' visibility='default' filepath='include/linux/sched.h' line='615' column='1' id='a324790e'>

        <data-member access='public'>

          <var-decl name='b' type-id='4edee319' visibility='default' filepath='include/linux/sched.h' line='621' column='1'/>

        </data-member>

        <data-member access='public'>

          <var-decl name='s' type-id='19c2251e' visibility='default' filepath='include/linux/sched.h' line='622' column='1'/>

        </data-member>

      </union-decl>

      <class-decl name='kernfs_node' size-in-bits='1024' is-struct='yes' visibility='default' filepath='include/linux/kernfs.h' line='132' column='1' id='29d79af7'>

        <data-member access='public' layout-offset-in-bits='0'>

          <var-decl name='count' type-id='49178f86' visibility='default' filepath='include/linux/kernfs.h' line='133' column='1'/>

android/abi_gki_aarch64_cuttlefish

+11 −7
Original line number Diff line number Diff line
@@ -230,7 +230,6 @@ 
  vring_del_virtqueue

  vring_interrupt

  vring_transport_features

  wait_for_completion

  wait_woken

  __wake_up

  __warn_printk
@@ -739,11 +738,13 @@ 
  blk_mq_complete_request

  blk_mq_end_request

  blk_mq_free_tag_set

  blk_mq_freeze_queue

  blk_mq_init_queue

  blk_mq_quiesce_queue

  blk_mq_quiesce_queue_nowait

  blk_mq_start_request

  blk_mq_start_stopped_hw_queues

  blk_mq_stop_hw_queue

  blk_mq_unfreeze_queue

  blk_mq_unquiesce_queue

  blk_mq_virtio_map_queues

  blk_put_request
@@ -800,6 +801,7 @@ 
  __splice_from_pipe

  system_freezing_cnt

  __unregister_chrdev

  wait_for_completion



# required by virtio_input.ko

  input_alloc_absinfo
@@ -813,14 +815,10 @@ 


# required by virtio_mmio.ko

  device_for_each_child

  devm_ioremap

  devm_kfree

  __devm_request_region

  iomem_resource

  devm_platform_ioremap_resource

  memparse

  platform_device_register_full

  platform_get_irq

  platform_get_resource

  sscanf



# required by virtio_net.ko
@@ -956,6 +954,12 @@ 
  sock_i_ino



# preserved by --additions-only

  blk_mq_quiesce_queue

  devm_ioremap

  devm_kfree

  __devm_request_region

  generic_shutdown_super

  iomem_resource

  platform_get_resource

  refcount_dec_and_test_checked

  refcount_inc_checked