Minchan Kim
05de9bcede
UPSTREAM: kernfs: prevent early freeing of root node
...
Marek reported the warning below.
=========================
WARNING: held lock freed!
5.16.0-rc2+ #10984 Not tainted
-------------------------
kworker/1:0/18 is freeing memory ffff00004034e200-ffff00004034e3ff,
with a lock still held there!
ffff00004034e348 (&root->kernfs_rwsem){++++}-{3:3}, at:
__kernfs_remove+0x310/0x37c
3 locks held by kworker/1:0/18:
#0 : ffff000040107938 ((wq_completion)cgroup_destroy){+.+.}-{0:0}, at:
process_one_work+0x1f0/0x6f0
#1 : ffff80000b55bdc0
((work_completion)(&(&css->destroy_rwork)->work)){+.+.}-{0:0}, at:
process_one_work+0x1f0/0x6f0
#2 : ffff00004034e348 (&root->kernfs_rwsem){++++}-{3:3}, at:
__kernfs_remove+0x310/0x37c
stack backtrace:
CPU: 1 PID: 18 Comm: kworker/1:0 Not tainted 5.16.0-rc2+ #10984
Hardware name: Raspberry Pi 4 Model B (DT)
Workqueue: cgroup_destroy css_free_rwork_fn
Call trace:
dump_backtrace+0x0/0x1ac
show_stack+0x18/0x24
dump_stack_lvl+0x8c/0xb8
dump_stack+0x18/0x34
debug_check_no_locks_freed+0x124/0x140
kfree+0xf0/0x3a4
kernfs_put+0x1f8/0x224
__kernfs_remove+0x1b8/0x37c
kernfs_destroy_root+0x38/0x50
css_free_rwork_fn+0x288/0x3d4
process_one_work+0x288/0x6f0
worker_thread+0x74/0x470
kthread+0x188/0x194
ret_from_fork+0x10/0x20
Since kernfs moves the kernfs_rwsem lock into root, it couldn't hold
the lock when the root node is tearing down. Thus, get the refcount
of root node.
Fixes: 393c371408m.szyprowski@samsung.com >
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com >
Acked-by: Tejun Heo <tj@kernel.org >
Signed-off-by: Minchan Kim <minchan@kernel.org >
Link: https://lore.kernel.org/r/20211201231648.1027165-1-minchan@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
(cherry picked from commit 555a0ce455surenb@google.com >
2024-01-31 12:33:54 -08:00
Minchan Kim
d8dbc91f9a
UPSTREAM: kernfs: switch global kernfs_rwsem lock to per-fs lock
...
The kernfs implementation has big lock granularity(kernfs_rwsem) so
every kernfs-based(e.g., sysfs, cgroup) fs are able to compete the
lock. It makes trouble for some cases to wait the global lock
for a long time even though they are totally independent contexts
each other.
A general example is process A goes under direct reclaim with holding
the lock when it accessed the file in sysfs and process B is waiting
the lock with exclusive mode and then process C is waiting the lock
until process B could finish the job after it gets the lock from
process A.
This patch switches the global kernfs_rwsem to per-fs lock, which
put the rwsem into kernfs_root.
Suggested-by: Tejun Heo <tj@kernel.org >
Acked-by: Tejun Heo <tj@kernel.org >
Signed-off-by: Minchan Kim <minchan@kernel.org >
Link: https://lore.kernel.org/r/20211118230008.2679780-1-minchan@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
(cherry picked from commit 393c371408surenb@google.com >
2024-01-31 12:33:54 -08:00
Greg Kroah-Hartman
73ba66a3c5
Reapply "perf: Disallow mis-matched inherited group reads"
...
This reverts commit 96e78d17ff3251e17ba5894ad194227c0a44adbb.
Keeps the ABI stable by taking advantage of a hole in the structure!
Bug: 307236803
Change-Id: Ic5f7ebeb3a9b13afdb3bfff7e54c4a93b863dab6
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com >
2024-01-31 02:02:04 +00:00
T.J. Mercier
076f9f28f5
FROMGIT: mm: memcg: don't periodically flush stats when memcg is disabled
...
The root memcg is onlined even when memcg is disabled. When it's onlined
a 2 second periodic stat flush is started, but no stat flushing is
required when memcg is disabled because there can be no child memcgs.
Most calls to flush memcg stats are avoided when memcg is disabled as a
result of the mem_cgroup_disabled check added in 7d7ef0a4686a ("mm: memcg:
restore subtree stats flushing"), but the periodic flushing started in
mem_cgroup_css_online is not. Skip it.
Link: https://lkml.kernel.org/r/20240126211927.1171338-1-tjmercier@google.com
Fixes: aa48e47e39tjmercier@google.com >
Acked-by: Shakeel Butt <shakeelb@google.com >
Acked-by: Johannes Weiner <hannes@cmpxchg.org >
Acked-by: Chris Li <chrisl@kernel.org >
Reported-by: Minchan Kim <minchan@google.com >
Cc: Michal Hocko <mhocko@kernel.org >
Cc: Muchun Song <muchun.song@linux.dev >
Cc: Roman Gushchin <roman.gushchin@linux.dev >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
(cherry picked from commit 7e9bccbe57812f888f51d46d7cdbc6327eee24f3
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git/
mm-unstable)
Signed-off-by: T.J. Mercier <tjmercier@google.com >
2024-01-30 20:40:26 +00:00
Amit Pundir
a330adce53
UPSTREAM: Revert "drm/bridge: lt9611uxc: Switch to devm MIPI-DSI helpers"
...
This reverts commit f53a045793amit.pundir@linaro.org >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Bug: 146449535
Change-Id: I4fdd0480c2df048a97dff263fc7da4016110c8f8
Signed-off-by: Amit Pundir <amit.pundir@linaro.org >
(cherry picked from commit 7aa33c99b5
2024-01-30 21:43:26 +05:30
Amit Pundir
ac7b9d215a
UPSTREAM: Revert "drm/bridge: lt9611uxc: Register and attach our DSI device at probe"
...
This reverts commit 29aba28ea1amit.pundir@linaro.org >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Bug: 146449535
Change-Id: I30de5ccc3baca99c876a213ca7884b2dbfed6926
Signed-off-by: Amit Pundir <amit.pundir@linaro.org >
(cherry picked from commit 4a8350a0ea
2024-01-30 21:43:16 +05:30
Amit Pundir
a9030727b0
UPSTREAM: Revert "drm/bridge: lt9611uxc: fix the race in the error path"
...
This reverts commit d0d01bb4a5amit.pundir@linaro.org >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Bug: 146449535
Change-Id: I2b14dacf44678ce65024092f5050ee735d39ea87
Signed-off-by: Amit Pundir <amit.pundir@linaro.org >
(cherry picked from commit e21817ce16
2024-01-30 21:42:53 +05:30
Kalesh Singh
d9ce9afcf1
ANDROID: mm: Fix VMA ref count after fast-mremap
...
Since the cmpxchg() to unlock the VMA (reset ref count from -1), is
enclosed in VM_BUG_ON_VMA() it gets compiled out in non-debug builds
(CONFIG_DEBUG_VM=n). This means that any VMA that underwent a fast-remap
will have it's refcount stuck at -1, making it not be eligible for
future speculative faults, and preventing freeing of the VMA.
Bug: 322411509
Change-Id: If5bf61c7d94268700f2c4f096d946201b68abdb8
Signed-off-by: Kalesh Singh <kaleshsingh@google.com >
2024-01-26 04:58:45 +00:00
James Tai
1982cd32ae
ANDROID: GKI: Remove CONFIG_MEDIA_CEC_RC
...
This config will cause the 'CtsHdmiCecHostTestCases' test case to fail.
According to the discussion in bug 309377116, it is recommended to remove this config.
Bug: 322143898
Change-Id: Ied37a6c55f4198dbb9dbb9b6c3156a8a7a0bd945
Signed-off-by: James Tai <james.tai@realtek.com >
2024-01-25 18:22:04 +00:00
Todd Kjos
270ce44fdb
Merge "Merge tag 'android14-5.15.144_r00' into branch 'android14-5.15'" into android14-5.15
2024-01-24 17:27:58 +00:00
John Stultz
9a196e8051
ANDROID: uid_sys_stats: Drop CONFIG_UID_SYS_STATS_DEBUG logic
...
It was pointed out that since commit b6115e140102 ("ANDROID:
uid_sys_stat: split the global lock uid_lock to the fine-grained locks
for each hlist in hash_table") taking a spin_lock in uid_lock()
causes a scheduling while atomic error if CONFIG_UID_SYS_STATS_DEBUG
is enabled, as get_full_task_comm() takes the mmap_write_lock()
which is a semaphore, breaking the proper ordering.
In the GKI CONFIG_UID_SYS_STATS_DEBUG is disabled, so this went
unnoticed.
The uid_sys_stats logic isn't ever going to go upstream (it depends
on reverting upstream logic) and will hopefully be replaced eventually.
So there's not much reason to drag around this debug logic that is
unused.
So drop it. Less code to schlep forward.
Bug: 320184870
Change-Id: I2cfce79d5a25a3eba11a5509444c07b4642ef2de
Signed-off-by: John Stultz <jstultz@google.com >
2024-01-23 17:07:00 +00:00
John Stultz
debd0f470b
ANDROID: uid_sys_stats: Fully initialize uid_entry_tmp value
...
Amit Pundir at Linaro reported seeing crashes in uid_sys_stats
driver when building with GCC.
Looking into it, it seems the uid_entry_tmp value is used
while only partially initialized, causing potential out of bound
access on the uid_entry io arrays.
This likely has gone unnoticed with clang as I believe we're
using the zero initialization for stack variables security
feature.
So change the logic to fully initialize the uid_entry_tmp
value.
Fixes: f68d4f3c3b53 ("ANDROID: uid_sys_stat: instead update_io_stats_uid_locked to update_io_stats_uid")
Reported-by: Amit Pundir <amit.pundir@linaro.org >
Signed-off-by: John Stultz <jstultz@google.com >
Change-Id: I78de245e80ef60aabec78a615c7ba582ab5a2242
2024-01-23 00:56:50 +00:00
Avichal Rakesh
cf1268f696
UPSTREAM: usb: gadget: uvc: Remove nested locking
...
When handling error status from uvcg_video_usb_req_queue,
uvc_video_complete currently calls uvcg_queue_cancel with
video->req_lock held. uvcg_queue_cancel internally locks
queue->irqlock, which nests queue->irqlock inside
video->req_lock. This isn't a functional bug at the
moment, but does open up possibilities for ABBA
deadlocks in the future.
This patch fixes the accidental nesting by dropping
video->req_lock before calling uvcg_queue_cancel.
Fixes: 6acba0345b68 ("usb:gadget:uvc Do not use worker thread to pump isoc usb requests")
Signed-off-by: Avichal Rakesh <arakesh@google.com >
Link: https://lore.kernel.org/r/20240104215009.2252452-2-arakesh@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Bug: 314338409
(cherry picked from commit 9866dc4314c6c858e451933f965d64532aec00a9)
Change-Id: I22c79314f6d3ca74c0d53e462a1bde26806d3ff2
Signed-off-by: Avichal Rakesh <arakesh@google.com >
2024-01-22 16:59:57 +00:00
Avichal Rakesh
c9395ddbaa
UPSTREAM: usb: gadget: uvc: Fix use are free during STREAMOFF
...
There is a path that may lead to freed memory being referenced,
causing kernel panics.
The kernel panic has the following stack trace:
Workqueue: uvcgadget uvcg_video_pump.c51fb85fece46625450f86adbf92c56c.cfi_jt
pstate: 60c00085 (nZCv daIf +PAN +UAO -TCO BTYPE=--)
pc : __list_del_entry_valid+0xc0/0xd4
lr : __list_del_entry_valid+0xc0/0xd4
Call trace:
__list_del_entry_valid+0xc0/0xd4
uvc_video_free_request+0x60/0x98
uvcg_video_pump+0x1cc/0x204
process_one_work+0x21c/0x4b8
worker_thread+0x29c/0x574
kthread+0x158/0x1b0
ret_from_fork+0x10/0x30
The root cause is that uvcg_video_usb_req_queue frees the uvc_request
if is_enabled is false and returns an error status. video_pump also
frees the associated request if uvcg_video_usb_req_queue returns an
error status, leading to double free and accessing garbage memory.
To fix the issue, this patch removes freeing logic from
uvcg_video_usb_req_queue, and lets the callers to the function handle
queueing errors as they see fit.
Fixes: 6acba0345b68 ("usb:gadget:uvc Do not use worker thread to pump isoc usb requests")
Tested-by: Avichal Rakesh <arakesh@google.com >
Signed-off-by: Avichal Rakesh <arakesh@google.com >
Link: https://lore.kernel.org/r/20240104215009.2252452-1-arakesh@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Bug: 314338409
(cherry picked from commit fe814b5b0f3042f1a583734497e726ee53783cc1)
Change-Id: Ieb5d969fdb23fd549bad88b4f1964128da844ca5
Signed-off-by: Avichal Rakesh <arakesh@google.com >
2024-01-22 16:59:55 +00:00
Paul Lawrence
7a71ed71fc
ANDROID: fuse-bpf: Fix the issue of abnormal lseek system calls
...
fuse_lseek_backing was returning the offset as an int, which would then
be treated as an ERR if in the range 4G-4096 and 4G.
Although the call would appear to work correctly, the file position
would be incorrect according to a subsequent fseek with SEEK_CUR.
Based on a change by chenyuwen <chenyuwen1@meizu.com > who found and
fixed this issue.
Bug: 319219307
Change-Id: I3aef5fb22751a72ce2bd7674ee081956a89fc752
Signed-off-by: chenyuwen <chenyuwen1@meizu.com >
Signed-off-by: Paul Lawrence <paullawrence@google.com >
2024-01-19 20:06:04 +00:00
Qais Yousef
da99db444b
ANDROID: Update the ABI symbol list
...
Adding the following symbols:
- drm_connector_attach_content_protection_property
- drm_hdcp_update_content_protection
- max_load_balance_interval
- register_kretprobe
- static_key_count
- sysctl_sched_min_granularity
- unregister_kretprobe
- usb_role_string
Bug: 269111781
Change-Id: I033015da82594cbbc7309bf816f3f93cc9cfbc7d
Signed-off-by: Qais Yousef <qyousef@google.com >
2024-01-19 04:24:50 +00:00
Qais Yousef
4f66f3be95
ANDROID: Export sysctl_sched_min_granularity
...
It is hidden behind inaccessible debugfs now.
Bug: 269111781
Change-Id: I826d6c8b8c9890bdf1990ae3ab44036c201eb471
Signed-off-by: Qais Yousef <qyousef@google.com >
2024-01-19 04:24:50 +00:00
Vincent Guittot
e32aeb03b9
UPSTREAM: sched/fair: Limit sched slice duration
...
In presence of a lot of small weight tasks like sched_idle tasks, normal
or high weight tasks can see their ideal runtime (sched_slice) to increase
to hundreds ms whereas it normally stays below sysctl_sched_latency.
2 normal tasks running on a CPU will have a max sched_slice of 12ms
(half of the sched_period). This means that they will make progress
every sysctl_sched_latency period.
If we now add 1000 idle tasks on the CPU, the sched_period becomes
3006 ms and the ideal runtime of the normal tasks becomes 609 ms.
It will even become 1500ms if the idle tasks belongs to an idle cgroup.
This means that the scheduler will look for picking another waiting task
after 609ms running time (1500ms respectively). The idle tasks change
significantly the way the 2 normal tasks interleave their running time
slot whereas they should have a small impact.
Such long sched_slice can delay significantly the release of resources
as the tasks can wait hundreds of ms before the next running slot just
because of idle tasks queued on the rq.
Cap the ideal_runtime to sysctl_sched_latency to make sure that tasks will
regularly make progress and will not be significantly impacted by
idle/background tasks queued on the rq.
Bug: 315185352
Bug: 269111781
Change-Id: I27f956ee275d17ef708d8d27dc082c66ed5a5275
Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org >
Signed-off-by: Ingo Molnar <mingo@kernel.org >
Tested-by: Dietmar Eggemann <dietmar.eggemann@arm.com >
Link: https://lore.kernel.org/r/20230113133613.257342-1-vincent.guittot@linaro.org
(cherry picked from commit 79ba1e607dqyousef@google.com >
2024-01-19 04:24:50 +00:00
Carlos Galo
b9e9a2c009
FROMGIT: mm: update mark_victim tracepoints fields
...
The current implementation of the mark_victim tracepoint provides only the
process ID (pid) of the victim process. This limitation poses challenges
for userspace tools that need additional information about the OOM victim.
The association between pid and the additional data may be lost after the
kill, making it difficult for userspace to correlate the OOM event with
the specific process.
In order to mitigate this limitation, add the following fields:
- UID
In Android each installed application has a unique UID. Including
the `uid` assists in correlating OOM events with specific apps.
- Process Name (comm)
Enables identification of the affected process.
- OOM Score
Allows userspace to get additional insights of the relative kill
priority of the OOM victim.
Link: https://lkml.kernel.org/r/20240111210539.636607-1-carlosgalo@google.com
Change-Id: Icc3ed013a9dfff9bb09f1d7588757e6028c17069
Signed-off-by: Carlos Galo <carlosgalo@google.com >
Cc: Steven Rostedt <rostedt@goodmis.org >
Cc: Suren Baghdasaryan <surenb@google.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
(cherry picked from commit 649ffb4cbb90a7f60f17dd74e57d814e762ea01d mm-unstable)
Bug: 315560026
Change-Id: I81fb6f3447f432100ad4cd25e22db23768003388
Signed-off-by: Carlos Galo <carlosgalo@google.com >
2024-01-19 00:26:45 +00:00
Rob Hueber
61d5f76a90
UPSTREAM: mmc: core: Do not force a retune before RPMB switch
...
Requesting a retune before switching to the RPMB partition has been
observed to cause CRC errors on the RPMB reads (-EILSEQ).
Since RPMB reads can not be retried, the clients would be directly
affected by the errors.
This commit disables the retune request prior to switching to the RPMB
partition: mmc_retune_pause() no longer triggers a retune before the
pause period begins.
This was verified with the sdhci-of-arasan driver (ZynqMP) configured
for HS200 using two separate eMMC cards (DG4064 and 064GB2). In both
cases, the error was easy to reproduce triggering every few tenths of
reads.
With this commit, systems that were utilizing OP-TEE to access RPMB
variables will experience an enhanced performance. Specifically, when
OP-TEE is configured to employ RPMB as a secure storage solution, it not
only writes the data but also the secure filesystem within the
partition. As a result, retrieving any variable involves multiple RPMB
reads, typically around five.
For context, on ZynqMP, each retune request consumed approximately
8ms. Consequently, reading any RPMB variable used to take at the very
minimum 40ms.
After droping the need to retune before switching to the RPMB partition,
this is no longer the case.
Bug: 317302967
Signed-off-by: Jorge Ramirez-Ortiz <jorge@foundries.io >
Acked-by: Avri Altman <avri.altman@wdc.com >
Acked-by: Adrian Hunter <adrian.hunter@intel.com >
Link: https://lore.kernel.org/r/20240103112911.2954632-1-jorge@foundries.io
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org >
(cherry picked from commit 67380251e8bbd3302c64fea07f95c31971b91c22)
Change-Id: I395b555ab74e203ce20b1cd234b18b0054a2e312
Signed-off-by: Rob Hueber <rhueber@google.com >
2024-01-19 00:24:11 +00:00
Yabin Cui
d85e6cb679
ANDROID: GKI: add symbol list for etm driver
...
Bug: 256184860
Change-Id: Ie31448124d941f1906e72207c0bf8088e99cff05
Signed-off-by: Yabin Cui <yabinc@google.com >
2024-01-18 00:05:21 +00:00
Yabin Cui
eb31cad2df
UPSTREAM: coresight: tmc: Don't enable TMC when it's not ready.
...
If TMC ETR is enabled without being ready, in later use we may
see AXI bus errors caused by accessing invalid addresses.
Bug: 256184860
Change-Id: I9c0b8c7af63a2e2e7469a8537bc721ec6ae6679c
Signed-off-by: Yabin Cui <yabinc@google.com >
[ Tweak error message ]
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com >
Link: https://lore.kernel.org/r/20230127231001.1920947-1-yabinc@google.com
(cherry picked from commit 669c461423
2024-01-16 14:41:06 -08:00
Pablo Neira Ayuso
57ddb1ecd7
UPSTREAM: netfilter: nf_tables: bail out on mismatching dynset and set expressions
...
[ Upstream commit 3701cd390fd731ee7ae8b8006246c8db82c72bea ]
If dynset expressions provided by userspace is larger than the declared
set expressions, then bail out.
Bug: 316085841
Fixes: 48b0ae046ehdthky0@gmail.com >
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org >
Signed-off-by: Sasha Levin <sashal@kernel.org >
(cherry picked from commit cf5f113c41joneslee@google.com >
Change-Id: I4bd3f7e9148d4bc12bbc67ecdd605c2957eb8010
2024-01-15 14:15:19 +00:00
Greg Kroah-Hartman
f26b6b0390
Merge tag 'android14-5.15.144_r00' into branch 'android14-5.15'
...
This merges the commits up to 5.15.144 LTS into the android14-5.15
branch. Included in here are the following commits:
* 39420ad9b4856eb60eab3355035c72caae297a7b1d146b18754c11798482aa3cc80e8e07ba21627efa5f992dcf4624f5f298410c05b60c93e765523b529f020f7bb8d59ea203fb63b1f994e9587314fd8ed7d2800f547937457f97e70d6698f94942885e8175dad2adc2134ed5321bc91916e81a4da77ef65a954998437b427d8cb727714a22a111c17f4276ca15561c990a3f27d9ad41759fab269f093e15fa61fc877f7c23b08531d87020385efff891bbf13a8758b0532fd38288af6f252c2a47958146f7a880b7d82e5dbe46412b2fb1fe13b6a6dd6f709907ea4f4a9fc6b02d099b274e0239375ecbd6df72b2f545f53ca306f21b7610d53a142864025b87ac25e8de73f41fd66f3b49a41590715e0a4c444339f3aaa5ab70a9c58eec2dcc4babb40550ad5d4522570239082715bde2b48f9480d3b174db0c3f1f6a94d83bb41dc361db400b1f8be0676d37bb86f50bb2a4af7a7721663c4dcfbff1fe779dbb42e16f961f8bd525bbd9dd4ec0e0e65b173fc3212c9846d8c8c377443956e6d37f44beefa69d8ee03cfd0d9b1674d9a9d8effd49e0fcb5225b77f41fb73d4ad03bf1404ce6ee69ca75274b17f5494d96bc64f66ea8bd605935985963d0d92b34d0ce536133f74b382205d0fc081c622eba64dcbf97a9a7cf7fe5071ae7d8d2bafe84ddc7a0a265181ed694fec5a71b6a615272bdf3445015a808878619e1052646e5731380b717c2ed9a998718c0ab949bf8bc456f87ac2704129402252ddae24f2b219f742ecc1b1c86240d91ecf7a0cab502091c77c287324df6ecdaebc7597ce900f8c6dc824aed5240811e64d6ddbd6276d125aaa6b7222bbdab9ac2cb57dc52117cd77aed508668e65128616fbcedd497b3c5a09d1631c755e7cdac9234835fcc5a9cbf824240a36f08a10ccca12b7d271b5630634511b3650e192352bd4b318a20663361b68b60891665a875addca1bfdb40d052b5ade2e37aa92644d849cf64c5d91fb1b7b7d08a96e5ffc86b76896fe733a6f844fb0219bf969e41d92e28ac3ccec33b762b0d529cfd85766c7c4bbf011bd6e5571507a1f82e39f75cea3291cb9009f9d1fbaf7e765ec2f1f5311389264a52acc910940a7bcd4f6e2f71188f976eb17307cb2034c02f800aabe1ed48987eef556daed3710c2ea7438af18a21980df00511a9c56eb7b24a7ffc9d2854cc251d31ea4df89deab0c35e8ef49679a20b21a39bf16cef8ca191855b4334687df9d0d06400e54da50b59cab0ae487f0460db1b18556be80b583dec140df78b8b7f5b754797722401c13d8a95d3d254e63e30d4881a755299bca8c681b0c3d2820d4e0afdd638bae9cda89de311e5d1cf5f113c41219c6b55844fe599a7cda5c2f9f7f8c8aca57e2304022c185e246bc719efb14d6d404c6113cba29fe047a1fc1275c53a4c43789fed5702a24071448e45171e5eb7401d9bab515b9bf02f1c0a53ed0b00a63780134700beca907a89c619b1b6f258a0bed351e7868e5da239affd939008af83ef29783a17a30f06d9bd2e5dd9a481da450f8c95a5f277c14b6d36ede14746e8aed5133fbfac5cc5a694e5ed1620c5ab980acfd188dcb9db8bb930c3a189a057818d6fcbcc6c8eef93d8853185771dd52ff136d211bae678cdb6e08a1d809b054d9bd1b1086ed02493ef0249024aa48912dbddb268156ce2529807860f6a7960f2cf43cfd842b71df0b6880658bb08df40d415b4158c87db78835b68711ee151a381952f82e3fa0a570d840d38d659a9f3db01e4d0b4329a3a93b60187f610072c17d4001e9973aea20a6b5321dca4515a2f5b2ba0a8330d5823191fb224681e92e5975094178366625069282587d8fe1454260f14839af4884b8af4499f0fc18454f0e0900bf95654e9c4a00c47a164c27b7b23e704db8ea6bec3ae293869732d215102caa78cbc8428011818a8604a90e1875eeda48147693835ed36b98806d20ffd9d356ea480eb262b2e931b3306f0d0522234d48f9008e80c7fa41e3ec986cb72eb9a2590b40061a982f9a55fe4d965024ed5ad0522a7579368478dfdd6038e129984dc9b85afaefa95ceec8231999edc0635984438293822b20f71c80994a8600a0de7ef5ffab6b410f8d0719b91d36ba3313a34d1c049ae2e4e8eeb17fb4b1698f0e9b6271a3dcb1d81a22702a8181134fde92064830d04159611cbc6a1a8d80b1fbade8c6fce8ddd0cc4b69fa912742d84137660f844f7077ce8d91eed010921d181a7a1d597683466e238419210186062c527d035b5d86e432bb75a2c346f09318fd972ecb9753ce09ba90f1a0f05021e93f95e9f7afe3f3880fc01e33eb49975859893f619048e7f38b3580b9dd6ab66bc78a295b1995ba626edec12712ae82d05cf5c612edd4888ceb5276d8cf001e6f6269fb81ca7aa8ef9b32f206ddaca6b2061747778a80274728899e26c6febacb5d50c6a6084ebfbed3a6aeac88a45293acba841b3874cc25ae949dbc28c01a8b94726fcc4a03ad390072af9ef66c023469bba81c5228e364406d4c152badc06b1221be624a5b0c835fd7d9754a498aabe41c0c4a6f163a6d17a608de3a58718bd108a139fe5718d3fc8a49336e1ac239fccf58ab21f766f32edfbff66483e9067b55452f4e5b7477db4af14f1033c508197d68eeaacbb657d6d5ea78d278e01947c9e12dd5a434d5c38cbc7c29dff1dcf90c9fa3d7912710e595b051c83a2a6e97c4be380992c474ff985b881ea0c4d5ec59ce842d776ce19c20064ac45d8e34b8f9842c4b98798d3b2728a3bb38bfdd5c380149b6ad3d8594de0376cf0698f733387d1841fc648fb4c9c43f79a72bf271c5a468e3ebf470387978fda070b3ccb9bcd0e9f475a114c9d732c6c8aeeb2c5cdeb0a4cf37d62570f75d0d831e7d66003733c8fe4088d7d8f12055238d0336e6db5c1d8cb287d31656262cb0facca20cc16019b7d42a4c6e89348fd132670ae9f223196b50606d320ca17ddec3d04f8ad0b74d0f3b3e993de40b99ac20612aaf0a07d601c701423bb36a573b325c4976160a0603e77e9e8e9bb966c50cf642ee64163e09cdfe90c49e74e956f26b6a61b450fa8bf80cc549ba50b767c98877109022ae66268574fe2e4ea7593c18f2c9092e8b2da754f92fc5ba77b6b45e0a70ed4a57383675abacc7efd1054d3c6a08c2ba466808812792a7960859b59fc312245bb94aab891659b77e9534790fde8f6237afabc931aa7154b7a3424c3b747f5098321f13e1ea45628436d80926ce63598a1e90efe17fc0d9506c76696fc7a50a2e0d394df98f4f1266716c407ff72fbbc8a14e3c63a51e6b4da426e718ce9e9d84413b15ff849948c4584a421a64049576c63628e76e6846eb8c191e30b99626b2871f5344f4757dbc0eb8a87a30633b5ebaee06a72057d1034d0541b3757fdb156f62f19f887967210467864d55bef34a97bb936adb6204c090b167b2c18640a18184d17b54c9b936c9c10ef8b24bb54bf5619c34d3ca6c3a1fe0901975bee0acfd543c108730e08cb91fa0b93a3de92e6c0f00de29c095f1a5eb6519f481c49ef7041fe6b461c373a2adf48d8be079aa71a6ba3569f786a33b581003c5aede46c403470431bba115f6c3a2771fac4387e450cc9ad1566e8be7335c17257ef5db146322bc540284d845212d586e7ba179cc121b7847653a292d38b87e88d0baec78e76545c0e88eb888caf274cb3842967188594c64a921c962158efd194800b074fee1869b8effd31a84968c2aa6a8d725bf0d121accf14910045c1ff7a5bcce23f387574b5e65e55553c5b5351655fd357a990dd741039f95b1d0dc0f37a37156974fd92d5f3c4a70442931e9e8e30b8b514b2a625da0f5821a48f6be5bd7d3901bf3b75bcfc188a0b480c654e097588e20cf9269b274c53064e8239cda210a4bdb67d16b2378531a4194e9ae82308d1359c65daf6406be003d6cfc131b078070581829ca3c65cf785e671d82037bb0f14257c1d8f66d4064b3b2541d41f64cad3ac6c71b9b177427165421cbe1ceb8b7cbb9bcf47fbde634368e0870f438acabe020f658c194454afa6319ed0cba1809684f5b346d6b76807a7032d4d6416e78f285120c2ca9abb9894c58c1748fef664d7670b3e902fa7ee519e807054366cd0e48a5e78d00835e7f29638ada2f304610244988f4e497f1acd5e0b788fb9ae6bcafe1fd01b0ad79e03ce0655bf5bfda356e916631907d009cd8b561a39c71357e672775cad7ff7f3bdb225d23ad76f24e6fbad3cc8a18be976be2cc5e191d66c80f489122ff61106d6c86a3007a63453f945af0a93a0f99a03dbd6a9eaa9a0b34448fe511d244156d78b549537a51e7f36f05ae00106631a96e9eb1c805b9cd28d25ec69f864f062baf2da3da5e1e61f74d336995f148b1697e1d1f79b19f0bfc8a5565904dee707546c1796adbc443a199f9f2082067c428cad17f5174f62a0aa3f7a400d5e300589d551eaa03ea36684c923d8982381f6b628c11cf5e117a237675aa1acdb6830de829ce8e995689b33b94f22260dabcfd4f2c09d4624b17d530c3a3a6dc9a37d43cdd22ceea81424c5812886866bba70887698f9de14bde5a43cf6acf06f42bd243319ab5fd264f3be63f7a802a0547b8dcf353904a8c29a89b23f21a0f310a93073e38086e8e55fa444f9d3ba62e80a5b512d52465b88c087fd0df3f871e89d0ed45a16ec5b05fb611f83ca0e7e088094c899e8e6c9c4cfaf15fcaf2a910f4af53443337acdf9f5e8cecb824829c2c6560680f7458e4b510fe9364858218130959f9f459cf044cc36705e5a28ec0ca05fae271652f57f02d28c17abe0f30567fcbc38f5ac54b9fd01115b03b801487109d8d94d6b3b5ea06a23f8884606f828a62af7146d866606826f2d117ac1b895a99ac11270ef755f120dad0e75d6c340713bdfd1b7e6562af60297ef59794d360b1d8943083bbb3907b89cd1a1a485e45d352887b3ed303766bb92741e4c15d7895ac9a21fdb64ddddee004d400253a0beda1847980be4c3b0d17269fb91db89f551b751c94256a8d3937f9e259d060f2fc424e9df588e24e73ab542b3eaa0d43c20bd0198bed48fe8d981855d6fb2cc0d456ebaad924e8d0b7676b0eab987c9c4dab06a92c9ef1564516235e7b3945dc61d78bce31a2bcb1308e55eb0863a9c3fde01f62c6bd2dfebea711472f8fa6c4b168697f15aa61c3c647f732aa0cb262941a29fe958e8316b20fcaafb574fc956be5641ca46d7ce1fb77f7c025ee9f598a5cc8c4504cc0cca0aae3837206a972511893eedf596aec3706971c9a4f13c5863a99d7b572742c860e094eb5423d78890d4d5f2a2ae48bd820dd34a7ad393e4aa8545cd1c2df64d99893b7c455f2f3860251f80041c58d3b196a1da6885e5ffa0b0c25e957fd06dc0f99f086cd44204a0f1999090904fc010379f8db02d302de683e27e611260e36f922b2693b9001f90cd9dc24a3c9e37012d0c66f91ce09238e862df66b72661f25d468666eb7b7f236563e0f79dd4ad0c1a83b79c7d684ca5c83c8043a8607725b2b01b9dc5482d2300fcf88bc9c944741abd658492cf7abb54f88704bf18a8bdb0428aa2b0ffdc1643995ee1e84e19b8098f73a8ab88f84bddc0df81ee12d9de01c0690b8925592a4cce4168eb9daf4780541640dcbf0e1e88bba24067d39f3ca6a6f70aedaea6f32a43e588ca45bfa00a293d57d0d01bb4a529aba28ea1f53a045793517a5137a5865ccd4ca68e3c8253b3e11e339faa30cb99e0961cd4ae681ac13591b859d78bddd94b5cc2bc519a42071feab7d9217286d0cc3057958cef4a40953c3580b8a01352541851a8a20d6ecd26347f025a02b163b371d79a96bed1df1b0bc99cf3b3e7eb23a6e0bf076b73c57e81d5e52ca4e461a2f75e11f54dd1175cf4bde964d21dc0c4070ada5d3aefc6fcfbca6d565a23533ca5153ae531e4e737761c2a690d1c37faca0928b72fba1ec4bffed2e59b5e9d8bf9f45fff806e7ff8ca9bee26206c858d1966bf2a797ece2efa87e2239f71657d416973cd608ebb098b8861b2925a76e8f00f5456c4bb46a50881d24cf5b64683f5d7b13e8b38be8fafac40733eedc19a9d359bce81b86b413d52f632aaa3b9870e3ad00be4a8ebe549e0627a3b3f5c0d91506a404f6e904ed45d7bec7ae4e143a3c82d3a8f4e58e1bfd4ed498880986257d2826120c9ba28e9e01591ada4dc4788d4eb4182a82027e741503f7cb7c47cca7b6fa9e6227709a0e4eab5b0aa5075336a762577b2ab5cd1064b32f18d1afbb9ececebcbf5f5e056e7424c6e3e51efcb29dc3fef310770f032db85a2d540c7458f7eef3a133eefb2fbf4ab91992ec47027423736379b120e4f81b8638e4ec7e8c7452e0b5da8ce0f90b263db85f0d6e58411565f9337b62bb46b208220195f87db13cde955e5cc6198ff2073a5f48c6602ca2ae2af22ca9d61fa1202da82c026f1dc8dc680529b49683d8344a7c4f049c0c00328b8ad8cce44c4dfac3fd541ccb34d60debc01fc1f5649aed53fe3cc63c7a5b6390fd6738fe41b64ff6059c3d281a4dd5e6ce25197747fe5f53a68a57c4855b22ac48aae53856628c3627cb6c3c7786e9015169f00d72ff64783e163ad6a86b4e78ea2662fc6f33725f8c3bd211c615c4dd6406627b96851f0f998648878c939a88751cc28ce74bbc9261993db4416ea3ad48b2e8189e39440c326aade33d3d9fa32e21c05dfcbb983eb64ae128b0927a0bed12894524980ee2de328398b962a3d3d73393966e79b59e629fc71738a3adc7cafef8af919abc62fc06d4bdde4dca039d2c10367c57aef9075eb99b6e2045e78ebe7c165fd21aa38d4c8bf5635a82e0fda8abfd4a664dd2e76b4f6215c0da71871389190b25437ffa428d5f031e15d0bf2c3a3aa6f7a992726f79e78e7709fd3201c7180897b56acf177db87c4a48b424bdf6cc1eeb494f67c76b7db55c60671502d27dd09f5ecc27ca4aebb21b07a2e606efd4980090c2948118c6e22bf6f00e0f95b831bc4957f00f9cdc57093b4e97d374a252766a8721048b58f7469cb65e69276eace761f3570322a446e3c1312b5d44e14f2d588bdfa4fa758d5c175f4cec0dad0c092852fb4ce4283cfa3b51ae0f9231ccdff42b0a5566fa3b9f94776873f2ead6afd112c3f46cd35e4e749529413ea66755494632634219053bc0c4bc119c532c5df016afb294c889d7b38384204dbfa41220d587b86cd8860f0175e762c251c7f1e02df6f6915a8cac3c243bd431a5d556b68d9b9c4071c61143a6cee2bfbfbc9a8718f862a356bc941bb770e42f2ac8b264390918ef995fd2b2dab6f68342755b90f482ad7b151b054f6fecb34f4e79e4a9eba4997gregkh@google.com >
2024-01-12 18:41:02 +00:00
Wesley Cheng
a4da62d21c
FROMGIT: usb: dwc3: gadget: Handle EP0 request dequeuing properly
...
Current EP0 dequeue path will share the same as other EPs. However, there
are some special considerations that need to be made for EP0 transfers:
- EP0 transfers never transition into the started_list
- EP0 only has one active request at a time
In case there is a vendor specific control message for a function over USB
FFS, then there is no guarantee on the timeline which the DATA/STATUS stage
is responded to. While this occurs, any attempt to end transfers on
non-control EPs will end up having the DWC3_EP_DELAY_STOP flag set, and
defer issuing of the end transfer command. If the USB FFS application
decides to timeout the control transfer, or if USB FFS AIO path exits, the
USB FFS driver will issue a call to usb_ep_dequeue() for the ep0 request.
In case of the AIO exit path, the AIO FS blocks until all pending USB
requests utilizing the AIO path is completed. However, since the dequeue
of ep0 req does not happen properly, all non-control EPs with the
DWC3_EP_DELAY_STOP flag set will not be handled, and the AIO exit path will
be stuck waiting for the USB FFS data endpoints to receive a completion
callback.
Fix is to utilize dwc3_ep0_reset_state() in the dequeue API to ensure EP0
is brought back to the SETUP state, and ensures that any deferred end
transfer commands are handled. This also will end any active transfers
on EP0, compared to the previous implementation which directly called
giveback only.
Fixes: fcd2def663Thinh.Nguyen@synopsys.com >
Signed-off-by: Wesley Cheng <quic_wcheng@quicinc.com >
Bug: 318577849
Change-Id: Ic00684db4b502f1aab128f7e49f22510dda24f60
(cherry picked from commit 730e12fbec53ab59dd807d981a204258a4cfb29a https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb-testing)
Signed-off-by: Wesley Cheng <quic_wcheng@quicinc.com >
(cherry picked from commit d6554d1262
2024-01-12 15:17:11 +00:00
Wesley Cheng
0d3c49180f
UPSTREAM: usb: dwc3: gadget: Refactor EP0 forced stall/restart into a separate API
...
Several sequences utilize the same routine for forcing the control endpoint
back into the SETUP phase. This is required, because those operations need
to ensure that EP0 is back in the default state.
Acked-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com >
Signed-off-by: Wesley Cheng <quic_wcheng@quicinc.com >
Link: https://lore.kernel.org/r/20230420212759.29429-3-quic_wcheng@quicinc.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Bug: 318577849
Change-Id: I10fb6823ad50abeb4efa70ffa2037e85725d20f7
(cherry picked from commit 8f40fc0808quic_wcheng@quicinc.com >
2024-01-12 15:17:11 +00:00
Wesley Cheng
154a4394d0
UPSTREAM: usb: dwc3: gadget: Execute gadget stop after halting the controller
...
Do not call gadget stop until the poll for controller halt is
completed. DEVTEN is cleared as part of gadget stop, so the intention to
allow ep0 events to continue while waiting for controller halt is not
happening.
Fixes: c96683798estable@vger.kernel.org
Acked-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com >
Signed-off-by: Wesley Cheng <quic_wcheng@quicinc.com >
Link: https://lore.kernel.org/r/20230420212759.29429-2-quic_wcheng@quicinc.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Bug: 318577849
Change-Id: I9c72fdd08b44a200505f8e4a91ba8c42338753ca
(cherry picked from commit 39674be56fquic_wcheng@quicinc.com >
2024-01-12 15:17:11 +00:00
Wesley Cheng
0b1767af48
BACKPORT: usb: dwc3: gadget: Stall and restart EP0 if host is unresponsive
...
It was observed that there are hosts that may complete pending SETUP
transactions before the stop active transfers and controller halt occurs,
leading to lingering endxfer commands on DEPs on subsequent pullup/gadget
start iterations.
dwc3_gadget_ep_disable name=ep8in flags=0x3009 direction=1
dwc3_gadget_ep_disable name=ep4in flags=1 direction=1
dwc3_gadget_ep_disable name=ep3out flags=1 direction=0
usb_gadget_disconnect deactivated=0 connected=0 ret=0
The sequence shows that the USB gadget disconnect (dwc3_gadget_pullup(0))
routine completed successfully, allowing for the USB gadget to proceed with
a USB gadget connect. However, if this occurs the system runs into an
issue where:
BUG: spinlock already unlocked on CPU
spin_bug+0x0
dwc3_remove_requests+0x278
dwc3_ep0_out_start+0xb0
__dwc3_gadget_start+0x25c
This is due to the pending endxfers, leading to gadget start (w/o lock
held) to execute the remove requests, which will unlock the dwc3
spinlock as part of giveback.
To mitigate this, resolve the pending endxfers on the pullup disable
path by re-locating the SETUP phase check after stop active transfers, since
that is where the DWC3_EP_DELAY_STOP is potentially set. This also allows
for handling of a host that may be unresponsive by using the completion
timeout to trigger the stall and restart for EP0.
Fixes: c96683798estable@vger.kernel.org
Acked-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com >
Signed-off-by: Wesley Cheng <quic_wcheng@quicinc.com >
Link: https://lore.kernel.org/r/20230413195742.11821-2-quic_wcheng@quicinc.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Bug: 318577849
Change-Id: I174da4d23e40fa4f13bc17582b09b6d76e5a35c0
(cherry picked from commit 02435a739bquic_wcheng@quicinc.com >
2024-01-12 15:17:11 +00:00
Wesley Cheng
b68fafef56
UPSTREAM: usb: dwc3: gadget: Submit endxfer command if delayed during disconnect
...
During a cable disconnect sequence, if ep0state is not in the SETUP phase,
then nothing will trigger any pending end transfer commands. Force
stopping of any pending SETUP transaction, and move back to the SETUP
phase.
Reviewed-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com >
Signed-off-by: Wesley Cheng <quic_wcheng@quicinc.com >
Link: https://lore.kernel.org/r/20220901193625.8727-6-quic_wcheng@quicinc.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Bug: 318577849
Change-Id: I7845e7730e48b0e6de5e2a428c6e6c310602771a
(cherry picked from commit 8422b769faquic_wcheng@quicinc.com >
2024-01-12 15:17:11 +00:00
Thinh Nguyen
02524b7519
UPSTREAM: usb: dwc3: ep0: Don't prepare beyond Setup stage
...
Since we can't guarantee that the host won't send new Setup packet
before going through the device-initiated disconnect, don't prepare
beyond the Setup stage and keep the device in EP0_SETUP_PHASE. This
ensures that the device-initated disconnect sequence can go through
gracefully. Note that the controller won't service the End Transfer
command if it can't DMA out the Setup packet.
Signed-off-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com >
Link: https://lore.kernel.org/r/6bacec56ecabb2c6e49a09cedfcac281fdc97de0.1650593829.git.Thinh.Nguyen@synopsys.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Signed-off-by: Wesley Cheng <quic_wcheng@quicinc.com >
Bug: 318577849
Change-Id: I490626f51ba79b94894995c5acf8bc81f649091f
(cherry picked from commit c96683798equic_wcheng@quicinc.com >
2024-01-12 15:17:11 +00:00
Charan Teja Kalla
149320568d
ANDROID: arm64: mm: perform clean & invalidation in __dma_map_area
...
commit c50f11c619c50f11c619quic_charante@quicinc.com >
Signed-off-by: Shiraz Hashim <quic_shashim@quicinc.com >
Signed-off-by: Prakash Gupta <quic_guptap@quicinc.com >
Signed-off-by: Pavankumar Kondeti <quic_pkondeti@quicinc.com >
(cherry picked from commit 8022d8faf64fbf1efba1f134fedc0eba758cdfd0)
2024-01-12 04:12:39 +00:00
qinglin.li
d0cdb904f9
ANDROID: GKI: Update symbol list for Amlogic
...
1 function symbol(s) added
'unsigned long long task_sched_runtime(struct task_struct*)'
Bug: 319333881
Change-Id: I2ce1c2948ee5acf904c672249f8c22066ea96379
Signed-off-by: Qinglin Li <qinglin.li@amlogic.com >
2024-01-10 18:06:43 +00:00
Coly Li
a95b355479
UPSTREAM: bcache: move uapi header bcache.h to bcache code directory
...
The header file include/uapi/linux/bcache.h is not really a user space
API heaer. This file defines the ondisk format of bcache internal meta
data but no one includes it from user space, bcache-tools has its own
copy of this header with minor modification.
Therefore, this patch moves include/uapi/linux/bcache.h to bcache code
directory as drivers/md/bcache/bcache_ondisk.h.
Suggested-by: Arnd Bergmann <arnd@kernel.org >
Suggested-by: Christoph Hellwig <hch@lst.de >
Signed-off-by: Coly Li <colyli@suse.de >
Link: https://lore.kernel.org/r/20211029060930.119923-2-colyli@suse.de
Signed-off-by: Jens Axboe <axboe@kernel.dk >
(cherry picked from commit cf2197ca4bgregkh@google.com >
Change-Id: Idb88d748a0cd11708a07ae7ad21ed76ede14b3c3
2024-01-10 10:42:31 +01:00
Pablo Neira Ayuso
6246b8f3ef
UPSTREAM: netfilter: nf_tables: skip set commit for deleted/destroyed sets
...
commit 7315dc1e122c85ffdfc8defffbb8f8b616c2eb1a upstream.
NFT_MSG_DELSET deactivates all elements in the set, skip
set->ops->commit() to avoid the unnecessary clone (for the pipapo case)
as well as the sync GC cycle, which could deactivate again expired
elements in such set.
Bug: 318548348
Fixes: 5f68718b34kevinrich1337@gmail.com >
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
(cherry picked from commit 0105571f80joneslee@google.com >
Change-Id: Ie733688e27d9568d797fc1bc477261883b7dc8c1
2024-01-09 16:26:01 +00:00
Quentin Perret
6048991845
ANDROID: KVM: arm64: Avoid BUG-ing from the host abort path
...
Under certain circumstances __get_fault_info() may resolve the faulting
address using the AT instruction. Given that this is being done outside
of the host lock critical section, it is racy and the resolution via AT
may fail. We currently BUG() in this situation, which is obviously less
than ideal. Moving the address resolution to the critical section may
have a performance impact, so let's keep it where it is, but bail out
and return to the host to try a second time.
Bug: 311830307
Change-Id: I26d61b04a4ccf040bd31802abb3c6b998ff4a48b
Signed-off-by: Quentin Perret <qperret@google.com >
2024-01-09 16:00:03 +00:00
erinwang
38cb0b1181
ANDROID: GKI: Update symbol list for lenovo
...
2 function symbol(s) added
'int mmc_app_cmd(struct mmc_host*, struct mmc_card*)'
'int sdhci_execute_tuning(struct mmc_host*, u32)'
Bug: 318326524
Change-Id: I0bbd724aacb7ffa43636c142bd3be01448e8f9b1
Signed-off-by: erinwang <erinwang2@lenovo.com >
2024-01-09 08:12:53 +00:00
Carlos Llamas
3cd672870a
ANDROID: binder: fix KMI-break due to alloc->lock
...
Wrap 'struct binder_proc' inside 'struct binder_proc_wrap' to add the
alloc->lock equivalent without breaking the KMI. Also, add convenient
apis to access/modify this new spinlock.
Without this patch, the following KMI issues show up:
type 'struct binder_proc' changed
byte size changed from 616 to 576
type 'struct binder_alloc' changed
byte size changed from 152 to 112
member 'spinlock_t lock' was added
member 'struct mutex mutex' was removed
Bug: 254650075
Change-Id: Ic31dc39fb82800a3e47be10a7873cd210f7b60be
Signed-off-by: Carlos Llamas <cmllamas@google.com >
2024-01-09 01:15:49 +00:00
Carlos Llamas
63f7ddea2e
ANDROID: binder: fix KMI-break due to address type change
...
In commit ("binder: keep vma addresses type as unsigned long") the vma
address type in 'struct binder_alloc' and 'struct binder_buffer' is
changed from 'void __user *' to 'unsigned long'.
This triggers the following KMI issues:
type 'struct binder_buffer' changed
member changed from 'void* user_data' to 'unsigned long user_data'
type changed from 'void*' to 'unsigned long'
type 'struct binder_alloc' changed
member changed from 'void* buffer' to 'unsigned long buffer'
type changed from 'void*' to 'unsigned long'
This offending commit is being backported as part of a larger patchset
from upstream in [1]. Lets fix these issues by doing a partial revert
that restores the original types and casts to an integer type where
necessary.
Note this approach is preferred over dropping the single KMI-breaking
patch from the backport, as this would have created non-trivial merge
conflicts in the subsequent cherry-picks.
Bug: 254650075
Link: https://lore.kernel.org/all/20231201172212.1813387-1-cmllamas@google.com/ [1]
Change-Id: Ief9de717d0f34642f5954ffa2e306075a5b4e02e
Signed-off-by: Carlos Llamas <cmllamas@google.com >
2024-01-09 01:15:49 +00:00
Carlos Llamas
74ecd99c15
BACKPORT: FROMGIT: binder: switch alloc->mutex to spinlock_t
...
The alloc->mutex is a highly contended lock that causes performance
issues on Android devices. When a low-priority task is given this lock
and it sleeps, it becomes difficult for the task to wake up and complete
its work. This delays other tasks that are also waiting on the mutex.
The problem gets worse when there is memory pressure in the system,
because this increases the contention on the alloc->mutex while the
shrinker reclaims binder pages.
Switching to a spinlock helps to keep the waiters running and avoids the
overhead of waking up tasks. This significantly improves the transaction
latency when the problematic scenario occurs.
The performance impact of this patchset was measured by stress-testing
the binder alloc contention. In this test, several clients of different
priorities send thousands of transactions of different sizes to a single
server. In parallel, pages get reclaimed using the shinker's debugfs.
The test was run on a Pixel 8, Pixel 6 and qemu machine. The results
were similar on all three devices:
after:
| sched | prio | average | max | min |
|--------+------+---------+-----------+---------|
| fifo | 99 | 0.135ms | 1.197ms | 0.022ms |
| fifo | 01 | 0.136ms | 5.232ms | 0.018ms |
| other | -20 | 0.180ms | 7.403ms | 0.019ms |
| other | 19 | 0.241ms | 58.094ms | 0.018ms |
before:
| sched | prio | average | max | min |
|--------+------+---------+-----------+---------|
| fifo | 99 | 0.350ms | 248.730ms | 0.020ms |
| fifo | 01 | 0.357ms | 248.817ms | 0.024ms |
| other | -20 | 0.399ms | 249.906ms | 0.020ms |
| other | 19 | 0.477ms | 297.756ms | 0.022ms |
The key metrics above are the average and max latencies (wall time).
These improvements should roughly translate to p95-p99 latencies on real
workloads. The response time is up to 200x faster in these scenarios and
there is no penalty in the regular path.
Note that it is only possible to convert this lock after a series of
changes made by previous patches. These mainly include refactoring the
sections that might_sleep() and changing the locking order with the
mmap_lock amongst others.
Reviewed-by: Alice Ryhl <aliceryhl@google.com >
Signed-off-by: Carlos Llamas <cmllamas@google.com >
Link: https://lore.kernel.org/r/20231201172212.1813387-29-cmllamas@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Bug: 254650075
(cherry picked from commit 7710e2cca32e7f3958480e8bd44f50e29d0c2509
https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
char-misc-next)
Change-Id: I67121be071d5f072ac0e5eb719c95c0f1dee5eb5
[cmllamas: fixed conflicts due to missing e66b77e505cmllamas@google.com >
2024-01-09 01:15:49 +00:00
Carlos Llamas
5a8658eac3
BACKPORT: FROMGIT: binder: reverse locking order in shrinker callback
...
The locking order currently requires the alloc->mutex to be acquired
first followed by the mmap lock. However, the alloc->mutex is converted
into a spinlock in subsequent commits so the order needs to be reversed
to avoid nesting the sleeping mmap lock under the spinlock.
The shrinker's callback binder_alloc_free_page() is the only place that
needs to be reordered since other functions have been refactored and no
longer nest these locks.
Some minor cosmetic changes are also included in this patch.
Signed-off-by: Carlos Llamas <cmllamas@google.com >
Link: https://lore.kernel.org/r/20231201172212.1813387-28-cmllamas@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Bug: 254650075
(cherry picked from commit e50f4e6cc9bfaca655d3b6a3506d27cf2caa1d40
https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
char-misc-next)
Change-Id: I7f7501945a477ac5571082a5dd2a7934f484b8ab
[cmllamas: fixed conflicts due to missing e66b77e505cmllamas@google.com >
2024-01-09 01:15:49 +00:00
Carlos Llamas
f0667c870c
FROMGIT: binder: avoid user addresses in debug logs
...
Prefer logging vma offsets instead of addresses or simply drop the debug
log altogether if not useful. Note this covers the instances affected by
the switch to store addresses as unsigned long. However, there are other
sections in the driver that could do the same.
Signed-off-by: Carlos Llamas <cmllamas@google.com >
Reviewed-by: Alice Ryhl <aliceryhl@google.com >
Link: https://lore.kernel.org/r/20231201172212.1813387-27-cmllamas@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Bug: 254650075
(cherry picked from commit 162c79731448a5a052e93af7753df579dfe0bf7a
https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
char-misc-next)
Change-Id: I92b7f409e45d9006492d56302e911ccdd8efc950
Signed-off-by: Carlos Llamas <cmllamas@google.com >
2024-01-09 01:15:49 +00:00
Carlos Llamas
b93c9f8565
FROMGIT: binder: refactor binder_delete_free_buffer()
...
Skip the freelist call immediately as needed, instead of continuing the
pointless checks. Also, drop the debug logs that we don't really need.
Signed-off-by: Carlos Llamas <cmllamas@google.com >
Reviewed-by: Alice Ryhl <aliceryhl@google.com >
Link: https://lore.kernel.org/r/20231201172212.1813387-26-cmllamas@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Bug: 254650075
(cherry picked from commit f07b83a48e944c8a1cc1e9f6703fae5e34df2ba4
https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
char-misc-next)
Change-Id: I035bd6cd5c06ec984cd6eb3c3b53e0958c64df4f
Signed-off-by: Carlos Llamas <cmllamas@google.com >
2024-01-09 01:15:49 +00:00
Carlos Llamas
f6b1c043ae
FROMGIT: binder: collapse print_binder_buffer() into caller
...
The code in print_binder_buffer() is quite small so it can be collapsed
into its single caller binder_alloc_print_allocated().
No functional change in this patch.
Signed-off-by: Carlos Llamas <cmllamas@google.com >
Reviewed-by: Alice Ryhl <aliceryhl@google.com >
Link: https://lore.kernel.org/r/20231201172212.1813387-25-cmllamas@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Bug: 254650075
(cherry picked from commit 8e905217c4543af9cf1754809846157a7dbbb261
https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
char-misc-next)
Change-Id: Ic3e2522b4702e60e09be3d5940f88ec8252ac793
Signed-off-by: Carlos Llamas <cmllamas@google.com >
2024-01-09 01:15:49 +00:00
Carlos Llamas
683f84a35f
FROMGIT: binder: document the final page calculation
...
The code to determine the page range for binder_lru_freelist_del() is
quite obscure. It leverages the buffer_size calculated before doing an
oversized buffer split. This is used to figure out if the last page is
being shared with another active buffer. If so, the page gets trimmed
out of the range as it has been previously removed from the freelist.
This would be equivalent to getting the start page of the next in-use
buffer explicitly. However, the code for this is much larger as we can
see in binder_free_buf_locked() routine. Instead, lets settle on
documenting the tricky step and using better names for now.
I believe an ideal solution would be to count the binder_page->users to
determine when a page should be added or removed from the freelist.
However, this is a much bigger change than what I'm willing to risk at
this time.
Signed-off-by: Carlos Llamas <cmllamas@google.com >
Link: https://lore.kernel.org/r/20231201172212.1813387-24-cmllamas@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Bug: 254650075
(cherry picked from commit 67dcc880780569ec40391cae4d8299adc1e7a44e
https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
char-misc-next)
Change-Id: Iec2466605fe7f8aa338c8313f586cdb7519a36e7
Signed-off-by: Carlos Llamas <cmllamas@google.com >
2024-01-09 01:15:49 +00:00
Carlos Llamas
4c82cbad43
BACKPORT: FROMGIT: binder: rename lru shrinker utilities
...
Now that the page allocation step is done separately we should rename
the binder_free_page_range() and binder_allocate_page_range() functions
to provide a more accurate description of what they do. Lets borrow the
freelist concept used in other parts of the kernel for this.
No functional change here.
Signed-off-by: Carlos Llamas <cmllamas@google.com >
Reviewed-by: Alice Ryhl <aliceryhl@google.com >
Link: https://lore.kernel.org/r/20231201172212.1813387-23-cmllamas@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Bug: 254650075
(cherry picked from commit ea9cdbf0c7273b55e251b2ed8f85794cfadab5d5
https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
char-misc-next)
Change-Id: I0d0dfcc6f72d54209da310be2ad5e30f3d722652
[cmllamas: fixed trivial conflicts due to missing commits e33c267ab7cmllamas@google.com >
2024-01-09 01:15:49 +00:00
Minghao Chi
eba1fb9603
UPSTREAM: drivers/android: remove redundant ret variable
...
Return value from list_lru_count() directly instead
of taking this in another redundant variable.
Reported-by: Zeal Robot <zealci@zte.com.cn >
Signed-off-by: Minghao Chi <chi.minghao@zte.com.cn >
Signed-off-by: CGEL ZTE <cgel.zte@gmail.com >
Link: https://lore.kernel.org/r/20220104113500.602158-1-chi.minghao@zte.com.cn
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Bug: 254650075
(cherry picked from commit b2fb28deddcmllamas@google.com >
2024-01-09 01:15:49 +00:00
Carlos Llamas
356047fe2a
FROMGIT: binder: make oversized buffer code more readable
...
The sections in binder_alloc_new_buf_locked() dealing with oversized
buffers are scattered which makes them difficult to read. Instead,
consolidate this code into a single block to improve readability.
No functional change here.
Signed-off-by: Carlos Llamas <cmllamas@google.com >
Reviewed-by: Alice Ryhl <aliceryhl@google.com >
Link: https://lore.kernel.org/r/20231201172212.1813387-22-cmllamas@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Bug: 254650075
(cherry picked from commit de0e6573125f8ea7a01a9b05a45b0c73116c73b2
https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
char-misc-next)
Change-Id: I62c2cec7341e13d9174b4f0839a1345df7cfd808
Signed-off-by: Carlos Llamas <cmllamas@google.com >
2024-01-09 01:15:49 +00:00
Carlos Llamas
f7476dca31
FROMGIT: binder: remove redundant debug log
...
The debug information in this statement is already logged earlier in the
same function. We can get rid of this duplicate log.
Signed-off-by: Carlos Llamas <cmllamas@google.com >
Reviewed-by: Alice Ryhl <aliceryhl@google.com >
Link: https://lore.kernel.org/r/20231201172212.1813387-21-cmllamas@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Bug: 254650075
(cherry picked from commit 258ce20ede33c551002705fa1488864fb287752c
https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
char-misc-next)
Change-Id: Ie533a55ea10b2af927004f1d0e244b386ba25360
Signed-off-by: Carlos Llamas <cmllamas@google.com >
2024-01-09 01:15:49 +00:00
Carlos Llamas
477e8e8453
BACKPORT: FROMGIT: binder: perform page installation outside of locks
...
Split out the insertion of pages to be outside of the alloc->mutex in a
separate binder_install_buffer_pages() routine. Since this is no longer
serialized, we must look at the full range of pages used by the buffers.
The installation is protected with mmap_sem in write mode since multiple
tasks might race to install the same page.
Besides avoiding unnecessary nested locking this helps in preparation of
switching the alloc->mutex into a spinlock_t in subsequent patches.
Signed-off-by: Carlos Llamas <cmllamas@google.com >
Reviewed-by: Alice Ryhl <aliceryhl@google.com >
Link: https://lore.kernel.org/r/20231201172212.1813387-20-cmllamas@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Bug: 254650075
(cherry picked from commit 37ebbb4f73a0d299fa0c7dd043932a2f5fbbb779
https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
char-misc-next)
Change-Id: I7b0684310b8824194d7e4a51a1fd67944f8ec06a
[cmllamas: fixed conflicts due to missing e66b77e505cmllamas@google.com >
2024-01-09 01:15:49 +00:00
Carlos Llamas
af71193412
FROMGIT: binder: initialize lru pages in mmap callback
...
Rather than repeatedly initializing some of the binder_lru_page members
during binder_alloc_new_buf(), perform this initialization just once in
binder_alloc_mmap_handler(), after the pages have been created.
Reviewed-by: Alice Ryhl <aliceryhl@google.com >
Signed-off-by: Carlos Llamas <cmllamas@google.com >
Link: https://lore.kernel.org/r/20231201172212.1813387-19-cmllamas@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Bug: 254650075
(cherry picked from commit 68aef12d094e4c96d972790f1620415460a4f3cf
https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
char-misc-next)
Change-Id: I3197038683f76a5cb98a79d017d1515429df2d73
Signed-off-by: Carlos Llamas <cmllamas@google.com >
2024-01-09 01:15:49 +00:00
Minchan Kim