Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixing size checks in Set/GetRotatingDeviceIdUniqueId and right sizing mRotatingDeviceIdUniqueId #24042

Merged
merged 1 commit into from
Dec 12, 2022
Merged

Fixing size checks in Set/GetRotatingDeviceIdUniqueId and right sizing mRotatingDeviceIdUniqueId #24042

merged 1 commit into from
Dec 12, 2022

Conversation

sharadb-amazon
Copy link
Contributor

@sharadb-amazon sharadb-amazon commented Dec 12, 2022 •
edited
Loading

Fixes #24041

Problem

RotatingDeviceId is not generated per custom uniqueId passed into the SDK. This was because the Get/Set methods on the rotatingDeviceIdUniqueId were asserting that sizeof the uniqueId passed in is equal to kRotatingDeviceIDUniqueIDLength, whereas it can actually be of varying sizes. Additionally, for the tv-casting-app, the default buffer size for the uniqueId was only 16 bytes, but that is just the minimum required length.

Change summary

  1. Changed the size/length assertions in the Set/GetRotatingDeviceIdUniqueId methods.
  2. For the tv-casting-app, overrode / defined CHIP_DEVICE_CONFIG_ROTATING_DEVICE_ID_UNIQUE_ID_LENGTH 64

Testing

Tested that the uniqueId passed in to the SDK actually gets used to generate the rotatingDeviceId

@github-actions
Copy link

github-actions bot commented Dec 12, 2022 •
edited
Loading

PR #24042: Size comparison from edd2863 to 3c3119d

Increases (8 builds for bl702, cc13x2_26x2, psoc6, telink)
platform target config section edd2863 3c3119d change % change
bl702 lighting-app bl702+rpc .debug_info 43520177 43520178 1 0.0
.text 1030024 1030026 2 0.0
cc13x2_26x2 all-clusters-minimal-app LP_CC2652R7 (read only) 643875 643883 8 0.0
.text 564432 564440 8 0.0
lock-ftd LP_CC2652R7 (read/write) 171840 171848 8 0.0
psoc6 all-clusters cy8ckit_062s2_43012 .debug_info 27069298 27069300 2 0.0
all-clusters-minimal cy8ckit_062s2_43012 .debug_info 26806115 26806117 2 0.0
telink all-clusters-minimal-app tlsr9518adk80d (read/write) 1031068 1031076 8 0.0
text 704640 704642 2 0.0
light-switch-app tlsr9518adk80d text 651250 651252 2 0.0
thermostat tlsr9518adk80d text 651710 651712 2 0.0
Decreases (5 builds for cc13x2_26x2, esp32, psoc6, telink)
platform target config section edd2863 3c3119d change % change
cc13x2_26x2 lock-ftd LP_CC2652R7 (read only) 677255 677247 -8 -0.0
.text 599360 599352 -8 -0.0
esp32 all-clusters-app c3devkit (read only) 1218898 1218896 -2 -0.0
.flash.text 1218898 1218896 -2 -0.0
psoc6 lock cy8ckit_062s2_43012 .debug_info 22487213 22487212 -1 -0.0
telink all-clusters-app tlsr9518adk80d text 739436 739434 -2 -0.0
lighting-app tlsr9518adk80d (read/write) 1033916 1033908 -8 -0.0
text 719634 719632 -2 -0.0
Full report (42 builds for bl602, bl702, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
platform target config section edd2863 3c3119d change % change
bl602 lighting-app bl602 (read/write) 1355182 1355182 0 0.0
.bss 87057 87057 0 0.0
.data 9984 9984 0 0.0
.text 1037908 1037908 0 0.0
bl602+rpc (read/write) 1400958 1400958 0 0.0
.bss 95097 95097 0 0.0
.data 10384 10384 0 0.0
.text 1069328 1069328 0 0.0
bl702 lighting-app bl702 (read only) 3262 3262 0 0.0
(read/write) 1195567 1195567 0 0.0
.bleromro 6296 6296 0 0.0
.bleromrw 124 124 0 0.0
.boot2 688 688 0 0.0
.bss 67182 67182 0 0.0
.bss_psram 30048 30048 0 0.0
.comment 48 48 0 0.0
.data 4048 4048 0 0.0
.debug_abbrev 1529212 1529212 0 0.0
.debug_aranges 132680 132680 0 0.0
.debug_frame 486776 486776 0 0.0
.debug_info 39221901 39221901 0 0.0
.debug_line 5145782 5145782 0 0.0
.debug_loc 3378857 3378857 0 0.0
.debug_ranges 363704 363704 0 0.0
.debug_str 3479563 3479563 0 0.0
.hbn 509 509 0 0.0
.hbn_noinit 260 260 0 0.0
.init 342 342 0 0.0
.init_array 144 144 0 0.0
.psram 0 0 0 0.0
.riscv.attributes 47 47 0 0.0
.rodata 116336 116336 0 0.0
.rsvd 3188 3188 0 0.0
.shstrtab 293 293 0 0.0
.stack 2048 2048 0 0.0
.strtab 568679 568679 0 0.0
.symtab 172112 172112 0 0.0
.tcm_data 36 36 0 0.0
.tcmcode 3262 3262 0 0.0
.text 0 0 0 0.0
956090 956090 0 0.0
bl702+rpc (read only) 3262 3262 0 0.0
(read/write) 1283995 1283995 0 0.0
.bleromro 6296 6296 0 0.0
.bleromrw 124 124 0 0.0
.boot2 688 688 0 0.0
.bss 75198 75198 0 0.0
.bss_psram 30320 30320 0 0.0
.comment 48 48 0 0.0
.data 4576 4576 0 0.0
.debug_abbrev 1677326 1677326 0 0.0
.debug_aranges 140824 140824 0 0.0
.debug_frame 514248 514248 0 0.0
.debug_info 43520177 43520178 1 0.0
.debug_line 5536797 5536797 0 0.0
.debug_loc 3573873 3573873 0 0.0
.debug_ranges 387272 387272 0 0.0
.debug_str 3881984 3881984 0 0.0
.hbn 509 509 0 0.0
.hbn_noinit 260 260 0 0.0
.init 342 342 0 0.0
.init_array 160 160 0 0.0
.psram 0 0 0 0.0
.riscv.attributes 47 47 0 0.0
.rodata 130048 130048 0 0.0
.rsvd 3188 3188 0 0.0
.shstrtab 293 293 0 0.0
.stack 2048 2048 0 0.0
.strtab 628901 628901 0 0.0
.symtab 190288 190288 0 0.0
.tcm_data 36 36 0 0.0
.tcmcode 3262 3262 0 0.0
.text 0 0 0 0.0
1030024 1030026 2 0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 679627 679627 0 0.0
(read/write) 171900 171900 0 0.0
.bss 81220 81220 0 0.0
.data 3380 3380 0 0.0
.rodata 89987 89987 0 0.0
.text 589328 589328 0 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 643875 643883 8 0.0
(read/write) 157996 157996 0 0.0
.bss 80500 80500 0 0.0
.data 3380 3380 0 0.0
.rodata 79123 79123 0 0.0
.text 564432 564440 8 0.0
lock-ftd LP_CC2652R7 (read only) 677255 677247 -8 -0.0
(read/write) 171840 171848 8 0.0
.bss 78876 78876 0 0.0
.data 3304 3304 0 0.0
.rodata 77415 77415 0 0.0
.text 599360 599352 -8 -0.0
lock-mtd LP_CC2652R7 (read only) 661955 661955 0 0.0
(read/write) 182396 182396 0 0.0
.bss 74132 74132 0 0.0
.data 3304 3304 0 0.0
.rodata 103499 103499 0 0.0
.text 557976 557976 0 0.0
pump-app LP_CC2652R7 (read only) 690183 690183 0 0.0
(read/write) 159648 159648 0 0.0
.bss 78844 78844 0 0.0
.data 3296 3296 0 0.0
.rodata 90935 90935 0 0.0
.text 598764 598764 0 0.0
pump-controller-app LP_CC2652R7 (read only) 674083 674083 0 0.0
(read/write) 175852 175852 0 0.0
.bss 78948 78948 0 0.0
.data 3292 3292 0 0.0
.rodata 86483 86483 0 0.0
.text 587120 587120 0 0.0
shell LP_CC2652R7 (read only) 670830 670830 0 0.0
(read/write) 183024 183024 0 0.0
.bss 83548 83548 0 0.0
.data 3376 3376 0 0.0
.rodata 86726 86726 0 0.0
.text 583788 583788 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 588430 588430 0 0.0
.app_xip_area 464688 464688 0 0.0
.bss 66200 66200 0 0.0
.data 728 728 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 592242 592242 0 0.0
.app_xip_area 463204 463204 0 0.0
.bss 71488 71488 0 0.0
.data 736 736 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 551490 551490 0 0.0
.app_xip_area 433252 433252 0 0.0
.bss 60736 60736 0 0.0
.data 684 684 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A+rpc (read/write) 976148 976148 0 0.0
.bss 152252 152252 0 0.0
.data 2168 2168 0 0.0
.text 821708 821708 0 0.0
BRD4161A+rs911x (read/write) 1037800 1037800 0 0.0
.bss 186728 186728 0 0.0
.data 2012 2012 0 0.0
.text 849040 849040 0 0.0
BRD4187C (read/write) 1149228 1149228 0 0.0
.bss 138648 138648 0 0.0
.data 2516 2516 0 0.0
.text 983468 983468 0 0.0
lock-app BRD4161A+wf200 (read/write) 1163488 1163488 0 0.0
.bss 158296 158296 0 0.0
.data 2020 2020 0 0.0
.text 1003152 1003152 0 0.0
window-app BRD4187C (read/write) 1141744 1141744 0 0.0
.bss 140064 140064 0 0.0
.data 2540 2540 0 0.0
.text 974544 974544 0 0.0
esp32 all-clusters-app c3devkit (read only) 1218898 1218896 -2 -0.0
(read/write) 1790954 1790954 0 0.0
.dram0.bss 76992 76992 0 0.0
.dram0.data 13928 13928 0 0.0
.flash.rodata 248312 248312 0 0.0
.flash.text 1218898 1218896 -2 -0.0
.iram0.text 71188 71188 0 0.0
m5stack (read only) 1233119 1233119 0 0.0
(read/write) 564179 564179 0 0.0
.dram0.bss 82144 82144 0 0.0
.dram0.data 34224 34224 0 0.0
.flash.rodata 314092 314092 0 0.0
.flash.text 1227735 1227735 0 0.0
.iram0.text 124803 124803 0 0.0
k32w contact k32w0+release (read/write) 662532 662532 0 0.0
.bss 77112 77112 0 0.0
.data 2104 2104 0 0.0
.text 564204 564204 0 0.0
light k32w0+release (read/write) 673112 673112 0 0.0
.bss 74904 74904 0 0.0
.data 2060 2060 0 0.0
.text 593420 593420 0 0.0
lock k32w0+release (read/write) 634068 634068 0 0.0
.bss 75664 75664 0 0.0
.data 2080 2080 0 0.0
.text 553596 553596 0 0.0
linux chip-tool-ipv6only arm64 (read only) 10625148 10625148 0 0.0
(read/write) 708097 708097 0 0.0
.bss 33905 33905 0 0.0
.data 2768 2768 0 0.0
.data.rel.ro 652392 652392 0 0.0
.dynamic 560 560 0 0.0
.got 13960 13960 0 0.0
.init 24 24 0 0.0
.init_array 208 208 0 0.0
.rodata 531628 531628 0 0.0
.text 8434100 8434100 0 0.0
thermostat-no-ble arm64 (read only) 2435188 2435188 0 0.0
(read/write) 143825 143825 0 0.0
.bss 55329 55329 0 0.0
.data 1816 1816 0 0.0
.data.rel.ro 77448 77448 0 0.0
.dynamic 560 560 0 0.0
.got 5184 5184 0 0.0
.init 24 24 0 0.0
.init_array 440 440 0 0.0
.rodata 145404 145404 0 0.0
.text 2045872 2045872 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2463424 2463424 0 0.0
.bss 215012 215012 0 0.0
.data 5872 5872 0 0.0
.text 1426068 1426068 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1190763 1190763 0 0.0
bss 145285 145285 0 0.0
rodata 144448 144448 0 0.0
text 819870 819870 0 0.0
nrf7002dk_nrf5340_cpuapp (read/write) 1360858 1360858 0 0.0
bss 105224 105224 0 0.0
rodata 211552 211552 0 0.0
text 759588 759588 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1136423 1136423 0 0.0
bss 144520 144520 0 0.0
rodata 120764 120764 0 0.0
text 790038 790038 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 (read only) 841976 841976 0 0.0
(read/write) 1748580 1748580 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 188704 188704 0 0.0
.comment 200 200 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2664 2664 0 0.0
.debug_abbrev 1238183 1238183 0 0.0
.debug_aranges 110904 110904 0 0.0
.debug_frame 372244 372244 0 0.0
.debug_info 27069298 27069300 2 0.0
.debug_line 3707334 3707334 0 0.0
.debug_loc 3620896 3620896 0 0.0
.debug_ranges 345760 345760 0 0.0
.debug_str 3449247 3449247 0 0.0
.heap 841976 841976 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 571583 571583 0 0.0
.symtab 422000 422000 0 0.0
.text 0 0 0 0.0
1548824 1548824 0 0.0
.zero.table 8 8 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 (read only) 842704 842704 0 0.0
(read/write) 1691108 1691108 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 187976 187976 0 0.0
.comment 200 200 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2664 2664 0 0.0
.debug_abbrev 1230074 1230074 0 0.0
.debug_aranges 110376 110376 0 0.0
.debug_frame 375300 375300 0 0.0
.debug_info 26806115 26806117 2 0.0
.debug_line 3726271 3726271 0 0.0
.debug_loc 3608502 3608502 0 0.0
.debug_ranges 344376 344376 0 0.0
.debug_str 3438259 3438259 0 0.0
.heap 842704 842704 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 535672 535672 0 0.0
.symtab 408432 408432 0 0.0
.text 1492080 1492080 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
light cy8ckit_062s2_43012 (read only) 850896 850896 0 0.0
(read/write) 1609300 1609300 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 179992 179992 0 0.0
.comment 200 200 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2456 2456 0 0.0
.debug_abbrev 1064871 1064871 0 0.0
.debug_aranges 102576 102576 0 0.0
.debug_frame 345636 345636 0 0.0
.debug_info 22268790 22268790 0 0.0
.debug_line 3293598 3293598 0 0.0
.debug_loc 3306424 3306424 0 0.0
.debug_ranges 308512 308512 0 0.0
.debug_str 3243845 3243845 0 0.0
.heap 850896 850896 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 471997 471997 0 0.0
.symtab 376800 376800 0 0.0
.text 1418464 1418464 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
lock cy8ckit_062s2_43012 (read only) 845904 845904 0 0.0
(read/write) 1643244 1643244 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 184968 184968 0 0.0
.comment 200 200 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2472 2472 0 0.0
.debug_abbrev 1066803 1066803 0 0.0
.debug_aranges 102960 102960 0 0.0
.debug_frame 347432 347432 0 0.0
.debug_info 22487213 22487212 -1 -0.0
.debug_line 3293428 3293428 0 0.0
.debug_loc 3327869 3327869 0 0.0
.debug_ranges 310368 310368 0 0.0
.debug_str 3259683 3259683 0 0.0
.heap 845904 845904 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 474714 474714 0 0.0
.symtab 378800 378800 0 0.0
.text 1447416 1447416 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
qpg lighting-app qpg6105+debug (read/write) 1151244 1151244 0 0.0
.bss 100436 100436 0 0.0
.data 840 840 0 0.0
.text 598344 598344 0 0.0
lock-app qpg6105+debug (read/write) 1117276 1117276 0 0.0
.bss 95908 95908 0 0.0
.data 836 836 0 0.0
.text 564372 564372 0 0.0
telink all-clusters-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 1091704 1091704 0 0.0
bss 99808 99808 0 0.0
text 739436 739434 -2 -0.0
all-clusters-minimal-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 1031068 1031076 8 0.0
bss 99032 99032 0 0.0
text 704640 704642 2 0.0
light-switch-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 952500 952500 0 0.0
bss 91272 91272 0 0.0
text 651250 651252 2 0.0
lighting-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 1033916 1033908 -8 -0.0
bss 100420 100420 0 0.0
text 719634 719632 -2 -0.0
ota-requestor-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 966076 966076 0 0.0
bss 92228 92228 0 0.0
text 662496 662496 0 0.0
thermostat tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 955204 955204 0 0.0
bss 92664 92664 0 0.0
text 651710 651712 2 0.0

@chrisdecenzo chrisdecenzo merged commit 77df17f into project-chip:master Dec 12, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bzbarsky-apple bzbarsky-apple bzbarsky-apple approved these changes

@chrisdecenzo chrisdecenzo chrisdecenzo approved these changes

@andy31415 andy31415 andy31415 approved these changes

@anush-apple anush-apple Awaiting requested review from anush-apple

@arkq arkq Awaiting requested review from arkq

@Byungjoo-Lee Byungjoo-Lee Awaiting requested review from Byungjoo-Lee

@carol-apple carol-apple Awaiting requested review from carol-apple

@chshu chshu Awaiting requested review from chshu

@chulspro chulspro Awaiting requested review from chulspro

@Damian-Nordic Damian-Nordic Awaiting requested review from Damian-Nordic

@dhrishi dhrishi Awaiting requested review from dhrishi

@electrocucaracha electrocucaracha Awaiting requested review from electrocucaracha

@emargolis emargolis Awaiting requested review from emargolis

@franck-apple franck-apple Awaiting requested review from franck-apple

@gjc13 gjc13 Awaiting requested review from gjc13

@harimau-qirex harimau-qirex Awaiting requested review from harimau-qirex

@harsha-rajendran harsha-rajendran Awaiting requested review from harsha-rajendran

@hawk248 hawk248 Awaiting requested review from hawk248

@jelderton jelderton Awaiting requested review from jelderton

@jepenven-silabs jepenven-silabs Awaiting requested review from jepenven-silabs

@jmartinez-silabs jmartinez-silabs Awaiting requested review from jmartinez-silabs

@jtung-apple jtung-apple Awaiting requested review from jtung-apple

@ksperling-apple ksperling-apple Awaiting requested review from ksperling-apple

@lazarkov lazarkov Awaiting requested review from lazarkov

@lpbeliveau-silabs lpbeliveau-silabs Awaiting requested review from lpbeliveau-silabs

@LuDuda LuDuda Awaiting requested review from LuDuda

@mlepage-google mlepage-google Awaiting requested review from mlepage-google

@mrjerryjohns mrjerryjohns Awaiting requested review from mrjerryjohns

@msandstedt msandstedt Awaiting requested review from msandstedt

@mspang mspang Awaiting requested review from mspang

@robszewczyk robszewczyk Awaiting requested review from robszewczyk

@saurabhst saurabhst Awaiting requested review from saurabhst

@selissia selissia Awaiting requested review from selissia

@tecimovic tecimovic Awaiting requested review from tecimovic

@tehampson tehampson Awaiting requested review from tehampson

@turon turon Awaiting requested review from turon

@vijs vijs Awaiting requested review from vijs

@vivien-apple vivien-apple Awaiting requested review from vivien-apple

@woody-apple woody-apple Awaiting requested review from woody-apple

@xylophone21 xylophone21 Awaiting requested review from xylophone21

@yufengwangca yufengwangca Awaiting requested review from yufengwangca

Assignees
No one assigned
Labels
examples platform review - approved
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[BUG] RotatingDeviceId not generated per custom uniqueId
4 participants
@sharadb-amazon @andy31415 @chrisdecenzo @bzbarsky-apple