Commit Graph

1082671 Commits

Author SHA1 Message Date
Greg Kroah-Hartman
7301998164 Merge 7403e6d826 ("Merge tag 'vfio-v5.18-rc1' of https://github.com/awilliam/linux-vfio") into android-mainline
Steps on the way to 5.18-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Id5ac7bb1fef94fbaf66255017a564c64071f49a3
2022-04-05 14:27:38 +02:00
Nathan Chancellor
cedf52d103 UPSTREAM: KVM: x86: Fix clang -Wimplicit-fallthrough in do_host_cpuid()
Clang warns:

  arch/x86/kvm/cpuid.c:739:2: error: unannotated fall-through between switch labels [-Werror,-Wimplicit-fallthrough]
          default:
          ^
  arch/x86/kvm/cpuid.c:739:2: note: insert 'break;' to avoid fall-through
          default:
          ^
          break;
  1 error generated.

Clang is a little more pedantic than GCC, which does not warn when
falling through to a case that is just break or return. Clang's version
is more in line with the kernel's own stance in deprecated.rst, which
states that all switch/case blocks must end in either break,
fallthrough, continue, goto, or return. Add the missing break to silence
the warning.

Fixes: f144c49e8c ("KVM: x86: synthesize CPUID leaf 0x80000021h if useful")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Message-Id: <20220322152906.112164-1-nathan@kernel.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
(cherry picked from commit 07ea4ab1f9)
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: If7a53c8c958b6cd3390822d1bb3af85d0ccba8ee
2022-04-05 11:15:46 +02:00
Greg Kroah-Hartman
ccb91c5fb3 Merge 1ebdbeb03e ("Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm") into android-mainline
Steps on the way to 5.18-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ie5f07fd9de81edbcd490c0d3544096b0be12a6e0
2022-04-05 11:15:22 +02:00
Greg Kroah-Hartman
635e0c0d37 Merge efee6c7929 ("Merge tag 'tomoyo-pr-20220322' of git://git.osdn.net/gitroot/tomoyo/tomoyo-test1") into android-mainline
Steps on the way to 5.18-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ifd87c188fb6679513143ff7977e3ccc2d8e0f5e0
2022-04-05 11:14:37 +02:00
Greg Kroah-Hartman
faab30bdcc Merge ed4643521e ("Merge tag 'arm-dt-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc") into android-mainline
Steps on the way to 5.18-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I13d27b9fb4b19af2c713623e0bbcfd0b114647cd
2022-04-05 08:12:56 +02:00
Greg Kroah-Hartman
55d4df9d29 Merge e6aef3496a ("Merge tag 'm68knommu-for-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu") into android-mainline
Steps on the way to 5.18-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ie86429baa4458303f9a41b8a543ccbca28f9c569
2022-04-05 08:07:00 +02:00
Greg Kroah-Hartman
d0dc96c6e9 ANDROID: gki defconfig movements
The media tree merge for 5.18-rc1 moved some Kconfig options around so
update the gki_defconfig files to fix up the build due to this
housekeeping change.

No config options are changed.

Fixes: 182966e1cd ("Merge tag 'media/v5.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ie7c1c4799507604e0352eabe7b3c300222ce4f41
2022-04-04 16:43:29 +02:00
Greg Kroah-Hartman
ee3ad33bfa Merge 182966e1cd ("Merge tag 'media/v5.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media") into android-mainline
Steps on the way to 5.18-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ib9bfd0cfa66628f64dea9aaf1883dc9b5602ada7
2022-04-04 16:40:22 +02:00
Greg Kroah-Hartman
1c188c2c5e Merge 9c4b86ebf5 ("Merge tag 'for-5.18/fbdev-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev") into android-mainline
Steps on the way to 5.18-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I791f482065934a181cfeaaa12c1e3795d3e35e2a
2022-04-04 16:39:33 +02:00
Greg Kroah-Hartman
0bbb71be27 Merge 5bebe2c9ae ("Merge tag 'mmc-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc") into android-mainline
Steps on the way to 5.18-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I2875a49300a6e99c263a8cec36ac4a98c98af8aa
2022-04-04 16:38:22 +02:00
Greg Kroah-Hartman
2a9a204359 Revert "ANDROID: GKI: amlogic: add DTB overlays"
This causes merge issues with 5.18-rc1.  It can be added back after
5.18-rc1 is out, but it really should be submitted upstream, especially
for something as "trivial" as dts files.

Bug: 179406580
Cc: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I55354a8dbdc95ebe38b9d7140f5b5721ba6fff75
2022-04-04 16:37:31 +02:00
Pradeep P V K
c6ca13e9aa FROMLIST: fuse: give wakeup hints to the scheduler
The synchronous wakeup interface is available only for the
interruptible wakeup. Add it for normal wakeup and use this
synchronous wakeup interface to wakeup the userspace daemon.
Scheduler can make use of this hint to find a better CPU for
the waker task.

With this change the performance numbers for compress, decompress
and copy use-cases on /sdcard path has improved by ~30%.

Use-case details:
1. copy 10000 files of each 4k size into /sdcard path
2. use any File explorer application that has compress/decompress
support
3. start compress/decompress and capture the time.

-------------------------------------------------
| Default   | wakeup support | Improvement/Diff |
-------------------------------------------------
| 13.8 sec  | 9.9 sec        | 3.9 sec (28.26%) |
-------------------------------------------------

Co-developed-by: Pavankumar Kondeti <quic_pkondeti@quicinc.com>
Signed-off-by: Pradeep P V K <quic_pragalla@quicinc.com>

Bug: 216261533
Link: https://lore.kernel.org/lkml/1638780405-38026-1-git-send-email-quic_pragalla@quicinc.com/
Change-Id: I9ac89064e34b1e0605064bf4d2d3a310679cb605
Signed-off-by: Pradeep P V K <quic_pragalla@quicinc.com>
Signed-off-by: Alessio Balsini <balsini@google.com>
2022-04-04 10:19:47 +00:00
Greg Kroah-Hartman
b2c024c2ba Merge c5c009e250 ("Merge tag 'slab-for-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab") into android-mainline
Steps on the way to 5.18-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I69954395df00a8ee8247c9edef82d9de5e9c8129
2022-04-03 12:28:57 +02:00
Greg Kroah-Hartman
1b523b5b76 Merge 6b1f86f8e9 ("Merge tag 'folio-5.18b' of git://git.infradead.org/users/willy/pagecache") into android-mainline
Steps on the way to 5.18-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Iadf17dfff68bf14174fcb9ede28e1f9b48804281
2022-04-03 12:27:40 +02:00
Greg Kroah-Hartman
6cca93f29c Merge 9030fb0bb9 ("Merge tag 'folio-5.18c' of git://git.infradead.org/users/willy/pagecache") into android-mainline
Steps on the way to 5.18-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I6bc8f04bf96772421bebc79fa4dd704102cc7575
2022-04-03 12:27:20 +02:00
Greg Kroah-Hartman
951c4cf25f Merge 3bf03b9a08 ("Merge branch 'akpm' (patches from Andrew)") into android-mainline
Steps on the way to 5.18-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ic4dffa9c9a9609189772310e3e26cce39778d41b
2022-04-03 12:26:33 +02:00
Greg Kroah-Hartman
12283eb030 Merge 3fe2f7446f ("Merge tag 'sched-core-2022-03-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline
Steps on the way to 5.18-rc1

Resolves merge conflicts in:
	kernel/sched/core.c
	kernel/sched/cputime.c
	kernel/sched/sched.h

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I5a1cc7ebbaf5f2fda5adf50a0bc7df9783633160
2022-04-02 16:38:28 +02:00
Greg Kroah-Hartman
f4b102e1e4 Revert "ANDROID: sched: Add vendor hooks for override sugov behavior"
This reverts commit 06881e01b5.  It causes
merge issues with 5.18-rc1 and has to be reverted for now.  If it is
still needed, it can be added back after 5.18-rc1.

Bug: 171598214
Cc: Wei Wang <wvw@google.com>
Cc: Will McVicker <willmcvicker@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I2139c63ef76875dabccb295d0fce8d396ac61785
2022-04-02 10:47:16 +02:00
Greg Kroah-Hartman
592bea2ef0 Revert "ANDROID: sched: Add vendor hooks for skipping sugov update"
This reverts commit 846bf8e8cb.  It causes
merge issues with 5.18-rc1 and has to be reverted for now.  If it is
still needed, it can be added back after 5.18-rc1.

Bug: 170511085
Cc: Wei Wang <wvw@google.com>
Cc: Will McVicker <willmcvicker@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I9375ff49ce856d39e56e44e5e02819ced87341c8
2022-04-02 10:47:16 +02:00
Greg Kroah-Hartman
dafc604d0d Revert "Revert "Revert "ANDROID: Sched: Add restricted vendor hooks for scheduler"""
This reverts commit ca60d78542.  It causes
merge issues with 5.18-rc1 and has to be reverted for now.  If it is
still needed, it can be added back after 5.18-rc1.

Bug: 200103201
Cc: Ashay Jaiswal <quic_ashayj@quicinc.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I08e5d2f87ab47024344e229b28d08baaa8ffae09
2022-04-02 10:47:16 +02:00
Greg Kroah-Hartman
d541cfda48 ANDROID: kernel/sched/android.h: add uclamp_* stub functions
Add stubs for uclamp_boosted() and uclamp_latency_sensitive() to keep
out-of-tree scheduler trees building and working properly.

Fixes: a54c38f4d3 ("Revert "ANDROID: sched: Introduce uclamp latency and boost wrapper"")
Cc: Quentin Perret <qperret@google.com>
Cc: Will McVicker <willmcvicker@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: If1cb6d7964e3a724f3b549bc972df7a2d57d9875
2022-04-02 10:47:16 +02:00
Greg Kroah-Hartman
a54c38f4d3 Revert "ANDROID: sched: Introduce uclamp latency and boost wrapper"
This reverts commit 0e00b6f9dd.  It causes
merge issues with 5.18-rc1 and has to be reverted for now.  If it is
still needed, it can be added back after 5.18-rc1.

Bug: 120440300
Cc: Patrick Bellasi <patrick.bellasi@arm.com>
Cc: Quentin Perret <qperret@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I3d04e4aac5bfb1a7e96623af58ed26352640f433
2022-04-01 17:03:49 +02:00
Greg Kroah-Hartman
8c65a1a56b Revert "ANDROID: sched/fair: Bias EAS placement for latency"
This reverts commit 760b82c9b8.  It causes
merge issues with 5.18-rc1 and has to be reverted for now.  If it is
still needed, it can be added back after 5.18-rc1.

Bug: 120440300
Cc: Quentin Perret <qperret@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I6e1cbec842188fe19a5eb27bf12c779fae3a1e8f
2022-04-01 17:03:49 +02:00
Greg Kroah-Hartman
84915fd80a ANDROID: add kernel/sched/android.h
Create a place for the android-specific scheduler addons to live so that
merges can happen easier and we have a better view of the technical debt
that is being drug along with the kernel updates.

Start it off with replacing an empty copy of task_may_not_preempt() to
solve the build problem for some devices where they are relying on this
function to be present in the system.

Fixes: 65c99af98b ("Revert "ANDROID: sched: avoid placing RT threads on cores handling softirqs"")
Cc: Quentin Perret <qperret@google.com>
Cc: Will McVicker <willmcvicker@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I4fd94fab3397b3a197b79b2ae27e9490b54cad59
2022-04-01 17:03:43 +02:00
Greg Kroah-Hartman
65c99af98b Revert "ANDROID: sched: avoid placing RT threads on cores handling softirqs"
This reverts commit 3adfd8e344.  It causes
merge issues with 5.18-rc1 and has to be reverted for now.  If it is
still needed, it can be added back after 5.18-rc1.

Bug: 31501544
Bug: 168521633
Cc: John Dias <joaodias@google.com>
Cc: J. Avila <elavila@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I03d90db2c9169975740a1f0d3193e44f27006c31
2022-04-01 17:03:17 +02:00
Greg Kroah-Hartman
66330b896c Revert "ANDROID: vendor_hooks: add waiting information for blocked tasks"
This reverts commit 9ad8ff902e.  It causes
merge issues with 5.18-rc1 and has to be reverted for now.  If it is
still needed, it can be added back after 5.18-rc1.

Bug: 162776704
Cc: Sangmoon Kim <sangmoon.kim@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I2b2a575b0d4e751bd4bbe969bdfc77c01bb8dac5
2022-04-01 14:26:26 +02:00
Greg Kroah-Hartman
69209b7f82 Revert "ANDROID: schedutil: add vendor hook for adjusting util to freq calculation"
This reverts commit a2d89d4f3a.  It causes
merge issues with 5.18-rc1 and has to be reverted for now.  If it is
still needed, it can be added back after 5.18-rc1.

Bug: 177845439
Cc: Yun Hsiang <yun.hsiang@mediatek.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Icce02530eda2e31af9faa9346717b12ca45152ad
2022-04-01 07:29:52 +02:00
Greg Kroah-Hartman
7c4dc7a76e Revert "ANDROID: Add a vendor hook that allow a module to modify the wake flag"
This reverts commit 0d0f0c5020.  It causes
merge issues with 5.18-rc1 and has to be reverted for now.  If it is
still needed, it can be added back after 5.18-rc1.

Bug: 181743516
Cc: Namkyu Kim <namkyu78.kim@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ib8e29d5d723457e18609bcbe6894e761bc21908c
2022-04-01 07:29:52 +02:00
Saravana Kannan
317f0cc6bf ANDROID: vendor_hooks: Reduce pointless modversions CRC churn
When vendor hooks are added to a file that previously didn't have any
vendor hooks, we end up indirectly including linux/tracepoint.h.  This
causes some data types that used to be opaque (forward declared) to the
code to become visible to the code.

Modversions correctly catches this change in visibility, but we don't
really care about the data types made visible when linux/tracepoint.h is
included. So, hide this from modversions in the central vendor_hooks.h file
instead of having to fix this on a case by case basis.

This change itself will cause a one time CRC breakage/churn because it's
fixing the existing vendor hook headers, but should reduce unnecessary CRC
churns in the future.

To avoid future pointless CRC churn, vendor hook header files that include
vendor_hooks.h should not include linux/tracepoint.h directly.

Bug: 227513263
Bug: 226140073
Signed-off-by: Saravana Kannan <saravanak@google.com>
Change-Id: Ia88e6af11dd94fe475c464eb30a6e5e1e24c938b
2022-03-31 19:07:59 +00:00
Greg Kroah-Hartman
f62f75ba16 Revert "ANDROID: sched: Add vendor hook to select ilb cpu"
This reverts commit 178eea2694.

It causes merge issues with 5.18-rc1 so revert it for now.  If it is
still needed, it can be forward ported after 5.18-rc1 is merged.

Bug: 190228983
Cc: Choonghoon Park <choong.park@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Iaa5cff0ebc6db74f09f7d81d153fa66fe3ac7a63
2022-03-31 07:37:03 +02:00
Nathan Chancellor
151af0832a UPSTREAM: mm/page_alloc: mark pagesets as __maybe_unused
Commit 9983a9d577 ("locking/local_lock: Make the empty local_lock_*()
function a macro.") in the -tip tree converted the local_lock_*()
functions into macros, which causes a warning with clang with
CONFIG_PREEMPT_RT=n + CONFIG_DEBUG_LOCK_ALLOC=n:

  mm/page_alloc.c:131:40: error: variable 'pagesets' is not needed and will not be emitted [-Werror,-Wunneeded-internal-declaration]
  static DEFINE_PER_CPU(struct pagesets, pagesets) = {
                                         ^
  1 error generated.

Prior to that change, clang was not able to tell that pagesets was
unused in this configuration because it does not perform cross function
analysis in the frontend.  After that change, it sees that the macros
just do a typecheck on the lock member of pagesets, which is evaluated
at compile time (so the variable is technically "used"), meaning the
variable is not needed in the final assembly, as the warning states.

Mark the variable as __maybe_unused to make it clear to clang that this
is expected in this configuration so there is no more warning.

Link: https://github.com/ClangBuiltLinux/linux/issues/1593
Link: https://lkml.kernel.org/r/20220215184322.440969-1-nathan@kernel.org
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Suggested-by: Nick Desaulniers <ndesaulniers@google.com>
Reported-by: "kernelci.org bot" <bot@kernelci.org>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit a4812d47de)
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I23cb1a39a78a5ed58b5a74bf5d37a780d3c534c8
2022-03-31 07:30:41 +02:00
Greg Kroah-Hartman
ffb4b41965 Merge ebd326ce72 ("Merge tag 'locking-core-2022-03-21' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline
Steps on the way to 5.18-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I226a6ed299a2c600b0652b2a9efc9ae2f4caf7d9
2022-03-30 14:19:38 +02:00
Greg Kroah-Hartman
bc3c078603 Merge 881b568756 ("Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt") into android-mainline
Steps on the way to 5.18-rc1

Resolves conflicts in:
	fs/crypto/inline_crypt.c
	fs/ext4/inode.c

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I9e21246dffb9d7cc6a713fe9820ec93bdabe0f6b
2022-03-30 14:06:56 +02:00
Greg Kroah-Hartman
2c7316efff Merge b47d5a4f6b ("Merge tag 'audit-pr-20220321' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit") into android-mainline
Steps on the way to 5.18-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I3e6d7b82bbb3878c847b4fa7a2b6a239e9f3a88b
2022-03-30 13:59:07 +02:00
Greg Kroah-Hartman
2ad8aa9b5d Merge c269497d24 ("Merge tag 'selinux-pr-20220321' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux") into android-mainline
Steps on the way to 5.18-rc1

Resolves conflicts in:
	security/selinux/include/security.h

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I066eec71a2ab40081f573a83dcce9bb2c53a39d3
2022-03-30 13:56:28 +02:00
Greg Kroah-Hartman
01c2c6acb7 Merge 7f313ff0ac ("Merge tag 'integrity-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity") into android-mainline
Steps on the way to 5.18-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I311e5ecde01f3fb59e88adcf3e1248f546c99818
2022-03-30 13:54:36 +02:00
Greg Kroah-Hartman
3cc26086f7 Merge 2142b7f0c6 ("Merge tag 'hardening-v5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux") into android-mainline
Steps on the way to 5.18-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I7158013056470bd29874fb42fc448a98e353971c
2022-03-30 13:53:14 +02:00
Greg Kroah-Hartman
03de68c593 Merge ad9c6ee642 ("Merge tag 'spi-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi") into android-mainline
Steps on the way to 5.18-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: If3f2c3127b0fd3182963c0ba2fe691270beeca4c
2022-03-30 08:11:46 +02:00
Greg Kroah-Hartman
6ac71d62b6 Merge d6ccf45113 ("Merge tag 'regulator-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator") into android-mainline
Steps on the way to 5.18-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I49d0ebd83a4616aded794a8e8f3ab15db632ddd9
2022-03-30 08:10:56 +02:00
Greg Kroah-Hartman
4cbc70f13b Merge fd27687791 ("Merge tag 'hwmon-for-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging") into android-mainline
Steps on the way to 5.18-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ic46bc415208a25e3755aea069bc193c490638a03
2022-03-30 08:09:39 +02:00
Greg Kroah-Hartman
d04d4bc9e9 Revert "ANDROID: fs: FS tracepoints to track IO."
5.18-rc1 has many merge issues and the block io path has been rewritten,
so the tracepoints added here do not work properly anymore (and break
the build.)

If this is really still needed (hint, I strongly doubt it), it can be
redesigned and added back after 5.18-rc1 is released.

Cc: Mohan Srinivasan <srmohan@google.com>
Cc: Amit Pundir <amit.pundir@linaro.org>
Cc: Alistair Strachan <astrachan@google.com>
Fixes: f2fe7bac26 ("ANDROID: fs: FS tracepoints to track IO.")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I64981f2f692a434b976e50677d3414037d5ee409
2022-03-30 07:59:20 +02:00
Greg Kroah-Hartman
79e8be5726 Merge 616355cc81 ("Merge tag 'for-5.18/block-2022-03-18' of git://git.kernel.dk/linux-block") into android-mainline
Steps on the way to 5.18-rc1

Resolves conflicts in:
	fs/iomap/direct-io.c

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I1d5e0c5da8f943631d9bc87ee9b2736acafba17e
2022-03-26 10:51:32 +01:00
Linus Torvalds
e0c2b40620 UPSTREAM: Revert "random: block in /dev/urandom"
This reverts commit 6f98a4bfee.

It turns out we still can't do this.  Way too many platforms that don't
have any real source of randomness at boot and no jitter entropy because
they don't even have a cycle counter.

As reported by Guenter Roeck:

 "This causes a large number of qemu boot test failures for various
  architectures (arm, m68k, microblaze, sparc32, xtensa are the ones I
  observed).

  Common denominator is that boot hangs at 'Saving random seed:'"

This isn't hugely unexpected - we tried it, it failed, so now we'll
revert it.

Link: https://lore.kernel.org/all/20220322155820.GA1745955@roeck-us.net/
Reported-and-bisected-by: Guenter Roeck <linux@roeck-us.net>
Cc: Jason Donenfeld <Jason@zx2c4.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit 0313bc278d)
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I7c5bfcacf71d51150ab2cb994c8fb938d643b148
2022-03-26 10:50:28 +01:00
Greg Kroah-Hartman
4ccafe1990 Merge b080cee72e ("Merge tag 'for-5.18/io_uring-statx-2022-03-18' of git://git.kernel.dk/linux-block") into android-mainline
Steps on the way to 5.18-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: If4aaa1b970e25a485597c8529e5fa1a8d3455ae8
2022-03-26 10:48:04 +01:00
Greg Kroah-Hartman
a433584a03 Merge af472a9efd ("Merge tag 'for-5.18/io_uring-2022-03-18' of git://git.kernel.dk/linux-block") into android-mainline
Steps on the way to 5.18-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I105fcb4fdab7c4edc987a7e7d187a9ee8cce9c26
2022-03-26 10:46:44 +01:00
Greg Kroah-Hartman
a00f0af4be ANDROID: remove CONFIG_HW_RANDOM_CAVIUM from arm64 gki_defconfig
It is no longer needed to be explicitly not set, due to some Kconfig
fixups in commit ab7d88549e ("hwrng: cavium - HW_RANDOM_CAVIUM should
depend on ARCH_THUNDER")

Fixes: ab7d88549e ("hwrng: cavium - HW_RANDOM_CAVIUM should depend on ARCH_THUNDER")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I2653568d2c6bc8f86c69b4da87f20c7d2172447e
2022-03-26 10:46:10 +01:00
Greg Kroah-Hartman
17e4b7765d Merge 93e220a62d ("Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6") into android-mainline
Steps on the way to 5.18-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I3a95095b9720062e75c84c63d065b49adba0c2ed
2022-03-26 10:45:28 +01:00
Bowgo Tsai
b81b813161 ANDROID: GKI: Enable BUILD_GKI_CERTIFICATION_TOOLS
Bug: 222082632
Test: TH
Signed-off-by: Bowgo Tsai <bowgotsai@google.com>
Change-Id: I29aa163a8de8d60c103aad642f306ad5d4b92d40
2022-03-25 22:25:34 +08:00
Greg Kroah-Hartman
df2e0e7aaa Merge 5628b8de12 ("Merge tag 'random-5.18-rc1-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random") into android-mainline
Steps on the way to 5.18-rc1

Resolves merge conflicts in:
	kernel/cpu.c

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I67b08ef925226640647ccdc1d449e1b3fa8c6fdc
2022-03-25 11:56:49 +01:00
Greg Kroah-Hartman
a11514341c Merge f400bea2d4 ("Merge tag 'pnp-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm") into android-mainline
Steps on the way to 5.18-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I5ed5612bd2d91829875da32e828ebf72bb885d96
2022-03-25 08:48:20 +01:00