Update edgeos kernels.
BUG=b/199578687
TEST=cusky
RELEASE_NOTE=none
Change-Id: Ie6ac4458355205f1151513a9020c1c83a2a2c7d2
Reviewed-on: https://cos-review.googlesource.com/c/cos/overlays/board-overlays/+/22611
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
Reviewed-by: Roy Yang <royyang@google.com>
diff --git a/project-edgeos/sys-kernel/lakitu-kernel-5_10/lakitu-kernel-5_10-5.10.58-r8.ebuild b/project-edgeos/sys-kernel/lakitu-kernel-5_10/lakitu-kernel-5_10-5.10.58-r8.ebuild
deleted file mode 120000
index 2b18bfd..0000000
--- a/project-edgeos/sys-kernel/lakitu-kernel-5_10/lakitu-kernel-5_10-5.10.58-r8.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-lakitu-kernel-5_10-5.10.58.ebuild
\ No newline at end of file
diff --git a/project-edgeos/sys-kernel/lakitu-kernel-5_10/lakitu-kernel-5_10-5.10.64-r10.ebuild b/project-edgeos/sys-kernel/lakitu-kernel-5_10/lakitu-kernel-5_10-5.10.64-r10.ebuild
new file mode 120000
index 0000000..12f57a1
--- /dev/null
+++ b/project-edgeos/sys-kernel/lakitu-kernel-5_10/lakitu-kernel-5_10-5.10.64-r10.ebuild
@@ -0,0 +1 @@
+lakitu-kernel-5_10-5.10.64.ebuild
\ No newline at end of file
diff --git a/project-edgeos/sys-kernel/lakitu-kernel-5_10/lakitu-kernel-5_10-5.10.58.ebuild b/project-edgeos/sys-kernel/lakitu-kernel-5_10/lakitu-kernel-5_10-5.10.64.ebuild
similarity index 93%
rename from project-edgeos/sys-kernel/lakitu-kernel-5_10/lakitu-kernel-5_10-5.10.58.ebuild
rename to project-edgeos/sys-kernel/lakitu-kernel-5_10/lakitu-kernel-5_10-5.10.64.ebuild
index 9fb2e02..930088e 100644
--- a/project-edgeos/sys-kernel/lakitu-kernel-5_10/lakitu-kernel-5_10-5.10.58.ebuild
+++ b/project-edgeos/sys-kernel/lakitu-kernel-5_10/lakitu-kernel-5_10-5.10.64.ebuild
@@ -13,8 +13,8 @@
EAPI=6
-CROS_WORKON_COMMIT="44374465de137e8fdd16b14fdae56edd9726733e"
-CROS_WORKON_TREE="53d8b0aa233120407593306d2459195b9fa637a1"
+CROS_WORKON_COMMIT="c6be0351b9fe8770372e090885c83f50af4e03ca"
+CROS_WORKON_TREE="3976d131f0d81a5af191719163ebaa89508f03c2"
CROS_WORKON_REPO="https://cos.googlesource.com"
CROS_WORKON_PROJECT="third_party/kernel"
CROS_WORKON_LOCALNAME="kernel/v5.10"
diff --git a/project-edgeos/sys-kernel/lakitu-kernel-rt-5_10/files/0000-patch-5.10.59-rt51.patch b/project-edgeos/sys-kernel/lakitu-kernel-rt-5_10/files/0000-patch-5.10.59-rt52.patch
similarity index 99%
rename from project-edgeos/sys-kernel/lakitu-kernel-rt-5_10/files/0000-patch-5.10.59-rt51.patch
rename to project-edgeos/sys-kernel/lakitu-kernel-rt-5_10/files/0000-patch-5.10.59-rt52.patch
index 6043731..046c7e5 100644
--- a/project-edgeos/sys-kernel/lakitu-kernel-rt-5_10/files/0000-patch-5.10.59-rt51.patch
+++ b/project-edgeos/sys-kernel/lakitu-kernel-rt-5_10/files/0000-patch-5.10.59-rt52.patch
@@ -15350,10 +15350,10 @@
+EXPORT_SYMBOL(__rt_rwlock_init);
diff --git a/kernel/locking/rwsem-rt.c b/kernel/locking/rwsem-rt.c
new file mode 100644
-index 000000000000..274172d5bb3a
+index 000000000000..b61edc4dcb73
--- /dev/null
+++ b/kernel/locking/rwsem-rt.c
-@@ -0,0 +1,318 @@
+@@ -0,0 +1,317 @@
+// SPDX-License-Identifier: GPL-2.0-only
+#include <linux/rwsem.h>
+#include <linux/sched/debug.h>
@@ -15554,7 +15554,6 @@
+ if (!atomic_dec_and_test(&sem->readers))
+ return;
+
-+ might_sleep();
+ raw_spin_lock_irq(&m->wait_lock);
+ /*
+ * Wake the writer, i.e. the rtmutex owner. It might release the
@@ -24858,11 +24857,11 @@
if ((wait_state != TASK_RUNNING ||
diff --git a/localversion-rt b/localversion-rt
new file mode 100644
-index 000000000000..75493460c41f
+index 000000000000..66a5ed8bf3d7
--- /dev/null
+++ b/localversion-rt
@@ -0,0 +1 @@
-+-rt51
++-rt52
diff --git a/mm/Kconfig b/mm/Kconfig
index 390165ffbb0f..c8cbcb5118b0 100644
--- a/mm/Kconfig
diff --git a/project-edgeos/sys-kernel/lakitu-kernel-rt-5_10/files/0003-ext4-fix-race-writing-to-an-inline_data-file-while-i.patch b/project-edgeos/sys-kernel/lakitu-kernel-rt-5_10/files/0003-ext4-fix-race-writing-to-an-inline_data-file-while-i.patch
new file mode 100644
index 0000000..f7bce2b
--- /dev/null
+++ b/project-edgeos/sys-kernel/lakitu-kernel-rt-5_10/files/0003-ext4-fix-race-writing-to-an-inline_data-file-while-i.patch
@@ -0,0 +1,46 @@
+From 09a379549620f122de3aa4e65df9329976e4cdf5 Mon Sep 17 00:00:00 2001
+From: Theodore Ts'o <tytso@mit.edu>
+Date: Fri, 20 Aug 2021 23:44:17 -0400
+Subject: [PATCH] ext4: fix race writing to an inline_data file while its
+ xattrs are changing
+
+commit a54c4613dac1500b40e4ab55199f7c51f028e848 upstream.
+
+The location of the system.data extended attribute can change whenever
+xattr_sem is not taken. So we need to recalculate the i_inline_off
+field since it mgiht have changed between ext4_write_begin() and
+ext4_write_end().
+
+This means that caching i_inline_off is probably not helpful, so in
+the long run we should probably get rid of it and shrink the in-memory
+ext4 inode slightly, but let's fix the race the simple way for now.
+
+Cc: stable@kernel.org
+Fixes: f19d5870cbf72 ("ext4: add normal write support for inline data")
+Reported-by: syzbot+13146364637c7363a7de@syzkaller.appspotmail.com
+Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ fs/ext4/inline.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
+index b41512d1badc..0f7b53d5edea 100644
+--- a/fs/ext4/inline.c
++++ b/fs/ext4/inline.c
+@@ -750,6 +750,12 @@ int ext4_write_inline_data_end(struct inode *inode, loff_t pos, unsigned len,
+ ext4_write_lock_xattr(inode, &no_expand);
+ BUG_ON(!ext4_has_inline_data(inode));
+
++ /*
++ * ei->i_inline_off may have changed since ext4_write_begin()
++ * called ext4_try_to_write_inline_data()
++ */
++ (void) ext4_find_inline_data_nolock(inode);
++
+ kaddr = kmap_atomic(page);
+ ext4_write_inline_data(inode, &iloc, kaddr, pos, len);
+ kunmap_atomic(kaddr);
+--
+2.33.0.309.g3052b89438-goog
+
diff --git a/project-edgeos/sys-kernel/lakitu-kernel-rt-5_10/lakitu-kernel-rt-5_10-5.10.59-r8.ebuild b/project-edgeos/sys-kernel/lakitu-kernel-rt-5_10/lakitu-kernel-rt-5_10-5.10.59-r9.ebuild
similarity index 100%
rename from project-edgeos/sys-kernel/lakitu-kernel-rt-5_10/lakitu-kernel-rt-5_10-5.10.59-r8.ebuild
rename to project-edgeos/sys-kernel/lakitu-kernel-rt-5_10/lakitu-kernel-rt-5_10-5.10.59-r9.ebuild
