Injune Choi
4e534b8a58
ANDROID: GKI: Galaxy android14-6.1 update symbol for alsa audio device
...
INFO: 1 function symbol(s) added
'int snd_ctl_remove_id(struct snd_card*, struct snd_ctl_elem_id*)'
snd_ctl_remove_id: remove the control of the given id and release it
audio amp driver need to remove kcontrol when reload dapm control.
Bug: 391517506
Change-Id: Ic8641be7a06d2dfcacd93e1c065f71704690a5bb
Signed-off-by: Injune Choi <injune.choi@samsung.com >
2025-02-10 19:21:15 +09:00
Rishi Sikka
1ac09f5c05
ANDROID: GKI: Update symbol list for arg
...
These symbols are missing from the symbol list and are not available at runtime for unsigned modules:
iio_get_channel_type
Bug: 386822958
Change-Id: I188d191a5a23451f155584e86d66ae56c235ad64
Signed-off-by: Rishi Sikka <rishisikka@google.com >
2025-02-07 10:58:42 -08:00
Lee Jones
e5f309b277
ANDROID: dm-bow: Protect Ranges fetched and erased from the RB tree
...
Bug: 195565510
Signed-off-by: Lee Jones <lee.jones@linaro.org >
(cherry picked from commit 98c15b2badjoneslee@google.com >
(cherry picked from https://android-review.googlesource.com/q/commit:5188b662614e86d094e09571e5853f910e9c9404 )
Merged-In: Ic8134eb902aa7d929e3121b2f69b1d258f570652
Change-Id: Ic8134eb902aa7d929e3121b2f69b1d258f570652
2025-02-07 07:56:37 -08:00
Martin Liu
09717ac61c
ANDROID: Update the ABI symbol list
...
Adding the following symbols:
- __traceiter_android_trigger_vendor_lmk_kill
- __tracepoint_android_trigger_vendor_lmk_kill
Bug: 385050909
Change-Id: I82e202177d870fe0a55c69172817c260ece41ff6
Signed-off-by: Martin Liu <liumartin@google.com >
2025-02-06 17:42:56 -08:00
Martin Liu
3031fa1817
ANDROID: Adding an Android vendor LMK event
...
This change adds an android_trigger_vendor_lmk_kill() trace event
which can be used by vendor modules to send LMKD kill requests.
LMKD attaches a BPF program to this trace event if it exists and
expects it to be in a particular format. To provide a standardized
definition for this event, we define and export it inside the GKI
even though there are no users. Android vendors can use this event
to emit this trace event inside their modules and experiment with
different kill strategies before upstreaming them into LMKD.
Bug: 385050909
Test: build and check the ftrace event
Change-Id: Ida4d9202675a90d6cc891e242c0621c5386df8cc
Signed-off-by: Martin Liu <liumartin@google.com >
2025-02-06 17:42:56 -08:00
Michal Pecio
7658169f5f
BACKPORT: usb: xhci: Fix NULL pointer dereference on certain command aborts
...
If a command is queued to the final usable TRB of a ring segment, the
enqueue pointer is advanced to the subsequent link TRB and no further.
If the command is later aborted, when the abort completion is handled
the dequeue pointer is advanced to the first TRB of the next segment.
If no further commands are queued, xhci_handle_stopped_cmd_ring() sees
the ring pointers unequal and assumes that there is a pending command,
so it calls xhci_mod_cmd_timer() which crashes if cur_cmd was NULL.
Don't attempt timer setup if cur_cmd is NULL. The subsequent doorbell
ring likely is unnecessary too, but it's harmless. Leave it alone.
This is probably Bug 219532, but no confirmation has been received.
The issue has been independently reproduced and confirmed fixed using
a USB MCU programmed to NAK the Status stage of SET_ADDRESS forever.
Everything continued working normally after several prevented crashes.
Link: https://bugzilla.kernel.org/show_bug.cgi?id=219532
Fixes: c311e391a7stable@vger.kernel.org
Signed-off-by: Michal Pecio <michal.pecio@gmail.com >
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com >
Link: https://lore.kernel.org/r/20241227120142.1035206-4-mathias.nyman@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Bug: 393469846
(cherry picked from commit 1e0a19912adb68a4b2b74fd77001c96cd83eb073)
[Sriram: Resolved minor conflict drivers/usb/host/xhci-ring.c ]
Change-Id: I0228fb40e139eb06b9ab68fd3e66ca3444da7077
Signed-off-by: Sriram Dash <quic_sriramd@quicinc.com >
2025-02-04 10:46:29 -08:00
Isaac J. Manjarres
4033df202b
ANDROID: OPP: Fix incorrectly backported logic in _set_opp_level()
...
Commit b50a013d33b50a013d33isaacmanjarres@google.com >
2025-02-03 22:13:04 -08:00
Pavel Begunkov
1cf6be7092
UPSTREAM: io_uring: fix waiters missing wake ups
...
There are reports of mariadb hangs, which is caused by a missing
barrier in the waking code resulting in waiters losing events.
The problem was introduced in a backport
3ab9326f933ab9326f93xan@charbonnet.com >
Fixes: 3ab9326f93https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1093243#99
Link: https://lore.kernel.org/io-uring/760086647776a5aebfa77cfff728837d476a4fd8.1737718881.git.asml.silence@gmail.com/
(cherry picked from commit 74a37ce697https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.128 )
Reviewed-by: Li Zetao <lizetao1@huawei.com >
Change-Id: Ib21c4cb9a135fb58188dadfb7996afcca93bb5e1
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Signed-off-by: Akilesh Kailash <akailash@google.com >
2025-02-03 09:23:49 -08:00
Jaegeuk Kim
2055772ead
UPSTREAM: f2fs: avoid trying to get invalid block address
...
In f2fs_new_inode(), if we fail to get a new inode, we go iput(), followed by
f2fs_evict_inode(). If the inode is not marked as bad, it'll try to call
f2fs_remove_inode_page() which tries to read the inode block given node id.
But, there's no block address allocated yet, which gives a chance to access
a wrong block address, if the block device has some garbage data in NAT table.
We need to make sure NAT table should have zero data for all the unallocated
node ids, but also would be better to take this unnecessary path as well.
Let's mark the faild inode as bad.
Bug: 383968963
Fixes: 0abd675e97chao@kernel.org >
Change-Id: I37bfd94f0612e1521ae43fe529fd186954f3dece
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org >
(cherry picked from commit e02938613eb206ebf788e2d3d4fccf534e4ea12e)
(cherry picked from commit 444939d3b27bb3857a7cc3e37595e794eef07db4)
2025-01-30 16:46:29 -08:00
Todd Kjos
554eb9d61a
ANDROID: KABI macros to release excess KABI fields for use with backports
...
With KMI freeze, we reserve padding in structs to be exclusively used
for LTS updates that would otherwise break the KMI. These fields are
reserved via the ANDROID_KABI_RESERVE() macro that adds a u64 field to
the struct. The ANDROID_KABI_USE() macro is used when the field is
needed for an LTS patch backport.
Since these fields must be reserved at KMI freeze time, we have make
our best guess at what might be needed - and sometimes reserve too many
fields. An example of this is the 8 ANDROID_KABI_RESERVE() fields in
`struct net_device` for android13-5.15. We are now 3 years into the
6 year lifetime for android13-5.15 and none of those 8 padding fields
have been used. At this point it is reasonable to allow 1 or 2 of those
fields to be used for non-LTS backports.
We won't relax the rule that ANDROID_KABI_RESERVE() is exclusively
for LTS backports, Instead we'll introduce a new macro,
ANDROID_KABI_BACKPORT_OK() to release some KABI fields for general use
as the branches age and the use of padding for LTS becomes unlikely.
We release the field for use by replacing the ANDROID_KABI_RESERVE()
with the new ANDROID_KABI_BACKPORT_OK() macro, which has the exact
same implementation, but allows others to use it for backporting
features from upstream.
When an ANDROID_KABI_BACKPORT_OK() field is going to be used, the
ANDROID_KABI_BACKPORT_USE() macro is used to indicate that the field
was used for a feature backport, not an LTS patch.
This patch adds the two new macros:
ANDROID_KABI_BACKPORT_OK() : exactly the same as ANDROID_KABI_RESERVE()
ANDROID_KABI_BACKPORT_USE() ; exacly the same as ANDROID_KABI_USE()
Patches that change an ANDROID_KABI_RESERVE() to ANDROID_KABI_BACKPORT_OK() must
be reviewed and get a CR+1 from gregkh@, joneslee@ or tkjos@ to make
sure it really is acceptable to reduce the padding for LTS merges.
Bug: 392673958
Signed-off-by: Todd Kjos <tkjos@google.com >
Change-Id: I19b9dfc16d891fb6fe48ec4379c6fa3dcb6adf24
(cherry picked from commit f1954b6e6cba2533beb6dff539b9d0b079ceb665)
2025-01-28 15:22:15 -08:00
Rishi Sikka
773ad7ab13
ANDROID: GKI: Add new symbol list for arg
...
Adds a new symbol list for android aarch64.
```
3 function symbol(s) added
'ssize_t iio_enum_available_read(struct iio_dev*, uintptr_t, const struct iio_chan_spec*, char*)'
'ssize_t iio_enum_read(struct iio_dev*, uintptr_t, const struct iio_chan_spec*, char*)'
'ssize_t iio_enum_write(struct iio_dev*, uintptr_t, const struct iio_chan_spec*, const char*, size_t)'
```
Bug: 386822958
Change-Id: I43b8c50200006f93404c12be546304eb71858334
Signed-off-by: Rishi Sikka <rishisikka@google.com >
2025-01-28 13:11:29 -08:00
Terry Tritton
1ffc24e7e8
UPSTREAM: Revert "PCI: Use preserve_config in place of pci_flags"
...
This reverts commit f858b0fab2terry.tritton@linaro.org >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
(cherry picked from commit 479a42eedbgregkh@google.com >
2025-01-28 07:32:07 -08:00
Greg Kroah-Hartman
34aea58089
Merge tag 'android14-6.1.124_r00' into android14-6.1
...
This merges the android14-6.1.124_r00 tag into the android14-6.1 branch,
catching it up with the latest LTS releases.
It contains the following commits:
* e280ed497f6a643e39f7528ab9320002dc81da4311a2f6348b302342ed435713068b2650cda709eb0ab35d883a4ff68760c1c63962be84677294e4da91b493f15dcbdb6a4c6a09ba95321abfb7011921a3f8ee1522887890bbdbe64d0a11a27af63ef5feeef34c01510310cbad16346db03e999e431c67f3cff1de87ed12539ac4a61f8da43e127635c2d787b7350b18cb1164026a409336ec56cb028a68886e31dc29b5d1ca2c565a7c42de603783ced1bd92977881f1b3b978159582731ea629e7bb465b18e1c5c217d67b2966376f1a739caa207980eba25e21dc5d336714dbd91b4a9baa81d26fee2cad2ad4cd11ac9cfef69532e1e748a8b8ab9bd0c8274cb294fa847c4daa21956f00d87094dde4fd7e607774a1373f1f094e0f78a110332ad4b3978fdf9b8f85c4d5d6ff1c86115fb41d9ba9c3c53b169219bbca7bc5de3f999bf828f1e04d9151c8cfd00e40b78dbdf5b46cff87743f0a3e857d5a824c30dfb32e9f4a788e16c8b484ba4014276b9d00ab0e0df7954e8575247896014602c46a2d131dcaac7a61c68c136652c50ff899afcbc35242a96c6f477f64116b937eb4ae1a08850a1ae96fb8d7326147e4c2616747731ff26009a0d4631b1e09e2a40de0330ac79324d42f16fea758ad2e60b675e37d8965fde551d8dc4e927dc732d24f1599e0fa15acddb8762036775f42e0459ef4a242bb8e287f596abbbd8286990730ddbdb106ced612906fb7468562373313613d15f4c244f2a16d2ba4581d8a5ac1b0ce4e8fedda719022a410d40c46db8fb5edd2024e8074bb33db84cb4c8c7b93728274b016bb8f4153e049204d45883477b19e323f856cf61b2e5e78ade7aeb0da47c629d393ba3c90162b048abad5a82ea605f61e385c4fdbffedadc693bf7aafb0c400e53deb6f4283f5ba098a7357ad7d1f8b2282b5086ea15205d7fdba6d5e45f03e6bb31cc2610aba67e1f1aa9718341be7bdc7eb71df4166a19b5055638c6ef358ba0f46864e9d5c23b6b47bbe2c737d4adff3974372138a5c7736aeace7d4c0b4b49cbd5beabe5f73aa61ddaac44e9a57119d11be848bde4a2a572e308fb480e57d133876e3a1c37ec8f74da4563edd786fbd050bb57671a7e2f5b657cd0416d472060434a1400a2ae6716c450489f991542d131b28ca6f1d1976db8a75f04fa2c639fcef942d233648d2fb14f94c300be883cd126daadf61f3036bc2534d59ab38c034ce266848d07e3a18f3ff759ec65a03ebbe09ce8d3631037ed4db3150718fe694a30323e6b113ac3b5366b9b9ca6cf45a2d9a4ff1a5a8a1a7949d51f810827e8e58bf4ac211fa4e178e7df25973b6d2aa3d501465501a4fd8c7fe4305cd7bfe589bbb7966c6ed131e9307c9b569fbb01e89a3301461f3b540c716c812b2347df6a81a361bd132740154531f76595c7ad7205a72acab765320c0a72ff366d8ecc0e323dd15b3121a68f1dec8bc3126429dc63e7134f6372c2d5b7d2c43e6fc9ff94511561dfe9ada93a12876d10321be2659c4ca8d8dd7d1f986ebe1cc8be2a762056d1592a76434c8bfbec2f528667334f371d12dfa38be64090cd7dfc38fc1667bf9d552e2e068da3d454cd51e41911ab245bbb2a63e684e2601463469c3e32cf6720b1362626b6fc9a00aeb5803fb498e9f29d1ee98649645f858b0fab29906dbe600489422e2begregkh@google.com >
2025-01-28 07:32:07 -08:00
Lokesh Vutla
11620ab958
FROMGIT: KVM: arm64: Flush hyp bss section after initialization of variables in bss
...
To determine CPU features during initialization, the nVHE hypervisor
utilizes sanitized values of the host's CPU features registers. These
values, stored in u64 idaa64*_el1_sys_val variables are updated by the
kvm_hyp_init_symbols() function at EL1. To ensure EL2 visibility with
the MMU off, the data cache needs to be flushed after these updates.
However, individually flushing each variable using
kvm_flush_dcache_to_poc() is inefficient.
These cpu feature variables would be part of the bss section of
the hypervisor. Hence, flush the entire bss section of hypervisor
once the initialization is complete.
Fixes: 6c30bfb18dhttps://lore.kernel.org/all/20250121044016.2219256-1-lokeshvutla@google.com/
(cherry picked from commit 9bcbb6104a344d3526e185ee1e7b985509914e90
https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git/ fixes)
Suggested-by: Fuad Tabba <tabba@google.com >
Signed-off-by: Lokesh Vutla <lokeshvutla@google.com >
Signed-off-by: Fuad Tabba <tabba@google.com >
2025-01-27 05:33:57 -08:00
Greg Kroah-Hartman
2f2e115eec
Merge 6.1.121-lts branch changes into android14-6.1
...
Steps on the way to a final 6.1.124 lts merge into android14-6.1
Changes included in here are:
* 747746a3c9e31da5fb5c29f02ec58a5d16dd18bfb61f346fa04c247039781a2471af327e44e70652fa719857f6f8b1f5472b054f07a204259550d6b08b41e6bccfb070291c8360fd3538d26fb69bb5190f40a04c2b48b1de8156595389142588f1014b5c4842df952810df49cfca27a650a3d44d25a292a7a52ac1d8839721c398c8c47ec91706dbb159c6cb73d97072f632e2b0b7963860cc1f6aa0427b82d11c765f5710da0732ef2affd597b2275422e628ae534ad1c3803267b254dcf0949199659724cb18815ea817f40de9c208b2904dcd14efb3f12b37e16561f720e801754ec823eea6b98dd5460456f8de1c38f007a96e28e17d8e1a143f723e9e3faaad820c7df24b3a8c29e640ae64cd1c785864d8fe01ad2d755fe68cd446fd10f458842e5af282ccab6aad13618d34fb8ec9a5e3a17ceca64182506b72c03ae52129c9d7ab1c5902fa3ec83213b664569793fc683fa13f853d02ceda7f64e92f79d58237927e3600195eda3d06b8251050f51a5b5f5b86cebf90c2d864afc6fe24e681c5a82437a0e2b3629245459a995a18c898ddb59a4bd0cc0b4ff5581f765e0bd4a4a25df979f6115fd6611e4cf1dd118452f863f820c3f594a34756bddf543dec062a450c746ed28a965446585e42a08c1f1268e9645cf5e07f5c20b9fa4cb99eeb1dc807ab3a8677ab79b9e4ef7efa60a37ca7b6649b8e7b5300a0877c81faf0988e55abcf0f910dbf2f2c38ab25aabfcaffd4ccde529504b37d687b98746ec0b877d14ed23e9dd8eef7301e6740aed32594ca5c9cb6473ab9326f937d5c04d26ddd16397b4747c9a7f81004df8ff9ab4118bd18344118bd183421bc72eef0fe695bc157cb35445052d61182f8b19da7c09f0beed8395d94eed8395d9497c22fd510ca8e6a7369db774504beb15437fb26641e9638aaf4a4250cf5779124960674b6d260cbac77fe057794ad56f61b3613d540c12c9502ac8380be263f3f6d5f0453a2c239c3c004c8ee41fc35b41d8adfd0af1d1d3e4e08715b741f816187b183d51345f75f07911f83852dcaa24a009d745a56aeef517d2d21c6bdc3326308f3ca17c112433c87d2b859dd67023cc16b146d0d63c36f03f3ffc7769f50d9f68e4a6e8a13f27e2991a023894e5a4e8d1b943a0c5fa469243255f2a9ca98ec151a16deb5173100034a2d84e49db5b37c557ba828559b1c7ac2f2c3deaf207d9a09516067a25ea28f4adc692826ff0346a746324a76b89f6f014c96a1491487eeddff9fc48fab51a203470f2eea5fda558c1b4fea8db295b197da8ffd84c694266a3354f7166df51487490f09dee88b0161589e18e450fc83cc871a02a579e16a0d33b4513cfd3ae8bd6c5f5d5947c9ac08ac3eaac4cfbb2f2342a6a6cf750b73a478f3841e9c3d8ed728ab716f7666039daf6f0277f168247bc5648abf72578afcc9d9b2f6165aec20baf71507dd376b0e61719497a715dce37cb7f609ba19adb9040299b28c9459e166bcea2ff66feb87f1720a7f8d0582984f872fb392d5f5e8852244350407652286f0a42718b16f40cc36ad10d480706e6b3eeb00efa48b6122efa3571a54e8a4474f16703a8674df81df1c4551fc7774be6b77e519c5be059dc61b448379d0cbd58379d0cbd58caec5e4a5467d2d7ccb1b361923570ab4951c142c0027dc17bcea29dff672c49143fbb5be6a0bb6670fc6d14ff8f794f387254abd3d875411aaa1d874eb8dd0c5374914d90a48dc44f3c1ed08c93d5a0af08132ee033e49e92f9dee6bfab098c03d0593c23abcb314f0cbcf1f7794b33b2d76b0afd7eadc780fa184d452023919705af836662589722261297b21233e5fc7a2f0ce45b3e6f251767f3e10e9c261cee384591b8b9c0eeeed4e9fa189388ff61cf02e72135e071370cf3eb583df26299d896c1557f8bfd8d65d8446637a608f4b2f2abd278cd7490fc0de4d790dcfdba3c45e332cd323c55b2521664c1ff6b5e3c7cbb332849f27e4fd0dde295bc31abdc768fc3da03c2939c05efb67c2c6d0565abef60d14907362d4c4373d55a47d935ac3d5178c28274b2d456f08d24a0f51eb88c331a19580bae7a289f3e398452de4514ba1e0553639d3bb22a828a01c6b3f6fedf3dc30da1097f8d90ba045ab083c2a6d4d0291025827628c77c55f45432b688424e195da06106d636e09349530ad77c29be93279054c135c0a526d4fffb1444fa1dfad7787e0f28edac74e733b96a3284739bb84bdb88f706f24a5f8306c013fde1c2b015f0652e4ccf8ec271234c169418d1d3940efa911a321571747a559aa84fa5db774c3c00ed2dcb0bd967ce724ffe8caa6daaf475999749a916a9c749a916a9c68fb250eecd60098113dcc372a27395283338fcd09adf8792bc942c54a366af853cf5fb18c92b051c1c2c835a02ee7bdc7cba1a68b570223a6919bb35bae60a933082b0dac788009cdcc4949b0aa10088ac227d875b6fcf1f3350cf598548ad62d5180c06ff67909ee535add1e9fc3c87e1432f117cba69c6bb5c8ebc911a9c19c28085980b68b4db84fc3527064a6daa4ab9916321c664d0feab9d6c90ba51e425d7c6fa594f2bb43864a76e5e83e3537b2860c0691005ad74ad77eb8f23a03875399c5435a6d5cb6109556ca003f492e9592cd695dd5a04d8f58343c5d346668e58e41c25ad0c1a72b560bcea01215d17b991ac442c2dab66240725c5fabb79612ed6b6b0d0d6e9d44a2c518ab005873743fd497cdd2c300663d3e00fa4c8ae52645abb68c947d8f7816be39353c92596404f3ae4f514b6cca20748d495e87e8ceff4995d0c2cb03ab481a1e8a79991e33a99fe1cf8c11776968bcb7faa87760ae39051762925e213f22fb428fe148d39c5bb7a2c3af95c98e7ab8022e13518b4c028c1bf8133be7fa5a34e18de94bdf8796f1cc7ae27880de459904a873ff43d008bb19464d73225aad0a6b5917e561366671d0e403f6bbbc4f7459c72d1cd2be2155e91924dc03866b5f12914fd76534a3466a929eb254505de90b73f02fb88556e82dcfe96c7c336ca8299aa73f1fcc10216370db28afdb66fb87c21dfc86bea8dcbcd9c88e3e6ff207cdf5803e3bb9c43df7dae287a95ee34a0f29fd2cd3c2f8665338a6f772c7964dcaa86552ddce811ed3b9e260596691b4763da3c375804cf5cfc464705537a22fd4b874981f75776afdcb2857f88a7f5e266aa2932c6efde565355054a60de9a6ba3135792eba6e6c04f68a73401dac8fd508d4331575df9686068c0b50f3de53c530513d230cfd4b7f34d90a7f2de63befbec9e72352a16cb33da1c8c749500b28338ae99f3e7ca7a0a9839d186d6aac3a5fc93296fe73dc2740832efbb74b71f9c0f1e36b4c689060372dc9509118023f09925f10c60629023438d01b59ad8b56af2b6b8e011fdc5251b1af03d1f525d4ef42e3edf9170011e922160cd5f956a5a75207ef6a3dbe75b2d427e3aa84082dc185b8c923c437ed1050f58715f69123bb5c7ffef5e5d569418eec0c51c8380cc46a558edf0fc17418f43a7e696b9790c386fb76f0fc1f391a71d5a63a0bc89e07ab9ad3d84150aab320a9244a399a27ca3da0be063ffa28445faec21f89265f887016c507df5065988ab85720502f0b3f147c97ea83488d303696b2256aa49eb3286d64d91d3d3513d4d54a6d066a687c5f18b0b10ab1fd2a9c356fc32ae99f7c2c16a486ba40e278e9af68a7f584f211c0ed753a3bd95e859e08be3d52b86bd595a4d701e2cdbef2d0e2920a369a9f75fa2d8b3cc81154a308945559be6e224fd631c4db1d7e1794e8a24767890d94d9cbd923cb613954cbc6fc9cfc4c823e40274a04ce0bc9da13ade87a3fc0996d2fd1e3efe7835873aa7f81386613a44be99faa97351403991a402f3cee7f3e3ae27e61d15db93cdacf6adeb401fdcb479d737d367f7727aede47d0f43078e892874ccfb7f88ed383aa97ef372dc98452287d338cee865e656d05659a3c1ad93ea7845361d5981d647c6ff688979e42e470d423b0cdfc818ffdbe3fa6b0410d339e12581169cfe66a5b8520754f86fd76e6e8c93792cad89a2c2ca00eca97dd1042934326aef7cd11087343ef71bab156a217fc3958977128343f42bc30da34dc7c33eec38382e92f90bcfb04e9749db9e4d50bdf102019606c6502d944ea3f18a6807c8938844ebc4f7dde472ee368b44794d2d6d398f143df272c03b72929f70c3b0e326fa1cc346cf7a572eb50781ad64de59179327e36624e115f31c357ef7705a38b601e05c4c1f8195bf6bab3e34276b3154c43206ac0ea38a8e92bca027707c0787286b4751fc0db3d3926eec7f3ba45c1767d9b8b6ca977f047d81cafc63bbc9c4e9d6942d160f5d361ae928883efee918b71d6f16e58b29879b6e617c1114d41eb5bfad4b553cc5c931d07ccff4fe12d6bf704eef38c53cd2a4e32aa07fdc5160408c494c198d9b1bd1e1e9a5905b72540f4326ed030293309ef3d9f5e40ff6ad49b3c53f99cc5112f6a6e47dc00ac2ec07ce683f8713a0e678098cef68ef0b11af752617e76f4630c6b9116c80fef45746101867a916e60bcaa858702a01dbd11afae5231bbe27ab999b778b52404b778b52404b514f45e0f31f29289c78f5a97443b41f80bdd527d3b43738523a2a5770def4a6cb5f26786d623fb882d94d746f7aee64ed7c92515247f1b67ca853a9bc7ccfbd34799f3f8fd31c6fe9b79284a8650df7519e81df89f42b87d0f503d9576791975b481f6a357b63fd2fa5b5ea2574d2655754e24cbc37e8357d385c07fdff61d85bca0222dbbf6f025336fd8f7ef1b97ceaabef6301d6ffdb03366dd6383dd6a7ba45b8bc656acf41577c310e6916c50952a6ff5c929407918ccfbcc7d553887bc73d4cc344fdd0e4387cef540386efa339ea628d40d287cd5b427960f67ca2a80ea8cc56db6237f3faf01bc778ad3e47bd8838c0ef61b836ce9c01c0b270de636d87d12b2f26a27eaad3c88eb3cadf8650938916551244a9c116890ae9610b69033f58d3aa457cadfa4d23f9f5d3dd1424a9eebcee40bff469c83a479d22242f500518cc89c49d377077703551d0b7f6f583be327591e2e915a8c948d3af8cae8a21bab96894ade1867879b7a372f00e22e5d187dcbaa8e57e58ecf9e63fd47e68f544cfc96b94052830e1611b1ea7c856ad633e18c9f8b35dc05a6ce174c9265b6ee752bea5fa601b466746cfb861cebee26a315b5b672df3554b221b3a9001123241aef4f88da508bb398b15f3d26c42eda63873b6a75c14af679c83dc3c8d0307b1aa01f3288f2bdea6a2cc95e5e6df74efc54ea2e51bbade744bf81266f9d3b7c1ec51f8404372e43bdc7e6f8ec9cdb53cbeffdd73496512fe8fa4a24f5b36534234a5f70eae50d21cd53f82a1d151bec2fd0253ccf145b0ea29bd7d9a5aeb962e41e9265b2529a8c28486f9c7193f1e72c1e2dbb722c1e2dbb7202a97d9d7f18028c437e23f63457f006258e57fe07121977cca5e0980fcd6441c359d821030e4c7f46cb2dc1b0321e4f94664c61c30203aecbbaf2c05a2f0e663c1649f1224b195b1a022c1340d82aa0da7b2b7be2449aa993c48c222df370c4e5e64d2834772c3f1afe6370363d98d36e06c52b7102622016c888161cb0a9c6ccaff177f3c1162c393499527a3e9bf08c272168927f3d89ff55ff99b60d5a73713e85376bb5b6e8a1ba19770c1c0e5c0d57df48fb837729592b96f1d03abc50e498e3ad9210452a9d0c18d84a05f0a3f547e951b292374771ad8c70ae703f8ff0a9666f489504dcf1ce3b2a80e710bb67c3ca63d4ea88b83f5e92834692a52ad60df36ff17f8632568aaa74fd4a578ca89b04c5fbc57cec66eddb8dcb58998a4595995457cd2a3d7bda75e1b1a52470f12cd22baf74ddab02607e679d7276d4c68110dee0bae56996ffa8627dde40797cb79af19cd327b45cfb96d5cfa9f892ddcf9f7961d460ecdfc2eb2901a8dad6db0e259bf92558218580244764a56ca76b59f99fa254cefad6b7721a4159138e9be768f08bb04650b5a9aeb1293a782a9c40c72019b40ca626f00f36db7626d262b79ae087c9738e304f8032d618dc8366abec79e6170bcc6a3f35bce9365368b4c894a74756889ec2e427f57b5752f561e43f619ecbd1ed34c86125482489747ad49dd8cddb339587dccfd9a4df5d1838582d4a7911bdcc78d10f2b0d9529e0e599af010abad52d7d478d39ad5112e48ce920aa8d2c6f785b89a9dc9a5182d379b09458eb665edd4bc02c4188b883c1d17ef00ff263bd117057fd15bdc0916eaa5814d4c5d4f4c9bd3700860beade0698b8gregkh@google.com >
2025-01-27 09:09:25 +00:00
Greg Kroah-Hartman
d2841af63f
Merge 6.1.119-lts branch changes into android14-6.1
...
Steps on the way to a final 6.1.124 lts merge into android14-6.1
Changes included in here are:
* 73b6ba5d32b7dd20a03058f9413785e4d90d63d3a0b8fd37fd9b242c423200baca74fb777595da531d4c8baef4af4040457dc2dcdaa27d2f2d48b62452c81fd0f58fad7b004b77b50f617a7443f3e1125874c1150ee2348d8c6134d83c3e6eb2c664df3b18cf702635298609e7068a015f9cabad6480c9a5d70c2e09045ecf539bc58e1c565eeb33e1fc8d1b3095f4e8cc199af46b9371603aa07a24995851d5949ee5d44dc3074003fa7ea92608742fd3f2f253a86db75c5394180edc35769698a45fc7fa16e41acec736e60dd1ac7e26200708d3197fc26cff4926d61a1ccd7974d8e0efa0db6dfee39c8f9416147d86b19031dbc5e0a6af5f89f886a0927d4dea25cc3b2a4fd9bbe6716f423014db62eb01a221208263e01aae58e8870d68fe179012d29347620d2259816addb2d95069556613d9609641e959ae35fcddd31b13c1ca469b2c3184e1d848eb0b32dd60de7881334e297d0a946c7600fa0c7c70ff8b69fbd07f17bfba288f53a749b23059656dbd1c21cc673c71514e87a52133gregkh@google.com >
2025-01-27 08:41:31 +00:00
Konstantin Komarov
ef4fb40b87
ANDROID: GKI: Add Paragon symbol list
...
This list contains symbols for Paragon UFSD driver for NTFS and exFAT file systems.
18 function symbol(s) added
'int __cond_resched_lock(spinlock_t*)'
'struct buffer_head* __find_get_block(struct block_device*, sector_t, unsigned int)'
'int __posix_acl_create(struct posix_acl**, gfp_t, umode_t*)'
'int add_to_page_cache_lru(struct page*, struct address_space*, unsigned long, gfp_t)'
'struct buffer_head* alloc_buffer_head(gfp_t)'
'void d_rehash(struct dentry*)'
'int filemap_fdatawrite_wbc(struct address_space*, struct writeback_control*)'
'void free_buffer_head(struct buffer_head*)'
'int posix_acl_equiv_mode(const struct posix_acl*, umode_t*)'
'struct posix_acl* posix_acl_from_xattr(struct user_namespace*, const void*, size_t)'
'int posix_acl_to_xattr(struct user_namespace*, const struct posix_acl*, void*, size_t)'
'int posix_acl_valid(struct user_namespace*, const struct posix_acl*)'
'void set_cached_acl(struct inode*, int, struct posix_acl*)'
'void shrink_dcache_sb(struct super_block*)'
'void sync_inodes_sb(struct super_block*)'
'void wait_for_completion_io(struct completion*)'
'void write_dirty_buffer(struct buffer_head*, blk_opf_t)'
'void yield()'
Bug: 390630697
Change-Id: Ie7152ec59bdc5630a502c8d538c949d3684abde5
Signed-off-by: Konstantin Komarov <Konstantin.Komarov.GKI@paragon-software.com >
2025-01-24 12:02:59 -08:00
soon9.lee
72db89d3d9
ANDROID: common-android14-6.1 Update the ABI symbol list
...
Adding the following symbols
- snd_card_ref
Bug: 391740635
Change-Id: I7b86db599ad19a55dc8c4ab424e1027d8e1bb4e6
Signed-off-by: soon9.lee <soon9.lee@samsung.corp-partner.google.com >
2025-01-24 03:38:24 -08:00
Sebastian Ene
092a580916
ANDROID: KVM: arm64: Present the 16Kb granule support to the guest VMs
...
Extend the allow mask for the ID_AA64MMFR0_EL1 register to add support for
the 16Kb protected guest VMs. When the guest reads this register the
hypervisor traps the access and returns its configuration derived from
the host.
Bug: 376870129
Bug: 278749606
Test: boot a 16Kb protected guest VM on a 16Kb host
Change-Id: If7d50c7345fc4d9db9dbcca04f19b8bbbc70925e
Signed-off-by: Sebastian Ene <sebastianene@google.com >
2025-01-23 01:22:09 -08:00
Pierre-Clément Tosi
0405a25a6e
ANDROID: KVM: arm64: Fix corrupted PSTATE during guest debug
...
When running non-protected guests for which the host has enabled
hardware-assisted debugging, pKVM "flushes" PSTATE and MDSCR_EL1 from
the host-controlled vCPU struct to its internal struct before actually
running the vCPU. However, on guest exit, it was failing to record
("sync") any change that the guest might have made to those registers.
As a result, the following vCPU flush discards those changes and the
following vCPU run happens with potentially corrupted registers. This
is particularly noticeable during Linux boot when guest updates to
PSTATE.{I,BTYPE} are lost.
Instead, sync PSTATE and MDSCR if they were flushed before the vCPU run.
Bug: 389970357
Fixes: 0a1f3a1f7bptosi@google.com >
2025-01-21 16:32:26 +00:00
Huacai Chen
d12538e9da
BACKPORT: PCI/portdrv: Prevent LS7A Bus Master clearing on shutdown
...
After cc27b735adhttps://lore.kernel.org/r/20230201043018.778499-2-chenhuacai@loongson.cn
Change-Id: I795b5e092d273eb82dabbab87203b916cd579a5a
Signed-off-by: Huacai Chen <chenhuacai@loongson.cn >
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com >
Bug: 390546635
(cherry picked from commit 62b6dee1b4jian.yang@mediatek.corp-partner.google.com >
2025-01-17 14:03:53 -08:00
Thiébaud Weksteen
dbdf659cc6
UPSTREAM: selinux: ignore unknown extended permissions
...
commit 900f83cf376bdaf798b6f5dcb2eae0c822e908b6 upstream.
When evaluating extended permissions, ignore unknown permissions instead
of calling BUG(). This commit ensures that future permissions can be
added without interfering with older kernels.
Cc: stable@vger.kernel.org
Fixes: fa1aa143actweek@google.com >
Signed-off-by: Paul Moore <paul@paul-moore.com >
Acked-by: Paul Moore <paul@paul-moore.com >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
Signed-off-by: Thiébaud Weksteen <tweek@google.com >
Change-Id: I1689d8c5084a24c1a34ef3d15d71f8cfa4122447
2025-01-16 09:19:26 +11:00
Daeho Jeong
e09bed3008
BACKPORT: f2fs: prevent writing without fallocate() for pinned files
...
In a case writing without fallocate(), we can't guarantee it's allocated
in the conventional area for zoned stroage. To make it consistent across
storage devices, we disallow it regardless of storage device types.
Signed-off-by: Daeho Jeong <daehojeong@google.com >
Reviewed-by: Chao Yu <chao@kernel.org >
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org >
Bug: 379813820
Change-Id: I47b9428d970004284c8de59665ba832f4df4cf13
Signed-off-by: Wu Bo <bo.wu@vivo.com >
(cherry picked from commit 3fdd89b452c2ea5e2195d6e315bef122769584c9)
[Wo Bo: Due to some applications pinning small files via ioctl, the fallocate call fails to allocate space when the system is upgraded. Therefore, it is forbidden to write data to pinned files through the normal write interface.]
2025-01-14 15:42:20 -08:00
Kalesh Singh
8a225f954d
ANDROID: Enable PM_USERSPACE_AUTOSLEEP in gki_defconfig
...
Android initiates autosuspend thread from a userspace service.
Enable this option so that the kernel knows how to handle various
pm_notification callback for when suspend/wakeup transitions are
very frequent.
Bug: 389989850
Change-Id: I86d2c98e6bc9dc2c24dddd29a6c3da192953afcf
Signed-off-by: Kalesh Singh <kaleshsingh@google.com >
2025-01-14 14:04:52 -08:00
Dmitry Skiba
a33878393a
ANDROID: Update the ABI symbol list
...
Adding the following symbols:
- param_set_uint_minmax
- regulator_sync_voltage
- __traceiter_android_rvh_vmscan_kswapd_done
- __traceiter_android_rvh_vmscan_kswapd_wake
- __traceiter_android_vh_binder_proc_transaction_finish
- __traceiter_android_vh_tune_swappiness
- __tracepoint_android_rvh_vmscan_kswapd_done
- __tracepoint_android_rvh_vmscan_kswapd_wake
- __tracepoint_android_vh_binder_proc_transaction_finish
- __tracepoint_android_vh_tune_swappiness
Bug: 379922825
Change-Id: Iba2893d6299d3ef10f6d96aaeed2976d6bab54a7
Signed-off-by: Dmitry Skiba <dskiba@google.com >
2025-01-13 18:02:25 -08:00
Dmitry Skiba
6f0b82dd8a
ANDROID: mm: add kswapd wake/done rvh
...
These restricted hooks are needed for cases when vendor implementation
needs to call sleeping functions. See the bug for details.
Bug: 379922825
Change-Id: I0e5626bed930830caf7f96a5b051b3174f4cf250
Signed-off-by: Dmitry Skiba <dskiba@google.com >
2025-01-13 18:02:10 -08:00
Greg Kroah-Hartman
e280ed497f
Revert "Bluetooth: hci_core: Fix sleeping function called from invalid context"
...
This reverts commit 028a68886egregkh@google.com >
2025-01-11 07:48:08 +00:00
Greg Kroah-Hartman
6a643e39f7
Revert "ipip,ip_tunnel,sit: Add FOU support for externally controlled ipip devices"
...
This reverts commit 19bbca7bc5ac931d4cdegregkh@google.com >
2025-01-11 07:08:29 +00:00
Greg Kroah-Hartman
528ab93200
Revert "ip_tunnel: annotate data-races around t->parms.link"
...
This reverts commit c3c53b1692gregkh@google.com >
2025-01-11 07:08:14 +00:00
Greg Kroah-Hartman
02dc81da43
Revert "ipv4: ip_tunnel: Unmask upper DSCP bits in ip_tunnel_bind_dev()"
...
This reverts commit 5fb41d9ba9gregkh@google.com >
2025-01-11 07:08:01 +00:00
Greg Kroah-Hartman
11a2f6348b
Revert "ipv4: ip_tunnel: Unmask upper DSCP bits in ip_md_tunnel_xmit()"
...
This reverts commit d6ff1c8611gregkh@google.com >
2025-01-11 07:07:48 +00:00
Greg Kroah-Hartman
302342ed43
Revert "ipv4: ip_tunnel: Unmask upper DSCP bits in ip_tunnel_xmit()"
...
This reverts commit 9b8f85c4d5gregkh@google.com >
2025-01-11 07:07:30 +00:00
Greg Kroah-Hartman
5713068b26
Revert "net: Fix netns for ip_tunnel_init_flow()"
...
This reverts commit d4b3978fdfgregkh@google.com >
2025-01-11 07:07:13 +00:00
Greg Kroah-Hartman
50cda709eb
Revert "usb: xhci: Limit Stop Endpoint retries"
...
This reverts commit ae1a08850agregkh@google.com >
2025-01-11 07:04:53 +00:00
Greg Kroah-Hartman
0ab35d883a
Revert "xhci: Turn NEC specific quirk for handling Stop Endpoint errors generic"
...
This reverts commit 116b937eb4gregkh@google.com >
2025-01-11 07:04:39 +00:00
Greg Kroah-Hartman
4ff68760c1
Merge 6.1.124 into android14-6.1-lts
...
Changes in 6.1.124
x86/hyperv: Fix hv tsc page based sched_clock for hibernation
selinux: ignore unknown extended permissions
btrfs: fix use-after-free in btrfs_encoded_read_endio()
tracing: Have process_string() also allow arrays
thunderbolt: Add support for Intel Lunar Lake
thunderbolt: Add support for Intel Panther Lake-M/P
thunderbolt: Don't display nvm_version unless upgrade supported
xhci: retry Stop Endpoint on buggy NEC controllers
usb: xhci: Limit Stop Endpoint retries
xhci: Turn NEC specific quirk for handling Stop Endpoint errors generic
net: mctp: handle skb cleanup on sock_queue failures
RDMA/mlx5: Enforce same type port association for multiport RoCE
RDMA/bnxt_re: Add check for path mtu in modify_qp
RDMA/bnxt_re: Fix reporting hw_ver in query_device
RDMA/bnxt_re: Fix max_qp_wrs reported
RDMA/bnxt_re: Fix the locking while accessing the QP table
drm/bridge: adv7511_audio: Update Audio InfoFrame properly
net: dsa: microchip: Fix KSZ9477 set_ageing_time function
net: dsa: microchip: add ksz_rmw8() function
net: dsa: microchip: Fix LAN937X set_ageing_time function
RDMA/hns: Refactor mtr find
RDMA/hns: Remove unused parameters and variables
RDMA/hns: Fix mapping error of zero-hop WQE buffer
RDMA/hns: Fix warning storm caused by invalid input in IO path
RDMA/hns: Fix missing flush CQE for DWQE
net: stmmac: platform: provide devm_stmmac_probe_config_dt()
net: stmmac: don't create a MDIO bus if unnecessary
net: stmmac: restructure the error path of stmmac_probe_config_dt()
net: fix memory leak in tcp_conn_request()
ipip,ip_tunnel,sit: Add FOU support for externally controlled ipip devices
ip_tunnel: annotate data-races around t->parms.link
ipv4: ip_tunnel: Unmask upper DSCP bits in ip_tunnel_bind_dev()
ipv4: ip_tunnel: Unmask upper DSCP bits in ip_md_tunnel_xmit()
ipv4: ip_tunnel: Unmask upper DSCP bits in ip_tunnel_xmit()
net: Fix netns for ip_tunnel_init_flow()
netrom: check buffer length before accessing it
drm/i915/dg1: Fix power gate sequence.
netfilter: nft_set_hash: unaligned atomic read on struct nft_set_ext
net: llc: reset skb->transport_header
ALSA: usb-audio: US16x08: Initialize array before use
eth: bcmsysport: fix call balance of priv->clk handling routines
net: mv643xx_eth: fix an OF node reference leak
net: wwan: t7xx: Fix FSM command timeout issue
RDMA/rtrs: Ensure 'ib_sge list' is accessible
net: reenable NETIF_F_IPV6_CSUM offload for BIG TCP packets
net: restrict SO_REUSEPORT to inet sockets
net: wwan: iosm: Properly check for valid exec stage in ipc_mmio_init()
af_packet: fix vlan_get_tci() vs MSG_PEEK
af_packet: fix vlan_get_protocol_dgram() vs MSG_PEEK
ila: serialize calls to nf_register_net_hooks()
btrfs: rename and export __btrfs_cow_block()
btrfs: fix use-after-free when COWing tree bock and tracing is enabled
wifi: mac80211: wake the queues in case of failure in resume
drm/amdkfd: Correct the migration DMA map direction
btrfs: flush delalloc workers queue before stopping cleaner kthread during unmount
ALSA: hda/realtek: Add new alc2xx-fixup-headset-mic model
sound: usb: enable DSD output for ddHiFi TC44C
sound: usb: format: don't warn that raw DSD is unsupported
bpf: fix potential error return
ksmbd: retry iterate_dir in smb2_query_dir
net: usb: qmi_wwan: add Telit FE910C04 compositions
Bluetooth: hci_core: Fix sleeping function called from invalid context
irqchip/gic: Correct declaration of *percpu_base pointer in union gic_base
ARC: build: Try to guess GCC variant of cross compiler
usb: xhci: Avoid queuing redundant Stop Endpoint commands
modpost: fix input MODULE_DEVICE_TABLE() built for 64-bit on 32-bit host
modpost: fix the missed iteration for the max bit in do_input()
ALSA hda/realtek: Add quirk for Framework F111:000C
ALSA: seq: oss: Fix races at processing SysEx messages
kcov: mark in_softirq_really() as __always_inline
RDMA/uverbs: Prevent integer overflow issue
pinctrl: mcp23s08: Fix sleeping in atomic context due to regmap locking
sky2: Add device ID 11ab:4373 for Marvell 88E8075
net/sctp: Prevent autoclose integer overflow in sctp_association_init()
drm: adv7511: Drop dsi single lane support
dt-bindings: display: adi,adv7533: Drop single lane support
mm/readahead: fix large folio support in async readahead
mm: vmscan: account for free pages to prevent infinite Loop in throttle_direct_reclaim()
mptcp: fix TCP options overflow.
mptcp: fix recvbuffer adjust on sleeping rcvmsg
mptcp: don't always assume copied data in mptcp_cleanup_rbuf()
zram: check comp is non-NULL before calling comp_destroy
Linux 6.1.124
Change-Id: I43da72a5fa6821c2f14540a42f7f3866982a95b5
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com >
2025-01-10 09:30:42 +00:00
Seiya Wang
770852bf7d
ANDROID: ABI: update protected symbol list
...
Add bt_sock_linked to protected symbol list
Bug: 387804010
Change-Id: I96abbc18d9cb122708a07d80ae9f8fa2da276ef2
Signed-off-by: Seiya Wang <seiya.wang@mediatek.com >
2025-01-09 08:49:10 -08:00
Giuliano Procida
bda0401cd8
ANDROID: GKI: load vendor modules without tainting the kernel
...
GKI repurposes module signing to distinguish GKI and vendor modules.
It was unhelpful and sometimes confusing to taint the kernel when
loading vendor modules.
Bug: 232430739
Bug: 383260800
Change-Id: If05a9e7d8e28954eba0472149fe312045c9c4fad
Signed-off-by: Giuliano Procida <gprocida@google.com >
(cherry picked from commit 23313da5700f038f95a82a695392e5bb5b550ba6)
2025-01-09 04:45:30 -08:00
Greg Kroah-Hartman
c63962be84
Linux 6.1.124
...
Link: https://lore.kernel.org/r/20250106151129.433047073@linuxfoundation.org
Tested-by: Pavel Machek (CIP) <pavel@denx.de >
Tested-by: Florian Fainelli <florian.fainelli@broadcom.com >
Tested-by: Salvatore Bonaccorso <carnil@debian.org >
Tested-by: Peter Schneider <pschneider1968@googlemail.com >
Tested-by: SeongJae Park <sj@kernel.org >
Tested-by: Ron Economos <re@w6rz.net >
Tested-by: Mark Brown <broonie@kernel.org >
Tested-by: Linux Kernel Functional Testing <lkft@linaro.org >
Tested-by: Jon Hunter <jonathanh@nvidia.com >
Tested-by: Shuah Khan <skhan@linuxfoundation.org >
Tested-by: kernelci.org bot <bot@kernelci.org >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2025-01-09 13:30:07 +01:00
Dominique Martinet
677294e4da
zram: check comp is non-NULL before calling comp_destroy
...
This is a pre-requisite for the backport of commit 74363ec674cb ("zram:
fix uninitialized ZRAM not releasing backing device"), which has been
implemented differently in commit 7ac07a26dehttps://lore.kernel.org/Z3ytcILx4S1v_ueJ@codewreck.org
Suggested-by: Kairui Song <kasong@tencent.com >
Signed-off-by: Dominique Martinet <dominique.martinet@atmark-techno.com >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2025-01-09 13:30:07 +01:00
Paolo Abeni
91b493f15d
mptcp: don't always assume copied data in mptcp_cleanup_rbuf()
...
commit 551844f26da2a9f76c0a698baaffa631d1178645 upstream.
Under some corner cases the MPTCP protocol can end-up invoking
mptcp_cleanup_rbuf() when no data has been copied, but such helper
assumes the opposite condition.
Explicitly drop such assumption and performs the costly call only
when strictly needed - before releasing the msk socket lock.
Fixes: fd8976790astable@vger.kernel.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com >
Reviewed-by: Mat Martineau <martineau@kernel.org >
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org >
Link: https://patch.msgid.link/20241230-net-mptcp-rbuf-fixes-v1-2-8608af434ceb@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2025-01-09 13:30:07 +01:00
Paolo Abeni
cbdb6a4c6a
mptcp: fix recvbuffer adjust on sleeping rcvmsg
...
commit 449e6912a2522af672e99992e1201a454910864e upstream.
If the recvmsg() blocks after receiving some data - i.e. due to
SO_RCVLOWAT - the MPTCP code will attempt multiple times to
adjust the receive buffer size, wrongly accounting every time the
cumulative of received data - instead of accounting only for the
delta.
Address the issue moving mptcp_rcv_space_adjust just after the
data reception and passing it only the just received bytes.
This also removes an unneeded difference between the TCP and MPTCP
RX code path implementation.
Fixes: 581302298524 ("mptcp: error out earlier on disconnect")
Cc: stable@vger.kernel.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com >
Reviewed-by: Mat Martineau <martineau@kernel.org >
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org >
Link: https://patch.msgid.link/20241230-net-mptcp-rbuf-fixes-v1-1-8608af434ceb@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2025-01-09 13:30:07 +01:00
Paolo Abeni
09ba95321a
mptcp: fix TCP options overflow.
...
commit cbb26f7d8451fe56ccac802c6db48d16240feebd upstream.
Syzbot reported the following splat:
Oops: general protection fault, probably for non-canonical address 0xdffffc0000000001: 0000 [#1 ] PREEMPT SMP KASAN PTI
KASAN: null-ptr-deref in range [0x0000000000000008-0x000000000000000f]
CPU: 1 UID: 0 PID: 5836 Comm: sshd Not tainted 6.13.0-rc3-syzkaller #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 11/25/2024
RIP: 0010:_compound_head include/linux/page-flags.h:242 [inline]
RIP: 0010:put_page+0x23/0x260 include/linux/mm.h:1552
Code: 90 90 90 90 90 90 90 55 41 57 41 56 53 49 89 fe 48 bd 00 00 00 00 00 fc ff df e8 f8 5e 12 f8 49 8d 5e 08 48 89 d8 48 c1 e8 03 <80> 3c 28 00 74 08 48 89 df e8 8f c7 78 f8 48 8b 1b 48 89 de 48 83
RSP: 0000:ffffc90003916c90 EFLAGS: 00010202
RAX: 0000000000000001 RBX: 0000000000000008 RCX: ffff888030458000
RDX: 0000000000000100 RSI: 0000000000000000 RDI: 0000000000000000
RBP: dffffc0000000000 R08: ffffffff898ca81d R09: 1ffff110054414ac
R10: dffffc0000000000 R11: ffffed10054414ad R12: 0000000000000007
R13: ffff88802a20a542 R14: 0000000000000000 R15: 0000000000000000
FS: 00007f34f496e800(0000) GS:ffff8880b8700000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007f9d6ec9ec28 CR3: 000000004d260000 CR4: 00000000003526f0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Call Trace:
<TASK>
skb_page_unref include/linux/skbuff_ref.h:43 [inline]
__skb_frag_unref include/linux/skbuff_ref.h:56 [inline]
skb_release_data+0x483/0x8a0 net/core/skbuff.c:1119
skb_release_all net/core/skbuff.c:1190 [inline]
__kfree_skb+0x55/0x70 net/core/skbuff.c:1204
tcp_clean_rtx_queue net/ipv4/tcp_input.c:3436 [inline]
tcp_ack+0x2442/0x6bc0 net/ipv4/tcp_input.c:4032
tcp_rcv_state_process+0x8eb/0x44e0 net/ipv4/tcp_input.c:6805
tcp_v4_do_rcv+0x77d/0xc70 net/ipv4/tcp_ipv4.c:1939
tcp_v4_rcv+0x2dc0/0x37f0 net/ipv4/tcp_ipv4.c:2351
ip_protocol_deliver_rcu+0x22e/0x440 net/ipv4/ip_input.c:205
ip_local_deliver_finish+0x341/0x5f0 net/ipv4/ip_input.c:233
NF_HOOK+0x3a4/0x450 include/linux/netfilter.h:314
NF_HOOK+0x3a4/0x450 include/linux/netfilter.h:314
__netif_receive_skb_one_core net/core/dev.c:5672 [inline]
__netif_receive_skb+0x2bf/0x650 net/core/dev.c:5785
process_backlog+0x662/0x15b0 net/core/dev.c:6117
__napi_poll+0xcb/0x490 net/core/dev.c:6883
napi_poll net/core/dev.c:6952 [inline]
net_rx_action+0x89b/0x1240 net/core/dev.c:7074
handle_softirqs+0x2d4/0x9b0 kernel/softirq.c:561
__do_softirq kernel/softirq.c:595 [inline]
invoke_softirq kernel/softirq.c:435 [inline]
__irq_exit_rcu+0xf7/0x220 kernel/softirq.c:662
irq_exit_rcu+0x9/0x30 kernel/softirq.c:678
instr_sysvec_apic_timer_interrupt arch/x86/kernel/apic/apic.c:1049 [inline]
sysvec_apic_timer_interrupt+0x57/0xc0 arch/x86/kernel/apic/apic.c:1049
asm_sysvec_apic_timer_interrupt+0x1a/0x20 arch/x86/include/asm/idtentry.h:702
RIP: 0033:0x7f34f4519ad5
Code: 85 d2 74 0d 0f 10 02 48 8d 54 24 20 0f 11 44 24 20 64 8b 04 25 18 00 00 00 85 c0 75 27 41 b8 08 00 00 00 b8 0f 01 00 00 0f 05 <48> 3d 00 f0 ff ff 76 75 48 8b 15 24 73 0d 00 f7 d8 64 89 02 48 83
RSP: 002b:00007ffec5b32ce0 EFLAGS: 00000246
RAX: 0000000000000001 RBX: 00000000000668a0 RCX: 00007f34f4519ad5
RDX: 00007ffec5b32d00 RSI: 0000000000000004 RDI: 0000564f4bc6cae0
RBP: 0000564f4bc6b5a0 R08: 0000000000000008 R09: 0000000000000000
R10: 00007ffec5b32de8 R11: 0000000000000246 R12: 0000564f48ea8aa4
R13: 0000000000000001 R14: 0000564f48ea93e8 R15: 00007ffec5b32d68
</TASK>
Eric noted a probable shinfo->nr_frags corruption, which indeed
occurs.
The root cause is a buggy MPTCP option len computation in some
circumstances: the ADD_ADDR option should be mutually exclusive
with DSS since the blamed commit.
Still, mptcp_established_options_add_addr() tries to set the
relevant info in mptcp_out_options, if the remaining space is
large enough even when DSS is present.
Since the ADD_ADDR infos and the DSS share the same union
fields, adding first corrupts the latter. In the worst-case
scenario, such corruption increases the DSS binary layout,
exceeding the computed length and possibly overwriting the
skb shared info.
Address the issue by enforcing mutual exclusion in
mptcp_established_options_add_addr(), too.
Cc: stable@vger.kernel.org
Reported-by: syzbot+38a095a81f30d82884c1@syzkaller.appspotmail.com
Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/538
Fixes: 1bff1e43a3pabeni@redhat.com >
Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org >
Reviewed-by: Eric Dumazet <edumazet@google.com >
Link: https://patch.msgid.link/025d9df8cde3c9a557befc47e9bc08fbbe3476e5.1734771049.git.pabeni@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2025-01-09 13:30:07 +01:00
Seiji Nishikawa
bfb7011921
mm: vmscan: account for free pages to prevent infinite Loop in throttle_direct_reclaim()
...
commit 6aaced5abd32e2a57cd94fd64f824514d0361da8 upstream.
The task sometimes continues looping in throttle_direct_reclaim() because
allow_direct_reclaim(pgdat) keeps returning false.
#0 [ffff80002cb6f8d0] __switch_to at ffff8000080095ac
#1 [ffff80002cb6f900] __schedule at ffff800008abbd1c
#2 [ffff80002cb6f990] schedule at ffff800008abc50c
#3 [ffff80002cb6f9b0] throttle_direct_reclaim at ffff800008273550
#4 [ffff80002cb6fa20] try_to_free_pages at ffff800008277b68
#5 [ffff80002cb6fae0] __alloc_pages_nodemask at ffff8000082c4660
#6 [ffff80002cb6fc50] alloc_pages_vma at ffff8000082e4a98
#7 [ffff80002cb6fca0] do_anonymous_page at ffff80000829f5a8
#8 [ffff80002cb6fce0] __handle_mm_fault at ffff8000082a5974
#9 [ffff80002cb6fd90] handle_mm_fault at ffff8000082a5bd4
At this point, the pgdat contains the following two zones:
NODE: 4 ZONE: 0 ADDR: ffff00817fffe540 NAME: "DMA32"
SIZE: 20480 MIN/LOW/HIGH: 11/28/45
VM_STAT:
NR_FREE_PAGES: 359
NR_ZONE_INACTIVE_ANON: 18813
NR_ZONE_ACTIVE_ANON: 0
NR_ZONE_INACTIVE_FILE: 50
NR_ZONE_ACTIVE_FILE: 0
NR_ZONE_UNEVICTABLE: 0
NR_ZONE_WRITE_PENDING: 0
NR_MLOCK: 0
NR_BOUNCE: 0
NR_ZSPAGES: 0
NR_FREE_CMA_PAGES: 0
NODE: 4 ZONE: 1 ADDR: ffff00817fffec00 NAME: "Normal"
SIZE: 8454144 PRESENT: 98304 MIN/LOW/HIGH: 68/166/264
VM_STAT:
NR_FREE_PAGES: 146
NR_ZONE_INACTIVE_ANON: 94668
NR_ZONE_ACTIVE_ANON: 3
NR_ZONE_INACTIVE_FILE: 735
NR_ZONE_ACTIVE_FILE: 78
NR_ZONE_UNEVICTABLE: 0
NR_ZONE_WRITE_PENDING: 0
NR_MLOCK: 0
NR_BOUNCE: 0
NR_ZSPAGES: 0
NR_FREE_CMA_PAGES: 0
In allow_direct_reclaim(), while processing ZONE_DMA32, the sum of
inactive/active file-backed pages calculated in zone_reclaimable_pages()
based on the result of zone_page_state_snapshot() is zero.
Additionally, since this system lacks swap, the calculation of inactive/
active anonymous pages is skipped.
crash> p nr_swap_pages
nr_swap_pages = $1937 = {
counter = 0
}
As a result, ZONE_DMA32 is deemed unreclaimable and skipped, moving on to
the processing of the next zone, ZONE_NORMAL, despite ZONE_DMA32 having
free pages significantly exceeding the high watermark.
The problem is that the pgdat->kswapd_failures hasn't been incremented.
crash> px ((struct pglist_data *) 0xffff00817fffe540)->kswapd_failures
$1935 = 0x0
This is because the node deemed balanced. The node balancing logic in
balance_pgdat() evaluates all zones collectively. If one or more zones
(e.g., ZONE_DMA32) have enough free pages to meet their watermarks, the
entire node is deemed balanced. This causes balance_pgdat() to exit early
before incrementing the kswapd_failures, as it considers the overall
memory state acceptable, even though some zones (like ZONE_NORMAL) remain
under significant pressure.
The patch ensures that zone_reclaimable_pages() includes free pages
(NR_FREE_PAGES) in its calculation when no other reclaimable pages are
available (e.g., file-backed or anonymous pages). This change prevents
zones like ZONE_DMA32, which have sufficient free pages, from being
mistakenly deemed unreclaimable. By doing so, the patch ensures proper
node balancing, avoids masking pressure on other zones like ZONE_NORMAL,
and prevents infinite loops in throttle_direct_reclaim() caused by
allow_direct_reclaim(pgdat) repeatedly returning false.
The kernel hangs due to a task stuck in throttle_direct_reclaim(), caused
by a node being incorrectly deemed balanced despite pressure in certain
zones, such as ZONE_NORMAL. This issue arises from
zone_reclaimable_pages() returning 0 for zones without reclaimable file-
backed or anonymous pages, causing zones like ZONE_DMA32 with sufficient
free pages to be skipped.
The lack of swap or reclaimable pages results in ZONE_DMA32 being ignored
during reclaim, masking pressure in other zones. Consequently,
pgdat->kswapd_failures remains 0 in balance_pgdat(), preventing fallback
mechanisms in allow_direct_reclaim() from being triggered, leading to an
infinite loop in throttle_direct_reclaim().
This patch modifies zone_reclaimable_pages() to account for free pages
(NR_FREE_PAGES) when no other reclaimable pages exist. This ensures zones
with sufficient free pages are not skipped, enabling proper balancing and
reclaim behavior.
[akpm@linux-foundation.org: coding-style cleanups]
Link: https://lkml.kernel.org/r/20241130164346.436469-1-snishika@redhat.com
Link: https://lkml.kernel.org/r/20241130161236.433747-2-snishika@redhat.com
Fixes: 5a1c84b404snishika@redhat.com >
Cc: Mel Gorman <mgorman@techsingularity.net >
Cc: <stable@vger.kernel.org >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2025-01-09 13:30:07 +01:00
Yafang Shao
a3f8ee1522
mm/readahead: fix large folio support in async readahead
...
commit 158cdce87c8c172787063998ad5dd3e2f658b963 upstream.
When testing large folio support with XFS on our servers, we observed that
only a few large folios are mapped when reading large files via mmap.
After a thorough analysis, I identified it was caused by the
`/sys/block/*/queue/read_ahead_kb` setting. On our test servers, this
parameter is set to 128KB. After I tune it to 2MB, the large folio can
work as expected. However, I believe the large folio behavior should not
be dependent on the value of read_ahead_kb. It would be more robust if
the kernel can automatically adopt to it.
With /sys/block/*/queue/read_ahead_kb set to 128KB and performing a
sequential read on a 1GB file using MADV_HUGEPAGE, the differences in
/proc/meminfo are as follows:
- before this patch
FileHugePages: 18432 kB
FilePmdMapped: 4096 kB
- after this patch
FileHugePages: 1067008 kB
FilePmdMapped: 1048576 kB
This shows that after applying the patch, the entire 1GB file is mapped to
huge pages. The stable list is CCed, as without this patch, large folios
don't function optimally in the readahead path.
It's worth noting that if read_ahead_kb is set to a larger value that
isn't aligned with huge page sizes (e.g., 4MB + 128KB), it may still fail
to map to hugepages.
Link: https://lkml.kernel.org/r/20241108141710.9721-1-laoar.shao@gmail.com
Link: https://lkml.kernel.org/r/20241206083025.3478-1-laoar.shao@gmail.com
Fixes: 4687fdbb80laoar.shao@gmail.com >
Tested-by: kernel test robot <oliver.sang@intel.com >
Cc: Matthew Wilcox <willy@infradead.org >
Cc: David Hildenbrand <david@redhat.com >
Cc: <stable@vger.kernel.org >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2025-01-09 13:30:06 +01:00
Biju Das
887890bbdb
dt-bindings: display: adi,adv7533: Drop single lane support
...
commit ee8f9ed57a397605434caeef351bafa3ec4dfdd4 upstream.
As per [1] and [2], ADV7535/7533 supports only 2-, 3-, or 4-lane. Drop
unsupported 1-lane from bindings.
[1] https://www.analog.com/media/en/technical-documentation/data-sheets/ADV7535.pdf
[2] https://www.analog.com/media/en/technical-documentation/data-sheets/ADV7533.pdf
Fixes: 1e4d58cd7fstable@vger.kernel.org
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org >
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be >
Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com >
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com >
Link: https://patchwork.freedesktop.org/patch/msgid/20241119192040.152657-3-biju.das.jz@bp.renesas.com
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2025-01-09 13:30:06 +01:00
Biju Das
e64d0a11a2
drm: adv7511: Drop dsi single lane support
...
commit 79d67c499c3f886202a40c5cb27e747e4fa4d738 upstream.
As per [1] and [2], ADV7535/7533 supports only 2-, 3-, or 4-lane. Drop
unsupported 1-lane.
[1] https://www.analog.com/media/en/technical-documentation/data-sheets/ADV7535.pdf
[2] https://www.analog.com/media/en/technical-documentation/data-sheets/ADV7533.pdf
Fixes: 1e4d58cd7fhien.huynh.px@renesas.com >
Cc: stable@vger.kernel.org
Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com >
Reviewed-by: Adam Ford <aford173@gmail.com >
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com >
Link: https://patchwork.freedesktop.org/patch/msgid/20241119192040.152657-4-biju.das.jz@bp.renesas.com
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2025-01-09 13:30:06 +01:00
Nikolay Kuratov
7af63ef5fe
net/sctp: Prevent autoclose integer overflow in sctp_association_init()
...
commit 4e86729d1ff329815a6e8a920cb554a1d4cb5b8d upstream.
While by default max_autoclose equals to INT_MAX / HZ, one may set
net.sctp.max_autoclose to UINT_MAX. There is code in
sctp_association_init() that can consequently trigger overflow.
Cc: stable@vger.kernel.org
Fixes: 9f70f46bd4kniv@yandex-team.ru >
Acked-by: Xin Long <lucien.xin@gmail.com >
Link: https://patch.msgid.link/20241219162114.2863827-1-kniv@yandex-team.ru
Signed-off-by: Jakub Kicinski <kuba@kernel.org >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2025-01-09 13:30:06 +01:00
Pascal Hambourg
eef34c0151
sky2: Add device ID 11ab:4373 for Marvell 88E8075
...
commit 03c8d0af2e409e15c16130b185e12b5efba0a6b9 upstream.
A Marvell 88E8075 ethernet controller has this device ID instead of
11ab:4370 and works fine with the sky2 driver.
Signed-off-by: Pascal Hambourg <pascal@plouf.fr.eu.org >
Cc: stable@vger.kernel.org
Link: https://patch.msgid.link/10165a62-99fb-4be6-8c64-84afd6234085@plouf.fr.eu.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2025-01-09 13:30:06 +01:00
Evgenii Shatokhin
0310cbad16
pinctrl: mcp23s08: Fix sleeping in atomic context due to regmap locking
...
commit a37eecb705f33726f1fb7cd2a67e514a15dfe693 upstream.
If a device uses MCP23xxx IO expander to receive IRQs, the following
bug can happen:
BUG: sleeping function called from invalid context
at kernel/locking/mutex.c:283
in_atomic(): 1, irqs_disabled(): 1, non_block: 0, ...
preempt_count: 1, expected: 0
...
Call Trace:
...
__might_resched+0x104/0x10e
__might_sleep+0x3e/0x62
mutex_lock+0x20/0x4c
regmap_lock_mutex+0x10/0x18
regmap_update_bits_base+0x2c/0x66
mcp23s08_irq_set_type+0x1ae/0x1d6
__irq_set_trigger+0x56/0x172
__setup_irq+0x1e6/0x646
request_threaded_irq+0xb6/0x160
...
We observed the problem while experimenting with a touchscreen driver which
used MCP23017 IO expander (I2C).
The regmap in the pinctrl-mcp23s08 driver uses a mutex for protection from
concurrent accesses, which is the default for regmaps without .fast_io,
.disable_locking, etc.
mcp23s08_irq_set_type() calls regmap_update_bits_base(), and the latter
locks the mutex.
However, __setup_irq() locks desc->lock spinlock before calling these
functions. As a result, the system tries to lock the mutex whole holding
the spinlock.
It seems, the internal regmap locks are not needed in this driver at all.
mcp->lock seems to protect the regmap from concurrent accesses already,
except, probably, in mcp_pinconf_get/set.
mcp23s08_irq_set_type() and mcp23s08_irq_mask/unmask() are called under
chip_bus_lock(), which calls mcp23s08_irq_bus_lock(). The latter takes
mcp->lock and enables regmap caching, so that the potentially slow I2C
accesses are deferred until chip_bus_unlock().
The accesses to the regmap from mcp23s08_probe_one() do not need additional
locking.
In all remaining places where the regmap is accessed, except
mcp_pinconf_get/set(), the driver already takes mcp->lock.
This patch adds locking in mcp_pinconf_get/set() and disables internal
locking in the regmap config. Among other things, it fixes the sleeping
in atomic context described above.
Fixes: 8f38910ba4stable@vger.kernel.org
Signed-off-by: Evgenii Shatokhin <e.shatokhin@yadro.com >
Link: https://lore.kernel.org/20241209074659.1442898-1-e.shatokhin@yadro.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2025-01-09 13:30:06 +01:00
Injune Choi