From patchwork Thu Apr 17 13:24:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 14055595 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6692C250F8; Thu, 17 Apr 2025 13:24:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744896272; cv=none; b=cd3ycatW+5YqMKtl/efA+j6zwK8ZH+S+VxvZoWdQkGAscITIXARePAEJU5U/jIQVSYd0FPbdlYdsw+XRIgEgQmG/Fxg9TQPNo78jj3rj52cFQBYoJe1KF0Blqi428sAcxJjabwl5yzuOYQCd4vg/vJCl3LVOxUq3ucqylOl9WBk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744896272; c=relaxed/simple; bh=diY3/1u1/WD+p9AEblri3iZQKdyS25WqDi9NW4HFrU8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=LVKfkOjHkXn4nWjiJELQG1kwQS6/U0eRTyAAnpzMuJKV0qfsZAEFSH+o+eTK+7u9SRko62lwLKATo8C2jyNpyH2LZVVRh0qKB/kpbfdUlw4bKRqEwiFHP0PtdNiDJt4SUSCBDLbRuKE4/CNAfrAM2WzDDolxWCYTbxuEwMh3zNQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=fbDRWQzp; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=zQoH4xjI; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="fbDRWQzp"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="zQoH4xjI" From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1744896268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yv/yVcQSzfawPhO9WVstK9PTMY/wLQfruBnhAUCsfAY=; b=fbDRWQzpi7ZI2L84xB0GMDiNCDS9oE2v5WODK9yI2Lw7ds6HyprYuki7TsuITKqfUrKe7r zVofSi59gYrAP4UsXteEW5eCMygD5/csLPKpy3WPcF3qkLguCVwyQzh0h2CwbWP/IQBaaj jw7mUUlfYS79pgTjx2vN7YcpVgZc90iKCiIZAPMbrribuhKezmzZbs7EKuQCQJRV95jD12 WzAVWoQNnpsnhtvERcBl7TalwvxTFQHTspEN0bkg2bbz0wDju/ln8ylaNFPimFeLSqRROt L92C5rAx2to6Wh58GesPfk77h9v6v13iiGuQ/eBye2B3/wtdOUC4LBEmWdpf8A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1744896268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yv/yVcQSzfawPhO9WVstK9PTMY/wLQfruBnhAUCsfAY=; b=zQoH4xjIHV2evLgbauFfFAIC5fyOPZTaZac1Pa51iMmHmQjkPCO2rbk0ctR4TTKoQzN+w1 UjxmqH1mZubEcoBw== Date: Thu, 17 Apr 2025 15:24:01 +0200 Subject: [PATCH net-next v2 1/2] ice: Don't use %pK through printk or tracepoints Precedence: bulk X-Mailing-List: linux-rdma@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250417-restricted-pointers-net-v2-1-94cf7ef8e6ae@linutronix.de> References: <20250417-restricted-pointers-net-v2-0-94cf7ef8e6ae@linutronix.de> In-Reply-To: <20250417-restricted-pointers-net-v2-0-94cf7ef8e6ae@linutronix.de> To: Tony Nguyen , Przemek Kitszel , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Saeed Mahameed , Leon Romanovsky , Tariq Toukan Cc: intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org, =?utf-8?q?Thomas?= =?utf-8?q?_Wei=C3=9Fschuh?= , Aleksandr Loktionov X-Developer-Signature: v=1; a=ed25519-sha256; t=1744896267; l=3588; i=thomas.weissschuh@linutronix.de; s=20240209; h=from:subject:message-id; bh=diY3/1u1/WD+p9AEblri3iZQKdyS25WqDi9NW4HFrU8=; b=X6vciUhrsEvEEpC3TTcgTLXn8O3sT1d1CblIZFEYqrRLtkA11cMHCPGRs/NdhFzKiCM9EGnwS D61fP/C3rCVC98l+ZTGTatHc3xTQc9sv+0b9QbtLFLyMyYpWYBicYKs X-Developer-Key: i=thomas.weissschuh@linutronix.de; a=ed25519; pk=pfvxvpFUDJV2h2nY0FidLUml22uGLSjByFbM6aqQQws= 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. Acked-by: Przemek Kitszel Signed-off-by: Thomas Weißschuh Reviewed-by: Aleksandr Loktionov --- 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..d27e8816a48fef5014148cae27e52c1801eaaada 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..4f35ef8d6b299b4acd6c85992c2c93b164a88372 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) \ From patchwork Thu Apr 17 13:24:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 14055596 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CD132245011; Thu, 17 Apr 2025 13:24:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744896272; cv=none; b=UabPgLCX7SybaJIUtSbdnmQiRoEHSuwwkjeoaI4Nnw5/xOXVVK/1iQPm69IwXVc9R+0j8EeA0y9kWuB7oB7DJKOsBPpRA3ZFrvXu2MjB59p8sO+s0329E/Bn9LnKkRFXsmn665VNsvjZUSl/VpzqPeZJ0pJfdeQfoDd8qQXoQyY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744896272; c=relaxed/simple; bh=1O27NFYPZ19IgzsREQln6IV5+vcG07b7Uu4J0pPD9hY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WoJr8lCwySE7hCZXKbEa5xFZ/jWmJIxD2M8+nuLGUxtzCRGpblPzHSvTt1QhwXVONB1KvelUlspC2zradPUDKM+ypGnW+o7ti6SvCHU/PvY/NezeSJ+YdoRAHFXd2aC5zhJitfXGEq6PxGplI4ZwU1318SkpUL7ouR0M84IdGk8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=g6QoP311; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=3PHqCejP; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="g6QoP311"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="3PHqCejP" From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1744896269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7qeA/MlLg5TVbU0397qorNcHIJah7W1zDQiEVoWGxtM=; b=g6QoP311AeS6Mx1cg5R8FbGlIPKlDyonmDm7HQC5di/uZqWa5NMemkurzPCsuK1ygx4gs7 7xZlHAyAxpa2BjqzLAiXrdSpyG7K8cnfHF1v9R4tX+m7fbDkYqERgyhbCKNiWA98eFo9dA rs9W1VEKHp4Rp92w+fGDOWgyCtuSS/Ovy8OJlNacqenWg2EM+sUjV65nMkzqf9v2sn0M+1 EhWA9GAV+sFd90YAbwpxcJ0S7faDeIgzAuDvKUB+uEoO2yavl8/Uzl/TWfdjdc1kcbRXKK szOnXS7VLoPLgUbHla/WOiAMRQgpMQdZkaqbGZfMaq+Bs/bZbeCii9jktLQpow== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1744896269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7qeA/MlLg5TVbU0397qorNcHIJah7W1zDQiEVoWGxtM=; b=3PHqCejP2SQSvoddhTitFoMUXI2U5NWhD1r/og0rnq8ykl4l7StGnf+hPP9a0v4aH017Bl g39UzVDsYL5H75Ag== Date: Thu, 17 Apr 2025 15:24:02 +0200 Subject: [PATCH net-next v2 2/2] net/mlx5: Don't use %pK through tracepoints Precedence: bulk X-Mailing-List: linux-rdma@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250417-restricted-pointers-net-v2-2-94cf7ef8e6ae@linutronix.de> References: <20250417-restricted-pointers-net-v2-0-94cf7ef8e6ae@linutronix.de> In-Reply-To: <20250417-restricted-pointers-net-v2-0-94cf7ef8e6ae@linutronix.de> To: Tony Nguyen , Przemek Kitszel , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Saeed Mahameed , Leon Romanovsky , Tariq Toukan Cc: intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org, =?utf-8?q?Thomas?= =?utf-8?q?_Wei=C3=9Fschuh?= , Aleksandr Loktionov X-Developer-Signature: v=1; a=ed25519-sha256; t=1744896267; l=1753; i=thomas.weissschuh@linutronix.de; s=20240209; h=from:subject:message-id; bh=1O27NFYPZ19IgzsREQln6IV5+vcG07b7Uu4J0pPD9hY=; b=WC7ZK4Hrm/09jUGuveXUDEo+yg1Ik/GZ/ozPjzk7bqcG8rwjI0WtWwjvGegAgrwKQQVmE6mxP tIYIHp8vJCrDD7rFXaoatFMXxgBKxvKuuCUaIpm9Kp86BgyBvjNtJS/ X-Developer-Key: i=thomas.weissschuh@linutronix.de; a=ed25519; pk=pfvxvpFUDJV2h2nY0FidLUml22uGLSjByFbM6aqQQws= 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 tracepoints. 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 Reviewed-by: Aleksandr Loktionov Reviewed-by: Tariq Toukan --- drivers/net/ethernet/mellanox/mlx5/core/sf/dev/diag/dev_tracepoint.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/sf/dev/diag/dev_tracepoint.h b/drivers/net/ethernet/mellanox/mlx5/core/sf/dev/diag/dev_tracepoint.h index 0537de86f9817dc80bd897688c539135b1ad37ac..9b0f44253f332aa602a84a1f6d7532a500dd4f55 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/sf/dev/diag/dev_tracepoint.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/sf/dev/diag/dev_tracepoint.h @@ -28,7 +28,7 @@ DECLARE_EVENT_CLASS(mlx5_sf_dev_template, __entry->hw_fn_id = sfdev->fn_id; __entry->sfnum = sfdev->sfnum; ), - TP_printk("(%s) sfdev=%pK aux_id=%d hw_id=0x%x sfnum=%u\n", + TP_printk("(%s) sfdev=%p aux_id=%d hw_id=0x%x sfnum=%u\n", __get_str(devname), __entry->sfdev, __entry->aux_id, __entry->hw_fn_id, __entry->sfnum)