github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-28 12:31:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #484 from ganeshmaharaj/virtio-fs-4-19-28

Browse Source 
kernel: Enable virtio-fs in kata kernel
This commit is contained in:
Graham Whaley 2019-05-07 15:52:07 +01:00 committed by GitHub
commit 4bb97ef14a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 4630 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kernel/configs/x86_64_kata_kvm_4.19.x
View File

@ -1,13 +1,13 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/x86 4.19.24 Kernel Configuration # Linux/x86 4.19.28 Kernel Configuration
# #
# #
# Compiler: gcc (Ubuntu 5.4.0-6ubuntu1~16.04.11) 5.4.0 20160609 # Compiler: gcc (Ubuntu 7.4.0-1ubuntu1~16.04~ppa1) 7.4.0
# #
CONFIG_CC_IS_GCC=y CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=50400 CONFIG_GCC_VERSION=70400
CONFIG_CLANG_VERSION=0 CONFIG_CLANG_VERSION=0
CONFIG_IRQ_WORK=y CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_EXTABLE_SORT=y CONFIG_BUILDTIME_EXTABLE_SORT=y
@ -2597,7 +2597,9 @@ CONFIG_FANOTIFY=y
# CONFIG_QUOTA is not set # CONFIG_QUOTA is not set
CONFIG_AUTOFS4_FS=y CONFIG_AUTOFS4_FS=y
CONFIG_AUTOFS_FS=y CONFIG_AUTOFS_FS=y
# CONFIG_FUSE_FS is not set CONFIG_FUSE_FS=y
# CONFIG_CUSE is not set
CONFIG_VIRTIO_FS=y
# CONFIG_OVERLAY_FS is not set # CONFIG_OVERLAY_FS is not set
# #

2
kernel/kata_config_version
View File

@ -1 +1 @@
36 37

4604
kernel/patches/4.19.x/0001-fuse-add-skeleton-virtio_fs.ko-module.patch Normal file
View File

File diff suppressed because it is too large Load Diff

6
kernel/patches/4.19.x/0001-Enable-memory-hotplug-using-probe-for-arm64.patch → kernel/patches/4.19.x/0002-Enable-memory-hotplug-using-probe-for-arm64.patch
View File

@ -1,7 +1,7 @@
From 074a6a9d83a4e790f892ef0fc91cdabbfbf26202 Mon Sep 17 00:00:00 2001 From 33ffc9a93a1d9e72594d5eb3e4fc583a1a2911d1 Mon Sep 17 00:00:00 2001
From: Jianyong Wu <jianyong.wu@arm.com> From: Jianyong Wu <jianyong.wu@arm.com>
Date: Tue, 19 Feb 2019 01:15:32 -0500 Date: Tue, 19 Feb 2019 01:15:32 -0500
Subject: [PATCH] Enable memory-hotplug using probe for arm64 Subject: [PATCH 2/5] Enable memory-hotplug using probe for arm64
--- ---
arch/arm64/Kconfig | 7 +++++++ arch/arm64/Kconfig | 7 +++++++
@ -94,5 +94,5 @@ index 146c04ceaa51..d276bd4d38b5 100644
+ return 0; + return 0;
+} +}
-- --
2.17.1 2.20.1

14
kernel/patches/4.19.x/0001-NO-UPSTREAM-9P-always-use-cached-inode-to-fill-in-v9.patch → kernel/patches/4.19.x/0003-NO-UPSTREAM-9P-always-use-cached-inode-to-fill-in-v9.patch
View File

@ -1,7 +1,7 @@
From 0a235af3130a0c40fe2198f18198c7ac4e799a03 Mon Sep 17 00:00:00 2001 From cab495651e8f71c39e87a08abbe051916110b3ca Mon Sep 17 00:00:00 2001
From: Julio Montes <julio.montes@intel.com> From: Julio Montes <julio.montes@intel.com>
Date: Mon, 18 Sep 2017 11:46:59 -0500 Date: Mon, 18 Sep 2017 11:46:59 -0500
Subject: [PATCH 2/3] NO-UPSTREAM: 9P: always use cached inode to fill in Subject: [PATCH 3/5] NO-UPSTREAM: 9P: always use cached inode to fill in
v9fs_vfs_getattr v9fs_vfs_getattr
So that if in cache=none mode, we don't have to lookup server that So that if in cache=none mode, we don't have to lookup server that
@ -17,10 +17,10 @@ Signed-off-by: Peng Tao <bergwolf@gmail.com>
2 files changed, 2 insertions(+), 2 deletions(-) 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
index bdabb27..30395e0 100644 index 85ff859d3af5..efdc2a8f37bb 100644
--- a/fs/9p/vfs_inode.c --- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c +++ b/fs/9p/vfs_inode.c
@@ -1068,7 +1068,7 @@ v9fs_vfs_getattr(const struct path *path, struct kstat *stat, @@ -1080,7 +1080,7 @@ v9fs_vfs_getattr(const struct path *path, struct kstat *stat,
p9_debug(P9_DEBUG_VFS, "dentry: %p\n", dentry); p9_debug(P9_DEBUG_VFS, "dentry: %p\n", dentry);
v9ses = v9fs_dentry2v9ses(dentry); v9ses = v9fs_dentry2v9ses(dentry);
@ -30,10 +30,10 @@ index bdabb27..30395e0 100644
return 0; return 0;
} }
diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c
index 7f6ae21..5d7e970 100644 index 4823e1c46999..daa5e6a41864 100644
--- a/fs/9p/vfs_inode_dotl.c --- a/fs/9p/vfs_inode_dotl.c
+++ b/fs/9p/vfs_inode_dotl.c +++ b/fs/9p/vfs_inode_dotl.c
@@ -481,7 +481,7 @@ v9fs_vfs_getattr_dotl(const struct path *path, struct kstat *stat, @@ -480,7 +480,7 @@ v9fs_vfs_getattr_dotl(const struct path *path, struct kstat *stat,
p9_debug(P9_DEBUG_VFS, "dentry: %p\n", dentry); p9_debug(P9_DEBUG_VFS, "dentry: %p\n", dentry);
v9ses = v9fs_dentry2v9ses(dentry); v9ses = v9fs_dentry2v9ses(dentry);
@ -43,5 +43,5 @@ index 7f6ae21..5d7e970 100644
return 0; return 0;
} }
-- --
2.9.5 2.20.1

6
kernel/patches/4.19.x/0002-Compile-in-evged-always.patch → kernel/patches/4.19.x/0004-Compile-in-evged-always.patch
View File

@ -1,7 +1,7 @@
From e35cb54fb8d07dd80fa8df44ff0de6eb5ff8d6cf Mon Sep 17 00:00:00 2001 From d78297bf9d8e41711bddc6003f460e815340a214 Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <arjan@linux.intel.com> From: Arjan van de Ven <arjan@linux.intel.com>
Date: Fri, 10 Aug 2018 13:22:08 +0000 Date: Fri, 10 Aug 2018 13:22:08 +0000
Subject: [PATCH 108/108] Compile in evged always Subject: [PATCH 4/5] Compile in evged always
We need evged for NEMU (and in general for hw reduced) We need evged for NEMU (and in general for hw reduced)
@ -25,5 +25,5 @@ index 6d59aa109a91..97f2fbbd5014 100644
acpi-y += property.o acpi-y += property.o
acpi-$(CONFIG_X86) += acpi_cmos_rtc.o acpi-$(CONFIG_X86) += acpi_cmos_rtc.o
-- --
2.18.0 2.20.1

12
kernel/patches/4.19.x/0003-arm64-backport-Arm64-KVM-Dynamic-IPA-and-52bit-IPA-s.patch → kernel/patches/4.19.x/0005-arm64-backport-Arm64-KVM-Dynamic-IPA-and-52bit-IPA-s.patch
View File

@ -1,8 +1,8 @@
From 60a4fed76e63c36cd327c4b404ec163e93a4805e Mon Sep 17 00:00:00 2001 From 6823b343a7c5f6fc3b93d4a00e919d14cb6a4adb Mon Sep 17 00:00:00 2001
From: Penny Zheng <penny.zheng@arm.com> From: Penny Zheng <penny.zheng@arm.com>
Date: Tue, 19 Feb 2019 16:05:44 +0800 Date: Tue, 19 Feb 2019 16:05:44 +0800
Subject: [PATCH] arm64: backport Arm64 KVM Dynamic IPA and 52bit IPA support Subject: [PATCH 5/5] arm64: backport Arm64 KVM Dynamic IPA and 52bit IPA
to 4.19.X support to 4.19.X
This patch is based on Suzuki K Poulose's This patch is based on Suzuki K Poulose's
[v6,00/18] kvm: arm64: Dynamic IPA and 52bit IPA [v6,00/18] kvm: arm64: Dynamic IPA and 52bit IPA
@ -258,10 +258,10 @@ index 460d616bb2d6..f6a7ea805232 100644
#endif /* __ARM_S2_PGTABLE_H_ */ #endif /* __ARM_S2_PGTABLE_H_ */
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 1b1a0e95c751..f9162da575a9 100644 index 881bea194d53..d77da7a56eb5 100644
--- a/arch/arm64/Kconfig --- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig
@@ -1132,6 +1132,19 @@ config ARM64_RAS_EXTN @@ -1139,6 +1139,19 @@ config ARM64_RAS_EXTN
and access the new registers if the system supports the extension. and access the new registers if the system supports the extension.
Platform RAS features may additionally depend on firmware support. Platform RAS features may additionally depend on firmware support.
@ -2273,5 +2273,5 @@ index a2a175b08b17..b3d1f0985117 100644
} }
-- --
2.17.1 2.20.1