Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 18798d6

Browse files
Ulises Mendez MartinezTreehugger Robot
authored andcommitted
ANDROID: Protect Kunit & virtio modules
* This is to mark previously non marked modules as protected. * This fixes the following error (while running `tools/bazel \ run //common:kernel_aarch64_abi_update` to update the ABI manually): ``` ERROR: protected exports list must be updated before updating ABI definition... ``` Fixes: ce93918 ("ANDROID: GKI: enable options to run GKI as Microdroid guest") Fixes: 22f9005 ("ANDROID: Build GKI with CONFIG_KUNIT=m") Bug: 287199267 Change-Id: I323c5ce23b6087ba94f497ae36ec68dc4fc11707 Signed-off-by: Ulises Mendez Martinez <[email protected]>
1 parent da9c5d8 commit 18798d6

File tree

2 files changed

+102
-2
lines changed

2 files changed

+102
-2
lines changed

android/abi_gki_protected_exports_aarch64

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,15 @@ __hci_cmd_sync_ev
55
__hci_cmd_sync_sk
66
__hci_cmd_sync_status
77
__hci_cmd_sync_status_sk
8+
__kunit_abort
9+
__kunit_activate_static_stub
10+
__kunit_add_resource
11+
__kunit_do_failed_assertion
12+
__kunit_test_suites_exit
13+
__kunit_test_suites_init
814
__nfc_alloc_vendor_cmd_reply_skb
15+
__regmap_init_ram
16+
__regmap_init_raw_ram
917
__traceiter_9p_fid_ref
1018
__tracepoint_9p_fid_ref
1119
alloc_can_err_skb
@@ -102,8 +110,15 @@ h4_recv_buf
102110
hci_alloc_dev_priv
103111
hci_cmd_sync
104112
hci_cmd_sync_cancel
113+
hci_cmd_sync_cancel_entry
105114
hci_cmd_sync_cancel_sync
115+
hci_cmd_sync_dequeue
116+
hci_cmd_sync_dequeue_once
117+
hci_cmd_sync_lookup_entry
106118
hci_cmd_sync_queue
119+
hci_cmd_sync_queue_once
120+
hci_cmd_sync_run
121+
hci_cmd_sync_run_once
107122
hci_cmd_sync_status
108123
hci_cmd_sync_submit
109124
hci_conn_check_secure
@@ -153,6 +168,32 @@ ieee802154_unregister_hw
153168
ieee802154_xmit_complete
154169
ieee802154_xmit_error
155170
ieee802154_xmit_hw_error
171+
kunit_add_action
172+
kunit_add_action_or_reset
173+
kunit_assert_prologue
174+
kunit_binary_assert_format
175+
kunit_binary_ptr_assert_format
176+
kunit_binary_str_assert_format
177+
kunit_cleanup
178+
kunit_deactivate_static_stub
179+
kunit_destroy_resource
180+
kunit_fail_assert_format
181+
kunit_init_test
182+
kunit_kfree
183+
kunit_kmalloc_array
184+
kunit_log_append
185+
kunit_mem_assert_format
186+
kunit_ptr_not_err_assert_format
187+
kunit_release_action
188+
kunit_remove_action
189+
kunit_remove_resource
190+
kunit_run_tests
191+
kunit_suite_has_succeeded
192+
kunit_suite_num_test_cases
193+
kunit_test_case_num
194+
kunit_try_catch_run
195+
kunit_try_catch_throw
196+
kunit_unary_assert_format
156197
l2cap_add_psm
157198
l2cap_chan_close
158199
l2cap_chan_connect
@@ -417,6 +458,25 @@ v9fs_get_default_trans
417458
v9fs_get_trans_by_name
418459
v9fs_register_trans
419460
v9fs_unregister_trans
461+
vp_modern_config_vector
462+
vp_modern_generation
463+
vp_modern_get_driver_features
464+
vp_modern_get_features
465+
vp_modern_get_num_queues
466+
vp_modern_get_queue_enable
467+
vp_modern_get_queue_reset
468+
vp_modern_get_queue_size
469+
vp_modern_get_status
470+
vp_modern_map_vq_notify
471+
vp_modern_probe
472+
vp_modern_queue_address
473+
vp_modern_queue_vector
474+
vp_modern_remove
475+
vp_modern_set_features
476+
vp_modern_set_queue_enable
477+
vp_modern_set_queue_reset
478+
vp_modern_set_queue_size
479+
vp_modern_set_status
420480
wpan_phy_find
421481
wpan_phy_for_each
422482
wpan_phy_free

android/gki_aarch64_protected_modules

Lines changed: 42 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,34 @@
11
arch/arm64/geniezone/gzvm.ko
2+
drivers/base/regmap/regmap-kunit.ko
3+
drivers/base/regmap/regmap-kunit.ko
4+
drivers/base/regmap/regmap-ram.ko
5+
drivers/base/regmap/regmap-ram.ko
6+
drivers/base/regmap/regmap-raw-ram.ko
7+
drivers/base/regmap/regmap-raw-ram.ko
8+
drivers/block/virtio_blk.ko
9+
drivers/block/virtio_blk.ko
210
drivers/bluetooth/btbcm.ko
311
drivers/bluetooth/btqca.ko
412
drivers/bluetooth/btsdio.ko
513
drivers/bluetooth/hci_uart.ko
14+
drivers/char/hw_random/cctrng.ko
15+
drivers/char/hw_random/cctrng.ko
16+
drivers/char/virtio_console.ko
17+
drivers/char/virtio_console.ko
18+
drivers/clk/clk-gate_test.ko
19+
drivers/clk/clk-gate_test.ko
20+
drivers/clk/clk_test.ko
21+
drivers/clk/clk_test.ko
22+
drivers/hid/hid-uclogic-test.ko
23+
drivers/hid/hid-uclogic-test.ko
24+
drivers/iio/test/iio-test-format.ko
25+
drivers/iio/test/iio-test-format.ko
26+
drivers/input/tests/input_test.ko
27+
drivers/input/tests/input_test.ko
28+
drivers/misc/open-dice.ko
29+
drivers/misc/open-dice.ko
30+
drivers/misc/vcpu_stall_detector.ko
31+
drivers/misc/vcpu_stall_detector.ko
632
drivers/net/can/dev/can-dev.ko
733
drivers/net/can/slcan/slcan.ko
834
drivers/net/can/vcan.ko
@@ -29,11 +55,21 @@ drivers/net/wwan/wwan.ko
2955
drivers/pps/pps_core.ko
3056
drivers/ptp/ptp.ko
3157
drivers/ptp/ptp_kvm.ko
58+
drivers/rtc/lib_test.ko
3259
drivers/usb/class/cdc-acm.ko
3360
drivers/usb/mon/usbmon.ko
3461
drivers/usb/serial/ftdi_sio.ko
3562
drivers/usb/serial/usbserial.ko
63+
drivers/virtio/virtio_balloon.ko
64+
drivers/virtio/virtio_pci.ko
65+
drivers/virtio/virtio_pci_modern_dev.ko
66+
fs/ext4/ext4-inode-test.ko
67+
fs/fat/fat_test.ko
68+
kernel/time/time_test.ko
3669
lib/crypto/libarc4.ko
70+
lib/kunit/kunit-example-test.ko
71+
lib/kunit/kunit.ko
72+
lib/kunit/kunit-test.ko
3773
net/6lowpan/6lowpan.ko
3874
net/6lowpan/nhc_dest.ko
3975
net/6lowpan/nhc_fragment.ko
@@ -43,15 +79,16 @@ net/6lowpan/nhc_mobility.ko
4379
net/6lowpan/nhc_routing.ko
4480
net/6lowpan/nhc_udp.ko
4581
net/8021q/8021q.ko
46-
net/9p/9pnet.ko
4782
net/9p/9pnet_fd.ko
83+
net/9p/9pnet.ko
4884
net/bluetooth/bluetooth.ko
4985
net/bluetooth/hidp/hidp.ko
5086
net/bluetooth/rfcomm/rfcomm.ko
51-
net/can/can.ko
5287
net/can/can-bcm.ko
5388
net/can/can-gw.ko
89+
net/can/can.ko
5490
net/can/can-raw.ko
91+
net/core/dev_addr_lists_test.ko
5592
net/ieee802154/6lowpan/ieee802154_6lowpan.ko
5693
net/ieee802154/ieee802154.ko
5794
net/ieee802154/ieee802154_socket.ko
@@ -62,3 +99,6 @@ net/nfc/nfc.ko
6299
net/rfkill/rfkill.ko
63100
net/tipc/diag.ko
64101
net/tipc/tipc.ko
102+
net/vmw_vsock/vmw_vsock_virtio_transport.ko
103+
sound/soc/soc-topology-test.ko
104+
sound/soc/soc-utils-test.ko

0 commit comments

Comments
 (0)