Blame test/integration/ubuntu-16.04/macro-printk.patch

Packit Service da4517
Index: src/net/ipv4/fib_frontend.c
Packit Service da4517
===================================================================
Packit Service da4517
--- src.orig/net/ipv4/fib_frontend.c
Packit Service da4517
+++ src/net/ipv4/fib_frontend.c
Packit Service ac8aad
@@ -728,6 +728,7 @@ errout:
Packit Service ac8aad
 	return err;
Packit Service ac8aad
 }
Packit Service ac8aad
 
Packit Service ac8aad
+#include "kpatch-macros.h"
Packit Service ac8aad
 static int inet_rtm_newroute(struct sk_buff *skb, struct nlmsghdr *nlh)
Packit Service ac8aad
 {
Packit Service ac8aad
 	struct net *net = sock_net(skb->sk);
Packit Service ac8aad
@@ -746,6 +747,7 @@ static int inet_rtm_newroute(struct sk_b
Packit Service ac8aad
 	}
Packit Service ac8aad
 
Packit Service ac8aad
 	err = fib_table_insert(tb, &cfg;;
Packit Service ac8aad
+	KPATCH_PRINTK("[inet_rtm_newroute]: err is %d\n", err);
Packit Service ac8aad
 errout:
Packit Service ac8aad
 	return err;
Packit Service ac8aad
 }
Packit Service da4517
Index: src/net/ipv4/fib_semantics.c
Packit Service da4517
===================================================================
Packit Service da4517
--- src.orig/net/ipv4/fib_semantics.c
Packit Service da4517
+++ src/net/ipv4/fib_semantics.c
Packit Service da4517
@@ -998,6 +998,7 @@ fib_convert_metrics(struct fib_info *fi,
Packit Service ac8aad
 	return 0;
Packit Service ac8aad
 }
Packit Service ac8aad
 
Packit Service ac8aad
+#include "kpatch-macros.h"
Packit Service ac8aad
 struct fib_info *fib_create_info(struct fib_config *cfg)
Packit Service ac8aad
 {
Packit Service ac8aad
 	int err;
Packit Service da4517
@@ -1025,6 +1026,7 @@ struct fib_info *fib_create_info(struct
Packit Service ac8aad
 #endif
Packit Service ac8aad
 
Packit Service ac8aad
 	err = -ENOBUFS;
Packit Service ac8aad
+	KPATCH_PRINTK("[fib_create_info]: create error err is %d\n",err);
Packit Service ac8aad
 	if (fib_info_cnt >= fib_info_hash_size) {
Packit Service ac8aad
 		unsigned int new_size = fib_info_hash_size << 1;
Packit Service ac8aad
 		struct hlist_head *new_info_hash;
Packit Service da4517
@@ -1045,6 +1047,7 @@ struct fib_info *fib_create_info(struct
Packit Service ac8aad
 		if (!fib_info_hash_size)
Packit Service ac8aad
 			goto failure;
Packit Service ac8aad
 	}
Packit Service ac8aad
+	KPATCH_PRINTK("[fib_create_info]: 2 create error err is %d\n",err);
Packit Service ac8aad
 
Packit Service ac8aad
 	fi = kzalloc(sizeof(*fi)+nhs*sizeof(struct fib_nh), GFP_KERNEL);
Packit Service ac8aad
 	if (!fi)
Packit Service da4517
@@ -1059,6 +1062,7 @@ struct fib_info *fib_create_info(struct
Packit Service da4517
 	} else {
Packit Service da4517
 		fi->fib_metrics = (struct dst_metrics *)&dst_default_metrics;
Packit Service da4517
 	}
Packit Service ac8aad
+	KPATCH_PRINTK("[fib_create_info]: 3 create error err is %d\n",err);
Packit Service da4517
 	fib_info_cnt++;
Packit Service ac8aad
 	fi->fib_net = net;
Packit Service ac8aad
 	fi->fib_protocol = cfg->fc_protocol;
Packit Service da4517
@@ -1075,6 +1079,7 @@ struct fib_info *fib_create_info(struct
Packit Service ac8aad
 		if (!nexthop_nh->nh_pcpu_rth_output)
Packit Service ac8aad
 			goto failure;
Packit Service ac8aad
 	} endfor_nexthops(fi)
Packit Service ac8aad
+	KPATCH_PRINTK("[fib_create_info]: 4 create error err is %d\n",err);
Packit Service ac8aad
 
Packit Service ac8aad
 	err = fib_convert_metrics(fi, cfg);
Packit Service ac8aad
 	if (err)
Packit Service da4517
@@ -1127,6 +1132,8 @@ struct fib_info *fib_create_info(struct
Packit Service ac8aad
 		nh->nh_weight = 1;
Packit Service ac8aad
 #endif
Packit Service ac8aad
 	}
Packit Service ac8aad
+	KPATCH_PRINTK("[fib_create_info]: 5 create error err is %d\n",err);
Packit Service ac8aad
+	KPATCH_PRINTK("[fib_create_info]: 6 create error err is %d\n",err);
Packit Service ac8aad
 
Packit Service ac8aad
 	if (fib_props[cfg->fc_type].error) {
Packit Service ac8aad
 		if (cfg->fc_gw || cfg->fc_oif || cfg->fc_mp)
Packit Service da4517
@@ -1144,6 +1151,7 @@ struct fib_info *fib_create_info(struct
Packit Service ac8aad
 			goto err_inval;
Packit Service ac8aad
 		}
Packit Service ac8aad
 	}
Packit Service ac8aad
+	KPATCH_PRINTK("[fib_create_info]: 7 create error err is %d\n",err);
Packit Service ac8aad
 
Packit Service ac8aad
 	if (cfg->fc_scope > RT_SCOPE_HOST)
Packit Service ac8aad
 		goto err_inval;
Packit Service da4517
@@ -1172,6 +1180,7 @@ struct fib_info *fib_create_info(struct
Packit Service ac8aad
 		if (linkdown == fi->fib_nhs)
Packit Service ac8aad
 			fi->fib_flags |= RTNH_F_LINKDOWN;
Packit Service ac8aad
 	}
Packit Service ac8aad
+	KPATCH_PRINTK("[fib_create_info]: 8 create error err is %d\n",err);
Packit Service ac8aad
 
Packit Service ac8aad
 	if (fi->fib_prefsrc && !fib_valid_prefsrc(cfg, fi->fib_prefsrc))
Packit Service ac8aad
 		goto err_inval;
Packit Service da4517
@@ -1180,6 +1189,7 @@ struct fib_info *fib_create_info(struct
Packit Service ac8aad
 		fib_info_update_nh_saddr(net, nexthop_nh);
Packit Service ac8aad
 		fib_add_weight(fi, nexthop_nh);
Packit Service ac8aad
 	} endfor_nexthops(fi)
Packit Service ac8aad
+	KPATCH_PRINTK("[fib_create_info]: 9 create error err is %d\n",err);
Packit Service ac8aad
 
Packit Service ac8aad
 	fib_rebalance(fi);
Packit Service ac8aad
 
Packit Service da4517
@@ -1191,6 +1201,7 @@ link_it:
Packit Service ac8aad
 		ofi->fib_treeref++;
Packit Service ac8aad
 		return ofi;
Packit Service ac8aad
 	}
Packit Service ac8aad
+	KPATCH_PRINTK("[fib_create_info]: 10 create error err is %d\n",err);
Packit Service ac8aad
 
Packit Service ac8aad
 	fi->fib_treeref++;
Packit Service ac8aad
 	atomic_inc(&fi->fib_clntref);
Packit Service da4517
@@ -1214,6 +1225,7 @@ link_it:
Packit Service ac8aad
 		hlist_add_head(&nexthop_nh->nh_hash, head);
Packit Service ac8aad
 	} endfor_nexthops(fi)
Packit Service ac8aad
 	spin_unlock_bh(&fib_info_lock);
Packit Service ac8aad
+	KPATCH_PRINTK("[fib_create_info]: 11 create error err is %d\n",err);
Packit Service ac8aad
 	return fi;
Packit Service ac8aad
 
Packit Service ac8aad
 err_inval:
Packit Service da4517
@@ -1224,6 +1236,7 @@ failure:
Packit Service ac8aad
 		fi->fib_dead = 1;
Packit Service ac8aad
 		free_fib_info(fi);
Packit Service ac8aad
 	}
Packit Service ac8aad
+	KPATCH_PRINTK("[fib_create_info]: 12 create error err is %d\n",err);
Packit Service ac8aad
 
Packit Service ac8aad
 	return ERR_PTR(err);
Packit Service ac8aad
 }
Packit Service da4517
Index: src/net/ipv4/fib_trie.c
Packit Service da4517
===================================================================
Packit Service da4517
--- src.orig/net/ipv4/fib_trie.c
Packit Service da4517
+++ src/net/ipv4/fib_trie.c
Packit Service ac8aad
@@ -1078,6 +1078,7 @@ static int fib_insert_alias(struct trie
Packit Service ac8aad
 }
Packit Service ac8aad
 
Packit Service ac8aad
 /* Caller must hold RTNL. */
Packit Service ac8aad
+#include "kpatch-macros.h"
Packit Service ac8aad
 int fib_table_insert(struct fib_table *tb, struct fib_config *cfg)
Packit Service ac8aad
 {
Packit Service ac8aad
 	struct trie *t = (struct trie *)tb->tb_data;
Packit Service ac8aad
@@ -1101,11 +1102,14 @@ int fib_table_insert(struct fib_table *t
Packit Service ac8aad
 	if ((plen < KEYLENGTH) && (key << plen))
Packit Service ac8aad
 		return -EINVAL;
Packit Service ac8aad
 
Packit Service ac8aad
+	KPATCH_PRINTK("[fib_table_insert]: start\n");
Packit Service ac8aad
 	fi = fib_create_info(cfg);
Packit Service ac8aad
 	if (IS_ERR(fi)) {
Packit Service ac8aad
 		err = PTR_ERR(fi);
Packit Service ac8aad
+		KPATCH_PRINTK("[fib_table_insert]: create error err is %d\n",err);
Packit Service ac8aad
 		goto err;
Packit Service ac8aad
 	}
Packit Service ac8aad
+	KPATCH_PRINTK("[fib_table_insert]: cross\n");
Packit Service ac8aad
 
Packit Service ac8aad
 	l = fib_find_node(t, &tp, key);
Packit Service ac8aad
 	fa = l ? fib_find_alias(&l->leaf, slen, tos, fi->fib_priority,