From: Greg Kroah-Hartman Date: Fri, 11 Sep 2020 12:54:26 +0000 (+0200) Subject: drop some patches that didn't apply and I forgot to remove. X-Git-Tag: v4.4.236~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=54a4f8ce0884a5f7e85f669ced2252beb47590b3;p=thirdparty%2Fkernel%2Fstable-queue.git drop some patches that didn't apply and I forgot to remove. --- diff --git a/queue-4.19/bnxt-don-t-enable-napi-until-rings-are-ready.patch b/queue-4.19/bnxt-don-t-enable-napi-until-rings-are-ready.patch deleted file mode 100644 index d6559b97531..00000000000 --- a/queue-4.19/bnxt-don-t-enable-napi-until-rings-are-ready.patch +++ /dev/null @@ -1,86 +0,0 @@ -From foo@baz Fri Sep 11 09:49:59 AM CEST 2020 -From: Jakub Kicinski -Date: Wed, 26 Aug 2020 12:40:07 -0700 -Subject: bnxt: don't enable NAPI until rings are ready - -From: Jakub Kicinski - -[ Upstream commit 96ecdcc992eb7f468b2cf829b0f5408a1fad4668 ] - -Netpoll can try to poll napi as soon as napi_enable() is called. -It crashes trying to access a doorbell which is still NULL: - - BUG: kernel NULL pointer dereference, address: 0000000000000000 - CPU: 59 PID: 6039 Comm: ethtool Kdump: loaded Tainted: G S 5.9.0-rc1-00469-g5fd99b5d9950-dirty #26 - RIP: 0010:bnxt_poll+0x121/0x1c0 - Code: c4 20 44 89 e0 5b 5d 41 5c 41 5d 41 5e 41 5f c3 41 8b 86 a0 01 00 00 41 23 85 18 01 00 00 49 8b 96 a8 01 00 00 0d 00 00 00 24 <89> 02 -41 f6 45 77 02 74 cb 49 8b ae d8 01 00 00 31 c0 c7 44 24 1a - netpoll_poll_dev+0xbd/0x1a0 - __netpoll_send_skb+0x1b2/0x210 - netpoll_send_udp+0x2c9/0x406 - write_ext_msg+0x1d7/0x1f0 - console_unlock+0x23c/0x520 - vprintk_emit+0xe0/0x1d0 - printk+0x58/0x6f - x86_vector_activate.cold+0xf/0x46 - __irq_domain_activate_irq+0x50/0x80 - __irq_domain_activate_irq+0x32/0x80 - __irq_domain_activate_irq+0x32/0x80 - irq_domain_activate_irq+0x25/0x40 - __setup_irq+0x2d2/0x700 - request_threaded_irq+0xfb/0x160 - __bnxt_open_nic+0x3b1/0x750 - bnxt_open_nic+0x19/0x30 - ethtool_set_channels+0x1ac/0x220 - dev_ethtool+0x11ba/0x2240 - dev_ioctl+0x1cf/0x390 - sock_do_ioctl+0x95/0x130 - -Reported-by: Rob Sherwood -Fixes: c0c050c58d84 ("bnxt_en: New Broadcom ethernet driver.") -Signed-off-by: Jakub Kicinski -Reviewed-by: Michael Chan -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman ---- - drivers/net/ethernet/broadcom/bnxt/bnxt.c | 12 ++++-------- - 1 file changed, 4 insertions(+), 8 deletions(-) - -diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c -index 432f8acb36e6..e4e815f40d7a 100644 ---- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c -+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c -@@ -9132,15 +9132,15 @@ static int __bnxt_open_nic(struct bnxt *bp, bool irq_re_init, bool link_re_init) - } - } - -- bnxt_enable_napi(bp); -- bnxt_debug_dev_init(bp); -- - rc = bnxt_init_nic(bp, irq_re_init); - if (rc) { - netdev_err(bp->dev, "bnxt_init_nic err: %x\n", rc); -- goto open_err; -+ goto open_err_irq; - } - -+ bnxt_enable_napi(bp); -+ bnxt_debug_dev_init(bp); -+ - if (link_re_init) { - mutex_lock(&bp->link_lock); - rc = bnxt_update_phy_setting(bp); -@@ -9171,10 +9171,6 @@ static int __bnxt_open_nic(struct bnxt *bp, bool irq_re_init, bool link_re_init) - bnxt_vf_reps_open(bp); - return 0; - --open_err: -- bnxt_debug_dev_exit(bp); -- bnxt_disable_napi(bp); -- - open_err_irq: - bnxt_del_napi(bp); - --- -2.26.2 - diff --git a/queue-4.19/series b/queue-4.19/series index f41b4f1d080..4267800b1b3 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -6,4 +6,3 @@ sctp-not-disable-bh-in-the-whole-sctp_get_port_local.patch tipc-fix-shutdown-of-connectionless-socket.patch net-disable-netpoll-on-fresh-napis.patch net-mlx5e-don-t-support-phys-switch-id-if-not-in-switchdev-mode.patch -bnxt-don-t-enable-napi-until-rings-are-ready.patch diff --git a/queue-5.4/gtp-add-gtpa_link-info-to-msg-sent-to-userspace.patch b/queue-5.4/gtp-add-gtpa_link-info-to-msg-sent-to-userspace.patch deleted file mode 100644 index f9caac747f8..00000000000 --- a/queue-5.4/gtp-add-gtpa_link-info-to-msg-sent-to-userspace.patch +++ /dev/null @@ -1,36 +0,0 @@ -From foo@baz Fri Sep 11 09:33:04 AM CEST 2020 -From: Nicolas Dichtel -Date: Tue, 25 Aug 2020 14:59:40 +0200 -Subject: gtp: add GTPA_LINK info to msg sent to userspace - -From: Nicolas Dichtel - -[ Upstream commit b274e47d9e3f4dcd4ad4028a316ec22dc4533ac7 ] - -During a dump, this attribute is essential, it enables the userspace to -know on which interface the context is linked to. - -Fixes: 459aa660eb1d ("gtp: add initial driver for datapath of GPRS Tunneling Protocol (GTP-U)") -Signed-off-by: Nicolas Dichtel -Tested-by: Gabriel Ganne -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman ---- - drivers/net/gtp.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c -index d89ec99abcd6..634bdea38ecb 100644 ---- a/drivers/net/gtp.c -+++ b/drivers/net/gtp.c -@@ -1182,6 +1182,7 @@ static int gtp_genl_fill_info(struct sk_buff *skb, u32 snd_portid, u32 snd_seq, - goto nlmsg_failure; - - if (nla_put_u32(skb, GTPA_VERSION, pctx->gtp_version) || -+ nla_put_u32(skb, GTPA_LINK, pctx->dev->ifindex) || - nla_put_be32(skb, GTPA_PEER_ADDRESS, pctx->peer_addr_ip4.s_addr) || - nla_put_be32(skb, GTPA_MS_ADDRESS, pctx->ms_addr_ip4.s_addr)) - goto nla_put_failure; --- -2.26.2 - diff --git a/queue-5.4/series b/queue-5.4/series index 25756f73812..22af1f9b356 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -6,4 +6,3 @@ sctp-not-disable-bh-in-the-whole-sctp_get_port_local.patch taprio-fix-using-wrong-queues-in-gate-mask.patch tipc-fix-shutdown-of-connectionless-socket.patch net-disable-netpoll-on-fresh-napis.patch -gtp-add-gtpa_link-info-to-msg-sent-to-userspace.patch