From 107ceca68029631e9cd1cee9ac24b1df6c1b219d Mon Sep 17 00:00:00 2001
From: Carlos Venegas <jos.c.venegas.munoz@intel.com>
Date: Tue, 6 Apr 2021 18:33:14 +0000
Subject: [PATCH] kernel: update experimental kernel to 5.10.x

Relevant changes for experimental :

42d3e2d04 virtiofs: calculate number of scatter-gather elements accurately
413daa1a3 fuse: connection remove fix
bf109c640 fuse: implement crossmounts
1866d779d fuse: Allow fuse_fill_super_common() for submounts
fcee216be fuse: split fuse_mount off of fuse_conn
8f622e949 fuse: drop fuse_conn parameter where possible
24754db27 fuse: store fuse_conn in fuse_req
c6ff213fe fuse: add submount support to <uapi/linux/fuse.h>
d78092e49 fuse: fix page dereference after free
9a752d18c virtiofs: add logic to free up a memory range
d0cfb9dcb virtiofs: maintain a list of busy elements
6ae330cad virtiofs: serialize truncate/punch_hole and dax fault path
9483e7d58 virtiofs: define dax address space operations
2a9a609a0 virtiofs: add DAX mmap support
c2d0ad00d virtiofs: implement dax read/write operations
ceec02d43 virtiofs: introduce setupmapping/removemapping commands
fd1a1dc6f virtiofs: implement FUSE_INIT map_alignment field
45f2348ec virtiofs: keep a list of free dax memory ranges
1dd539577 virtiofs: add a mount option to enable dax
22f3787e9 virtiofs: set up virtio_fs dax_device
f4fd4ae35 virtiofs: get rid of no_mount_options
b43b7e81e virtiofs: provide a helper function for virtqueue initialization

Fixes: #1639

Signed-off-by: Carlos Venegas <jos.c.venegas.munoz@intel.com>
---
 tools/packaging/kernel/build-kernel.sh           | 16 +++++++++-------
 .../patches/5.10.x/experimental/no_patches.txt   |  0
 versions.yaml                                    |  4 ++--
 3 files changed, 11 insertions(+), 9 deletions(-)
 create mode 100644 tools/packaging/kernel/patches/5.10.x/experimental/no_patches.txt

diff --git a/tools/packaging/kernel/build-kernel.sh b/tools/packaging/kernel/build-kernel.sh
index 51b0325b31..27b7b429c5 100755
--- a/tools/packaging/kernel/build-kernel.sh
+++ b/tools/packaging/kernel/build-kernel.sh
@@ -123,12 +123,6 @@ get_kernel() {
 	[ ! -d "${kernel_path}" ] || die "kernel_path already exist"
 
 
-	if [[ ${experimental_kernel} == "true" ]]; then
-		kernel_tarball="linux-${version}.tar.gz"
-		curl --fail -OL "https://gitlab.com/virtio-fs/linux/-/archive/${version}/${kernel_tarball}"
-		tar xf "${kernel_tarball}"
-		mv "linux-${version}" "${kernel_path}"
-	else
 
 		#Remove extra 'v'
 		version=${version#v}
@@ -159,7 +153,6 @@ get_kernel() {
 		tar xf "${kernel_tarball}"
 
 		mv "linux-${version}" "${kernel_path}"
-	fi
 }
 
 get_major_kernel_version() {
@@ -338,6 +331,7 @@ setup_kernel() {
 	local major_kernel
 	major_kernel=$(get_major_kernel_version "${kernel_version}")
 	local patches_dir_for_version="${patches_path}/${major_kernel}.x"
+	local experimental_patches_dir="${patches_path}/${major_kernel}.x/experimental"
 
 	[ -n "${arch_target}" ] || arch_target="$(uname -m)"
 	arch_target=$(arch_to_kernel "${arch_target}")
@@ -347,6 +341,12 @@ setup_kernel() {
 	# Apply version specific patches
 	${packaging_scripts_dir}/apply_patches.sh "${patches_dir_for_version}"
 
+	# Apply version specific patches for experimental build
+	if [ "${experimental_kernel}" == "true" ] ;then
+		info "Apply experimental patches"
+		${packaging_scripts_dir}/apply_patches.sh "${experimental_patches_dir}"
+	fi
+
 	[ -n "${hypervisor_target}" ] || hypervisor_target="kvm"
 	[ -n "${kernel_config_path}" ] || kernel_config_path=$(get_default_kernel_config "${kernel_version}" "${hypervisor_target}" "${arch_target}" "${kernel_path}")
 
@@ -474,6 +474,8 @@ main() {
 	if [ -z "$kernel_version" ]; then
 		if [[ ${experimental_kernel} == "true" ]]; then
 			kernel_version=$(get_from_kata_deps "assets.kernel-experimental.tag" "${kata_version}")
+			#Remove extra 'v'
+			kernel_version="${kernel_version#v}"
 		else
 			kernel_version=$(get_from_kata_deps "assets.kernel.version" "${kata_version}")
 			#Remove extra 'v'
diff --git a/tools/packaging/kernel/patches/5.10.x/experimental/no_patches.txt b/tools/packaging/kernel/patches/5.10.x/experimental/no_patches.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/versions.yaml b/versions.yaml
index e382a2ebb2..ab21db950d 100644
--- a/versions.yaml
+++ b/versions.yaml
@@ -162,8 +162,8 @@ assets:
 
   kernel-experimental:
     description: "Linux kernel with virtio-fs support"
-    url: "https://gitlab.com/virtio-fs/linux.git"
-    tag: "kata-v5.6-april-09-2020"
+    url: "https://cdn.kernel.org/pub/linux/kernel/v4.x/"
+    tag: "v5.10.25"
 
 externals:
   description: "Third-party projects used by the system"