From: Sasha Levin Date: Tue, 5 Nov 2024 10:20:18 +0000 (-0500) Subject: Drop net-hns3-fix-kernel-crash-when-1588-is-sent-on-hip08.patch X-Git-Tag: v4.19.323~90 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8ca21b0bed731e0e72a5ac66e4a078eae2d483fd;p=thirdparty%2Fkernel%2Fstable-queue.git Drop net-hns3-fix-kernel-crash-when-1588-is-sent-on-hip08.patch Signed-off-by: Sasha Levin --- diff --git a/queue-5.15/net-hns3-fix-kernel-crash-when-1588-is-sent-on-hip08.patch b/queue-5.15/net-hns3-fix-kernel-crash-when-1588-is-sent-on-hip08.patch deleted file mode 100644 index cb9d5ff82a1..00000000000 --- a/queue-5.15/net-hns3-fix-kernel-crash-when-1588-is-sent-on-hip08.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 4ba73f7a48e53564e867ee42410fd069f78032fd Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 25 Oct 2024 17:29:38 +0800 -Subject: net: hns3: fix kernel crash when 1588 is sent on HIP08 devices - -From: Jie Wang - -[ Upstream commit 2cf246143519ecc11dab754385ec42d78b6b6a05 ] - -Currently, HIP08 devices does not register the ptp devices, so the -hdev->ptp is NULL. But the tx process would still try to set hardware time -stamp info with SKBTX_HW_TSTAMP flag and cause a kernel crash. - -[ 128.087798] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000018 -... -[ 128.280251] pc : hclge_ptp_set_tx_info+0x2c/0x140 [hclge] -[ 128.286600] lr : hclge_ptp_set_tx_info+0x20/0x140 [hclge] -[ 128.292938] sp : ffff800059b93140 -[ 128.297200] x29: ffff800059b93140 x28: 0000000000003280 -[ 128.303455] x27: ffff800020d48280 x26: ffff0cb9dc814080 -[ 128.309715] x25: ffff0cb9cde93fa0 x24: 0000000000000001 -[ 128.315969] x23: 0000000000000000 x22: 0000000000000194 -[ 128.322219] x21: ffff0cd94f986000 x20: 0000000000000000 -[ 128.328462] x19: ffff0cb9d2a166c0 x18: 0000000000000000 -[ 128.334698] x17: 0000000000000000 x16: ffffcf1fc523ed24 -[ 128.340934] x15: 0000ffffd530a518 x14: 0000000000000000 -[ 128.347162] x13: ffff0cd6bdb31310 x12: 0000000000000368 -[ 128.353388] x11: ffff0cb9cfbc7070 x10: ffff2cf55dd11e02 -[ 128.359606] x9 : ffffcf1f85a212b4 x8 : ffff0cd7cf27dab0 -[ 128.365831] x7 : 0000000000000a20 x6 : ffff0cd7cf27d000 -[ 128.372040] x5 : 0000000000000000 x4 : 000000000000ffff -[ 128.378243] x3 : 0000000000000400 x2 : ffffcf1f85a21294 -[ 128.384437] x1 : ffff0cb9db520080 x0 : ffff0cb9db500080 -[ 128.390626] Call trace: -[ 128.393964] hclge_ptp_set_tx_info+0x2c/0x140 [hclge] -[ 128.399893] hns3_nic_net_xmit+0x39c/0x4c4 [hns3] -[ 128.405468] xmit_one.constprop.0+0xc4/0x200 -[ 128.410600] dev_hard_start_xmit+0x54/0xf0 -[ 128.415556] sch_direct_xmit+0xe8/0x634 -[ 128.420246] __dev_queue_xmit+0x224/0xc70 -[ 128.425101] dev_queue_xmit+0x1c/0x40 -[ 128.429608] ovs_vport_send+0xac/0x1a0 [openvswitch] -[ 128.435409] do_output+0x60/0x17c [openvswitch] -[ 128.440770] do_execute_actions+0x898/0x8c4 [openvswitch] -[ 128.446993] ovs_execute_actions+0x64/0xf0 [openvswitch] -[ 128.453129] ovs_dp_process_packet+0xa0/0x224 [openvswitch] -[ 128.459530] ovs_vport_receive+0x7c/0xfc [openvswitch] -[ 128.465497] internal_dev_xmit+0x34/0xb0 [openvswitch] -[ 128.471460] xmit_one.constprop.0+0xc4/0x200 -[ 128.476561] dev_hard_start_xmit+0x54/0xf0 -[ 128.481489] __dev_queue_xmit+0x968/0xc70 -[ 128.486330] dev_queue_xmit+0x1c/0x40 -[ 128.490856] ip_finish_output2+0x250/0x570 -[ 128.495810] __ip_finish_output+0x170/0x1e0 -[ 128.500832] ip_finish_output+0x3c/0xf0 -[ 128.505504] ip_output+0xbc/0x160 -[ 128.509654] ip_send_skb+0x58/0xd4 -[ 128.513892] udp_send_skb+0x12c/0x354 -[ 128.518387] udp_sendmsg+0x7a8/0x9c0 -[ 128.522793] inet_sendmsg+0x4c/0x8c -[ 128.527116] __sock_sendmsg+0x48/0x80 -[ 128.531609] __sys_sendto+0x124/0x164 -[ 128.536099] __arm64_sys_sendto+0x30/0x5c -[ 128.540935] invoke_syscall+0x50/0x130 -[ 128.545508] el0_svc_common.constprop.0+0x10c/0x124 -[ 128.551205] do_el0_svc+0x34/0xdc -[ 128.555347] el0_svc+0x20/0x30 -[ 128.559227] el0_sync_handler+0xb8/0xc0 -[ 128.563883] el0_sync+0x160/0x180 - -Fixes: 0bf5eb788512 ("net: hns3: add support for PTP") -Signed-off-by: Jie Wang -Signed-off-by: Jijie Shao -Signed-off-by: Paolo Abeni -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c -index 0f06f95b09bc2..8802cdd6403ed 100644 ---- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c -+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c -@@ -70,6 +70,9 @@ bool hclge_ptp_set_tx_info(struct hnae3_handle *handle, struct sk_buff *skb) - struct hclge_dev *hdev = vport->back; - struct hclge_ptp *ptp = hdev->ptp; - -+ if (!ptp) -+ return false; -+ - if (!test_bit(HCLGE_PTP_FLAG_TX_EN, &ptp->flags) || - test_and_set_bit(HCLGE_STATE_PTP_TX_HANDLING, &hdev->state)) { - ptp->tx_skipped++; --- -2.43.0 - diff --git a/queue-5.15/series b/queue-5.15/series index d537906f7f3..ceb06b5605d 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -28,7 +28,6 @@ netfilter-nft_payload-sanitize-offset-and-length-bef.patch net-hns3-fix-missing-features-due-to-dev-features-co.patch net-hns3-resolved-the-issue-that-the-debugfs-query-r.patch net-hns3-initialize-reset_timer-before-hclgevf_misc_.patch -net-hns3-fix-kernel-crash-when-1588-is-sent-on-hip08.patch firmware-arm_sdei-fix-the-input-parameter-of-cpuhp_r.patch acpi-cppc-make-rmw_lock-a-raw_spin_lock.patch fs-ntfs3-check-if-more-than-chunk-size-bytes-are-wri.patch diff --git a/queue-6.1/net-hns3-fix-kernel-crash-when-1588-is-sent-on-hip08.patch b/queue-6.1/net-hns3-fix-kernel-crash-when-1588-is-sent-on-hip08.patch deleted file mode 100644 index 434216ab025..00000000000 --- a/queue-6.1/net-hns3-fix-kernel-crash-when-1588-is-sent-on-hip08.patch +++ /dev/null @@ -1,96 +0,0 @@ -From ec274edabe48f6490dfd9e3ccf2cb821167826da Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 25 Oct 2024 17:29:38 +0800 -Subject: net: hns3: fix kernel crash when 1588 is sent on HIP08 devices - -From: Jie Wang - -[ Upstream commit 2cf246143519ecc11dab754385ec42d78b6b6a05 ] - -Currently, HIP08 devices does not register the ptp devices, so the -hdev->ptp is NULL. But the tx process would still try to set hardware time -stamp info with SKBTX_HW_TSTAMP flag and cause a kernel crash. - -[ 128.087798] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000018 -... -[ 128.280251] pc : hclge_ptp_set_tx_info+0x2c/0x140 [hclge] -[ 128.286600] lr : hclge_ptp_set_tx_info+0x20/0x140 [hclge] -[ 128.292938] sp : ffff800059b93140 -[ 128.297200] x29: ffff800059b93140 x28: 0000000000003280 -[ 128.303455] x27: ffff800020d48280 x26: ffff0cb9dc814080 -[ 128.309715] x25: ffff0cb9cde93fa0 x24: 0000000000000001 -[ 128.315969] x23: 0000000000000000 x22: 0000000000000194 -[ 128.322219] x21: ffff0cd94f986000 x20: 0000000000000000 -[ 128.328462] x19: ffff0cb9d2a166c0 x18: 0000000000000000 -[ 128.334698] x17: 0000000000000000 x16: ffffcf1fc523ed24 -[ 128.340934] x15: 0000ffffd530a518 x14: 0000000000000000 -[ 128.347162] x13: ffff0cd6bdb31310 x12: 0000000000000368 -[ 128.353388] x11: ffff0cb9cfbc7070 x10: ffff2cf55dd11e02 -[ 128.359606] x9 : ffffcf1f85a212b4 x8 : ffff0cd7cf27dab0 -[ 128.365831] x7 : 0000000000000a20 x6 : ffff0cd7cf27d000 -[ 128.372040] x5 : 0000000000000000 x4 : 000000000000ffff -[ 128.378243] x3 : 0000000000000400 x2 : ffffcf1f85a21294 -[ 128.384437] x1 : ffff0cb9db520080 x0 : ffff0cb9db500080 -[ 128.390626] Call trace: -[ 128.393964] hclge_ptp_set_tx_info+0x2c/0x140 [hclge] -[ 128.399893] hns3_nic_net_xmit+0x39c/0x4c4 [hns3] -[ 128.405468] xmit_one.constprop.0+0xc4/0x200 -[ 128.410600] dev_hard_start_xmit+0x54/0xf0 -[ 128.415556] sch_direct_xmit+0xe8/0x634 -[ 128.420246] __dev_queue_xmit+0x224/0xc70 -[ 128.425101] dev_queue_xmit+0x1c/0x40 -[ 128.429608] ovs_vport_send+0xac/0x1a0 [openvswitch] -[ 128.435409] do_output+0x60/0x17c [openvswitch] -[ 128.440770] do_execute_actions+0x898/0x8c4 [openvswitch] -[ 128.446993] ovs_execute_actions+0x64/0xf0 [openvswitch] -[ 128.453129] ovs_dp_process_packet+0xa0/0x224 [openvswitch] -[ 128.459530] ovs_vport_receive+0x7c/0xfc [openvswitch] -[ 128.465497] internal_dev_xmit+0x34/0xb0 [openvswitch] -[ 128.471460] xmit_one.constprop.0+0xc4/0x200 -[ 128.476561] dev_hard_start_xmit+0x54/0xf0 -[ 128.481489] __dev_queue_xmit+0x968/0xc70 -[ 128.486330] dev_queue_xmit+0x1c/0x40 -[ 128.490856] ip_finish_output2+0x250/0x570 -[ 128.495810] __ip_finish_output+0x170/0x1e0 -[ 128.500832] ip_finish_output+0x3c/0xf0 -[ 128.505504] ip_output+0xbc/0x160 -[ 128.509654] ip_send_skb+0x58/0xd4 -[ 128.513892] udp_send_skb+0x12c/0x354 -[ 128.518387] udp_sendmsg+0x7a8/0x9c0 -[ 128.522793] inet_sendmsg+0x4c/0x8c -[ 128.527116] __sock_sendmsg+0x48/0x80 -[ 128.531609] __sys_sendto+0x124/0x164 -[ 128.536099] __arm64_sys_sendto+0x30/0x5c -[ 128.540935] invoke_syscall+0x50/0x130 -[ 128.545508] el0_svc_common.constprop.0+0x10c/0x124 -[ 128.551205] do_el0_svc+0x34/0xdc -[ 128.555347] el0_svc+0x20/0x30 -[ 128.559227] el0_sync_handler+0xb8/0xc0 -[ 128.563883] el0_sync+0x160/0x180 - -Fixes: 0bf5eb788512 ("net: hns3: add support for PTP") -Signed-off-by: Jie Wang -Signed-off-by: Jijie Shao -Signed-off-by: Paolo Abeni -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c -index 0f06f95b09bc2..8802cdd6403ed 100644 ---- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c -+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c -@@ -70,6 +70,9 @@ bool hclge_ptp_set_tx_info(struct hnae3_handle *handle, struct sk_buff *skb) - struct hclge_dev *hdev = vport->back; - struct hclge_ptp *ptp = hdev->ptp; - -+ if (!ptp) -+ return false; -+ - if (!test_bit(HCLGE_PTP_FLAG_TX_EN, &ptp->flags) || - test_and_set_bit(HCLGE_STATE_PTP_TX_HANDLING, &hdev->state)) { - ptp->tx_skipped++; --- -2.43.0 - diff --git a/queue-6.1/series b/queue-6.1/series index 07a673ec116..39f05adcbea 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -38,7 +38,6 @@ netfilter-nft_payload-sanitize-offset-and-length-bef.patch net-hns3-fix-missing-features-due-to-dev-features-co.patch net-hns3-resolved-the-issue-that-the-debugfs-query-r.patch net-hns3-initialize-reset_timer-before-hclgevf_misc_.patch -net-hns3-fix-kernel-crash-when-1588-is-sent-on-hip08.patch iomap-convert-iomap_unshare_iter-to-use-large-folios.patch iomap-improve-shared-block-detection-in-iomap_unshar.patch iomap-don-t-bother-unsharing-delalloc-extents.patch diff --git a/queue-6.11/net-hns3-fix-kernel-crash-when-1588-is-sent-on-hip08.patch b/queue-6.11/net-hns3-fix-kernel-crash-when-1588-is-sent-on-hip08.patch deleted file mode 100644 index f527cd852ca..00000000000 --- a/queue-6.11/net-hns3-fix-kernel-crash-when-1588-is-sent-on-hip08.patch +++ /dev/null @@ -1,96 +0,0 @@ -From dd11a46806e62bed207553d45865bd3777ce3970 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 25 Oct 2024 17:29:38 +0800 -Subject: net: hns3: fix kernel crash when 1588 is sent on HIP08 devices - -From: Jie Wang - -[ Upstream commit 2cf246143519ecc11dab754385ec42d78b6b6a05 ] - -Currently, HIP08 devices does not register the ptp devices, so the -hdev->ptp is NULL. But the tx process would still try to set hardware time -stamp info with SKBTX_HW_TSTAMP flag and cause a kernel crash. - -[ 128.087798] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000018 -... -[ 128.280251] pc : hclge_ptp_set_tx_info+0x2c/0x140 [hclge] -[ 128.286600] lr : hclge_ptp_set_tx_info+0x20/0x140 [hclge] -[ 128.292938] sp : ffff800059b93140 -[ 128.297200] x29: ffff800059b93140 x28: 0000000000003280 -[ 128.303455] x27: ffff800020d48280 x26: ffff0cb9dc814080 -[ 128.309715] x25: ffff0cb9cde93fa0 x24: 0000000000000001 -[ 128.315969] x23: 0000000000000000 x22: 0000000000000194 -[ 128.322219] x21: ffff0cd94f986000 x20: 0000000000000000 -[ 128.328462] x19: ffff0cb9d2a166c0 x18: 0000000000000000 -[ 128.334698] x17: 0000000000000000 x16: ffffcf1fc523ed24 -[ 128.340934] x15: 0000ffffd530a518 x14: 0000000000000000 -[ 128.347162] x13: ffff0cd6bdb31310 x12: 0000000000000368 -[ 128.353388] x11: ffff0cb9cfbc7070 x10: ffff2cf55dd11e02 -[ 128.359606] x9 : ffffcf1f85a212b4 x8 : ffff0cd7cf27dab0 -[ 128.365831] x7 : 0000000000000a20 x6 : ffff0cd7cf27d000 -[ 128.372040] x5 : 0000000000000000 x4 : 000000000000ffff -[ 128.378243] x3 : 0000000000000400 x2 : ffffcf1f85a21294 -[ 128.384437] x1 : ffff0cb9db520080 x0 : ffff0cb9db500080 -[ 128.390626] Call trace: -[ 128.393964] hclge_ptp_set_tx_info+0x2c/0x140 [hclge] -[ 128.399893] hns3_nic_net_xmit+0x39c/0x4c4 [hns3] -[ 128.405468] xmit_one.constprop.0+0xc4/0x200 -[ 128.410600] dev_hard_start_xmit+0x54/0xf0 -[ 128.415556] sch_direct_xmit+0xe8/0x634 -[ 128.420246] __dev_queue_xmit+0x224/0xc70 -[ 128.425101] dev_queue_xmit+0x1c/0x40 -[ 128.429608] ovs_vport_send+0xac/0x1a0 [openvswitch] -[ 128.435409] do_output+0x60/0x17c [openvswitch] -[ 128.440770] do_execute_actions+0x898/0x8c4 [openvswitch] -[ 128.446993] ovs_execute_actions+0x64/0xf0 [openvswitch] -[ 128.453129] ovs_dp_process_packet+0xa0/0x224 [openvswitch] -[ 128.459530] ovs_vport_receive+0x7c/0xfc [openvswitch] -[ 128.465497] internal_dev_xmit+0x34/0xb0 [openvswitch] -[ 128.471460] xmit_one.constprop.0+0xc4/0x200 -[ 128.476561] dev_hard_start_xmit+0x54/0xf0 -[ 128.481489] __dev_queue_xmit+0x968/0xc70 -[ 128.486330] dev_queue_xmit+0x1c/0x40 -[ 128.490856] ip_finish_output2+0x250/0x570 -[ 128.495810] __ip_finish_output+0x170/0x1e0 -[ 128.500832] ip_finish_output+0x3c/0xf0 -[ 128.505504] ip_output+0xbc/0x160 -[ 128.509654] ip_send_skb+0x58/0xd4 -[ 128.513892] udp_send_skb+0x12c/0x354 -[ 128.518387] udp_sendmsg+0x7a8/0x9c0 -[ 128.522793] inet_sendmsg+0x4c/0x8c -[ 128.527116] __sock_sendmsg+0x48/0x80 -[ 128.531609] __sys_sendto+0x124/0x164 -[ 128.536099] __arm64_sys_sendto+0x30/0x5c -[ 128.540935] invoke_syscall+0x50/0x130 -[ 128.545508] el0_svc_common.constprop.0+0x10c/0x124 -[ 128.551205] do_el0_svc+0x34/0xdc -[ 128.555347] el0_svc+0x20/0x30 -[ 128.559227] el0_sync_handler+0xb8/0xc0 -[ 128.563883] el0_sync+0x160/0x180 - -Fixes: 0bf5eb788512 ("net: hns3: add support for PTP") -Signed-off-by: Jie Wang -Signed-off-by: Jijie Shao -Signed-off-by: Paolo Abeni -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c -index 5fff8ed388f8b..787126358ceaf 100644 ---- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c -+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c -@@ -58,6 +58,9 @@ bool hclge_ptp_set_tx_info(struct hnae3_handle *handle, struct sk_buff *skb) - struct hclge_dev *hdev = vport->back; - struct hclge_ptp *ptp = hdev->ptp; - -+ if (!ptp) -+ return false; -+ - if (!test_bit(HCLGE_PTP_FLAG_TX_EN, &ptp->flags) || - test_and_set_bit(HCLGE_STATE_PTP_TX_HANDLING, &hdev->state)) { - ptp->tx_skipped++; --- -2.43.0 - diff --git a/queue-6.11/series b/queue-6.11/series index b85ca81ca0a..09ebf197f21 100644 --- a/queue-6.11/series +++ b/queue-6.11/series @@ -56,7 +56,6 @@ netfilter-nft_payload-sanitize-offset-and-length-bef.patch net-hns3-fix-missing-features-due-to-dev-features-co.patch net-hns3-resolved-the-issue-that-the-debugfs-query-r.patch net-hns3-initialize-reset_timer-before-hclgevf_misc_.patch -net-hns3-fix-kernel-crash-when-1588-is-sent-on-hip08.patch bpf-test_run-fix-live_frame-frame-update-after-a-pag.patch iomap-improve-shared-block-detection-in-iomap_unshar.patch iomap-don-t-bother-unsharing-delalloc-extents.patch diff --git a/queue-6.6/net-hns3-fix-kernel-crash-when-1588-is-sent-on-hip08.patch b/queue-6.6/net-hns3-fix-kernel-crash-when-1588-is-sent-on-hip08.patch deleted file mode 100644 index a7641555b1d..00000000000 --- a/queue-6.6/net-hns3-fix-kernel-crash-when-1588-is-sent-on-hip08.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 751baed049cfb6fa6c76b161d738b3144f369326 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 25 Oct 2024 17:29:38 +0800 -Subject: net: hns3: fix kernel crash when 1588 is sent on HIP08 devices - -From: Jie Wang - -[ Upstream commit 2cf246143519ecc11dab754385ec42d78b6b6a05 ] - -Currently, HIP08 devices does not register the ptp devices, so the -hdev->ptp is NULL. But the tx process would still try to set hardware time -stamp info with SKBTX_HW_TSTAMP flag and cause a kernel crash. - -[ 128.087798] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000018 -... -[ 128.280251] pc : hclge_ptp_set_tx_info+0x2c/0x140 [hclge] -[ 128.286600] lr : hclge_ptp_set_tx_info+0x20/0x140 [hclge] -[ 128.292938] sp : ffff800059b93140 -[ 128.297200] x29: ffff800059b93140 x28: 0000000000003280 -[ 128.303455] x27: ffff800020d48280 x26: ffff0cb9dc814080 -[ 128.309715] x25: ffff0cb9cde93fa0 x24: 0000000000000001 -[ 128.315969] x23: 0000000000000000 x22: 0000000000000194 -[ 128.322219] x21: ffff0cd94f986000 x20: 0000000000000000 -[ 128.328462] x19: ffff0cb9d2a166c0 x18: 0000000000000000 -[ 128.334698] x17: 0000000000000000 x16: ffffcf1fc523ed24 -[ 128.340934] x15: 0000ffffd530a518 x14: 0000000000000000 -[ 128.347162] x13: ffff0cd6bdb31310 x12: 0000000000000368 -[ 128.353388] x11: ffff0cb9cfbc7070 x10: ffff2cf55dd11e02 -[ 128.359606] x9 : ffffcf1f85a212b4 x8 : ffff0cd7cf27dab0 -[ 128.365831] x7 : 0000000000000a20 x6 : ffff0cd7cf27d000 -[ 128.372040] x5 : 0000000000000000 x4 : 000000000000ffff -[ 128.378243] x3 : 0000000000000400 x2 : ffffcf1f85a21294 -[ 128.384437] x1 : ffff0cb9db520080 x0 : ffff0cb9db500080 -[ 128.390626] Call trace: -[ 128.393964] hclge_ptp_set_tx_info+0x2c/0x140 [hclge] -[ 128.399893] hns3_nic_net_xmit+0x39c/0x4c4 [hns3] -[ 128.405468] xmit_one.constprop.0+0xc4/0x200 -[ 128.410600] dev_hard_start_xmit+0x54/0xf0 -[ 128.415556] sch_direct_xmit+0xe8/0x634 -[ 128.420246] __dev_queue_xmit+0x224/0xc70 -[ 128.425101] dev_queue_xmit+0x1c/0x40 -[ 128.429608] ovs_vport_send+0xac/0x1a0 [openvswitch] -[ 128.435409] do_output+0x60/0x17c [openvswitch] -[ 128.440770] do_execute_actions+0x898/0x8c4 [openvswitch] -[ 128.446993] ovs_execute_actions+0x64/0xf0 [openvswitch] -[ 128.453129] ovs_dp_process_packet+0xa0/0x224 [openvswitch] -[ 128.459530] ovs_vport_receive+0x7c/0xfc [openvswitch] -[ 128.465497] internal_dev_xmit+0x34/0xb0 [openvswitch] -[ 128.471460] xmit_one.constprop.0+0xc4/0x200 -[ 128.476561] dev_hard_start_xmit+0x54/0xf0 -[ 128.481489] __dev_queue_xmit+0x968/0xc70 -[ 128.486330] dev_queue_xmit+0x1c/0x40 -[ 128.490856] ip_finish_output2+0x250/0x570 -[ 128.495810] __ip_finish_output+0x170/0x1e0 -[ 128.500832] ip_finish_output+0x3c/0xf0 -[ 128.505504] ip_output+0xbc/0x160 -[ 128.509654] ip_send_skb+0x58/0xd4 -[ 128.513892] udp_send_skb+0x12c/0x354 -[ 128.518387] udp_sendmsg+0x7a8/0x9c0 -[ 128.522793] inet_sendmsg+0x4c/0x8c -[ 128.527116] __sock_sendmsg+0x48/0x80 -[ 128.531609] __sys_sendto+0x124/0x164 -[ 128.536099] __arm64_sys_sendto+0x30/0x5c -[ 128.540935] invoke_syscall+0x50/0x130 -[ 128.545508] el0_svc_common.constprop.0+0x10c/0x124 -[ 128.551205] do_el0_svc+0x34/0xdc -[ 128.555347] el0_svc+0x20/0x30 -[ 128.559227] el0_sync_handler+0xb8/0xc0 -[ 128.563883] el0_sync+0x160/0x180 - -Fixes: 0bf5eb788512 ("net: hns3: add support for PTP") -Signed-off-by: Jie Wang -Signed-off-by: Jijie Shao -Signed-off-by: Paolo Abeni -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c -index 507d7ce26d831..0ddf102c76f7c 100644 ---- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c -+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c -@@ -58,6 +58,9 @@ bool hclge_ptp_set_tx_info(struct hnae3_handle *handle, struct sk_buff *skb) - struct hclge_dev *hdev = vport->back; - struct hclge_ptp *ptp = hdev->ptp; - -+ if (!ptp) -+ return false; -+ - if (!test_bit(HCLGE_PTP_FLAG_TX_EN, &ptp->flags) || - test_and_set_bit(HCLGE_STATE_PTP_TX_HANDLING, &hdev->state)) { - ptp->tx_skipped++; --- -2.43.0 - diff --git a/queue-6.6/series b/queue-6.6/series index 1671dc71bdc..cc32d5a188b 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -40,7 +40,6 @@ netfilter-nft_payload-sanitize-offset-and-length-bef.patch net-hns3-fix-missing-features-due-to-dev-features-co.patch net-hns3-resolved-the-issue-that-the-debugfs-query-r.patch net-hns3-initialize-reset_timer-before-hclgevf_misc_.patch -net-hns3-fix-kernel-crash-when-1588-is-sent-on-hip08.patch bpf-test_run-fix-live_frame-frame-update-after-a-pag.patch iomap-improve-shared-block-detection-in-iomap_unshar.patch iomap-don-t-bother-unsharing-delalloc-extents.patch