packages: linux-kernel: T2625: import pipeline

Imported Pipeline from https://github.com/vyos/vyos-build-kernel commit
c28976b38b7d98

2 files changed, 462 insertions, 0 deletions

diff --git a/packages/linux-kernel/patches/kernel/0001-VyOS-Add-linkstate-IP-device-attribute.patch b/packages/linux-kernel/patches/kernel/0001-VyOS-Add-linkstate-IP-device-attribute.patch
new file mode 100644
index 00000000..f23c41a5
--- /dev/null
+++ b/packages/linux-kernel/patches/kernel/0001-VyOS-Add-linkstate-IP-device-attribute.patch
@@ -0,0 +1,164 @@
+From 81d38c4a32e059ad7835f7dc254e7627642afbe9 Mon Sep 17 00:00:00 2001
+From: Stephen Hemminger <stephen@networkplumber.org>
+Date: Mon, 29 Apr 2013 18:50:15 -0700
+Subject: [PATCH] VyOS: Add linkstate IP device attribute
+
+Backport of earlier Vyatta patch.
+
+(cherry picked from commit 7c5a851086686be14ae937c80d6cee34814dbefc)
+---
+ Documentation/networking/ip-sysctl.txt | 13 +++++++++++++
+ include/linux/inetdevice.h             |  1 +
+ include/linux/ipv6.h                   |  1 +
+ include/uapi/linux/ip.h                |  1 +
+ include/uapi/linux/ipv6.h              |  1 +
+ net/ipv4/devinet.c                     |  2 ++
+ net/ipv6/addrconf.c                    |  9 +++++++++
+ net/ipv6/route.c                       | 12 ++++++++++++
+ 8 files changed, 40 insertions(+)
+
+diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
+index 960de8fe3f40..8e737f77f4e6 100644
+--- a/Documentation/networking/ip-sysctl.txt
++++ b/Documentation/networking/ip-sysctl.txt
+@@ -1168,6 +1168,19 @@ rp_filter - INTEGER
+ 	Default value is 0. Note that some distributions enable it
+ 	in startup scripts.
+ 
++link_filter - INTEGER
++        0 - Allow packets to be received for the address on this interface
++	even if interface is disabled or no carrier.
++
++	1 - Ignore packets received if interface associated with the incoming
++	address is down.
++
++	2 - Ignore packets received if interface associated with the incoming
++	address is down or has no carrier.
++
++	Default value is 0. Note that some distributions enable it
++	in startup scripts.
++
+ arp_filter - BOOLEAN
+ 	1 - Allows you to have multiple network interfaces on the same
+ 	subnet, and have the ARPs for each interface be answered
+diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h
+index c759d1cbcedd..d3e88498910b 100644
+--- a/include/linux/inetdevice.h
++++ b/include/linux/inetdevice.h
+@@ -131,6 +131,7 @@ static inline void ipv4_devconf_setall(struct in_device *in_dev)
+ #define IN_DEV_ARP_ANNOUNCE(in_dev)	IN_DEV_MAXCONF((in_dev), ARP_ANNOUNCE)
+ #define IN_DEV_ARP_IGNORE(in_dev)	IN_DEV_MAXCONF((in_dev), ARP_IGNORE)
+ #define IN_DEV_ARP_NOTIFY(in_dev)	IN_DEV_MAXCONF((in_dev), ARP_NOTIFY)
++#define IN_DEV_LINKFILTER(in_dev)	IN_DEV_MAXCONF((in_dev), LINKFILTER)
+ 
+ struct in_ifaddr {
+ 	struct hlist_node	hash;
+diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
+index 8415bf1a9776..80a0ada19c9a 100644
+--- a/include/linux/ipv6.h
++++ b/include/linux/ipv6.h
+@@ -76,6 +76,7 @@ struct ipv6_devconf {
+ 	__s32           ndisc_tclass;
+ 
+ 	struct ctl_table_header *sysctl_header;
++	__s32		link_filter;	/* VyOS */
+ };
+ 
+ struct ipv6_params {
+diff --git a/include/uapi/linux/ip.h b/include/uapi/linux/ip.h
+index e42d13b55cf3..baf8e77c201b 100644
+--- a/include/uapi/linux/ip.h
++++ b/include/uapi/linux/ip.h
+@@ -169,6 +169,7 @@ enum
+ 	IPV4_DEVCONF_DROP_UNICAST_IN_L2_MULTICAST,
+ 	IPV4_DEVCONF_DROP_GRATUITOUS_ARP,
+ 	IPV4_DEVCONF_BC_FORWARDING,
++	IPV4_DEVCONF_LINKFILTER,	/* VyOS only */
+ 	__IPV4_DEVCONF_MAX
+ };
+ 
+diff --git a/include/uapi/linux/ipv6.h b/include/uapi/linux/ipv6.h
+index 9c0f4a92bcff..619edd130cfd 100644
+--- a/include/uapi/linux/ipv6.h
++++ b/include/uapi/linux/ipv6.h
+@@ -187,6 +187,7 @@ enum {
+ 	DEVCONF_DISABLE_POLICY,
+ 	DEVCONF_ACCEPT_RA_RT_INFO_MIN_PLEN,
+ 	DEVCONF_NDISC_TCLASS,
++	DEVCONF_LINK_FILTER,
+ 	DEVCONF_MAX
+ };
+ 
+diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
+index ea4bd8a52422..6c6aad3c302f 100644
+--- a/net/ipv4/devinet.c
++++ b/net/ipv4/devinet.c
+@@ -2310,6 +2310,8 @@ static struct devinet_sysctl_table {
+ 					      "route_localnet"),
+ 		DEVINET_SYSCTL_FLUSHING_ENTRY(DROP_UNICAST_IN_L2_MULTICAST,
+ 					      "drop_unicast_in_l2_multicast"),
++		/* VyOS */
++		DEVINET_SYSCTL_RW_ENTRY(LINKFILTER, "link_filter"),
+ 	},
+ };
+ 
+diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
+index 4e81ff2f4588..5ae30cf09028 100644
+--- a/net/ipv6/addrconf.c
++++ b/net/ipv6/addrconf.c
+@@ -5200,6 +5200,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf,
+ 	array[DEVCONF_ADDR_GEN_MODE] = cnf->addr_gen_mode;
+ 	array[DEVCONF_DISABLE_POLICY] = cnf->disable_policy;
+ 	array[DEVCONF_NDISC_TCLASS] = cnf->ndisc_tclass;
++	array[DEVCONF_LINK_FILTER] = cnf->link_filter;
+ }
+ 
+ static inline size_t inet6_ifla6_size(void)
+@@ -6514,6 +6515,14 @@ static const struct ctl_table addrconf_sysctl[] = {
+ 		.mode           = 0644,
+ 		.proc_handler   = addrconf_sysctl_disable_policy,
+ 	},
++	/* VyOS */
++	{
++		.procname	= "link_filter",
++		.data		= &ipv6_devconf.link_filter,
++		.maxlen		= sizeof(int),
++		.mode		= 0644,
++		.proc_handler	= proc_dointvec
++	},
+ 	{
+ 		.procname	= "ndisc_tclass",
+ 		.data		= &ipv6_devconf.ndisc_tclass,
+diff --git a/net/ipv6/route.c b/net/ipv6/route.c
+index abcb5ae77319..90296536873f 100644
+--- a/net/ipv6/route.c
++++ b/net/ipv6/route.c
+@@ -590,6 +590,15 @@ static inline int rt6_check_dev(struct fib6_info *rt, int oif)
+ 	return 0;
+ }
+ 
++static inline int rt6_link_filter(struct fib6_info *rt)
++{
++	const struct net_device *dev = rt->fib6_nh.nh_dev;
++	int linkf = __in6_dev_get(dev)->cnf.link_filter;
++
++	return (linkf && !netif_running(dev))
++		|| (linkf > 1 && !netif_carrier_ok(dev));
++}
++
+ static inline enum rt6_nud_state rt6_check_neigh(struct fib6_info *rt)
+ {
+ 	enum rt6_nud_state ret = RT6_NUD_FAIL_HARD;
+@@ -629,6 +638,9 @@ static int rt6_score_route(struct fib6_info *rt, int oif, int strict)
+ 	m = rt6_check_dev(rt, oif);
+ 	if (!m && (strict & RT6_LOOKUP_F_IFACE))
+ 		return RT6_NUD_FAIL_HARD;
++	if (rt6_link_filter(rt))
++		return -1;
++
+ #ifdef CONFIG_IPV6_ROUTER_PREF
+ 	m |= IPV6_DECODE_PREF(IPV6_EXTRACT_PREF(rt->fib6_flags)) << 2;
+ #endif
+-- 
+2.11.0
+
diff --git a/packages/linux-kernel/patches/kernel/0002-VyOS-add-inotify-support-for-stackable-filesystems-o.patch b/packages/linux-kernel/patches/kernel/0002-VyOS-add-inotify-support-for-stackable-filesystems-o.patch
new file mode 100644
index 00000000..1555a3d7
--- /dev/null
+++ b/packages/linux-kernel/patches/kernel/0002-VyOS-add-inotify-support-for-stackable-filesystems-o.patch
@@ -0,0 +1,298 @@
+From 1d625d2f745b61a718ce52cd1729f467c17defa6 Mon Sep 17 00:00:00 2001
+From: Alex Harpin <development@landsofshadow.co.uk>
+Date: Wed, 31 Dec 2014 10:33:38 +0000
+Subject: [PATCH] VyOS: add inotify support for stackable filesystems
+ (overlayfs)
+
+As it stands at the moment, overlayfs doesn't have full support for
+inotify, and as such anything that relies on inotify currently has
+issues.  The simplest method of demonstrating this is to tail a file
+(so tail -f /var/log/messages) and see that it doesn't follow changes
+in that file.  This has been reported in a number of places, including
+Bug #882147 in Ubuntu.  This patch is based on the version proposed by
+Li Jianguo in response to this bug, adding support for inotify in
+stackable filesystems.
+
+This commit provides a complete fix for the workaround implemented
+for bug #303, and will allow that commit to be reverted.
+
+Bug #425 http://bugzilla.vyos.net/show_bug.cgi?id=425
+
+(cherry picked from commit a93f1128bc83b5a6628da242e71c18ef05e81ea2)
+---
+ fs/notify/inotify/Kconfig        |   9 ++++
+ fs/notify/inotify/inotify_user.c | 112 ++++++++++++++++++++++++++++++++++++++-
+ fs/overlayfs/super.c             |  24 ++++++++-
+ include/linux/inotify.h          |  28 ++++++++++
+ 4 files changed, 170 insertions(+), 3 deletions(-)
+
+diff --git a/fs/notify/inotify/Kconfig b/fs/notify/inotify/Kconfig
+index b981fc0c8379..b0b208bd584b 100644
+--- a/fs/notify/inotify/Kconfig
++++ b/fs/notify/inotify/Kconfig
+@@ -15,3 +15,12 @@ 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 ac6978d3208c..6780209a34f7 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> /* fs_initcall */
+@@ -85,6 +86,94 @@ struct 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;
+@@ -342,7 +431,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;
+ 
+@@ -356,6 +445,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,
+ 			      struct inotify_inode_mark *i_mark)
+ {
+diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
+index 30adc9d408a0..722a7fdf9540 100644
+--- a/fs/overlayfs/super.c
++++ b/fs/overlayfs/super.c
+@@ -18,6 +18,7 @@
+ #include <linux/seq_file.h>
+ #include <linux/posix_acl_xattr.h>
+ #include <linux/exportfs.h>
++#include <linux/inotify.h>
+ #include "overlayfs.h"
+ 
+ MODULE_AUTHOR("Miklos Szeredi <miklos@szeredi.hu>");
+@@ -1533,6 +1534,18 @@ static void ovl_inode_init_once(void *foo)
+ 	inode_init_once(&oi->vfs_inode);
+ }
+ 
++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)
+ {
+ 	int err;
+@@ -1547,13 +1560,21 @@ static int __init ovl_init(void)
+ 
+ 	err = register_filesystem(&ovl_fs_type);
+ 	if (err)
+-		kmem_cache_destroy(ovl_inode_cachep);
++		goto err;
++	err = inotify_register_stackfs(&ovl_inotify);
++	if (err)
++		goto err;
++	return err;
+ 
++err:
++	kmem_cache_destroy(ovl_inode_cachep);
++	unregister_filesystem(&ovl_fs_type);
+ 	return err;
+ }
+ 
+ static void __exit ovl_exit(void)
+ {
++	inotify_unregister_stackfs(&ovl_inotify);
+ 	unregister_filesystem(&ovl_fs_type);
+ 
+ 	/*
+@@ -1562,7 +1583,6 @@ static void __exit ovl_exit(void)
+ 	 */
+ 	rcu_barrier();
+ 	kmem_cache_destroy(ovl_inode_cachep);
+-
+ }
+ 
+ module_init(ovl_init);
+diff --git a/include/linux/inotify.h b/include/linux/inotify.h
+index 6a24905f6e1e..248b1441ba83 100644
+--- a/include/linux/inotify.h
++++ b/include/linux/inotify.h
+@@ -9,6 +9,8 @@
+ 
+ #include <linux/sysctl.h>
+ #include <uapi/linux/inotify.h>
++#include <linux/list.h>
++#include <linux/fs.h>
+ 
+ extern struct ctl_table inotify_table[]; /* for sysctl */
+ 
+@@ -20,4 +22,30 @@ extern struct ctl_table inotify_table[]; /* for sysctl */
+ 			  IN_DONT_FOLLOW | IN_EXCL_UNLINK | IN_MASK_ADD | \
+ 			  IN_MASK_CREATE | 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	/* _LINUX_INOTIFY_H */
+-- 
+2.11.0
+