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

Packit Service da4517
diff -Nupr src.orig/net/ipv4/fib_frontend.c src/net/ipv4/fib_frontend.c
Packit Service da4517
--- src.orig/net/ipv4/fib_frontend.c	2020-05-12 11:14:29.710771918 -0400
Packit Service da4517
+++ src/net/ipv4/fib_frontend.c	2020-05-12 11:15:48.047376894 -0400
Packit Service da4517
@@ -789,6 +789,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
 			     struct netlink_ext_ack *extack)
Packit Service da4517
 {
Packit Service da4517
@@ -810,6 +811,7 @@ static int inet_rtm_newroute(struct sk_b
Packit Service da4517
 	err = fib_table_insert(net, tb, &cfg, extack);
Packit Service da4517
 	if (!err && cfg.fc_type == RTN_LOCAL)
Packit Service da4517
 		net->ipv4.fib_has_custom_local_routes = true;
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
diff -Nupr src.orig/net/ipv4/fib_semantics.c src/net/ipv4/fib_semantics.c
Packit Service da4517
--- src.orig/net/ipv4/fib_semantics.c	2020-05-12 11:14:29.710771918 -0400
Packit Service da4517
+++ src/net/ipv4/fib_semantics.c	2020-05-12 11:15:48.047376894 -0400
Packit Service da4517
@@ -1025,6 +1025,7 @@ fib_convert_metrics(struct fib_info *fi,
Packit Service da4517
 				  fi->fib_metrics->metrics);
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
 				 struct netlink_ext_ack *extack)
Packit Service da4517
 {
Packit Service da4517
@@ -1058,6 +1059,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
@@ -1078,6 +1080,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)
Packit Service da4517
@@ -1093,6 +1096,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
@@ -1109,8 +1114,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
@@ -1172,6 +1179,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
@@ -1193,6 +1201,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
 		NL_SET_ERR_MSG(extack, "Invalid scope");
Packit Service da4517
@@ -1231,6 +1240,7 @@ struct fib_info *fib_create_info(struct
Packit Service da4517
 		if (linkdown == fi->fib_nhs)
Packit Service da4517
 			fi->fib_flags |= RTNH_F_LINKDOWN;
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 && !fib_valid_prefsrc(cfg, fi->fib_prefsrc)) {
Packit Service da4517
 		NL_SET_ERR_MSG(extack, "Invalid prefsrc address");
Packit Service da4517
@@ -1240,6 +1250,7 @@ struct fib_info *fib_create_info(struct
Packit Service da4517
 	change_nexthops(fi) {
Packit Service da4517
 		fib_info_update_nh_saddr(net, 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
@@ -1251,6 +1262,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
 	refcount_set(&fi->fib_clntref, 1);
Packit Service da4517
@@ -1274,6 +1286,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
@@ -1284,6 +1297,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
diff -Nupr src.orig/net/ipv4/fib_trie.c src/net/ipv4/fib_trie.c
Packit Service da4517
--- src.orig/net/ipv4/fib_trie.c	2020-05-12 11:14:29.710771918 -0400
Packit Service da4517
+++ src/net/ipv4/fib_trie.c	2020-05-12 11:15:48.047376894 -0400
Packit Service da4517
@@ -1121,6 +1121,7 @@ static bool fib_valid_key_len(u32 key, u
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, struct netlink_ext_ack *extack)
Packit Service da4517
 {
Packit Service da4517
@@ -1143,11 +1144,14 @@ int fib_table_insert(struct net *net, st
Packit Service da4517
 
Packit Service da4517
 	pr_debug("Insert table=%u %08x/%d\n", tb->tb_id, key, plen);
Packit Service da4517
 
Packit Service da4517
+	KPATCH_PRINTK("[fib_table_insert]: start\n");
Packit Service da4517
 	fi = fib_create_info(cfg, extack);
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,