Blame test/integration/rhel-7.6/macro-printk.patch

Packit Service da4517
Index: kernel-rhel7/net/ipv4/fib_frontend.c
Packit Service da4517
===================================================================
Packit Service da4517
--- kernel-rhel7.orig/net/ipv4/fib_frontend.c
Packit Service da4517
+++ kernel-rhel7/net/ipv4/fib_frontend.c
Packit Service da4517
@@ -685,6 +685,7 @@ errout:
Packit Service da4517
 	return err;
Packit Service da4517
 }
Packit Service da4517
 
Packit Service da4517
+#include "kpatch-macros.h"
Packit Service da4517
 static int inet_rtm_newroute(struct sk_buff *skb, struct nlmsghdr *nlh)
Packit Service da4517
 {
Packit Service da4517
 	struct net *net = sock_net(skb->sk);
Packit Service da4517
@@ -703,6 +704,7 @@ static int inet_rtm_newroute(struct sk_b
Packit Service da4517
 	}
Packit Service da4517
 
Packit Service da4517
 	err = fib_table_insert(net, tb, &cfg;;
Packit Service da4517
+	KPATCH_PRINTK("[inet_rtm_newroute]: err is %d\n", err);
Packit Service da4517
 errout:
Packit Service da4517
 	return err;
Packit Service da4517
 }
Packit Service da4517
Index: kernel-rhel7/net/ipv4/fib_semantics.c
Packit Service da4517
===================================================================
Packit Service da4517
--- kernel-rhel7.orig/net/ipv4/fib_semantics.c
Packit Service da4517
+++ kernel-rhel7/net/ipv4/fib_semantics.c
Packit Service da4517
@@ -969,6 +969,7 @@ fib_convert_metrics(struct fib_info *fi,
Packit Service da4517
 	return 0;
Packit Service da4517
 }
Packit Service da4517
 
Packit Service da4517
+#include "kpatch-macros.h"
Packit Service da4517
 struct fib_info *fib_create_info(struct fib_config *cfg)
Packit Service da4517
 {
Packit Service da4517
 	int err;
Packit Service da4517
@@ -993,6 +994,7 @@ struct fib_info *fib_create_info(struct
Packit Service da4517
 #endif
Packit Service da4517
 
Packit Service da4517
 	err = -ENOBUFS;
Packit Service da4517
+	KPATCH_PRINTK("[fib_create_info]: create error err is %d\n",err);
Packit Service da4517
 	if (fib_info_cnt >= fib_info_hash_size) {
Packit Service da4517
 		unsigned int new_size = fib_info_hash_size << 1;
Packit Service da4517
 		struct hlist_head *new_info_hash;
Packit Service da4517
@@ -1013,6 +1015,7 @@ struct fib_info *fib_create_info(struct
Packit Service da4517
 		if (!fib_info_hash_size)
Packit Service da4517
 			goto failure;
Packit Service da4517
 	}
Packit Service da4517
+	KPATCH_PRINTK("[fib_create_info]: 2 create error err is %d\n",err);
Packit Service da4517
 
Packit Service da4517
 	fi = kzalloc(sizeof(*fi)+nhs*sizeof(struct fib_nh), GFP_KERNEL);
Packit Service da4517
 	if (fi == NULL)
Packit Service da4517
@@ -1028,6 +1031,8 @@ struct fib_info *fib_create_info(struct
Packit Service da4517
 		fi->fib_metrics = (struct dst_metrics *)&dst_default_metrics;
Packit Service da4517
 	}
Packit Service da4517
 	fib_info_cnt++;
Packit Service da4517
+	KPATCH_PRINTK("[fib_create_info]: 3 create error err is %d\n",err);
Packit Service da4517
+
Packit Service da4517
 	fi->fib_net = net;
Packit Service da4517
 	fi->fib_protocol = cfg->fc_protocol;
Packit Service da4517
 	fi->fib_scope = cfg->fc_scope;
Packit Service da4517
@@ -1043,8 +1048,10 @@ struct fib_info *fib_create_info(struct
Packit Service da4517
 		if (!nexthop_nh->nh_pcpu_rth_output)
Packit Service da4517
 			goto failure;
Packit Service da4517
 	} endfor_nexthops(fi)
Packit Service da4517
+	KPATCH_PRINTK("[fib_create_info]: 4 create error err is %d\n",err);
Packit Service da4517
 
Packit Service da4517
 	err = fib_convert_metrics(fi, cfg);
Packit Service da4517
+	KPATCH_PRINTK("[fib_create_info]: 5 create error err is %d\n",err);
Packit Service da4517
 	if (err)
Packit Service da4517
 		goto failure;
Packit Service da4517
 
Packit Service da4517
@@ -1095,6 +1102,7 @@ struct fib_info *fib_create_info(struct
Packit Service da4517
 		nh->nh_weight = 1;
Packit Service da4517
 #endif
Packit Service da4517
 	}
Packit Service da4517
+	KPATCH_PRINTK("[fib_create_info]: 6 create error err is %d\n",err);
Packit Service da4517
 
Packit Service da4517
 	if (fib_props[cfg->fc_type].error) {
Packit Service da4517
 		if (cfg->fc_gw || cfg->fc_oif || cfg->fc_mp)
Packit Service da4517
@@ -1112,6 +1120,7 @@ struct fib_info *fib_create_info(struct
Packit Service da4517
 			goto err_inval;
Packit Service da4517
 		}
Packit Service da4517
 	}
Packit Service da4517
+	KPATCH_PRINTK("[fib_create_info]: 7 create error err is %d\n",err);
Packit Service da4517
 
Packit Service da4517
 	if (cfg->fc_scope > RT_SCOPE_HOST)
Packit Service da4517
 		goto err_inval;
Packit Service da4517
@@ -1134,6 +1143,7 @@ struct fib_info *fib_create_info(struct
Packit Service da4517
 				goto failure;
Packit Service da4517
 		} endfor_nexthops(fi)
Packit Service da4517
 	}
Packit Service da4517
+	KPATCH_PRINTK("[fib_create_info]: 8 create error err is %d\n",err);
Packit Service da4517
 
Packit Service da4517
 	if (fi->fib_prefsrc) {
Packit Service da4517
 		if (cfg->fc_type != RTN_LOCAL || !cfg->fc_dst ||
Packit Service da4517
@@ -1146,6 +1156,7 @@ struct fib_info *fib_create_info(struct
Packit Service da4517
 		fib_info_update_nh_saddr(net, nexthop_nh);
Packit Service da4517
 		fib_add_weight(fi, nexthop_nh);
Packit Service da4517
 	} endfor_nexthops(fi)
Packit Service da4517
+	KPATCH_PRINTK("[fib_create_info]: 9 create error err is %d\n",err);
Packit Service da4517
 
Packit Service da4517
 	fib_rebalance(fi);
Packit Service da4517
 
Packit Service da4517
@@ -1157,6 +1168,7 @@ link_it:
Packit Service da4517
 		ofi->fib_treeref++;
Packit Service da4517
 		return ofi;
Packit Service da4517
 	}
Packit Service da4517
+	KPATCH_PRINTK("[fib_create_info]: 10 create error err is %d\n",err);
Packit Service da4517
 
Packit Service da4517
 	fi->fib_treeref++;
Packit Service da4517
 	atomic_inc(&fi->fib_clntref);
Packit Service da4517
@@ -1180,6 +1192,7 @@ link_it:
Packit Service da4517
 		hlist_add_head(&nexthop_nh->nh_hash, head);
Packit Service da4517
 	} endfor_nexthops(fi)
Packit Service da4517
 	spin_unlock_bh(&fib_info_lock);
Packit Service da4517
+	KPATCH_PRINTK("[fib_create_info]: 11 create error err is %d\n",err);
Packit Service da4517
 	return fi;
Packit Service da4517
 
Packit Service da4517
 err_inval:
Packit Service da4517
@@ -1190,6 +1203,7 @@ failure:
Packit Service da4517
 		fi->fib_dead = 1;
Packit Service da4517
 		free_fib_info(fi);
Packit Service da4517
 	}
Packit Service da4517
+	KPATCH_PRINTK("[fib_create_info]: 12 create error err is %d\n",err);
Packit Service da4517
 
Packit Service da4517
 	return ERR_PTR(err);
Packit Service da4517
 }
Packit Service da4517
Index: kernel-rhel7/net/ipv4/fib_trie.c
Packit Service da4517
===================================================================
Packit Service da4517
--- kernel-rhel7.orig/net/ipv4/fib_trie.c
Packit Service da4517
+++ kernel-rhel7/net/ipv4/fib_trie.c
Packit Service da4517
@@ -1105,6 +1105,7 @@ static int fib_insert_alias(struct trie
Packit Service da4517
 }
Packit Service da4517
 
Packit Service da4517
 /* Caller must hold RTNL. */
Packit Service da4517
+#include "kpatch-macros.h"
Packit Service da4517
 int fib_table_insert(struct net *net, struct fib_table *tb,
Packit Service da4517
 		     struct fib_config *cfg)
Packit Service da4517
 {
Packit Service da4517
@@ -1130,11 +1131,14 @@ int fib_table_insert(struct net *net, st
Packit Service da4517
 	if ((plen < KEYLENGTH) && (key << plen))
Packit Service da4517
 		return -EINVAL;
Packit Service da4517
 
Packit Service da4517
+	KPATCH_PRINTK("[fib_table_insert]: start\n");
Packit Service da4517
 	fi = fib_create_info(cfg);
Packit Service da4517
 	if (IS_ERR(fi)) {
Packit Service da4517
 		err = PTR_ERR(fi);
Packit Service da4517
+		KPATCH_PRINTK("[fib_table_insert]: create error err is %d\n",err);
Packit Service da4517
 		goto err;
Packit Service da4517
 	}
Packit Service da4517
+	KPATCH_PRINTK("[fib_table_insert]: cross\n");
Packit Service da4517
 
Packit Service da4517
 	l = fib_find_node(t, &tp, key);
Packit Service da4517
 	fa = l ? fib_find_alias(&l->leaf, slen, tos, fi->fib_priority,