scottk/OpenNetworkLinux
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenNetworkLinux.git synced 2025-12-26 09:47:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

- 3.2 LTS X86 Base configuration.

Browse Source
This commit is contained in:
Jeffrey Townsend
2017-06-13 08:34:24 -07:00
parent 48a81f89e6
commit 90611663f2
7 changed files with 6510 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/base/any/kernels/3.2-lts/configs/x86_64-all/.gitignore vendored Normal file
View File

@@ -0,0 +1,2 @@
kernel-3.2*
linux-*

41
packages/base/any/kernels/3.2-lts/configs/x86_64-all/Makefile Normal file
View File

@@ -0,0 +1,41 @@
############################################################
# <bsn.cl fy=2015 v=onl>
#
# Copyright 2015 Big Switch Networks, Inc.
#
# Licensed under the Eclipse Public License, Version 1.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.eclipse.org/legal/epl-v10.html
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
# either express or implied. See the License for the specific
# language governing permissions and limitations under the
# License.
#
# </bsn.cl>
############################################################
#
# Default 3.2 LTS Configuration for X86_64
#
############################################################
THIS_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
include $(ONL)/make/config.mk
export ARCH := x86_64
ifndef K_TARGET_DIR
K_TARGET_DIR := $(THIS_DIR)
endif
include ../../kconfig.mk
K_CONFIG := x86_64-all.config
K_BUILD_TARGET := bzImage
K_COPY_SRC := arch/x86/boot/bzImage
ifndef K_COPY_DST
K_COPY_DST := kernel-3.2-lts-x86_64-all
endif
include $(ONL)/make/kbuild.mk

3010
packages/base/any/kernels/3.2-lts/configs/x86_64-all/x86_64-all.config Normal file
View File

File diff suppressed because it is too large Load Diff

12
packages/base/any/kernels/3.2-lts/patches/kernel-fs-overlayfs-inode.patch Normal file
View File

@@ -0,0 +1,12 @@
diff -uNpr a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c
--- a/fs/overlayfs/inode.c 2015-04-07 13:55:17.487864270 -0700
+++ b/fs/overlayfs/inode.c 2015-04-07 13:56:24.948259512 -0700
@@ -68,7 +68,7 @@ int ovl_permission(struct inode *inode,
spin_unlock(&inode->i_lock);
return -ENOENT;
}
- alias = list_entry(inode->i_dentry.next, struct dentry, d_alias);
+ alias = list_entry(inode->i_dentry.next, struct dentry, d_u.d_alias);
dget(alias);
spin_unlock(&inode->i_lock);
oe = alias->d_fsdata;

3178
packages/base/any/kernels/3.2-lts/patches/kernel-overlayfs-v11.patch Normal file
View File

File diff suppressed because it is too large Load Diff

264
packages/base/any/kernels/3.2-lts/patches/overlayfs_notify.patch Normal file
View File

@@ -0,0 +1,264 @@
Fix issues with OverlayFS not interacting correctly with the notify system
diff --git a/fs/notify/inotify/Kconfig b/fs/notify/inotify/Kconfig
index b981fc0..137d3fa 100644
--- a/fs/notify/inotify/Kconfig
+++ b/fs/notify/inotify/Kconfig
@@ -15,3 +15,13 @@ config INOTIFY_USER
For more information, see <file:Documentation/filesystems/inotify.txt>
If unsure, say Y.
+
+
+config INOTIFY_STACKFS
+ bool "Inotify support for stackable filesystem"
+ select INOTIFY_USER
+ default y
+ ---help---
+ Say Y here to enable inotify support for stackable filesystem.
+
+ If unsure, say N.
diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
index f255d37..e555ac5 100644
--- a/fs/notify/inotify/inotify_user.c
+++ b/fs/notify/inotify/inotify_user.c
@@ -24,6 +24,7 @@
#include <linux/file.h>
#include <linux/fs.h> /* struct inode */
+#include <linux/mount.h>
#include <linux/fsnotify_backend.h>
#include <linux/idr.h>
#include <linux/init.h> /* module_init */
@@ -86,6 +87,93 @@ ctl_table inotify_table[] = {
};
#endif /* CONFIG_SYSCTL */
+#ifdef CONFIG_INOTIFY_STACKFS
+
+static DEFINE_RWLOCK(inotify_fs_lock);
+static LIST_HEAD(inotify_fs_list);
+
+static inline struct file_system_type* peek_fs_type(struct path *path)
+{
+ return path->mnt->mnt_sb->s_type;
+}
+
+static struct inotify_stackfs* inotify_get_stackfs(struct path *path)
+{
+ struct file_system_type *fs;
+ struct inotify_stackfs *fse, *ret = NULL;
+
+ fs = peek_fs_type(path);
+
+ read_lock(&inotify_fs_lock);
+ list_for_each_entry(fse, &inotify_fs_list, list) {
+ if (fse->fs_type == fs) {
+ ret = fse;
+ break;
+ }
+ }
+ read_unlock(&inotify_fs_lock);
+
+ return ret;
+}
+
+static inline void inotify_put_stackfs(struct inotify_stackfs *fs)
+{
+}
+
+int inotify_register_stackfs(struct inotify_stackfs *fs)
+{
+ int ret = 0;
+ struct inotify_stackfs *fse;
+
+ BUG_ON(IS_ERR_OR_NULL(fs->fs_type));
+ BUG_ON(IS_ERR_OR_NULL(fs->func));
+
+ INIT_LIST_HEAD(&fs->list);
+
+ write_lock(&inotify_fs_lock);
+ list_for_each_entry(fse, &inotify_fs_list, list) {
+ if (fse->fs_type == fs->fs_type) {
+ write_unlock(&inotify_fs_lock);
+ ret = -EBUSY;
+ goto out;
+ }
+ }
+ list_add_tail(&fs->list, &inotify_fs_list);
+ write_unlock(&inotify_fs_lock);
+
+out:
+ return ret;
+}
+EXPORT_SYMBOL_GPL(inotify_register_stackfs);
+
+void inotify_unregister_stackfs(struct inotify_stackfs *fs)
+{
+ struct inotify_stackfs *fse, *n;
+
+ write_lock(&inotify_fs_lock);
+ list_for_each_entry_safe(fse, n, &inotify_fs_list, list) {
+ if (fse == fs) {
+ list_del(&fse->list);
+ break;
+ }
+ }
+ write_unlock(&inotify_fs_lock);
+}
+EXPORT_SYMBOL_GPL(inotify_unregister_stackfs);
+
+#else
+
+static inline struct inotify_stackfs* inotify_get_stackfs(struct path *path)
+{
+ return NULL;
+}
+
+static inline void inotify_put_stackfs(struct inotify_stackfs *fs)
+{
+}
+
+#endif /* CONFIG_INOTIFY_STACKFS */
+
static inline __u32 inotify_arg_to_mask(u32 arg)
{
__u32 mask;
@@ -348,7 +436,7 @@ static const struct file_operations inotify_fops = {
/*
* find_inode - resolve a user-given path to a specific inode
*/
-static int inotify_find_inode(const char __user *dirname, struct path *path, unsigned flags)
+static inline int __inotify_find_inode(const char __user *dirname, struct path *path, unsigned flags)
{
int error;
@@ -362,6 +450,27 @@ static int inotify_find_inode(const char __user *dirname, struct path *path, uns
return error;
}
+static int inotify_find_inode(const char __user *dirname, struct path *path, unsigned flags)
+{
+ int ret;
+ struct path tpath;
+ struct inotify_stackfs *fse;
+
+ ret = __inotify_find_inode(dirname, &tpath, flags);
+ if (ret)
+ return ret;
+ fse = inotify_get_stackfs(&tpath);
+ if (fse == NULL) {
+ *path = tpath;
+ return 0;
+ }
+ ret = fse->func(path, &tpath);
+ inotify_put_stackfs(fse);
+ path_put(&tpath);
+
+ return ret;
+}
+
static int inotify_add_to_idr(struct idr *idr, spinlock_t *idr_lock,
int *last_wd,
struct inotify_inode_mark *i_mark)
diff --git a/overlayfs/super.c b/fs/overlayfs/super.c
index 508cf19..cb39ec9 100644
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@ -16,6 +16,7 @@
#include <linux/parser.h>
#include <linux/module.h>
#include <linux/seq_file.h>
+#include <linux/inotify.h>
#include "overlayfs.h"
MODULE_AUTHOR("Miklos Szeredi <miklos@szeredi.hu>");
@@ -642,14 +643,40 @@ static struct file_system_type ovl_fs_type = {
.kill_sb = kill_anon_super,
};
+static int ovl_inotify_path(struct path *dst, struct path *src)
+{
+ ovl_path_real(src->dentry, dst);
+
+ path_get(dst);
+
+ return 0;
+}
+
+static struct inotify_stackfs ovl_inotify = {
+ .fs_type = &ovl_fs_type,
+ .func = ovl_inotify_path,
+};
+
static int __init ovl_init(void)
{
- return register_filesystem(&ovl_fs_type);
+ int ret;
+
+ ret = register_filesystem(&ovl_fs_type);
+ if (ret)
+ return ret;
+ ret = inotify_register_stackfs(&ovl_inotify);
+ if (ret) {
+ pr_err("overlayfs: hook inotify error\n");
+ unregister_filesystem(&ovl_fs_type);
+ }
+
+ return ret;
}
static void __exit ovl_exit(void)
{
- unregister_filesystem(&ovl_fs_type);
+ inotify_unregister_stackfs(&ovl_inotify);
+ unregister_filesystem(&ovl_fs_type);
}
module_init(ovl_init);
diff --git a/include/linux/inotify.h b/include/linux/inotify.h
index d33041e..9d7e36f 100644
--- a/include/linux/inotify.h
+++ b/include/linux/inotify.h
@@ -10,6 +10,8 @@
/* For O_CLOEXEC and O_NONBLOCK */
#include <linux/fcntl.h>
#include <linux/types.h>
+#include <linux/list.h>
+#include <linux/fs.h>
/*
* struct inotify_event - structure read from the inotify device for each event
@@ -82,6 +84,32 @@ extern struct ctl_table inotify_table[]; /* for sysctl */
IN_DONT_FOLLOW | IN_EXCL_UNLINK | IN_MASK_ADD | \
IN_ISDIR | IN_ONESHOT)
+typedef int (*inotify_path_proc)(struct path *dst, struct path *src);
+
+struct inotify_stackfs {
+ struct list_head list; /* entry in inotify_fs_list */
+ struct file_system_type *fs_type; /* registed file_system_type */
+ inotify_path_proc func; /* registed callback function */
+};
+
+#ifdef CONFIG_INOTIFY_STACKFS
+
+extern int inotify_register_stackfs(struct inotify_stackfs *fs);
+extern void inotify_unregister_stackfs(struct inotify_stackfs *fs);
+
+#else
+
+static inline int inotify_register_stackfs(struct inotify_stackfs *fs)
+{
+ return 0;
+}
+
+static inline void inotify_unregister_stackfs(struct inotify_stackfs *fs)
+{
+}
+
+#endif /* CONFIG_INOTIFY_STACKFS */
+
#endif
#endif /* _LINUX_INOTIFY_H */

3
packages/base/any/kernels/3.2-lts/patches/series Normal file
View File

@@ -0,0 +1,3 @@
kernel-overlayfs-v11.patch
kernel-fs-overlayfs-inode.patch
overlayfs_notify.patch