Piteball
/
android_kernel_samsung_msm8976
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

net: rmnet_data: Change the print format for addresses 

Print format %p displays the kernel address while bypassing the
kptr_restrict sysctl settings.

Change the print format for addresses from %p to %pK. If
kptr_restrict is enabled, addresses are printed as zeroes. To view
the actual addresses, disable kptr_restrict by -
echo 0 > /proc/sys/kernel/kptr_restrict

CRs-Fixed: 987054
Change-Id: Icb8ef62c8263ae7b17d6883c0e6a1c93d2156a6a
Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
This commit is contained in:
Subash Abhinov Kasiviswanathan 2016-03-16 16:28:28 -06:00 committed by Gerrit - the friendly Code Review server
parent 75ba72b4f3
commit b380a1fea9
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/rmnet_data/rmnet_data_handlers.c
View File

@ -104,9 +104,10 @@ void rmnet_print_packet(const struct sk_buff *skb, const char *dev, char dir)
if (!printlen)
return;
pr_err("[%s][%c] - PKT skb->len=%d skb->head=%p skb->data=%p skb->tail=%p skb->end=%p\n",
dev, dir, skb->len, (void *)skb->head, (void *)skb->data,
skb_tail_pointer(skb), skb_end_pointer(skb));
pr_err("[%s][%c] - PKT skb->len=%d skb->head=%pK skb->data=%pK\n",
dev, dir, skb->len, (void *)skb->head, (void *)skb->data);
pr_err("[%s][%c] - PKT skb->tail=%pK skb->end=%pK\n",
dev, dir, skb_tail_pointer(skb), skb_end_pointer(skb));
if (skb->len > 0)
len = skb->len;

9
net/rmnet_data/rmnet_data_trace.h
View File

@ -39,8 +39,8 @@ DECLARE_EVENT_CLASS(rmnet_handler_template,
__assign_str(name, skb->dev->name);
),
TP_printk("dev=%s skbaddr=%p len=%u",
__get_str(name), __entry->skbaddr, __entry->len)
TP_printk("dev=%s skbaddr=%pK len=%u",
__get_str(name), __entry->skbaddr, __entry->len)
)
DEFINE_EVENT(rmnet_handler_template, rmnet_egress_handler,
@ -128,8 +128,9 @@ DECLARE_EVENT_CLASS(rmnet_aggregation_template,
__entry->num = num_agg_pakcets;
),
TP_printk("dev=%s skbaddr=%p len=%u agg_count: %d",
__get_str(name), __entry->skbaddr, __entry->len, __entry->num)
TP_printk("dev=%s skbaddr=%pK len=%u agg_count: %d",
__get_str(name), __entry->skbaddr, __entry->len,
__entry->num)
)
DEFINE_EVENT(rmnet_aggregation_template, rmnet_map_aggregate,

6
net/rmnet_data/rmnet_data_vnd.c
View File

@ -824,7 +824,7 @@ static int _rmnet_vnd_update_flow_map(uint8_t action,
itm->tc_flow_valid[i] = 1;
itm->tc_flow_id[i] = tc_flow;
rc = RMNET_VND_UPDATE_FLOW_OK;
LOGD("{%p}->tc_flow_id[%d]=%08X",
LOGD("{%pK}->tc_flow_id[%d]=%08X",
itm, i, tc_flow);
break;
}
@ -840,7 +840,7 @@ static int _rmnet_vnd_update_flow_map(uint8_t action,
itm->tc_flow_valid[i] = 0;
itm->tc_flow_id[i] = 0;
j++;
LOGD("{%p}->tc_flow_id[%d]=0", itm, i);
LOGD("{%pK}->tc_flow_id[%d]=0", itm, i);
}
} else {
j++;
@ -985,7 +985,7 @@ int rmnet_vnd_del_tc_flow(uint32_t id, uint32_t map_flow, uint32_t tc_flow)
if (r == RMNET_VND_UPDATE_FLOW_NO_VALID_LEFT) {
if (itm)
LOGD("Removed flow mapping [%s][0x%08X]@%p",
LOGD("Removed flow mapping [%s][0x%08X]@%pK",
dev->name, itm->map_flow_id, itm);
kfree(itm);
}