Skip to content

Merge android 6.8 mainline#2

Draft
ljmf00 wants to merge 4944 commits into
mainfrom
acjl/merge-android-6.8-mainline
Draft

Merge android 6.8 mainline#2
ljmf00 wants to merge 4944 commits into
mainfrom
acjl/merge-android-6.8-mainline

Conversation

@ljmf00

@ljmf00 ljmf00 commented Apr 16, 2024

Copy link
Copy Markdown
Owner

No description provided.

gregkh and others added 30 commits November 27, 2023 15:11
@gregkh
Merge fdce8bd ("Merge tag 'slab-for-6.7' of git://git.kernel.org/pub/…
9186090 
…scm/linux/kernel/git/vbabka/slab") into android-mainline

Steps on the way to 6.7-rc1

Change-Id: I01cac768c4ca9226534d8ffe0976e396994a0b8a
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
@gregkh
Merge b9ff774 ("Merge tag 'tpmdd-v6.7' of git://git.kernel.org/pub/sc…
7c4c453 
…m/linux/kernel/git/jarkko/linux-tpmdd") into android-mainline

Steps on the way to 6.7-rc1

Change-Id: Ib1c6be397d6fe67dc3e698697f10248168b7f691
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
@gregkh
Merge 455cdcb ("Merge tag 'rust-6.7' of https://github.com/Rust-for-L…
50a656a 
…inux/linux") into android-mainline

Steps on the way to 6.7-rc1

Change-Id: Iac969751633fa04c87f55fd262227a24fe2be51f
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
ANDROID: Add packaging rules for KUnit test modules.
df94db3 
Include KUnit modules and test configuration inside `tests.zip` alongside the kselftest tests.

Bug: 311187098
Change-Id: Ic82cd8611d0761435a45c8e82c7d10a009d01a73
Signed-off-by: Joe Fradley <joefradley@google.com>
Revert "ANDROID: Add packaging rules for KUnit test modules."
d0d077e 
This reverts commit df94db3.

Reason for revert:
kernel_virt_debug_* build breakage

Change-Id: I5e7fe4225159e1292532b7930e8da7e2d2f413f3
Signed-off-by: Joe Fradley <joefradley@google.com>
ANDROID: interconnect: Enable debugfs client
4439db7 
The interconnect debugfs client supports voting for any path registered
with the framework from shell, which is important for debugging and
testing.

This is normally disabled by default since directly touching bus HW from
user space can introduce security issues. However, Android already
considers debugfs itself unsafe and doesn't allow mounting it on user
devices anyway.

A similar approach was taken to enable writable debugfs files for the
clock framework in commit 861a024 ("ANDROID: clk: Enable writable
debugfs files").

Bug: 304307718
Change-Id: I800692b5151e6f0277f6a6db1ffdb4d4696f8350
Signed-off-by: Mike Tipton <quic_mdtipton@quicinc.com>
@gregkh
Merge 89ed67e ("Merge tag 'net-next-6.7' of git://git.kernel.org/pub/…
0e01ee2 
…scm/linux/kernel/git/netdev/net-next") into android-mainline

Steps on the way to 6.7-rc1

Change-Id: I791c738e22463c16e0bcfe47e76132d41d9d41be
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Merge "Merge 89ed67e ("Merge tag 'net-next-6.7' of git://git.kernel.o…
81d02c2 
…rg/pub/scm/linux/kernel/git/netdev/net-next") into android-mainline" into android-mainline
ANDROID: Fix selftest x86_64 config and add --skip-cvd-kill option to…
db07b9d 
… kselftest.sh

Change-Id: I9c661f8958eecd3d3a3870295a9e2acd6b199590
Signed-off-by: Weijia He <hwj@google.com>
Bug: 291147200
@gregkh
Merge 4ac4677 ("Merge tag 'thermal-6.7-rc1' of git://git.kernel.org/p…
fb30419 
…ub/scm/linux/kernel/git/rafael/linux-pm") into android-mainline

Steps on the way to 6.7-rc1

Change-Id: Idbab09f3a801a616fefab4abf9bb392f3bde8f69
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
@browse-zhang @toddkjos
ANDROID: thermal: enable 'Bang Bang thermal governor'
484348c 
Enable 'CONFIG_THERMAL_GOV_BANG_BANG' to manage platform thermals
and replace 'gov_backward_compatible',
as the latter no longer exists after kernel-4.19

Bug: 313782905
Change-Id: I66ec3d9ab1a845366664301931ddbdcf30aafe19
Signed-off-by: yugang.wang <yugang.wang@mediatek.com>
Signed-off-by: Browse Zhang <browse.zhang@mediatek.com>
@Rickyiu @toddkjos
ANDROID: sched: Add trace_android_rvh_set_user_nice_locked
039b2e0 
We will need vendor hook of set_user_nice with lock to avoid race
condition. Remove the unlocked version as well.

Bug: 300872872
Change-Id: I24fc1e13cc6578dcc418d956a5146ad29ff76a56
Signed-off-by: Rick Yiu <rickyiu@google.com>
ANDROID: add OWNERS file for kselftests
a2ebe39 
Bug: 291147200
Change-Id: I1edc6f4e6a703afc76d2344dfebf1c138f92191a
Signed-off-by: Edward Liaw <edliaw@google.com>
ANDROID: kselftests: Use KernelTargetTest and handle skip exit code
93dd591 
kselftests use exit code 4 when skipping tests.  Use KernelTargetTest to
handle this correctly.

Bug: 291147200
Change-Id: I6a8dfb67b29b04f6e54b2ca9a42c138a2d6b65f6
Signed-off-by: Edward Liaw <edliaw@google.com>
ANDROID: mm: cma: introduce __cma_alloc API
3390547 
This patch enhances the CMA API with support for failfast mode,
utilizing the __GFP_NORETRY flag. This mode is specifically designed
for high-order bulk allocation scenarios, enabling the CMA API to
avoid prolonged stalls resulting from blocking pages such as those
undergoing page writeback or page locking. Instead of stalling, the
API will continue searching for readily migratable pages across
different pageblocks.

The original patch link:
Link: https://lore.kernel.org/linux-mm/YAnM5PbNJZlk%2F%2FiX@google.com/T/#m36b144ff81fe0a8f0ecaf6813de4819ecc41f8fe

Bug: 308881290
Change-Id: I1c623f17fb49c26005aaffc17330cf820ce6585c
Signed-off-by: Richard Chang <richardycc@google.com>
ANDROID: mm: lru_cache_disable skips lru cache drainnig
816567b 
lru_cache_disable is not trivial cost since it should run work
from every cores in the system. Thus, repeated call of the
function whenever alloc_contig_range in the cma's allocation loop
is called is expensive.

This patch makes the lru_cache_disable smarter in that it will
not run __lru_add_drain_all since it knows the cache was already
disabled by someone else.
With that, user of alloc_contig_range can disable the lru cache
in advance in their context so that subsequent alloc_contig_range
for user's operation will avoid the costly function call.

Bug: 313795505
Change-Id: Icbb0e6dbf74644d45f562fd1d845888ca1f1f347
Signed-off-by: Richard Chang <richardycc@google.com>
@lambert-mtk
ANDROID: devlink: Select CONFIG_NET_DEVLINK in Kconfig.gki
9a034cb 
Select hidden Kconfig: NET_DEVLINK.

Required by device drivers to provide unified interface to expose
device info, capture coredump and perform device flash.

Bug: 283707518

Change-Id: I1cc5b7dce36c79549cd7f1d9b755f7bab3973f0e
Signed-off-by: michael cai <michael.cai@mediatek.com>
Signed-off-by: lambert wang <lambert.wang@mediatek.com>
(cherry picked from commit ec419af)
ANDROID: kselftests: Use tests-dir in kselftest script
3856301 
Replace usage of `--extra-file testsdir` with `--tests-dir` to prevent
folder from being cleaned up unintentionally.

Bug: 291147200
Change-Id: I535780afb272dd3494756c61a8b474157ce94b9b
Signed-off-by: Edward Liaw <edliaw@google.com>
ANDROID: Add futex self tests
80979fa 
This change adds futex self tests

Change-Id: I20fcc0ecc139db017e235ee679f22ca1aa0ea71c
Signed-off-by: Weijia He <hwj@google.com>
Bug: 291147200
Signed-off-by: Edward Liaw <edliaw@google.com>
@jiyongp @metti
ANDROID: Move microdroid and crashdump defconfigs to common
9c5ef7c 
They don't have device-specific modules. They are just generic configs
that are different from GKI.

Bug: 301852599
Bug: 315040683
Test: run following commands
tools/bazel run //common:kernel_aarch64_microdroid_dist
tools/bazel run //common:kernel_x86_64_microdroid_dist
tools/bazel run //common:kernel_aarch64_microdroid_config -- menuconfig
tools/bazel run //common:kernel_x86_64_microdroid_config -- menuconfig
tools/bazel run //common:kernel_aarch64_crashdump_dist
tools/bazel run //common:kernel_x86_64_crashdump_dist
tools/bazel run //common:kernel_aarch64_crashdump_config -- menuconfig
tools/bazel run //common:kernel_x86_64_crashdump_config -- menuconfig

Change-Id: I8908a7499451ace0740979b694eb5fcc68398c61
Signed-off-by: Jiyong Park <jiyong@google.com>
(cherry picked from commit ae5ea90)
ANDROID: Add timer self tests
e49cb50 
This change adds timer self tests

Change-Id: I478103a90e7497ec44575fcfbc9852453dafd2e1
Signed-off-by: Weijia He <hwj@google.com>
Bug: 291147200
ANDROID: Add mm self tests
0e4e05e 
This change adds mm self tests

Change-Id: Ib193d852701db59189f586257146d89582987836
Signed-off-by: Weijia He <hwj@google.com>
Bug: 291147200
@gregkh
Merge 34aac0a ("Merge tag 'spi-v6.7' of git://git.kernel.org/pub/scm/…
17a6776 
…linux/kernel/git/broonie/spi") into android-mainline

Steps on the way to 6.7-rc1

Change-Id: Iad41a9ce20c9cfa886cd5b19bbfbaac78ea27e79
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
@gregkh
Merge f9ae180 ("Merge tag 'for-v6.7' of git://git.kernel.org/pub/scm/…
804ee29 
…linux/kernel/git/sre/linux-power-supply") into android-mainline

Steps on the way to 6.7-rc1

Change-Id: Iae7da0e2896ffd72e214d44b4453218c90abdf75
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
@gregkh
Merge 4684e92 ("Merge tag 'soc-arm-6.7' of git://git.kernel.org/pub/s…
661cdfd 
…cm/linux/kernel/git/soc/soc") into android-mainline

Steps on the way to 6.7-rc1

Change-Id: I4810b2688c9cb11dec46c2e987a6ca998ee26733
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
@gregkh
Merge 1e0c505 ("Merge tag 'asm-generic-6.7' of git://git.kernel.org/p…
99d6c4d 
…ub/scm/linux/kernel/git/arnd/asm-generic") into android-mainline

Steps on the way to 6.7-rc1

Change-Id: I554f2052a4eb6208940afd7b0f8e75d1c2ef475d
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
@gregkh
ANDROID: fix up location of qcom-scm.ko module
49253ab 
In commit bdac188 ("firmware: qcom: move Qualcomm code into its own
directory"), the qcom modules are moved to a subdirectory, which breaks
the db845c build as the qcom-scm.ko module is no longer found.  Rename
the file to the proper location in order to resolve this.

Fixes: bdac188 ("firmware: qcom: move Qualcomm code into its own directory")
Change-Id: Ib00607e9d9fbb09816dc287b45140df8ba0e963f
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
@gregkh
Merge 426ee51 ("Merge tag 'sysctl-6.7-rc1' of git://git.kernel.org/pu…
ee39209 
…b/scm/linux/kernel/git/mcgrof/linux") into android-mainline

Steps on the way to 6.7-rc1

Change-Id: I30eb92f94027aa88327d309dba0b8e52053ac27f
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
@gregkh
Merge 21e80f3 ("Merge tag 'modules-6.7-rc1' of git://git.kernel.org/p…
242a024 
…ub/scm/linux/kernel/git/mcgrof/linux") into android-mainline

Steps on the way to 6.7-rc1

Change-Id: I1285112075e195f45a138efd3c5963aba53e5a73
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
ANDROID: Update license for selftest build and configs
2597aed 
Bug: 291147200
Change-Id: I41c7c067c62b8fb038a96bf516710010b617d363
Signed-off-by: Weijia He <hwj@google.com>
Joe Fradley and others added 18 commits March 27, 2024 16:42
ANDROID: coverage doc: make examples test specific.
0dd2f32 
Bug: 330225462

Change-Id: Ib1d29fa90e09af062eb27024955363d8c4d8bb5f
Signed-off-by: Joe Fradley <joefradley@google.com>
@lag-google
Merge e1aa9df ("Merge tag 'pci-v6.8-changes' of git://git.kernel.org/…
f98163d 
…pub/scm/linux/kernel/git/pci/pci") into android-mainline

Steps on the way to v6.8-rc1

Signed-off-by: Lee Jones <joneslee@google.com>
Change-Id: Iad20cdd11400a6702f48159fb43e466a62f9d286
@lag-google
Merge 296455a ("Merge tag 'char-misc-6.8-rc1' of git://git.kernel.org…
3de52a5 
…/pub/scm/linux/kernel/git/gregkh/char-misc") into android-mainline

Steps on the way to v6.8-rc1

Signed-off-by: Lee Jones <joneslee@google.com>
Change-Id: I7ba6f71d857ee038050ee35f358ed5989d8d247e
@lag-google
Revert "mei: rework Kconfig dependencies"
b8ed662 
This reverts commit d667378.

Seemingly breaks:

  v2/android-gki/ack_platform_integration_main_aosp_cf_x86_64_boot_test on kernel_virt_gcov_x86_64

Unable to find root partition.

Signed-off-by: Lee Jones <joneslee@google.com>
Change-Id: Ibfa81a28e481085f9270cbf3ddf804e085920fc1
@lag-google
Merge e38f734 ("Merge tag 'staging-6.8-rc1' of git://git.kernel.org/p…
26c3fa8 
…ub/scm/linux/kernel/git/gregkh/staging") into android-mainline

Steps on the way to v6.8-rc1

Signed-off-by: Lee Jones <joneslee@google.com>
Change-Id: If31efbb9c172626d5f532917952fdd264a4fafdd
@lag-google
Merge 8c94ccc ("Merge tag 'usb-6.8-rc1' of git://git.kernel.org/pub/s…
66942fe 
…cm/linux/kernel/git/gregkh/usb") into android-mainline

Steps on the way to v6.8-rc1

Signed-off-by: Lee Jones <joneslee@google.com>
Change-Id: I81f18ae0459edb092419ac6c12d770b1bab9ac2c
@lag-google
UPSTREAM: usb: typec: tcpm: fix the PD disabled case
5491639 
If the PD is disabled for the port, port->pds will be left as NULL,
which causes the following crash during caps intilisation. Fix the
crash.

Unable to handle kernel NULL pointer dereference at virtual address 0000000000000000
Call trace:
 tcpm_register_port+0xaec/0xc44
 qcom_pmic_typec_probe+0x1a4/0x254
 platform_probe+0x68/0xc0
 really_probe+0x148/0x2ac
 __driver_probe_device+0x78/0x12c
 driver_probe_device+0xd8/0x160
Bluetooth: hci0: QCA Product ID   :0x0000000a
 __device_attach_driver+0xb8/0x138
 bus_for_each_drv+0x80/0xdc
Bluetooth: hci0: QCA SOC Version  :0x40020150
 __device_attach+0x9c/0x188
 device_initial_probe+0x14/0x20
 bus_probe_device+0xac/0xb0
 deferred_probe_work_func+0x8c/0xc8
 process_one_work+0x1ec/0x51c
 worker_thread+0x1ec/0x3e4
 kthread+0x120/0x124
 ret_from_fork+0x10/0x20

Bug: 331422443
Fixes: cd099cd ("usb: typec: tcpm: Support multiple capabilities")
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20240113-pmi632-typec-v2-5-182d9aa0a5b3@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit f2e5d3d)
Signed-off-by: Lee Jones <joneslee@google.com>
Change-Id: Ib2c298e37255218b595df6209c0fa5118922edaa
@lag-google
ANDROID: xt_quota2: Replace strlcpy() with compatible and safer varia…
bc77380 
…nt strscpy()

strlcpy() has now been formally removed from the kernel due to the risks it poses.

Let's follow suit and convert over to strscpy().

Fixes the following build error:

  net/netfilter/xt_quota2.c:114:3: error:
    call to undeclared library function 'strlcpy' with type 'unsigned long (char *, const char *, unsigned long)';
      ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
    114 |                 strlcpy(pm->prefix, prefix, sizeof(pm->prefix));

Fixes: d262700 ("string: Remove strlcpy()")
Signed-off-by: Lee Jones <joneslee@google.com>
Change-Id: I33990ba6ddd60901f21ea1c6e60675c7c1262c54
@lag-google
ANDROID: debug_kinfo: Replace strlcpy() with compatible and safer var…
20039e6 
…iant strscpy()

strlcpy() has now been formally removed from the kernel due to the risks it poses.

Fixes the following build error:

  drivers/android/debug_kinfo.c:161:2: error:
    call to undeclared library function 'strlcpy' with type 'unsigned long (char *, const char *, unsigned long)';
      ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
    161 |         strlcpy(info->last_uts_release, init_utsname()->release, sizeof(info->last_uts_release));
        |         ^

Fixes: d262700 ("string: Remove strlcpy()")
Signed-off-by: Lee Jones <joneslee@google.com>
Change-Id: Ib2b863c07676495626dd03af762ddb201d326127
@lag-google
Merge 3cb9871 ("Merge tag 'urgent-rcu.2024.01.24a' of https://github.…
6fe236d 
…com/neeraju/linux") into android-mainline

Steps on the way to v6.8-rc1

Signed-off-by: Lee Jones <joneslee@google.com>
Change-Id: I2b95d8ef56b0a11e730c1cb3bff593c689b32d10
@lag-google
Merge d1bba17 ("Merge tag '6.8-rc1-smb3-client-fixes' of git://git.sa…
cc0a229 
…mba.org/sfrench/cifs-2.6") into android-mainline

Steps on the way to v6.8-rc1

Signed-off-by: Lee Jones <joneslee@google.com>
Change-Id: I0e758b0e963a39d813145741a4901ef2eea33e51
@lag-google
ANDROID: gki_defconfig: Re-align defconfigs with saveconfig after lat…
2cfc63c 
…est merge

Avoids pre-submit failures due to non-succinct defconfigs.

Fixes: 6d49233 ("ANDROID: Ensure DIMLIB is available for kernel_virt_* builds")
Signed-off-by: Lee Jones <joneslee@google.com>
Change-Id: I1b4299ded0ea5917f18299b75abe7ded961668e8
@lag-google
Merge e8f897f ("Linux 6.8") into android-mainline
b61b6f7 
Steps on the way to v6.8-rc1

Signed-off-by: Lee Jones <joneslee@google.com>
Change-Id: I9a2d863d5fe2e294f900fbcca8758801e0d0db87
@lag-google
Revert "ANDROID: gki_defconfig: Re-align defconfigs with saveconfig a…
0029c51 
…fter latest merge"

This reverts commit 2cfc63c.

On subsequent merges `saveconfig` decided that these weren't required
after all.

Signed-off-by: Lee Jones <joneslee@google.com>
Change-Id: I2c09069fc7ceba880723ce7e49eeb7b7411eb197
@jacky8hyf
ANDROID: Add pkg_files for TEST_MAPPING.
ad8cdc6 
This is so that it can be included
in test_mappings.zip.

Test: TH
Bug: 330775243
Change-Id: I54c92953dab027ed68bb427adf5e08029f9d7799
Signed-off-by: Yifan Hong <elsk@google.com>
@ljmf00
Merge tag 'android-mainline-6.8' into acjl/merge-android-6.8-mainline
f0dc278
@ljmf00
Merge remote-tracking branch 'origin/main' into acjl/merge-android-6.…
d051a20 
…8-mainline
@ljmf00
crypto: remove duplicate case for OID_id_ecdsa_with_sha1
5190645
@ljmf00 ljmf00 force-pushed the acjl/merge-android-6.8-mainline branch from d22505e to 5190645 Compare April 22, 2024 00:01
@ljmf00 ljmf00 closed this Apr 28, 2024
@ljmf00 ljmf00 reopened this Apr 28, 2024
@ljmf00 ljmf00 marked this pull request as draft April 28, 2024 22:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.