summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
24 hourskleaf: fix kernel_config dep to keys.common-android14-5.15-2024-05Yifan Hong
Properly set post_setup_deps. Test: TH Bug: 346376722 Fixes: 1cbff62c4e816dfb ("kleaf: clean up abs paths in .config.") Change-Id: I6458b038046a1a1699ba0942a38d147a78738902
40 hoursANDROID: Pixel: Add missing symbol to symbol listRobin Hsu
Pixel MM Metrics: add the missing symbol 'seq_put_decimal_ll' and re-do update list Bug: 299190787 Bug: 345872630 Test: local build Change-Id: I005ccfa15cee8252bc51242460bbab9b7d0eb2ab Signed-off-by: Robin Hsu <robinhsu@google.com> (cherry picked from commit d86f55a38edfefc37fedd356d10979d697c42eb5)
2 dayskernel_env: add KCPPFLAGS_COMPAT equal to KCPPFLAGSGiuliano Procida
This is to ensure the 32-bit vDSO is deterministically generated and has a reproducible build ID. Bug: 345452375 Change-Id: I6ca1559c96b185f920c3a4479ca886078232785d Signed-off-by: Giuliano Procida <gprocida@google.com>
4 dayskleaf: clarify defconfig_fragments.Yifan Hong
Clarify that they are applied on .config after make defconfig. Hence, it should really be named post_defconfig_fragments or dot_config_fragments. Bug: 345544754 Change-Id: I49d5ec34fed20d6b66fbee5d22ad60fcf31c51df
8 dayskleaf: Option to clean up abs paths in .config.Yifan Hong
With a patch that allows relative paths of UNUSED_KSYMS_WHITELIST to be interpreted against the output directory, this change is possible to remove absolute paths from .config, thereby removing ir-reproducibility. UNUSED_KSYMS_WHITELIST is stored in $OUT_DIR before kernel_config is archived by kernel_filegroup_declaration(). MODULE_SIG_KEY and SYSTEM_TRUSTED_KEY are keys, so they are not distributed; they are restored when re-setting up the environment for kernel_config, and skipped for kernel_filegroup. Because the patch is not universally applied on the frozen braches android14-5.15 and android14-6.1, this is made an attribute, kernel_build.rewrite_absolute_paths_in_config, so non-frozen branches with the patch can opt in. Test: TH Bug: 333769605 Bug: 342390208 Change-Id: Ic2b65b3e6867a661fa306b19125787a98badf228
8 dayskleaf: analysis/inputs.py be lenient about inputsYifan Hong
Some actions may not take any inputs at all. Test: TH Bug: 343647190 Change-Id: I5865565a4cc14459dfd171abf93ef32ed1016bb2 (cherry picked from commit 2f97e2f235c3c965fb838737899ab450230ed4c0)
9 daysANDROID: ABI fixup for abi break in struct dst_opsGreg Kroah-Hartman
In commit 92f1655aa2b2 ("net: fix __dst_negative_advice() race") the struct dst_ops callback negative_advice is callback changes function parameters. But as this pointer is part of a structure that is tracked in the ABI checker, the tool triggers when this is changed. However, the callback pointer is internal to the networking stack, so changing the function type is safe, so needing to preserve this is not required. To do so, switch the function pointer type back to the old one so that the checking tools pass, AND then do a hard cast of the function pointer to the new type when assigning and calling the function. Bug: 343727534 Bug: 344532070 Fixes: 92f1655aa2b2 ("net: fix __dst_negative_advice() race") Change-Id: I48d4ab4bbd29f8edc8fbd7923828b7f78a23e12e Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> (cherry picked from commit 9a84d60e35317c5799ebcbf1c6872f0a2b7d6006)
13 daysRevert^2 "kleaf: split UNUSED_KSYMS_WHITELIST to its own step."Yifan Hong
This reverts commit bf3bcfb2a039ce8dfa332c10a58a06c1f2a507d4. Reason for revert: Relanding change that should be fine to go in on its own. Below is the original commit message. kleaf: split UNUSED_KSYMS_WHITELIST to its own step. Attempt to set CONFIG_UNUSED_KSYMS_WHITELIST regardless of the value in CONFIG_TRIM_UNUSED_KSYMS. The dependency of UNUSED_KSYMS_WHITELIST on TRIM_UNUSED_KSYMS should be opaque to Kleaf. Change-Id: I84a2d2f16478157583e6e5a42d8231ec546f0be9 Test: manual Bug: 275648361 Bug: 342390208
2024-05-29UPSTREAM: netlink: hold nlk->cb_mutex longer in __netlink_dump_start()Eric Dumazet
__netlink_dump_start() releases nlk->cb_mutex right before calling netlink_dump() which grabs it again. This seems dangerous, even if KASAN did not bother yet. Add a @lock_taken parameter to netlink_dump() to let it grab the mutex if called from netlink_recvmsg() only. Signed-off-by: Eric Dumazet <edumazet@google.com> Reviewed-by: Jiri Pirko <jiri@nvidia.com> Signed-off-by: David S. Miller <davem@davemloft.net> (cherry picked from commit b5590270068c4324dac4a2b5a4a156e02e21339f) Bug: 339546075 Bug: 343361790 Change-Id: I29a711ea804794b556674011cbd23c5bf9a03ab6 Signed-off-by: yenchia.chen <yenchia.chen@mediatek.com> Signed-off-by: Carlos Llamas <cmllamas@google.com> (cherry picked from commit 58719dc95f96b2f5aad4fdbc319ca5624d8e7fe6)
2024-05-29ANDROID: export one function for mm metricsRobin Hsu
export function for sysfs node formating Bug: 299190787 Bug: 343363199 Change-Id: I71e6a0815efa8df99d036bf457b8a0081999f3de Signed-off-by: Robin Hsu <robinhsu@google.com> (cherry picked from commit d19f3c553ad438c86a28c84717a9ea6d0b276f8b)
2024-05-28Revert "kleaf: kernel_config properly depend on system_trusted_k..."Yifan Hong
Revert submission 3101887-android14-ksyms-wl Reason for revert: Restore green in release builds Reverted changes: /q/submissionid:3101887-android14-ksyms-wl Change-Id: I461644cc9e7930faa0e3629568508c69f92c421a
2024-05-28kleaf: clean up abs paths in .config. (android14)Yifan Hong
With a patch that allows relative paths of UNUSED_KSYMS_WHITELIST to be interpreted against the output directory, this change is possible to remove absolute paths from .config, thereby removing ir-reproducibility. UNUSED_KSYMS_WHITELIST is stored in $OUT_DIR before kernel_config is archived by kernel_filegroup_declaration(). MODULE_SIG_KEY and SYSTEM_TRUSTED_KEY are keys, so they are not distributed; they are restored when re-setting up the environment for kernel_config, and skipped for kernel_filegroup. Test: TH Bug: 333769605 Bug: 342390208 Change-Id: I289563675e3d2ec182cf88801ee831ceda2ba3a9
2024-05-23FROMLIST: usb: typec: tcpm: Ignore received Hard Reset in TOGGLING stateKyle Tso
Similar to what fixed in Commit a6fe37f428c1 ("usb: typec: tcpm: Skip hard reset when in error recovery"), the handling of the received Hard Reset has to be skipped during TOGGLING state. [ 4086.021288] VBUS off [ 4086.021295] pending state change SNK_READY -> SNK_UNATTACHED @ 650 ms [rev2 NONE_AMS] [ 4086.022113] VBUS VSAFE0V [ 4086.022117] state change SNK_READY -> SNK_UNATTACHED [rev2 NONE_AMS] [ 4086.022447] VBUS off [ 4086.022450] state change SNK_UNATTACHED -> SNK_UNATTACHED [rev2 NONE_AMS] [ 4086.023060] VBUS VSAFE0V [ 4086.023064] state change SNK_UNATTACHED -> SNK_UNATTACHED [rev2 NONE_AMS] [ 4086.023070] disable BIST MODE TESTDATA [ 4086.023766] disable vbus discharge ret:0 [ 4086.023911] Setting usb_comm capable false [ 4086.028874] Setting voltage/current limit 0 mV 0 mA [ 4086.028888] polarity 0 [ 4086.030305] Requesting mux state 0, usb-role 0, orientation 0 [ 4086.033539] Start toggling [ 4086.038496] state change SNK_UNATTACHED -> TOGGLING [rev2 NONE_AMS] // This Hard Reset is unexpected [ 4086.038499] Received hard reset [ 4086.038501] state change TOGGLING -> HARD_RESET_START [rev2 HARD_RESET] Fixes: f0690a25a140 ("staging: typec: USB Type-C Port Manager (tcpm)") Cc: stable@vger.kernel.org Signed-off-by: Kyle Tso <kyletso@google.com> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Change-Id: Icfa144f370bd87670df1cd71f247a3528ab4c591 Bug: 331356545 Bug: 342340365 Link: https://lore.kernel.org/all/20240520154858.1072347-1-kyletso@google.com/
2024-05-17BACKPORT: FROMGIT: usb: typec: tcpm: Check for port partner validity before ↵Badhri Jagan Sridharan
consuming it typec_register_partner() does not guarantee partner registration to always succeed. In the event of failure, port->partner is set to the error value or NULL. Given that port->partner validity is not checked, this results in the following crash: Unable to handle kernel NULL pointer dereference at virtual address 00000000000003c0 pc : run_state_machine+0x1bc8/0x1c08 lr : run_state_machine+0x1b90/0x1c08 .. Call trace: run_state_machine+0x1bc8/0x1c08 tcpm_state_machine_work+0x94/0xe4 kthread_worker_fn+0x118/0x328 kthread+0x1d0/0x23c ret_from_fork+0x10/0x20 To prevent the crash, check for port->partner validity before derefencing it in all the call sites. Cc: stable@vger.kernel.org Fixes: c97cd0b4b54e ("usb: typec: tcpm: set initial svdm version based on pd revision") Signed-off-by: Badhri Jagan Sridharan <badhri@google.com> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Link: https://lore.kernel.org/r/20240427202812.3435268-1-badhri@google.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Bug: 321849121 Bug: 341158375 (cherry picked from commit ae11f04b452b5205536e1c02d31f8045eba249dd https://kernel.googlesource.com/pub/scm/linux/kernel/git/gregkh/usb usb-linus) Change-Id: I01510c86e147b3011afc5d475fc1dc38d2636a60 Signed-off-by: Zheng Pan <zhengpan@google.com> Signed-off-by: Badhri Jagan Sridharan <badhri@google.com> (cherry picked from commit d5eef65564c24f080637dc784aebb19a592a44ce)
2024-05-09ANDROID: 16K: Fix call to show_pad_maps_fn()Kalesh Singh
The call should be for printing maps not smaps; fix this. Bug: 338774168 Bug: 330117029 Bug: 327600007 Bug: 330767927 Bug: 328266487 Bug: 329803029 Change-Id: I8356b9e93fa2a300cb8bcd66fed857d42e8bfdca Signed-off-by: Kalesh Singh <kaleshsingh@google.com>
2024-05-08Kleaf: Skip build checks for gcov builds (violations_check)Yifan Hong
This disables checks like strict mode checks as they are not relevant for debug like builds. Fixes previous CL that misses symbols violations check. Bug: 338000028 Bug: 339103585 Fixes: 167cb729bd82a9a8 ("Kleaf: Skip build checks for gcov builds") Change-Id: I6c52750b4d78b72024d6390392ed5dda1ebd53b2
2024-05-08kleaf: Add integration test for --config=local CONFIG_ changes.Yifan Hong
If CONFIG_* changes, with --config=local, extract-ikconfig vmlinux must contain the same change. Test: TH Bug: 312268956 Change-Id: I9064ef4bc51b01ed9953b5ed4ae99bcb5bee8719
2024-05-06kleaf: checkpatch_presubmit: Use --no-tree optionErik Staats
Running with --no-tree prevents spdxcheck.py from being run and generating an error. Bug: 199237323 Bug: 327484174 Test: Verified no errors are encountered when running checkpatch_presubmit on a patch with a SPDX header. Change-Id: I7e19f400598650f260a2721f76106bd7d31e8262 Signed-off-by: Erik Staats <estaats@google.com> (cherry picked from commit 05bdd1b3fae49adda5bd2a459ba7ef905d524f6d)
2024-05-04Kleaf: Skip build checks for gcov buildsMatthias Maennich
This disables checks like strict mode checks as they are not relevant for debug like builds. Bug: 338000028 Change-Id: If87377b6396812510beeb852e4ed1d7ae0098bf7 Signed-off-by: Matthias Maennich <maennich@google.com>
2024-05-02checkpatch: skip reapply commitsGiuliano Procida
These are just reverts of reverts and should also be skipped. Suggested-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I7dd15c32d133011336b370b72692c1bbbe0645da Signed-off-by: Giuliano Procida <gprocida@google.com>
2024-05-01ANDROID: Initialize android14-5.15-2024-05Todd Kjos
Bug: 337902422 Signed-off-by: Todd Kjos <tkjos@google.com> Change-Id: Ieaeb29e2a20e89d78d9e199f2230ef42289ef0a7
2024-04-21checkpatch: skip revert commitsMatthias Maennich
Those patches are regularly violating the code style but not much can be done about that. Suggested-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I7a0bfc81895ed69bc3aad91d78cb74cd9977f852 Signed-off-by: Matthias Maennich <maennich@google.com> (cherry picked from commit 839c9ae0a06013e9a95e795cf70df916d4a81d48)
2024-04-18Added repo manifest.Gerrit Code Review
2024-04-18Added repo manifest.Gerrit Code Review