> -----Original Message-----
> From: Intel-wired-lan <[email protected]> On Behalf Of
> Thomas Weißschuh
> Sent: Monday, April 14, 2025 10:26 AM
> To: Jeff Johnson <[email protected]>; Loic Poulain
> <[email protected]>; Brian Norris <[email protected]>;
> Francesco Dolcini <[email protected]>; Nguyen, Anthony L
> <[email protected]>; Kitszel, Przemyslaw
> <[email protected]>; Andrew Lunn <[email protected]>;
> David S. Miller <[email protected]>; Dumazet, Eric
> <[email protected]>; Jakub Kicinski <[email protected]>; Paolo Abeni
> <[email protected]>; Saeed Mahameed <[email protected]>; Leon
> Romanovsky <[email protected]>; Tariq Toukan <[email protected]>
> Cc: [email protected]; [email protected];
> [email protected]; [email protected];
> [email protected]; [email protected]; intel-wired-
> [email protected]; [email protected]; [email protected];
> Thomas Weißschuh <[email protected]>
> Subject: [Intel-wired-lan] [PATCH net-next 6/7] ice: Don't use %pK through
> printk or tracepoints
> 
> In the past %pK was preferable to %p as it would not leak raw pointer values
> into the kernel log.
> Since commit ad67b74d2469 ("printk: hash addresses printed with %p") the
> regular %p has been improved to avoid this issue.
> Furthermore, restricted pointers ("%pK") were never meant to be used
> through printk(). They can still unintentionally leak raw pointers or acquire
> sleeping looks in atomic contexts.
> 
> Switch to the regular pointer formatting which is safer and easier to reason
> about.
> There are still a few users of %pK left, but these use it through seq_file, 
> for
> which its usage is safe.
> 
> Signed-off-by: Thomas Weißschuh <[email protected]>
Reviewed-by: Aleksandr Loktionov <[email protected]>
> ---
>  drivers/net/ethernet/intel/ice/ice_main.c  |  2 +-
> drivers/net/ethernet/intel/ice/ice_trace.h | 10 +++++-----
>  2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/net/ethernet/intel/ice/ice_main.c
> b/drivers/net/ethernet/intel/ice/ice_main.c
> index
> d390157b59fe1873ddab78323cdc0bbaea6ad0c5..d27e8816a48fef5014148
> cae27e52c1801eaaada 100644
> --- a/drivers/net/ethernet/intel/ice/ice_main.c
> +++ b/drivers/net/ethernet/intel/ice/ice_main.c
> @@ -9118,7 +9118,7 @@ static int ice_create_q_channels(struct ice_vsi *vsi)
>               list_add_tail(&ch->list, &vsi->ch_list);
>               vsi->tc_map_vsi[i] = ch->ch_vsi;
>               dev_dbg(ice_pf_to_dev(pf),
> -                     "successfully created channel: VSI %pK\n", ch-
> >ch_vsi);
> +                     "successfully created channel: VSI %p\n", ch->ch_vsi);
>       }
>       return 0;
> 
> diff --git a/drivers/net/ethernet/intel/ice/ice_trace.h
> b/drivers/net/ethernet/intel/ice/ice_trace.h
> index
> 07aab6e130cd553fa1fcaa2feac9d14f0433239a..4f35ef8d6b299b4acd6c859
> 92c2c93b164a88372 100644
> --- a/drivers/net/ethernet/intel/ice/ice_trace.h
> +++ b/drivers/net/ethernet/intel/ice/ice_trace.h
> @@ -130,7 +130,7 @@ DECLARE_EVENT_CLASS(ice_tx_template,
>                                  __entry->buf = buf;
>                                  __assign_str(devname);),
> 
> -                 TP_printk("netdev: %s ring: %pK desc: %pK buf %pK",
> __get_str(devname),
> +                 TP_printk("netdev: %s ring: %p desc: %p buf %p",
> +__get_str(devname),
>                             __entry->ring, __entry->desc, __entry->buf)  );
> 
> @@ -158,7 +158,7 @@ DECLARE_EVENT_CLASS(ice_rx_template,
>                                  __entry->desc = desc;
>                                  __assign_str(devname);),
> 
> -                 TP_printk("netdev: %s ring: %pK desc: %pK",
> __get_str(devname),
> +                 TP_printk("netdev: %s ring: %p desc: %p",
> __get_str(devname),
>                             __entry->ring, __entry->desc)
>  );
>  DEFINE_EVENT(ice_rx_template, ice_clean_rx_irq, @@ -182,7 +182,7 @@
> DECLARE_EVENT_CLASS(ice_rx_indicate_template,
>                                  __entry->skb = skb;
>                                  __assign_str(devname);),
> 
> -                 TP_printk("netdev: %s ring: %pK desc: %pK skb %pK",
> __get_str(devname),
> +                 TP_printk("netdev: %s ring: %p desc: %p skb %p",
> +__get_str(devname),
>                             __entry->ring, __entry->desc, __entry->skb)  );
> 
> @@ -205,7 +205,7 @@ DECLARE_EVENT_CLASS(ice_xmit_template,
>                                  __entry->skb = skb;
>                                  __assign_str(devname);),
> 
> -                 TP_printk("netdev: %s skb: %pK ring: %pK",
> __get_str(devname),
> +                 TP_printk("netdev: %s skb: %p ring: %p",
> __get_str(devname),
>                             __entry->skb, __entry->ring)
>  );
> 
> @@ -228,7 +228,7 @@ DECLARE_EVENT_CLASS(ice_tx_tstamp_template,
>                   TP_fast_assign(__entry->skb = skb;
>                                  __entry->idx = idx;),
> 
> -                 TP_printk("skb %pK idx %d",
> +                 TP_printk("skb %p idx %d",
>                             __entry->skb, __entry->idx)
>  );
>  #define DEFINE_TX_TSTAMP_OP_EVENT(name) \
> 
> --
> 2.49.0

Reply via email to