Commit Graph

1106681 Commits

Author SHA1 Message Date
Vincent Whitchurch
fe925e7db4 UPSTREAM: um: virt-pci: set device ready in probe()
Call virtio_device_ready() to make this driver work after commit
b4ec69d7e09 ("virtio: harden vring IRQ"), since the driver uses the
virtqueues in the probe function.  (The virtio core sets the device
ready when probe returns.)

Fixes: 8b4ec69d7e ("virtio: harden vring IRQ")
Fixes: 68f5d3f3b6 ("um: add PCI over virtio emulation driver")
Signed-off-by: Vincent Whitchurch <vincent.whitchurch@axis.com>
Message-Id: <20220610151203.3492541-1-vincent.whitchurch@axis.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Tested-by: Johannes Berg <johannes@sipsolutions.net>
(cherry picked from commit eacea84459)
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: If175f1a6a10e3f53afa89b9ae3f98cd6e6f99823
2022-07-01 20:24:03 +00:00
Treehugger Robot
93b7970e26 Merge "Merge 6e5f6a8691 ("Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost") into android-mainline" into android-mainline 2022-07-01 20:24:03 +00:00
Greg Kroah-Hartman
665530475d Merge 6e5f6a8691 ("Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost") into android-mainline
Steps on the way to 5.19-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Iacbded03d6aa9a6d729d5bcf6fa6eed7a96a1d09
2022-07-01 15:36:01 +02:00
Greg Kroah-Hartman
435497317d Merge be83f04d25 ("virtio: allow to unbreak virtqueue") into android-mainline
Steps on the way to 5.19-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Icfc6cca8e0cb5f02deb28f60ea448f1133934bf4
2022-07-01 15:30:27 +02:00
Greg Kroah-Hartman
cb3b6474ab Merge 3a232277c1 ("virtio-ccw: implement synchronize_cbs()") into android-mainline
Steps on the way to 5.19-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I633944b3c3bc1ba0a58de16f575ebfadb72e9368
2022-07-01 11:40:35 +02:00
Greg Kroah-Hartman
118bfb38c8 Merge bda324fd03 ("vdpasim: control virtqueue support") into android-mainline
Steps on the way to 5.19-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I6572031ce09e545a8bc5058be67fc96ee6aafc5a
2022-07-01 11:18:03 +02:00
Greg Kroah-Hartman
547d254a9d Merge 6f6ebb9899 ("Merge tag 'sound-fix-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound") into android-mainline
Steps on the way to 5.19-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ibc7c8044476080b3a65d2cef9e3cb47f9a7588d6
2022-07-01 09:19:55 +02:00
Greg Kroah-Hartman
9b051650de Merge ab18b7b36a ("Merge tag 'drm-next-2022-06-03-1' of git://anongit.freedesktop.org/drm/drm") into android-mainline
Steps on the way to 5.19-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ie3b5aa18baf83505c953f59bb69070b4889a43c0
2022-07-01 09:19:45 +02:00
Greg Kroah-Hartman
6ecbbf3e5b Merge 50fd82b3a9 ("Merge tag 'docs-5.19-2' of git://git.lwn.net/linux") into android-mainline
Steps on the way to 5.19-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Iaa2ffd8855335610547c83dcae56184d8f2c7429
2022-07-01 09:19:35 +02:00
Greg Kroah-Hartman
1ac03d8954 Merge baf86ac1c9 ("Merge tag 'asm-generic-fixes-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic") into android-mainline
Steps on the way to 5.19-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I4e0c08cd408e606c1616fc0fc200a137b0aab82b
2022-07-01 09:19:22 +02:00
Carlos Llamas
88b166cbf2 ANDROID: gki_defconfig: enable IPV6_MROUTE
Enable support for IPv6 multicast forwarding, required for devices with
border routing capabilities. Note this option will likely be unset after
making ipv6 a GKI module.

Bug: 233821827
Signed-off-by: Carlos Llamas <cmllamas@google.com>
Change-Id: I0ffabbe21373ac23bc353abda51862eba0135972
2022-06-30 13:45:46 +00:00
Guenter Roeck
d196788eda UPSTREAM: watchdog: gxp: Add missing MODULE_LICENSE
The build system says:

ERROR: modpost: missing MODULE_LICENSE() in drivers/watchdog/gxp-wdt.o

Add the missing MODULE_LICENSE.

Signed-off-by: Nick Hawkins <nick.hawkins@hpe.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/all/20220603131419.2948578-1-linux@roeck-us.net/
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
(cherry picked from commit b6c8cd80ac)
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I517f21913374a6608e07462a319a0e07297b4e46
2022-06-29 20:18:55 +02:00
Greg Kroah-Hartman
df7fb96b9f Merge 09a018176b ("Merge tag 'arm-late-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc") into android-mainline
Steps on the way to 5.19-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I4973ce3f484afda5c90d1339cd4a8d68a8a8e769
2022-06-29 20:18:45 +02:00
Greg Kroah-Hartman
5c4ea62dc8 Merge 96479c0980 ("Merge tag 'arm-multiplatform-5.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc") into android-mainline
Steps on the way to 5.19-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Iad78a06b49ccde43bbb7becad2c0364502b48bb1
2022-06-29 20:12:12 +02:00
Greg Kroah-Hartman
606ba5ace0 Merge 58f9d52ff6 ("Merge tag 'net-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net") into android-mainline
Steps on the way to 5.19-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I2cd84319e175aa95ce9cff4402f6a67915afe321
2022-06-29 20:11:22 +02:00
Greg Kroah-Hartman
2f60073848 Merge c399c85d60 ("Merge tag 'pci-v5.19-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci") into android-mainline
Steps on the way to 5.19-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I607f68c16c324952bf04ead11244d03b7502f25a
2022-06-29 20:10:27 +02:00
Greg Kroah-Hartman
6de0a2769e ANDROID: add drivers/leds/rgb/leds-qcom-lpg.ko to db845c module list
Add the drivers/leds/rgb/leds-qcom-lpg.ko driver to the list of modules
that the db845c build needs as it is now upstream and actually builds.

Fixes: 24e2d05d1b ("leds: Add driver for Qualcomm LPG")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I5bb6ffe688c5c9fe85313d1d7302d248789508ab
2022-06-29 20:08:57 +02:00
Greg Kroah-Hartman
93be1a4d85 Merge 2a5699b0de ("Merge tag 'leds-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds") into android-mainline
Steps on the way to 5.19-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I3b0bc701c0ec7f1955eea15157753b6f377fc7a6
2022-06-29 20:01:26 +02:00
Greg Kroah-Hartman
78dcf9434c Merge f8a52af9d0 ("Merge tag 'i2c-for-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux") into android-mainline
Steps on the way to 5.19-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I7a6f4006a216fc4828361ba7ec74e6a8e3849877
2022-06-29 20:00:36 +02:00
Greg Kroah-Hartman
f7eff2dfa2 Merge 3cc30140db ("Merge tag 'pci-v5.19-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci") into android-mainline
Steps on the way to 5.19-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I99872c1974ace8515cd56e274f7aff16f32cbfaa
2022-06-29 08:35:04 +02:00
Greg Kroah-Hartman
ddaec487a3 ANDROID: gki_defconfig: reorder some mm config options
Commit 0710d0122a ("mm: Kconfig: reorganize misplaced mm options")
reorginized the mm config options a bit, so the gki_defconfig options
also need to be reordered so that the build succeeds.

Fixes: 0710d0122a ("mm: Kconfig: reorganize misplaced mm options")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ic4228bc9498258e0d184daeac482c79253843b83
2022-06-29 08:33:09 +02:00
Greg Kroah-Hartman
e2d2ecb4d6 Merge 8291eaafed ("Merge tag 'mm-stable-2022-05-27' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm") into android-mainline
Steps on the way to 5.19-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ibe6f82bf687972be4683e20f8df7bddce7cd8422
2022-06-29 08:29:52 +02:00
Greg Kroah-Hartman
8fd8d8e717 Merge 77fb622de1 ("Merge tag 'mm-hotfixes-stable-2022-05-27' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm") into android-mainline
Steps on the way to 5.19-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I18601ada1139de6e701d0ba9a34c45ad1d8c4f77
2022-06-28 15:33:45 +02:00
Greg Kroah-Hartman
ddb98226ac ANDROID: remove CONFIG_USELIB from x86 gki_defconfig
In commit 7374fa33dc ("init/Kconfig: remove USELIB syscall by
default") CONFIG_USELIB is disabled, so remove the "is not set" setting
in the x86 gki_defconfig file to resolve the build issue.

Fixes: 7374fa33dc ("init/Kconfig: remove USELIB syscall by default")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: If7565bffb90b2efd913f08a8aeccbb11cc77ac17
2022-06-28 15:31:27 +02:00
Greg Kroah-Hartman
3b390fba1d Merge 6f664045c8 ("Merge tag 'mm-nonmm-stable-2022-05-26' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm") into android-mainline
Steps on the way to 5.19-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I477b976bc22189a1d052d6c3d2773966a1128eaa
2022-06-28 14:54:22 +02:00
Greg Kroah-Hartman
cc910b9eaa Merge 7e284070ab ("Merge tag 'for-5.19/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm") into android-mainline
Steps on the way to 5.19-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I9981265de6b27657eaaf51bd1fa19ce0ce9f2cc6
2022-06-28 14:52:55 +02:00
Greg Kroah-Hartman
f5794dc184 Revert "Revert "Revert "Revert "ANDROID: GKI: Add module load time protected symbol lookup""""
This reverts commit 090a1da697.

It brings it back now that we have merged around the problem area.

Bug: 200082547
Bug: 214445388
Cc: Ramji Jiyani <ramjiyani@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Iaa69221f341bf2face454ec0452efff2cbba9042
2022-06-28 12:55:56 +02:00
Greg Kroah-Hartman
8246e1a92f Merge ef98f9cfe2 ("Merge tag 'modules-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux") into android-mainline
Steps on the way to 5.19-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I83fd30737a60ed30a735742c2f6f17a13fea0bbe
2022-06-28 11:53:33 +02:00
Greg Kroah-Hartman
090a1da697 Revert "Revert "Revert "ANDROID: GKI: Add module load time protected symbol lookup"""
This reverts commit 5ffc4c2275.

It conflicts in bad ways with the module code changes in 5.19-rc1 so
revert it for now.  If it is still needed, it can be added back later.

Bug: 200082547
Bug: 214445388
Cc: Ramji Jiyani <ramjiyani@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ibf0b85c355cfc3e1a45c213a131a12c9e3061349
2022-06-28 11:52:40 +02:00
Greg Kroah-Hartman
40d350b483 Revert "ANDROID: GKI: Disable security lockdown for unsigned modules"
This reverts commit befc75e758.

It conflicts in bad ways with the module code changes in 5.19-rc1 so
revert it for now.  If it is still needed, it can be added back in
later.

Bug: 200082547
Bug: 214445388
Cc: Ramji Jiyani <ramjiyani@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ice884d241ae153a75facc1ca409ea5c59653cde3
2022-06-28 09:44:28 +02:00
Greg Kroah-Hartman
c0199c0154 Revert "ANDROID: module: Add vendor hook"
This reverts commit 5ebe162306.

It causes lots of conflicts in the 5.19-rc1 merge due to the rewrite and
movement of the module core code.  If this is still needed, it can be
added back later.

Bug: 181639260
Cc: Kuan-Ying Lee <Kuan-Ying.Lee@mediatek.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I742e7ef56c2dd7a9b6c9c296dc9f96bced84bc7c
2022-06-28 09:44:08 +02:00
Jing-Ting Wu
a024fc656b ANDROID: sched: add vendor hook to set_cpus_allowed
Add new vendor hook when set affinity to detect task status
for performance tuning.

Bug: 236775946
Change-Id: I407637c85e2ea93585877312f090981fee848979
Signed-off-by: Jing-Ting Wu <Jing-Ting.Wu@mediatek.com>
2022-06-24 12:13:17 +08:00
Nathan Chancellor
483887d651 ANDROID: Incremental fs: Use ERR_CAST in handle_mapped_file()
When building android-mainline with a version of clang that supports
CONFIG_RANDSTRUCT, there are errors about casts from randomized
structures to non-randomized structures:

  fs/incfs/data_mgmt.c:240:10: error: casting from randomized structure pointer type 'struct dentry *' to 'struct data_file *'
                  return (struct data_file *)index_file_dentry;
                         ^
  fs/incfs/data_mgmt.c:257:12: error: casting from randomized structure pointer type 'struct file *' to 'struct data_file *'
                  result = (struct data_file *)bf;
                           ^
  2 errors generated.

As suggested by Kees on aosp/1995750, these casts should actually be
using the ERR_CAST macro, which is a more proper way to pass error
pointers around.

Change-Id: Iab73ac7503235f1147154a01a22ab8608e3daf8b
Fixes: 3f4938108a ("ANDROID: Incremental fs: Create mapped file")
Link: https://github.com/ClangBuiltLinux/linux/issues/1652
Suggested-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
2022-06-23 12:54:22 -07:00
Riccardo Paolo Bestetti
0f0ddc32df UPSTREAM: ipv4: ping: fix bind address validity check
Commit 8ff978b8b2 ("ipv4/raw: support binding to nonlocal addresses")
introduced a helper function to fold duplicated validity checks of bind
addresses into inet_addr_valid_or_nonlocal(). However, this caused an
unintended regression in ping_check_bind_addr(), which previously would
reject binding to multicast and broadcast addresses, but now these are
both incorrectly allowed as reported in [1].

This patch restores the original check. A simple reordering is done to
improve readability and make it evident that multicast and broadcast
addresses should not be allowed. Also, add an early exit for INADDR_ANY
which replaces lost behavior added by commit 0ce779a9f5 ("net: Avoid
unnecessary inet_addr_type() call when addr is INADDR_ANY").

Furthermore, this patch introduces regression selftests to catch these
specific cases.

[1] https://lore.kernel.org/netdev/CANP3RGdkAcDyAZoT1h8Gtuu0saq+eOrrTiWbxnOs+5zn+cpyKg@mail.gmail.com/

Fixes: 8ff978b8b2 ("ipv4/raw: support binding to nonlocal addresses")
Cc: Miaohe Lin <linmiaohe@huawei.com>
Reported-by: Maciej Żenczykowski <maze@google.com>
Signed-off-by: Carlos Llamas <cmllamas@google.com>
Signed-off-by: Riccardo Paolo Bestetti <pbl@bestov.io>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit b4a028c4d0)

Bug: 235430656
Test: atest vts_kernel_net_tests
Signed-off-by: Carlos Llamas <cmllamas@google.com>
Change-Id: I8ac173422e2a1aec1f69d7bca8253b045c80371e
2022-06-23 16:16:33 +00:00
Greg Kroah-Hartman
593e016519 Merge 44d35720c9 ("Merge tag 'sysctl-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux") into android-mainline
Steps on the way to 5.19-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I18505aae180d7c54ac425efd2c60fefc47e0b1e4
2022-06-22 08:38:40 +02:00
Baolin Wang
7c7c59ca51 UPSTREAM: arm64/hugetlb: Fix building errors in huge_ptep_clear_flush()
Fix the arm64 build error which was caused by commit ae07562909 ("mm:
change huge_ptep_clear_flush() to return the original pte") interacting
with commit fb396bb459 ("arm64/hugetlb: Drop TLB flush from
get_clear_flush()"):

  arch/arm64/mm/hugetlbpage.c: In function ‘huge_ptep_clear_flush’:
  arch/arm64/mm/hugetlbpage.c:515:9: error: implicit declaration of function ‘get_clear_flush’; did you mean ‘ptep_clear_flush’? [-Werror=implicit-function-declaration]
    515 |  return get_clear_flush(vma->vm_mm, addr, ptep, pgsize, ncontig);
        |         ^~~~~~~~~~~~~~~
        |         ptep_clear_flush

Due to the new get_clear_contig() has dropped TLB flush, we should add
an explicit TLB flush in huge_ptep_clear_flush() to keep original
semantics when changing to use new get_clear_contig().

Fixes: fb396bb459 ("arm64/hugetlb: Drop TLB flush from get_clear_flush()").
Fixes: ae07562909 ("mm: change huge_ptep_clear_flush() to return the original pte")
Reported-and-tested-by: Linux Kernel Functional Testing <lkft@linaro.org>
Reported-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Suggested-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Baolin Wang <baolin.wang@linux.alibaba.com>
Reviewed-by: Gavin Shan <gshan@redhat.com>
Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Anshuman Khandual <anshuman.khandual@arm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit e68b823ab0)
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I31fbc8728fbd3b108343b71e29f281c6d408b7f9
2022-06-22 06:34:46 +00:00
Greg Kroah-Hartman
a0cfb5ab27 ANDROID: fix up gki_defconfig files due to Kconfig movements
Commit 006477f40d ("kconfig: move the "Executable file formats" menu
to fs/Kconfig.binfmt") moved the Kconfig order around a bit, which
messed with the checking of the gki_defconfig files by the build system.

Also the ZSMALLOC=m requirement went away with commit 6140ae41ef
("zram: fix Kconfig dependency warning") and it is still enabled.

Fix all of these up by reordering some of the config options.

Fixes: 006477f40d ("kconfig: move the "Executable file formats" menu to fs/Kconfig.binfmt")
Fixes: 6140ae41ef ("zram: fix Kconfig dependency warning")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ibd807dae4cc50999838f4471f4f144e6cdb41db1
2022-06-22 06:34:46 +00:00
Greg Kroah-Hartman
8916d060d7 Merge "Merge 98931dd95f ("Merge tag 'mm-stable-2022-05-25' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm") into android-mainline" into android-mainline 2022-06-22 06:34:46 +00:00
Michal Kubecek
e0fa54c93d UPSTREAM: Revert "net: af_key: add check for pfkey_broadcast in function pfkey_process"
This reverts commit 4dc2a5a8f6.

A non-zero return value from pfkey_broadcast() does not necessarily mean
an error occurred as this function returns -ESRCH when no registered
listener received the message. In particular, a call with
BROADCAST_PROMISC_ONLY flag and null one_sk argument can never return
zero so that this commit in fact prevents processing any PF_KEY message.
One visible effect is that racoon daemon fails to find encryption
algorithms like aes and refuses to start.

Excluding -ESRCH return value would fix this but it's not obvious that
we really want to bail out here and most other callers of
pfkey_broadcast() also ignore the return value. Also, as pointed out by
Steffen Klassert, PF_KEY is kind of deprecated and newer userspace code
should use netlink instead so that we should only disturb the code for
really important fixes.

v2: add a comment explaining why is the return value ignored

Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
(cherry picked from commit 9c90c9b3e5)

Bug: 235430656
Test: TreeHugger, fixes failures in Android net-test wrt. pf_key.
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Signed-off-by: Carlos Llamas <cmllamas@google.com>
Change-Id: I173e37a840be187cb471a97b450b9fa06842497d
2022-06-21 20:46:18 +00:00
Greg Kroah-Hartman
1878ac5f64 Merge 98931dd95f ("Merge tag 'mm-stable-2022-05-25' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm") into android-mainline
Steps on the way to 5.19-rc1

Resolves merge conflict in:
	fs/proc/base.c
	mm/util.c

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I55d6d0cadb4dbd0f978a1e7d14444068bd050a7c
2022-06-21 18:17:43 +02:00
Greg Kroah-Hartman
56d33a1ce1 ANDROID: disable LTO and CFI
5.19-rc1 has merge issues with CFI at the moment, so we need to disable
LTO and CFI to enable the merge to continue.  This will be fixed up
later in the 5.19-rcX process.

Bug: 236688521
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ibf79663f0e31b3d083c56d793522071f4c16480b
2022-06-21 14:13:52 +02:00
Greg Kroah-Hartman
b620c49424 Merge df202b452f ("Merge tag 'kbuild-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild") into android-mainline
Steps on the way to 5.19-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia2ecf8a3282630939344386ffa0aca7ed75af8f2
2022-06-21 14:08:53 +02:00
Steve Muckle
0670db0f72 ANDROID: add smuckle to OWNERS
Signed-off-by: Steve Muckle <smuckle@google.com>
Change-Id: I5a14dbbf719534be52207f545600818d4a183f86
2022-06-18 10:41:40 -07:00
Bowgo Tsai
2ad997b4d1 ANDROID: Adding Image.gz and boot-gz.img
This adds <10 seconds for a LTO=thin build, while the original
build time is about ~250 seconds on a build machine with 48 2.60 GHz
processors and 64GB RAM.

Within the 10 seconds, ~3 seconds spent on building Image.gz,
~5 seconds for packing Image.gz as boot-gz.img and <1 second for
including the boot-gz.img into the boot-img.tar.gz.

Bug: 233352819
Test: LTO=thin BUILD_CONFIG=common/build.config.gki.aarch64 build/build.sh
Signed-off-by: Bowgo Tsai <bowgotsai@google.com>
Change-Id: I283ef004d1233d2e175573b893379e0d68221353
2022-06-13 10:00:31 +00:00
Greg Kroah-Hartman
ab93f3aae9 Revert "ANDROID: modpost: Forbid double exports"
This reverts commit 479488f5bf.

It was merged in a different way upstream in 5.19-rc1, so drop it now to
allow the merge to be clean.

Bug: 174214891
Cc: Quentin Perret <qperret@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I127ccf87a4cd8b0ace0dc83e69458ccc64eb66ac
2022-06-12 07:17:40 +02:00
Peter Collingbourne
1e0ed73b2e ANDROID: Enable SM8450 drivers and DTB in the db845c config
Bug: 217455793
Change-Id: I710c1e40161bb49ad68ae7ef8804fa25c7b8a232
Signed-off-by: Peter Collingbourne <pcc@google.com>
2022-06-10 15:08:55 -07:00
Ramji Jiyani
bf0dc51ca3 ANDROID: GKI: remove info print for header generation
Script doesn't honor the Kernel's quiet command
mechanism with KBuild; so need to remove info
only echo. Added set -x in case make V=1 for keeping
debugging handy for script in the future.

Bug: 234116152
Test: TH
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
Change-Id: Iea881816b9bc8c47157a33da67d6cf5f8357a7be
(cherry picked from commit 08a1879c876258e1ad269ab3dc111ffc6750440a)
2022-06-10 18:20:19 +00:00
Shubhi Jain
146005b2c3 ANDROID: Add clang-tidy/clang-analyzer support for mixed build environment
Running clang-tidy/clang-analyzer with MAKE_GOALS fails in a mixed
build environment because archive files pertaining to the vmlinux are
expected as input to make rule. This would cause a failure when
generating compile_commands.json file, so we need to indicate that we
are running a mixed build environment when running clang-tidy/
clang-analyzer.

Bug: 233781076
Change-Id: I67afee105eb52c245aab04172c5a397bd8593532
Signed-off-by: Shubhi Jain <quic_shubhij@quicinc.com>
2022-06-09 17:08:54 +00:00
Jaegeuk Kim
22d5a9e86f ANDROID: dm-default-key: support report_zones
This patch links report_zone in dm-default-key, Android-only feature, in
order to support zoned devices [1].

[1] https://zonedstorage.io/docs/linux/overview

Bug: 228969778
Bug: 160885805
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: I05163d471c1a06e12ff58cf73276ad0adc6d4978
2022-06-09 15:33:22 +00:00
Jaegeuk Kim
1cbf632fa8 ANDROID: GKI: enable zoned device support
This patch enables zoned devices for Android.

Bug: 228969778
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: I7cb14675b4991a80c61e799cade8666c78bb8031
2022-06-09 15:33:11 +00:00