diff options
| author | Subash Abhinov Kasiviswanathan <subashab@codeaurora.org> | 2016-03-16 16:28:28 -0600 |
|---|---|---|
| committer | Kyle Yan <kyan@codeaurora.org> | 2016-04-28 16:47:34 -0700 |
| commit | 28e988cc2ffac301f8270ef50de268b4b4c44e93 (patch) | |
| tree | ef185536068081ee39262769e23a1b7a1958a92d /net/rmnet_data | |
| parent | cc83850fd310d1ad22294e2ee29ec5e15eb4983d (diff) | |
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>
Diffstat (limited to 'net/rmnet_data')
| -rw-r--r-- | net/rmnet_data/rmnet_data_handlers.c | 7 | ||||
| -rw-r--r-- | net/rmnet_data/rmnet_data_trace.h | 9 | ||||
| -rw-r--r-- | net/rmnet_data/rmnet_data_vnd.c | 6 |
3 files changed, 12 insertions, 10 deletions
diff --git a/net/rmnet_data/rmnet_data_handlers.c b/net/rmnet_data/rmnet_data_handlers.c index 7ea599f746c2..6c40f229d5d6 100644 --- a/net/rmnet_data/rmnet_data_handlers.c +++ b/net/rmnet_data/rmnet_data_handlers.c @@ -117,9 +117,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; diff --git a/net/rmnet_data/rmnet_data_trace.h b/net/rmnet_data/rmnet_data_trace.h index 5b09232fb3af..9663979db13c 100644 --- a/net/rmnet_data/rmnet_data_trace.h +++ b/net/rmnet_data/rmnet_data_trace.h @@ -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, diff --git a/net/rmnet_data/rmnet_data_vnd.c b/net/rmnet_data/rmnet_data_vnd.c index e76d29c7e6e3..6d6893c7d99d 100644 --- a/net/rmnet_data/rmnet_data_vnd.c +++ b/net/rmnet_data/rmnet_data_vnd.c @@ -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++; @@ -984,7 +984,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); } |