| 1 |
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c |
| 2 |
index 0113993..0ea4967 100644 |
| 3 |
--- a/net/ipv4/fib_frontend.c |
| 4 |
+++ b/net/ipv4/fib_frontend.c |
| 5 |
@@ -767,6 +767,7 @@ static int inet_rtm_delroute(struct sk_buff *skb, struct nlmsghdr *nlh, |
| 6 |
return err; |
| 7 |
} |
| 8 |
|
| 9 |
+#include "kpatch-macros.h" |
| 10 |
static int inet_rtm_newroute(struct sk_buff *skb, struct nlmsghdr *nlh, |
| 11 |
struct netlink_ext_ack *extack) |
| 12 |
{ |
| 13 |
@@ -788,6 +789,7 @@ static int inet_rtm_newroute(struct sk_buff *skb, struct nlmsghdr *nlh, |
| 14 |
err = fib_table_insert(net, tb, &cfg, extack); |
| 15 |
if (!err && cfg.fc_type == RTN_LOCAL) |
| 16 |
net->ipv4.fib_has_custom_local_routes = true; |
| 17 |
+ KPATCH_PRINTK("[inet_rtm_newroute]: err is %d\n", err); |
| 18 |
errout: |
| 19 |
return err; |
| 20 |
} |
| 21 |
diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c |
| 22 |
index 446204c..5b73a01 100644 |
| 23 |
--- a/net/ipv4/fib_semantics.c |
| 24 |
+++ b/net/ipv4/fib_semantics.c |
| 25 |
@@ -1025,6 +1025,7 @@ static bool fib_valid_prefsrc(struct fib_config *cfg, __be32 fib_prefsrc) |
| 26 |
fi->fib_metrics->metrics); |
| 27 |
} |
| 28 |
|
| 29 |
+#include "kpatch-macros.h" |
| 30 |
struct fib_info *fib_create_info(struct fib_config *cfg, |
| 31 |
struct netlink_ext_ack *extack) |
| 32 |
{ |
| 33 |
@@ -1058,6 +1059,7 @@ struct fib_info *fib_create_info(struct fib_config *cfg, |
| 34 |
#endif |
| 35 |
|
| 36 |
err = -ENOBUFS; |
| 37 |
+ KPATCH_PRINTK("[fib_create_info]: create error err is %d\n",err); |
| 38 |
if (fib_info_cnt >= fib_info_hash_size) { |
| 39 |
unsigned int new_size = fib_info_hash_size << 1; |
| 40 |
struct hlist_head *new_info_hash; |
| 41 |
@@ -1078,6 +1080,7 @@ struct fib_info *fib_create_info(struct fib_config *cfg, |
| 42 |
if (!fib_info_hash_size) |
| 43 |
goto failure; |
| 44 |
} |
| 45 |
+ KPATCH_PRINTK("[fib_create_info]: 2 create error err is %d\n",err); |
| 46 |
|
| 47 |
fi = kzalloc(sizeof(*fi)+nhs*sizeof(struct fib_nh), GFP_KERNEL); |
| 48 |
if (!fi) |
| 49 |
@@ -1093,6 +1096,8 @@ struct fib_info *fib_create_info(struct fib_config *cfg, |
| 50 |
fi->fib_metrics = (struct dst_metrics *)&dst_default_metrics; |
| 51 |
} |
| 52 |
fib_info_cnt++; |
| 53 |
+ KPATCH_PRINTK("[fib_create_info]: 3 create error err is %d\n",err); |
| 54 |
+ |
| 55 |
fi->fib_net = net; |
| 56 |
fi->fib_protocol = cfg->fc_protocol; |
| 57 |
fi->fib_scope = cfg->fc_scope; |
| 58 |
@@ -1109,8 +1114,10 @@ struct fib_info *fib_create_info(struct fib_config *cfg, |
| 59 |
if (!nexthop_nh->nh_pcpu_rth_output) |
| 60 |
goto failure; |
| 61 |
} endfor_nexthops(fi) |
| 62 |
+ KPATCH_PRINTK("[fib_create_info]: 4 create error err is %d\n",err); |
| 63 |
|
| 64 |
err = fib_convert_metrics(fi, cfg); |
| 65 |
+ KPATCH_PRINTK("[fib_create_info]: 5 create error err is %d\n",err); |
| 66 |
if (err) |
| 67 |
goto failure; |
| 68 |
|
| 69 |
@@ -1172,6 +1179,7 @@ struct fib_info *fib_create_info(struct fib_config *cfg, |
| 70 |
nh->nh_weight = 1; |
| 71 |
#endif |
| 72 |
} |
| 73 |
+ KPATCH_PRINTK("[fib_create_info]: 6 create error err is %d\n",err); |
| 74 |
|
| 75 |
if (fib_props[cfg->fc_type].error) { |
| 76 |
if (cfg->fc_gw || cfg->fc_oif || cfg->fc_mp) { |
| 77 |
@@ -1193,6 +1201,7 @@ struct fib_info *fib_create_info(struct fib_config *cfg, |
| 78 |
goto err_inval; |
| 79 |
} |
| 80 |
} |
| 81 |
+ KPATCH_PRINTK("[fib_create_info]: 7 create error err is %d\n",err); |
| 82 |
|
| 83 |
if (cfg->fc_scope > RT_SCOPE_HOST) { |
| 84 |
NL_SET_ERR_MSG(extack, "Invalid scope"); |
| 85 |
@@ -1231,6 +1240,7 @@ struct fib_info *fib_create_info(struct fib_config *cfg, |
| 86 |
if (linkdown == fi->fib_nhs) |
| 87 |
fi->fib_flags |= RTNH_F_LINKDOWN; |
| 88 |
} |
| 89 |
+ KPATCH_PRINTK("[fib_create_info]: 8 create error err is %d\n",err); |
| 90 |
|
| 91 |
if (fi->fib_prefsrc && !fib_valid_prefsrc(cfg, fi->fib_prefsrc)) { |
| 92 |
NL_SET_ERR_MSG(extack, "Invalid prefsrc address"); |
| 93 |
@@ -1240,6 +1250,7 @@ struct fib_info *fib_create_info(struct fib_config *cfg, |
| 94 |
change_nexthops(fi) { |
| 95 |
fib_info_update_nh_saddr(net, nexthop_nh); |
| 96 |
} endfor_nexthops(fi) |
| 97 |
+ KPATCH_PRINTK("[fib_create_info]: 9 create error err is %d\n",err); |
| 98 |
|
| 99 |
fib_rebalance(fi); |
| 100 |
|
| 101 |
@@ -1251,6 +1262,7 @@ struct fib_info *fib_create_info(struct fib_config *cfg, |
| 102 |
ofi->fib_treeref++; |
| 103 |
return ofi; |
| 104 |
} |
| 105 |
+ KPATCH_PRINTK("[fib_create_info]: 10 create error err is %d\n",err); |
| 106 |
|
| 107 |
fi->fib_treeref++; |
| 108 |
refcount_set(&fi->fib_clntref, 1); |
| 109 |
@@ -1274,6 +1286,7 @@ struct fib_info *fib_create_info(struct fib_config *cfg, |
| 110 |
hlist_add_head(&nexthop_nh->nh_hash, head); |
| 111 |
} endfor_nexthops(fi) |
| 112 |
spin_unlock_bh(&fib_info_lock); |
| 113 |
+ KPATCH_PRINTK("[fib_create_info]: 11 create error err is %d\n",err); |
| 114 |
return fi; |
| 115 |
|
| 116 |
err_inval: |
| 117 |
@@ -1284,6 +1297,7 @@ struct fib_info *fib_create_info(struct fib_config *cfg, |
| 118 |
fi->fib_dead = 1; |
| 119 |
free_fib_info(fi); |
| 120 |
} |
| 121 |
+ KPATCH_PRINTK("[fib_create_info]: 12 create error err is %d\n",err); |
| 122 |
|
| 123 |
return ERR_PTR(err); |
| 124 |
} |
| 125 |
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c |
| 126 |
index 5bc0c89..d57b327 100644 |
| 127 |
--- a/net/ipv4/fib_trie.c |
| 128 |
+++ b/net/ipv4/fib_trie.c |
| 129 |
@@ -1121,6 +1121,7 @@ static bool fib_valid_key_len(u32 key, u8 plen, struct netlink_ext_ack *extack) |
| 130 |
} |
| 131 |
|
| 132 |
/* Caller must hold RTNL. */ |
| 133 |
+#include "kpatch-macros.h" |
| 134 |
int fib_table_insert(struct net *net, struct fib_table *tb, |
| 135 |
struct fib_config *cfg, struct netlink_ext_ack *extack) |
| 136 |
{ |
| 137 |
@@ -1143,11 +1144,14 @@ int fib_table_insert(struct net *net, struct fib_table *tb, |
| 138 |
|
| 139 |
pr_debug("Insert table=%u %08x/%d\n", tb->tb_id, key, plen); |
| 140 |
|
| 141 |
+ KPATCH_PRINTK("[fib_table_insert]: start\n"); |
| 142 |
fi = fib_create_info(cfg, extack); |
| 143 |
if (IS_ERR(fi)) { |
| 144 |
err = PTR_ERR(fi); |
| 145 |
+ KPATCH_PRINTK("[fib_table_insert]: create error err is %d\n",err); |
| 146 |
goto err; |
| 147 |
} |
| 148 |
+ KPATCH_PRINTK("[fib_table_insert]: cross\n"); |
| 149 |
|
| 150 |
l = fib_find_node(t, &tp, key); |
| 151 |
fa = l ? fib_find_alias(&l->leaf, slen, tos, fi->fib_priority, |