Mike Rapoport
e6ffb329ee
UPSTREAM: arm64/mm: fold check for KFENCE into can_set_direct_map()
...
KFENCE requires linear map to be mapped at page granularity, so that it
is possible to protect/unprotect single pages, just like with
rodata_full and DEBUG_PAGEALLOC.
Instead of repating
can_set_direct_map() || IS_ENABLED(CONFIG_KFENCE)
make can_set_direct_map() handle the KFENCE case.
This also prevents potential false positives in kernel_page_present()
that may return true for non-present page if CONFIG_KFENCE is enabled.
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com >
Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com >
Link: https://lore.kernel.org/r/20220921074841.382615-1-rppt@kernel.org
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com >
(cherry picked from commit b9dd04a20fsurenb@google.com >
2023-12-13 21:22:34 +00:00
Yongqin Liu
b39c28c44c
ANDROID: GKI: db845c: Update symbols list and ABI on rpmsg_register_device_override
...
5.15.138 Dragonboard 845c because of recently added symbol,
rpmsg_register_device_override.
So add it to the symbol list and update the abi definitions.
Bug: 313495196
Change-Id: I3a3504b6d2061bfce0abe9801e2ecb210c337b9f
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org >
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com >
(cherry picked from commit 02ca2ae2afjoneslee@google.com >
2023-12-13 11:15:42 +00:00
Greg Kroah-Hartman
d0b481d97e
ANDROID: fix up rpmsg_device ABI break
...
In commit e70898ae1ae70898ae1agregkh@google.com >
(cherry picked from commit 4f2270e2bca1854ebe8be23a82f665eaa27ee831)
Signed-off-by: Lee Jones <joneslee@google.com >
2023-12-13 11:15:42 +00:00
Greg Kroah-Hartman
6bfb30205b
ANDROID: fix up platform_device ABI break
...
In commit 389190b254389190b254gregkh@google.com >
Change-Id: Ieb4a730a6a5767d31fbec2f1ba683617f5cda7a9
(cherry picked from commit 1202da82c0joneslee@google.com >
2023-12-13 11:15:41 +00:00
Hangyu Hua
649e9135df
UPSTREAM: rpmsg: Fix possible refcount leak in rpmsg_register_device_override()
...
commit d7bd416d35bb17d110cbkrzysztof.kozlowski@linaro.org >
Signed-off-by: Hangyu Hua <hbh25y@gmail.com >
Link: https://lore.kernel.org/r/20220624024120.11576-1-hbh25y@gmail.com
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org >
Signed-off-by: Lee Jones <lee@kernel.org >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
(cherry picked from commit d4c8bf5635joneslee@google.com >
Change-Id: I10440a18479d5d207bafb706311c0467b853cf6c
2023-12-13 11:15:41 +00:00
Bjorn Andersson
b1e39deac4
UPSTREAM: rpmsg: glink: Release driver_override
...
commit fb80ef67e842cd402b8f39e47767ecquic_clew@quicinc.com >
Signed-off-by: Bjorn Andersson <quic_bjorande@quicinc.com >
Signed-off-by: Bjorn Andersson <andersson@kernel.org >
Link: https://lore.kernel.org/r/20230109223931.1706429-1-quic_bjorande@quicinc.com
Signed-off-by: Lee Jones <lee@kernel.org >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
(cherry picked from commit a82e0fda8ajoneslee@google.com >
Change-Id: I08b147ad640a8e2d71699a09815bbf048425a1fd
2023-12-13 11:15:41 +00:00
Krzysztof Kozlowski
9697a16480
BACKPORT: rpmsg: Fix calling device_lock() on non-initialized device
...
commit bb17d110cb42cd402b8fm.szyprowski@samsung.com >
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org >
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com >
Link: https://lore.kernel.org/r/20220429195946.1061725-2-krzysztof.kozlowski@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Signed-off-by: Lee Jones <lee@kernel.org >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
(cherry picked from commit bfd4a664ddjoneslee@google.com >
Change-Id: Ic07d9ff669e88a50354ad8e978ae8e93316a2a5e
2023-12-13 11:15:41 +00:00
Krzysztof Kozlowski
01b4519a41
BACKPORT: rpmsg: Fix kfree() of static memory on setting driver_override
...
commit 42cd402b8f950a7388f0c0cdc19f84bjorn.andersson@linaro.org >
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org >
Link: https://lore.kernel.org/r/20220419113435.246203-13-krzysztof.kozlowski@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Signed-off-by: Lee Jones <lee@kernel.org >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
(cherry picked from commit 2e76b4f621joneslee@google.com >
Change-Id: Ib900ad13efcfdf7e50fb92bb45dff2b8aa8ff443
2023-12-13 11:15:41 +00:00
Krzysztof Kozlowski
d82ae69002
UPSTREAM: rpmsg: Constify local variable in field store macro
...
commit e5f89131a0krzysztof.kozlowski@linaro.org >
Link: https://lore.kernel.org/r/20220419113435.246203-12-krzysztof.kozlowski@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Signed-off-by: Lee Jones <lee@kernel.org >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
(cherry picked from commit 5c0da71871joneslee@google.com >
Change-Id: If5610892601368e855ec1be57e01dbbe06ae046a
2023-12-13 11:15:41 +00:00
Krzysztof Kozlowski
341acb7bac
UPSTREAM: driver: platform: Add helper for safer setting of driver_override
...
commit 6c2f421174#1 ] PREEMPT SMP ARM
...
(kfree) from [<c058da50>] (platform_device_release+0x88/0xb4)
(platform_device_release) from [<c0585be0>] (device_release+0x2c/0x90)
(device_release) from [<c0a69050>] (kobject_put+0xec/0x20c)
(kobject_put) from [<c0f2f120>] (exynos5_clk_probe+0x154/0x18c)
(exynos5_clk_probe) from [<c058de70>] (platform_drv_probe+0x6c/0xa4)
(platform_drv_probe) from [<c058b7ac>] (really_probe+0x280/0x414)
(really_probe) from [<c058baf4>] (driver_probe_device+0x78/0x1c4)
(driver_probe_device) from [<c0589854>] (bus_for_each_drv+0x74/0xb8)
(bus_for_each_drv) from [<c058b48c>] (__device_attach+0xd4/0x16c)
(__device_attach) from [<c058a638>] (bus_probe_device+0x88/0x90)
(bus_probe_device) from [<c05871fc>] (device_add+0x3dc/0x62c)
(device_add) from [<c075ff10>] (of_platform_device_create_pdata+0x94/0xbc)
(of_platform_device_create_pdata) from [<c07600ec>] (of_platform_bus_create+0x1a8/0x4fc)
(of_platform_bus_create) from [<c0760150>] (of_platform_bus_create+0x20c/0x4fc)
(of_platform_bus_create) from [<c07605f0>] (of_platform_populate+0x84/0x118)
(of_platform_populate) from [<c0f3c964>] (of_platform_default_populate_init+0xa0/0xb8)
(of_platform_default_populate_init) from [<c01031f8>] (do_one_initcall+0x8c/0x404)
Provide a helper which clearly documents the usage of driver_override.
This will allow later to reuse the helper and reduce the amount of
duplicated code.
Convert the platform driver to use a new helper and make the
driver_override field const char (it is not modified by the core).
Bug: 95334746
Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com >
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com >
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org >
Link: https://lore.kernel.org/r/20220419113435.246203-2-krzysztof.kozlowski@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Signed-off-by: Lee Jones <lee@kernel.org >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
(cherry picked from commit 389190b254joneslee@google.com >
Change-Id: I1ef85ee1f3828e947adec4a45363d8434876aade
2023-12-13 11:15:40 +00:00
Joe Fradley
81051a615f
Revert "ANDROID: Enable CONFIG_KUNIT=y."
...
Revert submission 2786276
Reason for revert: Missing required KUnit patches
Reverted changes: /q/submissionid:2786276
Change-Id: I2c86750dacd9c2910e7d91ec913158f0019c828b
Signed-off-by: Joe Fradley <joefradley@google.com >
2023-12-12 22:33:08 +00:00
Joe Fradley
1d5461bec0
Revert "ANDROID: Add kunit targets."
...
Revert submission 2786276
Reason for revert: Missing required KUnit patches
Reverted changes: /q/submissionid:2786276
Change-Id: I8d229dd0ffa781d9f1732b73b8d71a05f15ecc80
Signed-off-by: Joe Fradley <joefradley@google.com >
2023-12-12 19:46:09 +00:00
Jens Axboe
12ab8f1569
UPSTREAM: io_uring/fdinfo: lock SQ thread while retrieving thread cpu/pid
...
commit 7644b1a1c9stable@vger.kernel.org
Link: https://bugzilla.kernel.org/show_bug.cgi?id=218032
Reviewed-by: Gabriel Krisman Bertazi <krisman@suse.de >
Signed-off-by: Jens Axboe <axboe@kernel.dk >
Signed-off-by: He Gao <hegao@google.com >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
(cherry picked from commit 3d7912710ejoneslee@google.com >
Change-Id: I044e0285d4535440606ff593230b873e3145db91
2023-12-12 17:52:01 +00:00
Lee Jones
3a7b8e544b
ANDROID: arm64: Remove a bunch of duplicate errata hunks
...
Fix some merging errors. Quells the following WARN() output:
Duplicate entry for capability 62
WARNING: CPU: 0 PID: 0 at arch/arm64/kernel/cpufeature.c:958 init_cpu_hwcaps_indirect_list_from_array+0x7c/0x98
Bug: 315739115
Signed-off-by: Lee Jones <joneslee@google.com >
Change-Id: I4e8798cc6395050a54222ec68432fae3c286dd87
2023-12-12 10:09:46 +00:00
Will Deacon
4ba6c3197c
ANDROID: arm64: Disable workaround for CPU errata 2441007 and 2441009
...
CPU errata 2441007 (Cortex-A55) and 2441009 (Cortex-A510) are categorised
as "rare" by Arm and consequently the workaround is not intended to be
deployed in practice as the issue is not expected to occur in real-world
environments.
Given that the cost of the workaround, which issues additional broadcast
TLB invalidation requests, has been shown to impact kswapd significantly
on Pixel devices, disable the workaround following Arm's recommendation.
Bug: 306231846
Signed-off-by: Will Deacon <willdeacon@google.com >
Change-Id: I39b6d9736cfa79827321151b45774f62c8d1a747
2023-12-11 20:01:42 +00:00
Nagireddy Annem
0bea71c862
ANDROID: abi_gki_aarch64_qcom: Add GIC and hibernation APIs
...
Add below functions and symbols to support GIC Deepsleep
and Hibernation feature.
4 function symbol(s) added
'int __traceiter_android_vh_gic_v3_suspend(void*, struct gic_chip_data*)'
'void gic_v3_cpu_init()'
'void gic_v3_dist_init()'
'void gic_v3_dist_wait_for_rwp()'
1 variable symbol(s) added
'struct tracepoint __tracepoint_android_vh_gic_v3_suspend'
Bug: 279879797
Change-Id: I96e439ef537e5dfc4e16c76fe6dd91bd5f13d6dd
Signed-off-by: Nagireddy Annem <quic_nannem@quicinc.com >
Signed-off-by: Darshankumar Jagdishchandra Thakkar <quic_djagdish@quicinc.com >
Signed-off-by: kamasali Satyanarayan <quic_kamasali@quicinc.com >
2023-12-08 17:11:32 +00:00
Nagireddy Annem
3923e9952d
ANDROID: irqchip/irq-gic-v3: Add vendor hook for gic suspend
...
This change adds vendor hook for gic suspend syscore ops callback.
And it is invoked during deepsleep and hibernation to store
gic register snapshot.
On upstream, currently gic_suspend is not used for
hibernation and deepsleep. This is added here to support deepsleep.
RFC patch https://lore.kernel.org/lkml/1652860121-24092-4-git-send-email-quic_vivekuma@quicinc.com/T/#r89b1845240646318fdcd69b20afa02680ab128f5 .
Bug: 279879797
Change-Id: I4e3729afa4daf18d73e00ee9601b6da72a578b4a
Signed-off-by: Nagireddy Annem <quic_nannem@quicinc.com >
Signed-off-by: Shreyas K K <quic_shrekk@quicinc.com >
2023-12-07 21:58:30 +05:30
Eric Biggers
bd58836882
ANDROID: Update the ABI representation
...
INFO: type 'struct fscrypt_info' changed
member 'u8 ci_data_unit_bits' was added
member 'u8 ci_data_units_per_block_bits' was added
type 'struct fscrypt_policy_v2' changed
member '__u8 log2_data_unit_size' was added
member changed from '__u8 __reserved[4]' to '__u8 __reserved[3]'
offset changed from 32 to 40
type changed from '__u8[4]' to '__u8[3]'
number of elements changed from 4 to 3
Bug: 299136786
Bug: 302588300
Change-Id: Idbbc2123961a41d395323c72cef67d94bdd17ab0
Signed-off-by: Eric Biggers <ebiggers@google.com >
2023-12-06 17:54:12 +00:00
Eric Biggers
16a47663f5
BACKPORT: fscrypt: support crypto data unit size less than filesystem block size
...
Until now, fscrypt has always used the filesystem block size as the
granularity of file contents encryption. Two scenarios have come up
where a sub-block granularity of contents encryption would be useful:
1. Inline crypto hardware that only supports a crypto data unit size
that is less than the filesystem block size.
2. Support for direct I/O at a granularity less than the filesystem
block size, for example at the block device's logical block size in
order to match the traditional direct I/O alignment requirement.
(1) first came up with older eMMC inline crypto hardware that only
supports a crypto data unit size of 512 bytes. That specific case
ultimately went away because all systems with that hardware continued
using out of tree code and never actually upgraded to the upstream
inline crypto framework. But, now it's coming back in a new way: some
current UFS controllers only support a data unit size of 4096 bytes, and
there is a proposal to increase the filesystem block size to 16K.
(2) was discussed as a "nice to have" feature, though not essential,
when support for direct I/O on encrypted files was being upstreamed.
Still, the fact that this feature has come up several times does suggest
it would be wise to have available. Therefore, this patch implements it
by using one of the reserved bytes in fscrypt_policy_v2 to allow users
to select a sub-block data unit size. Supported data unit sizes are
powers of 2 between 512 and the filesystem block size, inclusively.
Support is implemented for both the FS-layer and inline crypto cases.
This patch focuses on the basic support for sub-block data units. Some
things are out of scope for this patch but may be addressed later:
- Supporting sub-block data units in combination with
FSCRYPT_POLICY_FLAG_IV_INO_LBLK_64, in most cases. Unfortunately this
combination usually causes data unit indices to exceed 32 bits, and
thus fscrypt_supported_policy() correctly disallows it. The users who
potentially need this combination are using f2fs. To support it, f2fs
would need to provide an option to slightly reduce its max file size.
- Supporting sub-block data units in combination with
FSCRYPT_POLICY_FLAG_IV_INO_LBLK_32. This has the same problem
described above, but also it will need special code to make DUN
wraparound still happen on a FS block boundary.
- Supporting use case (2) mentioned above. The encrypted direct I/O
code will need to stop requiring and assuming FS block alignment.
This won't be hard, but it belongs in a separate patch.
- Supporting this feature on filesystems other than ext4 and f2fs.
(Filesystems declare support for it via their fscrypt_operations.)
On UBIFS, sub-block data units don't make sense because UBIFS encrypts
variable-length blocks as a result of compression. CephFS could
support it, but a bit more work would be needed to make the
fscrypt_*_block_inplace functions play nicely with sub-block data
units. I don't think there's a use case for this on CephFS anyway.
Link: https://lore.kernel.org/r/20230925055451.59499-6-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com >
Bug: 299136786
Bug: 302588300
(cherry picked from commit 5b11888471806edf699316d4dcb9b426caebbef2)
(Reworked this commit to not change struct fscrypt_operations and not
depend on other commits that changed struct fscrypt_operations. Also
resolved conflicts with the HW-wrapped key support. Also use pages
instead of folios, since older kernels don't have folios.)
Change-Id: Ic3dc56ef3f42d123f812e9037e2cc6f0b24bacc1
Signed-off-by: Eric Biggers <ebiggers@google.com >
2023-12-06 17:54:12 +00:00
Minchan Kim
a934b92361
ANDROID: mm: do not allow file-backed pages from CMA
...
Android has carried custom patches not allowing file-backed page
allocation from CMA area since it could cause CMA allocation
failure/slowness. However, Compaction could allow migrating
file-backed pages to CMA area so causes CMA allocation's trouble.
This patch checks whether there are file-backed migration source
pages or not in compaction. If there are, compaction allows only
MIGRATE_MOVABLE's pageblock, not MIGRATE_CMA's one for selecting
migration target pages(i.e., free pages).
[surenb: original patch reworked using compact_control_ext to avoid
breaking frozen ABI]
Bug: 207498240
Bug: 305594365
Change-Id: Ibf30eea6bf24aafa2a75a73cef6084b1c837bd06
Signed-off-by: Minchan Kim <minchan@google.com >
Signed-off-by: Suren Baghdasaryan <surenb@google.com >
2023-12-05 18:58:52 +00:00
Pablo Neira Ayuso
35482d0d38
UPSTREAM: netfilter: nf_tables: remove catchall element in GC sync path
...
[ Upstream commit 93995bf4af2c5a99e2a87f0cd5ce547d31eb7630 ]
The expired catchall element is not deactivated and removed from GC sync
path. This path holds mutex so just call nft_setelem_data_deactivate()
and nft_setelem_catchall_remove() before queueing the GC work.
Bug: 310691882
Fixes: 4a9e12ea7ekongln9170@gmail.com >
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org >
Signed-off-by: Florian Westphal <fw@strlen.de >
Signed-off-by: Sasha Levin <sashal@kernel.org >
(cherry picked from commit 13e2d49647joneslee@google.com >
Change-Id: Ic5d1d98fe5a749e759869f0789cbb77c4ab5e6c2
2023-12-05 13:14:45 +00:00
Paul Lawrence
e19a3cd1ce
ANDROID: fuse-bpf: Ignore readaheads unless they go to the daemon
...
readpages will be triggered on the fuse fs in passthrough mode though
system calls like fadvise. If the daemon isn't aware of the file, this
will likely cause a hang.
For the moment, simply ignore fadvise in this situation
Bug: 301201239
Test: fuse_test, atest ScopedStorageDeviceTest both pass
Signed-off-by: Paul Lawrence <paullawrence@google.com >
(cherry picked from https://android-review.googlesource.com/q/commit:ac9071df3ba6715219a16a44d4711f041b0c25de )
Merged-In: I524a84aeeb1b1593e51264fcc37f7cfa66757168
Change-Id: I524a84aeeb1b1593e51264fcc37f7cfa66757168
2023-12-01 16:06:07 +00:00
Martin Liu
5421e17c17
ANDROID: Update the ABI symbol list
...
Adding the following symbols:
- __traceiter_android_vh_ptep_clear_flush_young
- __tracepoint_android_vh_ptep_clear_flush_young
Bug: 312692863
Change-Id: I5e6232bb1121d3d59ea57380c7950412b1652208
Signed-off-by: Martin Liu <liumartin@google.com >
2023-12-01 16:05:35 +00:00
Martin Liu
46f8b2ca58
ANDROID: GKI: add a vendor hook in ptep_clear_flush_young()
...
Add a vendor hook to be able to skip ptep tlb flush.
Bug: 312692863
Test: boot
Change-Id: Ifbc7a52111616d0542b866532a9bf82368e6c8f1
Signed-off-by: Martin Liu <liumartin@google.com >
2023-12-01 16:05:35 +00:00
Andrew Yang
0add0e52ef
UPSTREAM: fs: drop_caches: draining pages before dropping caches
...
commit 8a144612ebhttps://lkml.kernel.org/r/20230630092203.16080-1-andrew.yang@mediatek.com
Change-Id: I9b03c53e39b87134d5ddd0c40ac9b36cf4d190cd
Signed-off-by: Andrew Yang <andrew.yang@mediatek.com >
Cc: Al Viro <viro@zeniv.linux.org.uk >
Cc: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com >
Cc: Christian Brauner <brauner@kernel.org >
Cc: Matthias Brugger <matthias.bgg@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Bug: 285794522
Signed-off-by: Will McVicker <willmcviker@google.com >
2023-11-30 23:45:53 +00:00
Treehugger Robot
0d1f309e44
Merge "Merge tag 'android14-5.15.137_r00' into branch 'android14-5.15'" into android14-5.15
2023-11-30 23:03:53 +00:00
Greg Kroah-Hartman
6dfd4d406c
Merge tag 'android14-5.15.137_r00' into branch 'android14-5.15'
...
This merges the 5.15.y LTS releases up to 5.15.137 into the
android14-5.15 branch.
Include in here are the following commits:
* 575f85f973b4bfba5c302173e8b338f0fd3e24932fbc60aaf5725499671912952a23a5dff33880d45a9d05a4f1a6df96ee0bc08d609fb2e1b030b10159f1095ab5b618062c0b67f29cd2f876d04c33954b129e3964e1a058cc24c6bbe51dcda73c8d7169c8b6c2df1e3ad81e6aff71d224acc45aa89a11a28c376d86364832212161e750fb71dca9fd6d44ab071382bda1431a5010bc5762e72ef15a3abee2ee24959825378041e7b7e7262029c0c53e363db1c171823463b1a50d2f17d5ae53c92e92c0ca2ab230a7070628043f928d1362ac43ec299a30e2db403038ba5479353b2da6d62bf6e2638245ca56d8afe6ca5bec7ecf2692fd37aaef491d9560f89ed0a096df486b75fed5ba30ee4f9d07b7abd2f652eb4adfaa77b187b130a2285a2eb64eb31a1bbbec17245102b0e6991838681af225e6e9a32c3e06aabf77156063f6f64f59ebfeb7b33d85fb391f89e3cc1b07137c658ea368f106c2b2ef3c62e2f0e2f64f3eeb266dab0ce4bc424f18fb92609823593898d8d685d3dc26c4fd6c52b12159db3f17e57129017ab1a5558ee0fafdd00f4ae3acfcb3f09e81403d201d1f419ac18d88030099bc91ae80d5290c569a126f24a9c471892deafbb19661919721348c7f74bc91ebd67d831e1daff3019b554f1d3d1ca58bdf95e29fcc19daa037db3372069744768cad01b33179dbf30426d7bc1766982023d70ea476863ef9202217a6a2ceb30cc1a270aa7a479d55719f988ae344291e8b6b4ca42a4df9ba0d7aa9651e66d026a3c734cbf8bc4b708bb660e58ef7d35f398b88d182d8ed7b8d32a6b67e6df571a6c136eabe870334f62612be04e0eef74befe43d1bcbab40c7ab7a24badb9dd8ff38d2a705582f7993355c2c01be806797c6d09e0b4e772a6af61c43be1effdc881f68d42aeae14fe42cecb513f6c093b977e5f8b43c9c1597c1ed0e1ef0715268dd6b62fdd2848a05c442e7a2aa7770fe5c6fbc5e1815844652045b9e5d220a427f18109144a81de47b3ee41b626e12d0e4ec856192806fd22695f24c52a4732da93f8a032cfc3f8e18a053fec7f6b9b700c03985405266b5b6e9528f0ba9f7542a3f1a3c737ce5518a2e10931e2dabd4aa0819f10abdb04c0b4eec015fa8d2910be6057f9123b13f82927cab474385adcdde035863547154e2db88cd5ceadc2bb6358002fd7ddb1ef2bb9a3e177ef5d6808be3ff9c0dc3e2c94da05eba6682f61b2d51ecba5afe86cbd2aac0047014807fb750259cf71a308f1924965a6ce81d7c1c790191ca1680c82929b8ec40a90ad092630e8a7cea6fa2d76ff4e50e2d6a4a3963866ad7f52d8cc0c4acd53a58f0e6324ed727b97f8f04c38bedd0a586742a374382d1a996#1485 on Zen4-based CPUs
| * 763167003a510d4a01d89cb61ab9f4f9a1af37b809b8ed95474c80ecef85a625de7e54eb28694f6dee881418733b2dbc4f3342c56e0156524f4536171d8e7fe855cb34e3b25cd56dbfe7505e13e69ddfaade10d51d8f12d2d66cbc9f6cbeb925dd54b95ab2bb3b43b9c4140dd77cd888d3f70b249a1fdb952112cacb38935a15334d667fe9101a2dcb31e65d6a217af2c672ef7088657795592e0858941cc742cffdced18a5c360eec5384c6aa0ae5616761cf9d30ebd417753f39de2bd185ae07d4dc9a890c7d4db9de60b683afe5f596b520e73ece06a01d68b6c65b5e58299e56e96b38d228ddc1e0b8b930f0f7bb982bd86fd6124cf0ea4b3d2a16f87810f4a0b665b7966e2191b9bdffb3f97d4999589ed2746cdfd58f2350e20429298c85a89b75bdddaeca18f7a2cf02e21884dcc8af81a9d3c346494ec7694e13732ee914c3a47e81b7bf367e5d8bd1382060c9ed88527f6136ced11dd6095fc7844fcf4c691878d6666c718d9b44afe0878f38b618a839064f8781fe259d949ccc91c3a02c02adc27783b471bf1abac613c0821b3b00bc24fb22bddb2e53585e2374e5693240a4b9bbd1d188497f74d60c9cf5e8805a899e2ce84837a192f6cda10784a12801a1ddb2cb145e6c20cd11899563147d89ee41bdb4fcf18ebc8b89b6969fb4dfb8e2fcdd79fda3b67adca1e19a103e0b10bb6aee06960cee8c1b3a3f6fbbccbaebad2e4c485afb9963497c8faa31085db7af530e6ff75f524d0ea2a63497bb0707fde78afbacf6190da6d21ba21ad7ccd45a0fb3df942737b54e8acee80f55d6d21e69422efc4e2f83952b310bca649b3f59e63568b75b017b3f33229d7834ab73e7ed79b4ddad3fb0bb1fae816cc4edc7b5c8a98ad3adf6aad6ba17158012d0b05165a218ca518454a2f5e9f8b0b6a8e1686746be7b0a210e6384b4f7f15568e514f897adaaa8347a711edcec18cf09a683023766cb6d74f591f1f025b61cae7473a6e74adc58994cbd55a819ddc525fffb2990a195ed132a5ae41358d560e98df8673f651bb5d00cd7db00d2cb806640527ebb3ea2b1d486fb111fe77cb13569ad596607f78e976770df8b9c59a7e0c10a8c0c5fd85fb03936e871492b837f13a8a48d2bcd2378e70c6238f090a8b4d2f5a604757aefce75bd2d0e3450487f3586b3feed9690ad557d3c29c6e8cd6e5e4223c8aff3994d4b83a30e94551e8c573f50182d13dadbaf58072e86c8bc44936fce6b88a585b1deb1555286e65ffc4d4bf0044fe4288990ec3547a94e87f07eb09f70d9134b01a390baf7cf0fdb9da93c7449e1a8b79ad745e028accb25850bf83d50662d21e48e3cdab909d540a4370afde57d7ba9a1589abd7cfd334cfd84a8bc0f6357344f2f3e613db9b420704aa90e624c53e7c559b7b4874f72cf8c5c9ecbfae08e61d50aada7fcba2db7e376a26bd8c6fad0021ecdcfec4ebd1ec7f998ff05ed4ae2ac0d068099d938c3d2780c615323a72a47ee15a67c59b882b970460e81e2bc51434b668e0f78a84fbe57fc50dc1df81ea9e46937e44ffb0e75aa86a71b39eae117fcbf770c66f5e12de36a6829bc797878277b096d5435a49b3bc39df101d84bf10fd51cd2640d86871a541999f3532a2396056642b4eb0807261196078274154712bd69c74dcaf5ba6d9d6b7ca3a1b0f4fb6f65780c191fc23cfa5d2b57c0bc657f8428598444467ead67db9ecb8499e65f075e2df381963208dc215967f912d9d8741aa39eee579910b1411ed7acb703171361917030d645206e9bd7a2bf6faa56d2418a0707b569051fa70dbdede00dcc9b4097ea82139e6ecd05eec2ee8bc97117b50d3939cccbd6d182d8567c47b238f496af9a55b713ea4b92e8e2c34afe8321efa88e770a5d236b52ab78000c3847329633b326df9ab5de3b14e843188860d354f6c196ecd3f8a2d69dcb6c3796e449a0a628f3b5cd7a9eee3b5df3c6a17900f90a7b958655629e6164acabf5df49c6e44f4c316a8de77753ef99506eaf8d7a00b90483d3a4607c949369f9f02e6846b6139af7dfb3c99366966caf082791b421b44a459c6524707fa1e16796800f0daf78b0489e8f24fe69e3b290795bd2479a2cf525d19e8bf3ea7c7e658a36a2d1125ee06b6c088c38a9d3bb58dad91abea15c656f0495e4be57857fb3e832b55881f6189f3731fa6d449e4d7a688f191a68fc0e75c70ff78c4554d381bfe138f1c434ddaf0c0a7e1f2aa354b4a367a2d74a39de24e4d2248cb911329317e3a29b80e9c6244cd00c08569c92f76b080fa8aa6386a2d4dce04b7073bd93763d587072a22696cf54603e8a8801c7c38a90763d39f4e8bf195968e3bf38c1d29f85ad4688b7962e672323380bbd46d6779c3cf274f9c78afcee05a7289a5d8bcb80293bd30af15e46abdfde037758787ff3d08abf1ec895e1a27664fcf0fd24f1fadded6b81ad1d5caeac96b9f0572b38cba491ee38cb3671a2eef16fe29368ad73216e00d8f81baeb9dfe961b1e456cf9f446b34fcb59437a4605449ccdb6c90f267e927089822b0412dd1c2f980bf15869be2957f01f3f6bf22a481bbe66670d4ef3c9c79c829d25e265353df78c2b97aaf9faf60a71fd191c861a61be6930c60e13948bb6a9fa52a33fc57135b1ea100ad3dd5846a87033b0c0780903566208ad9ef84a7c2ca49cef3acd35e7ae10e46870eea54ef7311101caa5b019a3e7ac65c29b64f96c0665ff3e9fc7b023157aa794c78bc9d25995eca70c14be8ba418d49961df5a3f549cd5490001e0a38bb84201071956ec64ee9dd3366594a1e6dfedd9377dde08333e2ab2b0a093cdf0a1f87f0ca67589d2479389106425dddb8f358b5a7ebe459c73de6b6ab696b0adfafb0dc100292e57b7964cd9deda268b5b76e743b7261f9a2c79c29ed1afb5972f685311dbe4f03fba096f1ceff37ac430787056d766e56fadd6994f806c671eeddcad7661e59ac7ae25a34ce774a80d037ed24a6c40238682d0f1c2ee2c62c87d6b5df330aac35ecaa36320c0d79f336893978f1b40b8e09b39e55d2e7c1abe80228b2745b55dac919481bd6dcc53600c0dc0d07c0abc8067c34ea3451694035201a97275339c3864da4a5d5fbdc4e99086a4480c5e6072324cfab5bb09dddc706b4934ab2aea3801c232f1e86014df086e859dd8173d90270072cd213c6c6ce1c5dd36c06a7f6b48247ff0d505ad42b999a7607bc7fe6242bbe21884d7a8a44e0a8f91f480c4ee1cf2a5bdf4d8d5ab63b51d016bb2353b7bb61b59ff750bfca5218aef9f3260733897ef0e8b8125fd6f40d1765b6890c3d0b62825dc681dd61cb1c20bc2c47034315b4a95eef5fea70e56778a385726b195e07a20476f2016d3375186d5e2348a375eef5160dc17e6d548b7cb2cc3c67e0812c9643fa638bfa87cf4a19280e8dfb1ad7b189cc347f765176cb4494cfe477b850b84dd11109c03dfcfb5842ef131cd74a8e12de76fddd7c2f90b1c2f4c5640d6d9210b3dd741840f08c2a6ea277b2c63868de7c53d95456660fe5edc6e44a9151ed4b00907fbed65c5d2d3f230077dd55f5ec56603b2c82149bc7834de18b49495a5979985f2d49acc5c5b2ed4e0adfa4e0b483a05874df0319e4973a4c302d5e22217c11676152264dd6aa2be13779bd17c99e1356eaceef24481d5c746e98631656184be0d5920b79f5a19c1e3167aa4b6fc8bdc3cf6b2bb1a1a6d4734ef765c3bc6685818e96f741b3414cf7a2ccbe9ce0dbde751facd363d0245b066905333a6a21e2964c98ecda302f1d470db19df21bf64f682be7b2f39b813de61db89226a8474506c9a69b951c83ead2436cf08859f58c172655e1d9707ad44409cd2d8138cea79f5db4ab19cfc47807a4309c27162a4316e951f17b89c3727b15a71bb25b1063921562def49a05aebe12c9f4c64322f3de9fa4708402c4b0453b0cf55934b2125f4a16a46c84f1ea164be5683945b177fde268c234c29848249f0def123f121a0aba2bf22920cc4c64529bcc70c4fae2d591f3f01e21d6c799a8d14d7905c581ad3e861cfdc51f7e3ddbea877fe9d87996eda9a2966556c49a33280ad6bad31d31220bd89c3acc6b9f26cb65ad51f19ab2c149c26aff273257fedecaeef88d68582b935294144b6a86608e1b0c51ffed9ca16ecf09699e7a2978e8d3703cf47d4749a49d442044f6ec5893d73d3787c9da0c7293f4bfa051f6508f4edcd65558388f2958bd188d1e386e9632a01e9a43563cfda0a49da2a7a905ac21b28742dbf9c2568132f74c4e7b4ddc903b018c3d10cbb7d8a4b46043dd31f7aba1bf1974df64819dd620b7d0a62a20990d6a850a22f9c17bd479c841b1111bafa210be7353af5bd579038659267a29f8bfb3d07714ada9e6142e5f3e48f741e9de16cb7986d6f80ddb9e42d8c7fa0b329d0f168c58d17e7660679a71b3118869fd166f0f715ea7d31a68bef237abd740db89b45cf29f9740d637359f52942a47d031d7e6c7686182318ac0548f48ec192ba8bb0072dde88ab4e44fb28379b31bb42aca7a4f1807fddd1c37013734076fb40cf2c4772759ab6248f4305304824d50e6f3572eef85205f71744189ecb4b400784d1b83aedbb717b4ee4c1a5c2885958905ed42cdd5fca720322a805ffdabba34017e1717f67be8121b8d30f4f6b483ead6d079a3e1cc426bd741879dc6f660813274e32fc97a17deca3342d111304db051c3bf3b154822356ede4aca5b2846b76f13f1a6992ecefed3256d804093a5b461a497097ea2f31c996be7f2cb6d20a8b52f0d202d82f34508d934c54c66d904f61fc650c446ad449efd4bd57d8890e9bac3cc749285efd9597231d60d41484ddaa90bcbb8f7097e18dc93de90f1e7d999f346d1b2a3d5e454e985957caac45b52f64d02822b7ca7cd0211fb24b65aac56a3d8ae45d1b51b130da50d60b8f2caf058833b711e9e44f630d4380eb0663114dfc11473e40b39fb7ddc113853a1e5ab1b19a648a075b0f127a7c68f994b830df6a84ef1d0a9ddbfed53a70c8de3052935443dc975dcb650a7cefcb002c54be323c73769c712389eaac0a9a1573539bab5f9ea670d0146348ef09df9546823738200f79e78bfa26a5e4be213fd667db96b708243d3dbde1d9c54824e97302f66ef144dbdf46fa8ab8d759d978e8302faf0bd6f4c20a41432377f7aeddd1c4a98c55fbd4eff9c83b1cb8bf42b3e24082f16febacbefe4964f62caacf1399e154392913d32e73ad53071fe779286949553abafedfe48fc5717b201bb96ad3830f04a41e79643cc0b1717fbf7da49d04f1e322fd8b6adb840a68fabdad97636dfc42bfff4d36247e5758ad9a397274bea01cc6b09671d0152e7758c48e4c4819076c3ad124432e0609273502dfc5875c0b1eee648d0b82c217fb7b0c488518025396b7627eee65b2ecc9254b24aea5bc6f5aa4197eeb55f9712279e978ef5d1f16d3826383647a3d36107ee94ca5eed95246bac7d3cde93b4711aa9e56fa8a0db0ba31254c4413633ef57b6d92c79b7f47031e32f0246b3c7d12beb1b1e188f2d41fa1dd43e1e541634fe406c4b7eb5e2c192919d98e63659098572ea48fd91dfeee01e0d6ab788afdbfd2840d9b9c8b35f3ca187bed08bb832261e69456612a93e53ea4c9a6372584c918fb77d9c022ab2dbbda65ecaec6119aaced9c0dc9d7d3fd2d698daa1510bae3d37b08c7a31badc0403450289602de9a21df46e717ebd0a6452f05b824022346c6efd3a1da48e7def004cf994d3f4edb5b1b3b9a85fd811657790b6a2f5510e0cbd6493a572b9d45138beea8ed7fd24b8d171ce8be48b11f93fff6e6904c7afd5cec7db9ea089f19a9a05308eb3a6099c00731bf0f683992d30e3f647e4b64ff99813405a70ab6b59660b6b1c5c55fab9389d41c40d848350c78e7144942d8cefb07b0243d26a048545d9fc56cb7bbefce3c4a6b07343423b3e047c54b6fc39a20b96cf695c75a43795890843254f2ff9ac0cf2802008e8c77dcbc0bb0ecaa2883b18b60dfa455934f11806585af3c8676b14c6d1e8087b75b4c90a75d3960be78ea6871116be2092d2a79eb25ea7b626097a7f288a962f11a97833a74f8d208383d685c7802ff51a0a872a05213af6f77e804505ad996bc68a196e7ffdcb63afd3b2ba11ed4de0478944f4ec9d118ad9e280033ef14c3f33904d0481251b7c060ca3f789d412e9b34ba4229f93bccedb871933c1a4117f1540671f90d5099bf90d7f7039aa1be9759d51eda27c4cce5700104df1c695273f4615319ef5c25bcf8c1b60dad0fa05aea281f0bf8a0711e9e62419e73714bb4a1d53b8cc2f96867cdd7f950863204debac93def0dbbef6c89a92b439e33a8c156b80319487ea5e8940e1313fa9d25faad57ba6e13f0dd5fbee49b97cb5f44f50305da85c523aec3faa126258c152ca4f21a9988b9c7a7f3901b04c23151421edc934d2a69720587011d2b41f798964cc2b0a20555b64fc2471f85908f6bfa4845e6948e062aa1acfbbfa7d712bb10215ffdb6bb94f46d3279a6dad0cd424c636b782373d1b7620d449a087c4269c725817d75773b6f281a37393dfff9c91cb4e364cab1399319298fd1dc2c12854gregkh@google.com >
2023-11-30 10:16:57 +00:00
Rick Yiu
73c2c0d53d
ANDROID: Update the ABI symbol list
...
Adding the following symbols:
- __traceiter_android_rvh_set_user_nice_locked
- __tracepoint_android_rvh_set_user_nice_locked
Bug: 300872872
Change-Id: Ib3aa1294e601d672d986f58cb8b66343f69ef417
Signed-off-by: Rick Yiu <rickyiu@google.com >
2023-11-30 10:13:24 +00:00
Rick Yiu
87344b2ab7
ANDROID: sched: Add trace_android_rvh_set_user_nice_locked
...
We will need vendor hook of set_user_nice with lock to avoid race
condition.
Bug: 300872872
Change-Id: I24fc1e13cc6578dcc418d956a5146ad29ff76a56
Signed-off-by: Rick Yiu <rickyiu@google.com >
2023-11-30 10:13:18 +00:00
Ruchira Revdekar
bd1e76c09b
ANDROID: GKI: update symbol list
...
INFO: ABI DIFFERENCES HAVE BEEN DETECTED!
INFO: 1 function symbol(s) added
'void __balance_callbacks(struct rq*)'
Bug: 241223356
Change-Id: Icdb97781ec7af4f183249f0db62ed3bb758000f4
Signed-off-by: Ruchira Revdekar <quic_rrevdeka@quicinc.com >
2023-11-29 20:46:03 +00:00
Stephen Dickey
fdaddcab76
ANDROID: GKI: vendor code needs __balance_callbacks access
...
Vendor module code needs to ensure that pushes to the balance
callback queue are handled prior to releasing rq locks.
Export __balance_callbacks to facilitate this.
Bug: 241223356
Change-Id: I86a3f5cb6cc7b97d87bd2db3e11cb7a8d99d4aef
Signed-off-by: Stephen Dickey <quic_dickey@quicinc.com >
(cherry picked from commit a2f552f49c9084dcc48b2066888d06a324e34b98)
2023-11-29 20:46:03 +00:00
Vincent Donnefort
e2fbc5cc3a
ANDROID: KVM: arm64: pkvm_module_ops documentation
...
This structure is at the heart of the module support for pKVM. Add a
description to help anyone trying to create a module.
Bug: 312200309
Change-Id: Ie1d9043a6a94d15dd8ef25c6f0f8d442da26bc1f
Signed-off-by: Vincent Donnefort <vdonnefort@google.com >
(cherry picked from commit af85ead8ce
2023-11-29 18:02:56 +00:00
Jimmy Hu
bf291bdd70
UPSTREAM: usb: typec: tcpm: Fix NULL pointer dereference in tcpm_pd_svdm()
...
It is possible that typec_register_partner() returns ERR_PTR on failure.
When port->partner is an error, a NULL pointer dereference may occur as
shown below.
[91222.095236][ T319] typec port0: failed to register partner (-17)
...
[91225.061491][ T319] Unable to handle kernel NULL pointer dereference
at virtual address 000000000000039f
[91225.274642][ T319] pc : tcpm_pd_data_request+0x310/0x13fc
[91225.274646][ T319] lr : tcpm_pd_data_request+0x298/0x13fc
[91225.308067][ T319] Call trace:
[91225.308070][ T319] tcpm_pd_data_request+0x310/0x13fc
[91225.308073][ T319] tcpm_pd_rx_handler+0x100/0x9e8
[91225.355900][ T319] kthread_worker_fn+0x178/0x58c
[91225.355902][ T319] kthread+0x150/0x200
[91225.355905][ T319] ret_from_fork+0x10/0x30
Add a check for port->partner to avoid dereferencing a NULL pointer.
Fixes: 5e1d4c49fbstable@vger.kernel.org
Signed-off-by: Jimmy Hu <hhhuuu@google.com >
Link: https://lore.kernel.org/r/20231020012132.100960-1-hhhuuu@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Bug: 280207787
(cherry picked from commit 4987daf86c152ff882d51572d154ad12e4ff3a4b)
Change-Id: I609640ff70258b8fd0e7f9eaad9eb60db35ccfad
Signed-off-by: Kyle Tso <kyletso@google.com >
2023-11-29 14:56:21 +08:00
Alan Stern
52ecdc264d
UPSTREAM: USB: core: Fix race by not overwriting udev->descriptor in hub_port_init()
...
commit ff33299ec8#0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 05/27/2023
Call Trace:
<TASK>
__dump_stack lib/dump_stack.c:88 [inline]
dump_stack_lvl+0xd9/0x150 lib/dump_stack.c:106
print_address_description.constprop.0+0x2c/0x3c0 mm/kasan/report.c:351
print_report mm/kasan/report.c:462 [inline]
kasan_report+0x11c/0x130 mm/kasan/report.c:572
read_descriptors+0x263/0x280 drivers/usb/core/sysfs.c:883
...
Allocated by task 758:
...
__do_kmalloc_node mm/slab_common.c:966 [inline]
__kmalloc+0x5e/0x190 mm/slab_common.c:979
kmalloc include/linux/slab.h:563 [inline]
kzalloc include/linux/slab.h:680 [inline]
usb_get_configuration+0x1f7/0x5170 drivers/usb/core/config.c:887
usb_enumerate_device drivers/usb/core/hub.c:2407 [inline]
usb_new_device+0x12b0/0x19d0 drivers/usb/core/hub.c:2545
As analyzed by Khazhy Kumykov, the cause of this bug is a race between
read_descriptors() and hub_port_init(): The first routine uses a field
in udev->descriptor, not expecting it to change, while the second
overwrites it.
Prior to commit 45bf39f8dfsyzbot+18996170f8096c6174d0@syzkaller.appspotmail.com
Closes: https://lore.kernel.org/linux-usb/000000000000c0ffe505fe86c9ca@google.com/#r
Signed-off-by: Alan Stern <stern@rowland.harvard.edu >
Cc: Khazhy Kumykov <khazhy@google.com >
Fixes: 45bf39f8dfstable@vger.kernel.org
Link: https://lore.kernel.org/r/b958b47a-9a46-4c22-a9f9-e42e42c31251@rowland.harvard.edu
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
(cherry picked from commit 7fe9d87996joneslee@google.com >
Change-Id: Ia5e4a65cd5d895bf0d85a5aa5efa1c4d1368d069
2023-11-28 18:27:32 +00:00
Alan Stern
a7f103722b
UPSTREAM: USB: core: Change usb_get_device_descriptor() API
...
commit de28e469dastern@rowland.harvard.edu >
Link: https://lore.kernel.org/r/d0111bb6-56c1-4f90-adf2-6cfe152f6561@rowland.harvard.edu
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
(cherry picked from commit eda9a29665joneslee@google.com >
Change-Id: I7c4be5b5dd06f7d5ba8aacad33ecf78f4a3b49e6
2023-11-28 18:27:28 +00:00
Alan Stern
28e703ec05
UPSTREAM: USB: core: Unite old scheme and new scheme descriptor reads
...
commit 85d07c5562stern@rowland.harvard.edu >
Cc: Oliver Neukum <oneukum@suse.com >
Link: https://lore.kernel.org/r/495cb5d4-f956-4f4a-a875-1e67e9489510@rowland.harvard.edu
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
(cherry picked from commit 56c49a3328joneslee@google.com >
Change-Id: I2ffdb9ee11219fca6aeb2cda7867ea53fd6ca61c
2023-11-28 18:27:26 +00:00
erinwang
e5f9357102
ANDROID: GKI: Update symbol list for lenovo
...
2 function symbol(s) added
'unsigned int regulator_get_linear_step(struct regulator*)'
'int smp_call_function_any(const struct cpumask*, smp_call_func_t, void*, int)'
Bug: 313550784
Change-Id: I733654a7d0ca8daba31ef7eedb874d0c8da1cd29
Signed-off-by: erinwang <erinwang2@lenovo.com >
2023-11-28 12:11:51 +00:00
Jayant Chowdhary
dcf95aa0af
FROMGIT: usb:gadget:uvc Do not use worker thread to pump isoc usb requests
...
When we use an async work queue to perform the function of pumping
usb requests to the usb controller, it is possible that amongst other
factors, thread scheduling affects at what cadence we're able to pump
requests. This could mean isoc usb requests miss their uframes - resulting
in video stream flickers on the host device.
To avoid this, we make the async_wq thread only produce isoc usb_requests
with uvc buffers encoded into them. The process of queueing to the
endpoint is done by the uvc_video_complete() handler. In case no
usb_requests are ready with encoded information, we just queue a zero
length request to the endpoint from the complete handler.
For bulk endpoints the async_wq thread still queues usb requests to the
endpoint.
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de >
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com >
Suggested-by: Avichal Rakesh <arakesh@google.com >
Suggested-by: Alan Stern <stern@rowland.harvard.edu >
Link: https://lore.kernel.org/r/20231120062026.3759463-1-jchowdhary@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Bug: 301915972
(cherry picked from commit 6acba0345b68772830582ca1ca369a2f45631275
https://kernel.googlesource.com/pub/scm/linux/kernel/git/gregkh/usb usb-next)
Change-Id: I5597cc29e9caec69e4f3575938d7d640857aaa28
Signed-off-by: Avichal Rakesh <arakesh@google.com >
2023-11-27 11:51:11 -08:00
Avichal Rakesh
8078e50f5e
FROMGIT: usb: gadget: uvc: Fix use-after-free for inflight usb_requests
...
Currently, the uvc gadget driver allocates all uvc_requests as one array
and deallocates them all when the video stream stops. This includes
de-allocating all the usb_requests associated with those uvc_requests.
This can lead to use-after-free issues if any of those de-allocated
usb_requests were still owned by the usb controller.
This is patch 2 of 2 in fixing the use-after-free issue. It adds a new
flag to uvc_video to track when frames and requests should be flowing.
When disabling the video stream, the flag is tripped and, instead
of de-allocating all uvc_requests and usb_requests, the gadget
driver only de-allocates those usb_requests that are currently
owned by it (as present in req_free). Other usb_requests are left
untouched until their completion handler is called which takes care
of freeing the usb_request and its corresponding uvc_request.
Now that uvc_video does not depends on uvc->state, this patch removes
unnecessary upates to uvc->state that were made to accommodate uvc_video
logic. This should ensure that uvc gadget driver never accidentally
de-allocates a usb_request that it doesn't own.
Link: https://lore.kernel.org/7cd81649-2795-45b6-8c10-b7df1055020d@google.com
Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com >
Reviewed-by: Michael Grzeschik <m.grzeschik@pengutronix.de >
Suggested-by: Michael Grzeschik <m.grzeschik@pengutronix.de >
Tested-by: Michael Grzeschik <m.grzeschik@pengutronix.de >
Signed-off-by: Avichal Rakesh <arakesh@google.com >
Link: https://lore.kernel.org/r/20231109004104.3467968-4-arakesh@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Bug: 296925310
(cherry picked from commit da324ffce34c521b239f319d4051260444a3eb4a
https://kernel.googlesource.com/pub/scm/linux/kernel/git/gregkh/usb usb-next)
Change-Id: Ib0378394dc20e894507f60c70f71c579d046cd7a
Signed-off-by: Avichal Rakesh <arakesh@google.com >
2023-11-27 11:51:08 -08:00
Avichal Rakesh
0041748215
FROMGIT: usb: gadget: uvc: move video disable logic to its own function
...
This patch refactors the video disable logic in uvcg_video_enable
into its own separate function 'uvcg_video_disable'. This function
is now used anywhere uvcg_video_enable(video, 0) was used.
Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com >
Suggested-by: Michael Grzeschik <m.grzeschik@pengutronix.de >
Signed-off-by: Avichal Rakesh <arakesh@google.com >
Link: https://lore.kernel.org/r/20231109004104.3467968-3-arakesh@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Bug: 296925310
(cherry picked from commit 2079b60bda3257146a4e8ed7525513865f7e6b3e
https://kernel.googlesource.com/pub/scm/linux/kernel/git/gregkh/usb usb-next)
Change-Id: Ie8934e6fe1577373b01e3c66626e4239cf9f8c83
Signed-off-by: Avichal Rakesh <arakesh@google.com >
2023-11-27 11:51:04 -08:00
Avichal Rakesh
563283055b
FROMGIT: usb: gadget: uvc: Allocate uvc_requests one at a time
...
Currently, the uvc gadget driver allocates all uvc_requests as one array
and deallocates them all when the video stream stops. This includes
de-allocating all the usb_requests associated with those uvc_requests.
This can lead to use-after-free issues if any of those de-allocated
usb_requests were still owned by the usb controller.
This patch is 1 of 2 patches addressing the use-after-free issue.
Instead of bulk allocating all uvc_requests as an array, this patch
allocates uvc_requests one at a time, which should allows for similar
granularity when deallocating the uvc_requests. This patch has no
functional changes other than allocating each uvc_request separately,
and similarly freeing each of them separately.
Link: https://lore.kernel.org/7cd81649-2795-45b6-8c10-b7df1055020d@google.com
Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com >
Reviewed-by: Michael Grzeschik <m.grzeschik@pengutronix.de >
Suggested-by: Michael Grzeschik <m.grzeschik@pengutronix.de >
Tested-by: Michael Grzeschik <m.grzeschik@pengutronix.de >
Signed-off-by: Avichal Rakesh <arakesh@google.com >
Link: https://lore.kernel.org/r/20231109004104.3467968-2-arakesh@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Bug: 296925310
(cherry picked from commit aeb686a98a9e9743c4c0338957e59643a2708146
https://kernel.googlesource.com/pub/scm/linux/kernel/git/gregkh/usb usb-next)
Change-Id: I33400ac6b28e72c6c10805e167e8bab7e2520a28
Signed-off-by: Avichal Rakesh <arakesh@google.com >
2023-11-27 11:50:58 -08:00
Avichal Rakesh
848fa308a9
FROMGIT: usb: gadget: uvc: prevent use of disabled endpoint
...
Currently the set_alt callback immediately disables the endpoint and queues
the v4l2 streamoff event. However, as the streamoff event is processed
asynchronously, it is possible that the video_pump thread attempts to queue
requests to an already disabled endpoint.
This change moves disabling usb endpoint to the end of streamoff event
callback. As the endpoint's state can no longer be used, video_pump is
now guarded by uvc->state as well. To be consistent with the actual
streaming state, uvc->state is now toggled between CONNECTED and STREAMING
from the v4l2 event callback only.
Link: https://lore.kernel.org/20230615171558.GK741@pendragon.ideasonboard.com/
Link: https://lore.kernel.org/20230531085544.253363-1-dan.scally@ideasonboard.com/
Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com >
Reviewed-by: Michael Grzeschik <m.grzeschik@pengutronix.de >
Tested-by: Michael Grzeschik <m.grzeschik@pengutronix.de >
Signed-off-by: Avichal Rakesh <arakesh@google.com >
Link: https://lore.kernel.org/r/20231109004104.3467968-1-arakesh@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Bug: 296925310
(cherry picked from commit 991544dc579b636e69defa3eec486fd6f6191e59
https://kernel.googlesource.com/pub/scm/linux/kernel/git/gregkh/usb usb-next)
Change-Id: Ic5631a526e72cbcf299dcb8167bb3d34468d37e9
Signed-off-by: Avichal Rakesh <arakesh@google.com >
2023-11-27 11:50:53 -08:00
Sai Harshini Nimmala
24e0a18cb4
ANDROID: abi_gki_aarch64_qcom: Update symbol list
...
Leaf changes summary: 1 artifact changed
Changed leaf types summary: 0 leaf type changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 0 Added
function
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 1 Added
variable
1 Added variable:
[A] 'tracepoint __tracepoint_android_rvh_update_thermal_stats'
1 function symbol(s) added
'int __traceiter_android_rvh_update_thermal_stats(void*, int)'
Bug: 203763121
Signed-off-by: Sai Harshini Nimmala <quic_snimmala@quicinc.com >
Change-Id: Ibbdd26ae66d1db01f4b76479c41a36eb590a7133
(cherry picked from commit 0e29f56ef055bb8ccba3a5d259002ec36c76da38)
2023-11-27 19:01:03 +00:00
Shaleen Agrawal
8ab43e8a3e
ANDROID: arch_topology: Add android_rvh_update_thermal_stats
...
Add trace hook so modules can track thermal changes to process
vendor value adds.
Bug: 203763121
Change-Id: I5c54b313d3c92c0514f18b07797dd20c9c6f5161
Signed-off-by: Shaleen Agrawal <shalagra@codeaurora.org >
2023-11-27 19:01:03 +00:00
liujing40
6ac8b4fbb4
ANDROID: fuse-bpf: Add NULL pointer check in fuse_release_in
...
If open request sent to classic fuse, backing_file is null.
In fuse_release_initialize, fput will trigger a crash.
Bug: 297831741
Signed-off-by: liujing40 <liujing40@xiaomi.corp-partner.google.com >
(cherry picked from https://android-review.googlesource.com/q/commit:4d2ff573981f06ba09e1ddda8726bb73ff6a2c3f )
Merged-In: I2d54d99d62b54c39a6dc9064f8f62488433aff6f
Change-Id: I2d54d99d62b54c39a6dc9064f8f62488433aff6f
2023-11-27 18:54:21 +00:00
vincent wang
4030b1eeed
ANDROID: GKI: update symbol list for lenovo
...
Update vendor hook symbols for lenovo
Bug: 312392542
Change-Id: I1e596bee5a7c776ab4c2af12fd473bf0e6fb2db8
Signed-off-by: vincent wang <vincentwang3@lenovo.com >
2023-11-27 18:37:02 +00:00
vincent wang
71647086d7
ANDROID: GKI: add a vendor hook in cpufreq_online
...
In this vendor hook, we can register the energy model before sending the
notification to avoid pd_init failure for some clusters.
more detail info about pd_init failure, pls refer to the link:
https://lore.kernel.org/lkml/20230118044733.29391-1-bhuwz@163.com/T/
But the change patch cannot be submitted upstream due to differences in the
cpufreq code, the failure only appears on the aosp kernel.
Bug: 312392542
Change-Id: Ied4c72d73083d794ad6d8af1eb305be4fb382de3
Signed-off-by: vincent wang <vincentwang3@lenovo.com >
2023-11-27 18:37:02 +00:00
Biswarup Pal
2cecfa7378
FROMGIT: Input: uinput - allow injecting event times
...
Currently, uinput doesn't use the input_set_timestamp API, so any
event injected using uinput is not accurately timestamped in terms of
measuring when the actual event happened. Hence, call the
input_set_timestamp API from uinput in order to provide a more
accurate sense of time for the event. Propagate only the timestamps
which are a) positive, b) within a pre-defined offset (10 secs) from
the current time, and c) not in the future.
Bug: 271946580
Bug: 277040837
Change-Id: I928be61d0114b78e2098995ee49eeb0376bef2a3
(cherry picked from commit 3a2df60200https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git master)
Signed-off-by: Biswarup Pal <biswarupp@google.com >
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net >
Reviewed-by: Siarhei Vishniakou <svv@google.com >
Link: https://lore.kernel.org/r/20230427000152.1407471-1-biswarupp@google.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com >
(cherry picked from commit ee1f5fc55cc7bf1bca78edbb8a1f9d989d4ea03e)
2023-11-24 11:39:37 +00:00
Chungkai Mei
e9a7a2060a
ANDROID: Update the ABI symbol list
...
Adding the following symbols:
- __traceiter_android_rvh_update_load_sum
- __tracepoint_android_rvh_update_load_sum
Bug: 181105055
Change-Id: Ie70d640f252f40af86aff48bcf2d5cfd80485393
Signed-off-by: Chungkai Mei <chungkai@google.com >
2023-11-23 06:34:17 +00:00
Chungkai Mei
984523c368
ANDROID: sched: Add vendor hook for update_load_sum
...
vendor may have the need to modify update_load_sum function
Bug: 181105055
Change-Id: I35964977a4b8917c62773d48a37340f880774e38
Signed-off-by: Chungkai Mei <chungkai@google.com >
2023-11-23 06:34:17 +00:00
Mike Rapoport