5.13.2-rc1 review
Subsystems (8)
Greg Kroah-Hartman
maintainerPATCH 425/800 mptcp: generate subflow hmac after mptcp_finish_join()
In reply to Greg Kroah-HartmanFrom: Jianguo Wu <[email protected]>
[ Upstream commit 0a4d8e96e4fd687af92b961d5cdcea0fdbde05fe ]
For outgoing subflow join, when recv SYNACK, in subflow_finish_connect(), the mptcp_finish_join() may return false in some cases, and send a RESET to remote, and no local hmac is required.
So generate subflow hmac after mptcp_finish_join().
--- net/mptcp/subflow.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/mptcp/subflow.c +3 -3
@@ -430,15 +430,15 @@ static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb) goto do_reset; } +if (!mptcp_finish_join (sk)) + goto do_reset; +subflow_generate_hmac (subflow->local_key, subflow->remote_key, subflow->local_nonce, subflow->remote_nonce, hmac);memcpy (subflow->hmac, hmac,MPTCPOPT_HMAC_LEN ); -if (!mptcp_finish_join (sk)) - goto do_reset; - subflow->mp_join =1 ;MPTCP_INC_STATS (sock_net (sk),MPTCP_MIB_JOINSYNACKRX );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 426/800 mptcp: make sure flag signal is set when add addr with port
In reply to Greg Kroah-HartmanFrom: Jianguo Wu <[email protected]>
[ Upstream commit eb5fb629f56da3f40f496c807da44a7ce7644779 ]
When add address with port, it is mean to create a listening socket, and send an ADD_ADDR to remote, so it must have flag signal set, add this check in mptcp_pm_parse_addr().
--- net/mptcp/pm_netlink.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
net/mptcp/pm_netlink.c +7 -1
@@ -971,8 +971,14 @@ skip_family:if (tb[MPTCP_PM_ADDR_ATTR_FLAGS ]) entry->flags =nla_get_u32 (tb[MPTCP_PM_ADDR_ATTR_FLAGS ]); -if (tb[MPTCP_PM_ADDR_ATTR_PORT ]) +if (tb[MPTCP_PM_ADDR_ATTR_PORT ]) { +if (!(entry->flags &MPTCP_PM_ADDR_FLAG_SIGNAL )) { +NL_SET_ERR_MSG_ATTR (info->extack, attr, +"flags must have signal when using port" ); +return -EINVAL ; + } entry->addr.port =htons (nla_get_u16 (tb[MPTCP_PM_ADDR_ATTR_PORT ])); + }return 0 ; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 427/800 RDMA/hns: Fix wrong timer context buffer page size
In reply to Greg Kroah-HartmanFrom: Xi Wang <[email protected]>
[ Upstream commit 5e6370d7cc75134b0eb5b15916aab40b628db9e1 ]
The HEM page size for QPC timer and CQC timer is always 4K and there's no need to calculate a different size by the hns driver, otherwise the ROCEE may access an invalid address.
--- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +0 -6
@@ -2092,12 +2092,6 @@ static void set_hem_page_size(struct hns_roce_dev *hr_dev)calc_pg_sz (caps->max_cqes, caps->cqe_sz, caps->cqe_hop_num,1 , &caps->cqe_buf_pg_sz, &caps->cqe_ba_pg_sz,HEM_TYPE_CQE ); -if (caps->cqc_timer_entry_sz) -calc_pg_sz (caps->num_cqc_timer, caps->cqc_timer_entry_sz, - caps->cqc_timer_hop_num, caps->cqc_timer_bt_num, - &caps->cqc_timer_buf_pg_sz, - &caps->cqc_timer_ba_pg_sz,HEM_TYPE_CQC_TIMER ); -/* SRQ */ if (caps->flags &HNS_ROCE_CAP_FLAG_SRQ ) { calc_pg_sz(caps->num_srqs, caps->srqc_entry_sz,
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 428/800 RDMA/srp: Fix a recently introduced memory leak
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
[ Upstream commit 7ec2e27a3afff64c96bfe7a77685c33619db84be ]
Only allocate a memory registration list if it will be used and if it will be freed.
--- drivers/infiniband/ulp/srp/ib_srp.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/infiniband/ulp/srp/ib_srp.c +6 -7
@@ -998,7 +998,6 @@ static int srp_alloc_req_data(struct srp_rdma_ch *ch)struct srp_device *srp_dev = target->srp_host->srp_dev;struct ib_device *ibdev = srp_dev->dev;struct srp_request *req; -void *mr_list;dma_addr_t dma_addr;int i, ret = -ENOMEM ;
@@ -1009,12 +1008,12 @@ static int srp_alloc_req_data(struct srp_rdma_ch *ch)for (i =0 ; i < target->req_ring_size; ++i) { req = &ch->req_ring[i]; - mr_list =kmalloc_array (target->mr_per_cmd,sizeof (void *), -GFP_KERNEL ); -if (!mr_list) - goto out; -if (srp_dev->use_fast_reg) - req->fr_list = mr_list; +if (srp_dev->use_fast_reg) { + req->fr_list =kmalloc_array (target->mr_per_cmd, +sizeof (void *),GFP_KERNEL ); +if (!req->fr_list) + goto out; + } req->indirect_desc =kmalloc (target->indirect_size,GFP_KERNEL );if (!req->indirect_desc) goto out;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 429/800 RDMA/rtrs-clt: Check state of the rtrs_clt_sess before reading its stats
In reply to Greg Kroah-HartmanFrom: Md Haris Iqbal <[email protected]>
[ Upstream commit 41db63a7efe1c8c2dd282c1849a6ebfbbedbaf67 ]
When get_next_path_min_inflight is called to select the next path, it iterates over the list of available rtrs_clt_sess (paths). It then reads the number of inflight IOs for that path to select one which has the least inflight IO.
But it may so happen that rtrs_clt_sess (path) is no longer in the connected state because closing or error recovery paths can change the status of the rtrs_clt_Sess.
For example, the client sent the heart-beat and did not get the response, it would change the session status and stop IO processing. The added checking of this patch can prevent accessing the broken path and generating duplicated error messages.
It is ok if the status is changed after checking the status because the error recovery path does not free memory and only tries to reconnection. And also it is ok if the session is closed after checking the status because closing the session changes the session status and flush all IO beforing free memory. If the session is being accessed for IO processing, the closing session will wait.
--- drivers/infiniband/ulp/rtrs/rtrs-clt.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/infiniband/ulp/rtrs/rtrs-clt.c +3 -0
@@ -814,6 +814,9 @@ static struct rtrs_clt_sess *get_next_path_min_inflight(struct path_it *it)int inflight;list_for_each_entry_rcu (sess, &clt->paths_list, s.entry) { +if (unlikely (READ_ONCE (sess->state) !=RTRS_CLT_CONNECTED )) +continue ; +if (unlikely (!list_empty (raw_cpu_ptr (sess->mp_skip_entry))))continue ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 430/800 RDMA/rtrs: Do not reset hb_missed_max after re-connection
In reply to Greg Kroah-HartmanFrom: Gioh Kim <[email protected]>
[ Upstream commit 64bce1ee978491a779eb31098b21c57d4e431d6a ]
When re-connecting, it resets hb_missed_max to 0. Before the first re-connecting, client will trigger re-connection when it gets hb-ack more than 5 times. But after the first re-connecting, clients will do re-connection whenever it does not get hb-ack because hb_missed_max is 0.
There is no need to reset hb_missed_max when re-connecting. hb_missed_max should be kept until closing the session.
--- drivers/infiniband/ulp/rtrs/rtrs.c | 1 - 1 file changed, 1 deletion(-)
drivers/infiniband/ulp/rtrs/rtrs.c +0 -1
@@ -376,7 +376,6 @@ void rtrs_stop_hb(struct rtrs_sess *sess) {cancel_delayed_work_sync (&sess->hb_dwork); sess->hb_missed_cnt =0 ; - sess->hb_missed_max =0 ; }EXPORT_SYMBOL_GPL (rtrs_stop_hb);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 431/800 RDMA/rtrs-srv: Fix memory leak of unfreed rtrs_srv_stats object
In reply to Greg Kroah-HartmanFrom: Gioh Kim <[email protected]>
[ Upstream commit 2371c40354509746e4a4dad09a752e027a30f148 ]
When closing a session, currently the rtrs_srv_stats object in the closing session is freed by kobject release. But if it failed to create a session by various reasons, it must free the rtrs_srv_stats object directly because kobject is not created yet.
This problem is found by kmemleak as below:
1. One client machine maps /dev/nullb0 with session name 'bla':
root@test1:~# echo "sessname=bla path=ip:192.168.122.190 \ device_path=/dev/nullb0" > /sys/devices/virtual/rnbd-client/ctl/map_device
2. Another machine failed to create a session with the same name 'bla':
root@test2:~# echo "sessname=bla path=ip:192.168.122.190 \ device_path=/dev/nullb1" > /sys/devices/virtual/rnbd-client/ctl/map_device -bash: echo: write error: Connection reset by peer
3. The kmemleak on server machine reported an error:
unreferenced object 0xffff888033cdc800 (size 128):
comm "kworker/2:1", pid 83, jiffies 4295086585 (age 2508.680s) hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<00000000a72903b2>] __alloc_sess+0x1d4/0x1250 [rtrs_server]
[<00000000d1e5321e>] rtrs_srv_rdma_cm_handler+0xc31/0xde0 [rtrs_server]
[<00000000bb2f6e7e>] cma_ib_req_handler+0xdc5/0x2b50 [rdma_cm]
[<00000000e896235d>] cm_process_work+0x2d/0x100 [ib_cm]
[<00000000b6866c5f>] cm_req_handler+0x11bc/0x1c40 [ib_cm]
[<000000005f5dd9aa>] cm_work_handler+0xe65/0x3cf2 [ib_cm]
[<00000000610151e7>] process_one_work+0x4bc/0x980
[<00000000541e0f77>] worker_thread+0x78/0x5c0
[<00000000423898ca>] kthread+0x191/0x1e0
[<000000005a24b239>] ret_from_fork+0x3a/0x50--- drivers/infiniband/ulp/rtrs/rtrs-srv.c | 1 + 1 file changed, 1 insertion(+)
drivers/infiniband/ulp/rtrs/rtrs-srv.c +1 -0
@@ -1481,6 +1481,7 @@ static void free_sess(struct rtrs_srv_sess *sess)kobject_del (&sess->kobj);kobject_put (&sess->kobj); }else { +kfree (sess->stats);kfree (sess); } }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 432/800 RDMA/rtrs-srv: Fix memory leak when having multiple sessions
In reply to Greg Kroah-HartmanFrom: Jack Wang <[email protected]>
[ Upstream commit 6bb97a2c1aa5278a30d49abb6186d50c34c207e2 ]
Gioh notice memory leak below
unreferenced object 0xffff8880acda2000 (size 2048):
comm "kworker/4:1", pid 77, jiffies 4295062871 (age 1270.730s) hex dump (first 32 bytes):
00 20 da ac 80 88 ff ff 00 20 da ac 80 88 ff ff . ....... ......
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<00000000e85d85b5>] rtrs_srv_rdma_cm_handler+0x8e5/0xa90 [rtrs_server]
[<00000000e31a988a>] cma_ib_req_handler+0xdc5/0x2b50 [rdma_cm]
[<000000000eb02c5b>] cm_process_work+0x2d/0x100 [ib_cm]
[<00000000e1650ca9>] cm_req_handler+0x11bc/0x1c40 [ib_cm]
[<000000009c28818b>] cm_work_handler+0xe65/0x3cf2 [ib_cm]
[<000000002b53eaa1>] process_one_work+0x4bc/0x980
[<00000000da3499fb>] worker_thread+0x78/0x5c0
[<00000000167127a4>] kthread+0x191/0x1e0
[<0000000060802104>] ret_from_fork+0x3a/0x50unreferenced object 0xffff88806d595d90 (size 8):
comm "kworker/4:1H", pid 131, jiffies 4295062972 (age 1269.720s) hex dump (first 8 bytes):
62 6c 61 00 6b 6b 6b a5 bla.kkk.
backtrace:
[<000000004447d253>] kstrdup+0x2e/0x60
[<0000000047259793>] kobject_set_name_vargs+0x2f/0xb0
[<00000000c2ee3bc8>] dev_set_name+0xab/0xe0
[<000000002b6bdfb1>] rtrs_srv_create_sess_files+0x260/0x290 [rtrs_server]
[<0000000075d87bd7>] rtrs_srv_info_req_done+0x71b/0x960 [rtrs_server]
[<00000000ccdf1bb5>] __ib_process_cq+0x94/0x100 [ib_core]
[<00000000cbcb60cb>] ib_cq_poll_work+0x32/0xc0 [ib_core]
[<000000002b53eaa1>] process_one_work+0x4bc/0x980
[<00000000da3499fb>] worker_thread+0x78/0x5c0
[<00000000167127a4>] kthread+0x191/0x1e0
[<0000000060802104>] ret_from_fork+0x3a/0x50
unreferenced object 0xffff88806d6bb100 (size 256):
comm "kworker/4:1H", pid 131, jiffies 4295062972 (age 1269.720s)
hex dump (first 32 bytes):
00 00 00 00 ad 4e ad de ff ff ff ff 00 00 00 00 .....N..........
ff ff ff ff ff ff ff ff 00 59 4d 86 ff ff ff ff .........YM.....
backtrace:
[<00000000a18a11e4>] device_add+0x74d/0xa00
[<00000000a915b95f>] rtrs_srv_create_sess_files.cold+0x49/0x1fe [rtrs_server]
[<0000000075d87bd7>] rtrs_srv_info_req_done+0x71b/0x960 [rtrs_server]
[<00000000ccdf1bb5>] __ib_process_cq+0x94/0x100 [ib_core]
[<00000000cbcb60cb>] ib_cq_poll_work+0x32/0xc0 [ib_core]
[<000000002b53eaa1>] process_one_work+0x4bc/0x980
[<00000000da3499fb>] worker_thread+0x78/0x5c0
[<00000000167127a4>] kthread+0x191/0x1e0
[<0000000060802104>] ret_from_fork+0x3a/0x50The problem is we increase device refcount by get_device in process_info_req for each path, but only does put_deice for last path, which lead to memory leak.
To fix it, it also calls put_device when dev_ref is not 0.
--- drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c | 1 + 1 file changed, 1 insertion(+)
drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c +1 -0
@@ -208,6 +208,7 @@ rtrs_srv_destroy_once_sysfs_root_folders(struct rtrs_srv_sess *sess)device_del (&srv->dev);put_device (&srv->dev); }else { +put_device (&srv->dev);mutex_unlock (&srv->paths_mutex); } }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 433/800 RDMA/rtrs-clt: Check if the queue_depth has changed during a reconnection
In reply to Greg Kroah-HartmanFrom: Md Haris Iqbal <[email protected]>
[ Upstream commit 5b73b799c25c68a4703cd6c5ac4518006d9865b8 ]
The queue_depth is a module parameter for rtrs_server. It is used on the client side to determing the queue_depth of the request queue for the RNBD virtual block device.
During a reconnection event for an already mapped device, in case the rtrs_server module queue_depth has changed, fail the reconnect attempt.
Also stop further auto reconnection attempts. A manual reconnect via sysfs has to be triggerred.
--- drivers/infiniband/ulp/rtrs/rtrs-clt.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
drivers/infiniband/ulp/rtrs/rtrs-clt.c +15 -4
@@ -1791,7 +1791,19 @@ static int rtrs_rdma_conn_established(struct rtrs_clt_con *con, queue_depth);return -ECONNRESET ; } -if (!sess->rbufs || sess->queue_depth < queue_depth) { +if (sess->queue_depth >0 && queue_depth != sess->queue_depth) { +rtrs_err (clt,"Error: queue depth changed\n" ); + +/* +* Stop any more reconnection attempts +*/ + sess->reconnect_attempts =-1 ; +rtrs_err (clt, +"Disabling auto-reconnect. Trigger a manual reconnect after issue is resolved\n" ); +return -ECONNRESET ; + } + +if (!sess->rbufs) {kfree (sess->rbufs); sess->rbufs =kcalloc (queue_depth,sizeof (*sess->rbufs),GFP_KERNEL );
@@ -1805,7 +1817,7 @@ static int rtrs_rdma_conn_established(struct rtrs_clt_con *con, sess->chunk_size = sess->max_io_size + sess->max_hdr_size;/* -* Global queue depth and IO size is always a minimum. +* Global IO size is always a minimum. * If while a reconnection server sends us a value a bit * higher - client does not care and uses cached minimum. *
@@ -1813,8 +1825,7 @@ static int rtrs_rdma_conn_established(struct rtrs_clt_con *con,* connections in parallel, use lock. */ mutex_lock (&clt->paths_mutex); - clt->queue_depth =min_not_zero (sess->queue_depth, - clt->queue_depth); + clt->queue_depth = sess->queue_depth; clt->max_io_size =min_not_zero (sess->max_io_size, clt->max_io_size);mutex_unlock (&clt->paths_mutex);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 434/800 RDMA/rtrs-clt: Fix memory leak of not-freed sess->stats and stats->pcpu_stats
In reply to Greg Kroah-HartmanFrom: Gioh Kim <[email protected]>
[ Upstream commit 7ecd7e290bee0ab9cf75b79a367a4cc113cf8292 ]
sess->stats and sess->stats->pcpu_stats objects are freed when sysfs entry is removed. If something wrong happens and session is closed before sysfs entry is created, sess->stats and sess->stats->pcpu_stats objects are not freed.
This patch adds freeing of them at three places:
1. When client uses wrong address and session creation fails.
2. When client fails to create a sysfs entry.
3. When client adds wrong address via sysfs add_path.
--- drivers/infiniband/ulp/rtrs/rtrs-clt.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/infiniband/ulp/rtrs/rtrs-clt.c +6 -0
@@ -2776,6 +2776,8 @@ struct rtrs_clt *rtrs_clt_open(struct rtrs_clt_ops *ops,if (err) {list_del_rcu (&sess->s.entry);rtrs_clt_close_conns (sess, true); +free_percpu (sess->stats->pcpu_stats); +kfree (sess->stats);free_sess (sess); goto close_all_sess; }
@@ -2784,6 +2786,8 @@ struct rtrs_clt *rtrs_clt_open(struct rtrs_clt_ops *ops,if (err) {list_del_rcu (&sess->s.entry);rtrs_clt_close_conns (sess, true); +free_percpu (sess->stats->pcpu_stats); +kfree (sess->stats);free_sess (sess); goto close_all_sess; }
@@ -3066,6 +3070,8 @@ int rtrs_clt_create_path_from_sysfs(struct rtrs_clt *clt, close_sess:rtrs_clt_remove_path_from_arr (sess);rtrs_clt_close_conns (sess, true); +free_percpu (sess->stats->pcpu_stats); +kfree (sess->stats);free_sess (sess);return err;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 435/800 ehea: fix error return code in ehea_restart_qps()
In reply to Greg Kroah-HartmanFrom: Zhen Lei <[email protected]>
[ Upstream commit 015dbf5662fd689d581c0bc980711b073ca09a1a ]
Fix to return -EFAULT from the error handling case instead of 0, as done elsewhere in this function.
By the way, when get_zeroed_page() fails, directly return -ENOMEM to simplify code.
--- drivers/net/ethernet/ibm/ehea/ehea_main.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/net/ethernet/ibm/ehea/ehea_main.c +5 -4
@@ -2618,10 +2618,8 @@ static int ehea_restart_qps(struct net_device *dev)u16 dummy16 =0 ; cb0 = (void *)get_zeroed_page (GFP_KERNEL ); -if (!cb0) { - ret = -ENOMEM ; - goto out; - } +if (!cb0) +return -ENOMEM ;for (i =0 ; i < (port->num_def_qps); i++) {struct ehea_port_res *pr = &port->port_res[i];
@@ -2641,6 +2639,7 @@ static int ehea_restart_qps(struct net_device *dev) cb0);if (hret !=H_SUCCESS ) {netdev_err (dev,"query_ehea_qp failed (1)\n" ); + ret = -EFAULT ; goto out; }
@@ -2653,6 +2652,7 @@ static int ehea_restart_qps(struct net_device *dev) &dummy64, &dummy16, &dummy16);if (hret !=H_SUCCESS ) {netdev_err (dev,"modify_ehea_qp failed (1)\n" ); + ret = -EFAULT ; goto out; }
@@ -2661,6 +2661,7 @@ static int ehea_restart_qps(struct net_device *dev) cb0);if (hret !=H_SUCCESS ) {netdev_err (dev,"query_ehea_qp failed (2)\n" ); + ret = -EFAULT ; goto out; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 436/800 clk: tegra30: Use 300MHz for video decoder by default
In reply to Greg Kroah-HartmanFrom: Dmitry Osipenko <[email protected]>
[ Upstream commit 56bb7c28ad00e7bcfc851c4e183c42d148d3ad4e ]
The 600MHz is a too high clock rate for some SoC versions for the video decoder hardware and this may cause stability issues. Use 300MHz for the video decoder by default, which is supported by all hardware versions.
--- drivers/clk/tegra/clk-tegra30.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/tegra/clk-tegra30.c +1 -1
@@ -1245,7 +1245,7 @@ static struct tegra_clk_init_table init_table[] __initdata = { { TEGRA30_CLK_GR3D, TEGRA30_CLK_PLL_C, 300000000, 0 }, { TEGRA30_CLK_GR3D2, TEGRA30_CLK_PLL_C, 300000000, 0 }, { TEGRA30_CLK_PLL_U, TEGRA30_CLK_CLK_MAX, 480000000, 0 }, - { TEGRA30_CLK_VDE, TEGRA30_CLK_PLL_C, 600000000, 0 }, + { TEGRA30_CLK_VDE, TEGRA30_CLK_PLL_C, 300000000, 0 }, { TEGRA30_CLK_SPDIF_IN_SYNC, TEGRA30_CLK_CLK_MAX, 24000000, 0 }, { TEGRA30_CLK_I2S0_SYNC, TEGRA30_CLK_CLK_MAX, 24000000, 0 }, { TEGRA30_CLK_I2S1_SYNC, TEGRA30_CLK_CLK_MAX, 24000000, 0 },
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 437/800 xfrm: remove the fragment check for ipv6 beet mode
In reply to Greg Kroah-HartmanFrom: Xin Long <[email protected]>
[ Upstream commit eebd49a4ffb420a991c606e54aa3c9f02857a334 ]
In commit 68dc022d04eb ("xfrm: BEET mode doesn't support fragments for inner packets"), it tried to fix the issue that in TX side the packet is fragmented before the ESP encapping while in the RX side the fragments always get reassembled before decapping with ESP.
This is not true for IPv6. IPv6 is different, and it's using exthdr to save fragment info, as well as the ESP info. Exthdrs are added in TX and processed in RX both in order. So in the above case, the ESP decapping will be done earlier than the fragment reassembling in TX side.
Here just remove the fragment check for the IPv6 inner packets to recover the fragments support for BEET mode.
--- net/xfrm/xfrm_output.c | 7 ------- 1 file changed, 7 deletions(-)
net/xfrm/xfrm_output.c +0 -7
@@ -711,15 +711,8 @@ out:static int xfrm6_extract_output (struct xfrm_state *x,struct sk_buff *skb) {#if IS_ENABLED (CONFIG_IPV6 ) -unsigned int ptr =0 ;int err; -if (x->outer_mode.encap ==XFRM_MODE_BEET && -ipv6_find_hdr (skb, &ptr,NEXTHDR_FRAGMENT ,NULL ,NULL ) >=0 ) { -net_warn_ratelimited ("BEET mode doesn't support inner IPv6 fragments\n" ); -return -EAFNOSUPPORT ; - } - err =xfrm6_tunnel_check_size (skb);if (err)return err;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 438/800 net/sched: act_vlan: Fix modify to allow 0
In reply to Greg Kroah-HartmanFrom: Boris Sukholitko <[email protected]>
[ Upstream commit 9c5eee0afca09cbde6bd00f77876754aaa552970 ]
Currently vlan modification action checks existence of vlan priority by comparing it to 0. Therefore it is impossible to modify existing vlan tag to have priority 0.
For example, the following tc command will change the vlan id but will not affect vlan priority:
tc filter add dev eth1 ingress matchall action vlan modify id 300 \
priority 0 pipe mirred egress redirect dev eth2
The incoming packet on eth1:
ethertype 802.1Q (0x8100), vlan 200, p 4, ethertype IPv4
will be changed to:
ethertype 802.1Q (0x8100), vlan 300, p 4, ethertype IPv4
although the user has intended to have p == 0.
The fix is to add tcfv_push_prio_exists flag to struct tcf_vlan_params and rely on it when deciding to set the priority.
--- include/net/tc_act/tc_vlan.h | 1 + net/sched/act_vlan.c | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-)
include/net/tc_act/tc_vlan.h +1 -0
@@ -16,6 +16,7 @@ struct tcf_vlan_params {u16 tcfv_push_vid;__be16 tcfv_push_proto;u8 tcfv_push_prio; +bool tcfv_push_prio_exists;struct rcu_head rcu; };
net/sched/act_vlan.c +5 -2
@@ -70,7 +70,7 @@ static int tcf_vlan_act(struct sk_buff *skb, const struct tc_action *a,/* replace the vid */ tci = (tci & ~VLAN_VID_MASK ) | p->tcfv_push_vid;/* replace prio bits, if tcfv_push_prio specified */ -if (p->tcfv_push_prio) { +if (p->tcfv_push_prio_exists) { tci &= ~VLAN_PRIO_MASK ; tci |= p->tcfv_push_prio <<VLAN_PRIO_SHIFT ; }
@@ -121,6 +121,7 @@ static int tcf_vlan_init(struct net *net, struct nlattr *nla,struct tc_action_net *tn =net_generic (net, vlan_net_id);struct nlattr *tb[TCA_VLAN_MAX +1 ];struct tcf_chain *goto_ch =NULL ; +bool push_prio_exists = false;struct tcf_vlan_params *p;struct tc_vlan *parm;struct tcf_vlan *v;
@@ -189,7 +190,8 @@ static int tcf_vlan_init(struct net *net, struct nlattr *nla, push_proto =htons (ETH_P_8021Q ); } -if (tb[TCA_VLAN_PUSH_VLAN_PRIORITY ]) + push_prio_exists = !!tb[TCA_VLAN_PUSH_VLAN_PRIORITY ]; +if (push_prio_exists) push_prio =nla_get_u8 (tb[TCA_VLAN_PUSH_VLAN_PRIORITY ]);break ;case TCA_VLAN_ACT_POP_ETH :
@@ -241,6 +243,7 @@ static int tcf_vlan_init(struct net *net, struct nlattr *nla, p->tcfv_action = action; p->tcfv_push_vid = push_vid; p->tcfv_push_prio = push_prio; + p->tcfv_push_prio_exists = push_prio_exists || action ==TCA_VLAN_ACT_PUSH ; p->tcfv_push_proto = push_proto;if (action ==TCA_VLAN_ACT_PUSH_ETH ) {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 439/800 RDMA/core: Sanitize WQ state received from the userspace
In reply to Greg Kroah-HartmanFrom: Leon Romanovsky <[email protected]>
[ Upstream commit f97442887275d11c88c2899e720fe945c1f61488 ]
The mlx4 and mlx5 implemented differently the WQ input checks. Instead of duplicating mlx4 logic in the mlx5, let's prepare the input in the central place.
The mlx5 implementation didn't check for validity of state input. It is not real bug because our FW checked that, but still worth to fix.
--- drivers/infiniband/core/uverbs_cmd.c | 21 +++++++++++++++++++-- drivers/infiniband/hw/mlx4/qp.c | 9 ++------- drivers/infiniband/hw/mlx5/qp.c | 6 ++---- 3 files changed, 23 insertions(+), 13 deletions(-)
drivers/infiniband/core/uverbs_cmd.c +19 -2
@@ -3034,12 +3034,29 @@ static int ib_uverbs_ex_modify_wq(struct uverbs_attr_bundle *attrs)if (!wq)return -EINVAL ; - wq_attr.curr_wq_state = cmd.curr_wq_state; - wq_attr.wq_state = cmd.wq_state;if (cmd.attr_mask &IB_WQ_FLAGS ) { wq_attr.flags = cmd.flags; wq_attr.flags_mask = cmd.flags_mask; } + +if (cmd.attr_mask &IB_WQ_CUR_STATE ) { +if (cmd.curr_wq_state >IB_WQS_ERR ) +return -EINVAL ; + + wq_attr.curr_wq_state = cmd.curr_wq_state; + }else { + wq_attr.curr_wq_state = wq->state; + } + +if (cmd.attr_mask &IB_WQ_STATE ) { +if (cmd.wq_state >IB_WQS_ERR ) +return -EINVAL ; + + wq_attr.wq_state = cmd.wq_state; + }else { + wq_attr.wq_state = wq_attr.curr_wq_state; + } + ret = wq->device->ops.modify_wq (wq, &wq_attr, cmd.attr_mask, &attrs->driver_udata); rdma_lookup_put_uobject(&wq->uobject->uevent.uobject,
drivers/infiniband/hw/mlx4/qp.c +2 -7
@@ -4251,13 +4251,8 @@ int mlx4_ib_modify_wq(struct ib_wq *ibwq, struct ib_wq_attr *wq_attr,if (wq_attr_mask &IB_WQ_FLAGS )return -EOPNOTSUPP ; - cur_state = wq_attr_mask &IB_WQ_CUR_STATE ? wq_attr->curr_wq_state : - ibwq->state; - new_state = wq_attr_mask &IB_WQ_STATE ? wq_attr->wq_state : cur_state; - -if (cur_state <IB_WQS_RESET || cur_state >IB_WQS_ERR || - new_state <IB_WQS_RESET || new_state >IB_WQS_ERR ) -return -EINVAL ; + cur_state = wq_attr->curr_wq_state; + new_state = wq_attr->wq_state;if ((new_state ==IB_WQS_RDY ) && (cur_state ==IB_WQS_ERR ))return -EINVAL ;
drivers/infiniband/hw/mlx5/qp.c +2 -4
@@ -5309,10 +5309,8 @@ int mlx5_ib_modify_wq(struct ib_wq *wq, struct ib_wq_attr *wq_attr, rqc =MLX5_ADDR_OF (modify_rq_in, in, ctx); - curr_wq_state = (wq_attr_mask &IB_WQ_CUR_STATE ) ? - wq_attr->curr_wq_state : wq->state; - wq_state = (wq_attr_mask &IB_WQ_STATE ) ? - wq_attr->wq_state : curr_wq_state; + curr_wq_state = wq_attr->curr_wq_state; + wq_state = wq_attr->wq_state;if (curr_wq_state ==IB_WQS_ERR ) curr_wq_state =MLX5_RQC_STATE_ERR ;if (wq_state ==IB_WQS_ERR )
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 440/800 IB/cm: Pair cm_alloc_response_msg() with a cm_free_response_msg()
In reply to Greg Kroah-HartmanFrom: Jason Gunthorpe <[email protected]>
[ Upstream commit 96376a40959e32502208210c62e68a6c60acfb48 ]
This is not a functional change, but it helps make the purpose of all the cm_free_msg() calls clearer. In this case a response msg has a NULL context[0], and is never placed in cm_id_priv->msg.
--- drivers/infiniband/core/cm.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-)
drivers/infiniband/core/cm.c +18 -11
@@ -413,7 +413,7 @@ static int cm_alloc_response_msg(struct cm_port *port, ret =cm_create_response_msg_ah (port, mad_recv_wc, m);if (ret) { -cm_free_msg (m); +ib_free_send_mad (m);return ret; }
@@ -421,6 +421,13 @@ static int cm_alloc_response_msg(struct cm_port *port,return 0 ; } +static void cm_free_response_msg (struct ib_mad_send_buf *msg) +{ +if (msg->ah) +rdma_destroy_ah (msg->ah,0 ); +ib_free_send_mad (msg); +} +static void *cm_copy_private_data (const void *private_data,u8 private_data_len) {void *data;
@@ -1569,16 +1576,16 @@ int ib_send_cm_req(struct ib_cm_id *cm_id,spin_lock_irqsave (&cm_id_priv->lock, flags); ret =ib_post_send_mad (cm_id_priv->msg,NULL );if (ret) { +cm_free_msg (cm_id_priv->msg);spin_unlock_irqrestore (&cm_id_priv->lock, flags); - goto error2; + goto out; }BUG_ON (cm_id->state !=IB_CM_IDLE ); cm_id->state =IB_CM_REQ_SENT ;spin_unlock_irqrestore (&cm_id_priv->lock, flags);return 0 ; - -error2:cm_free_msg (cm_id_priv->msg); -out:return ret; +out: +return ret; }EXPORT_SYMBOL (ib_send_cm_req);
@@ -1618,7 +1625,7 @@ static int cm_issue_rej(struct cm_port *port, IBA_GET(CM_REJ_REMOTE_COMM_ID, rcv_msg)); ret =ib_post_send_mad (msg,NULL );if (ret) -cm_free_msg (msg); +cm_free_response_msg (msg);return ret; }
@@ -1974,7 +1981,7 @@ static void cm_dup_req_handler(struct cm_work *work,return ; unlock:spin_unlock_irq (&cm_id_priv->lock); -free:cm_free_msg (msg); +free:cm_free_response_msg (msg); } static struct cm_id_private *cm_match_req(struct cm_work *work,
@@ -2453,7 +2460,7 @@ static void cm_dup_rep_handler(struct cm_work *work) goto deref; unlock:spin_unlock_irq (&cm_id_priv->lock); -free:cm_free_msg (msg); +free:cm_free_response_msg (msg); deref:cm_deref_id (cm_id_priv); }
@@ -2794,7 +2801,7 @@ static int cm_issue_drep(struct cm_port *port, IBA_GET(CM_DREQ_REMOTE_COMM_ID, dreq_msg)); ret =ib_post_send_mad (msg,NULL );if (ret) -cm_free_msg (msg); +cm_free_response_msg (msg);return ret; }
@@ -2853,7 +2860,7 @@ static int cm_dreq_handler(struct cm_work *work)if (cm_create_response_msg_ah (work->port, work->mad_recv_wc, msg) ||ib_post_send_mad (msg,NULL )) -cm_free_msg (msg); +cm_free_response_msg (msg); goto deref;case IB_CM_DREQ_RCVD : atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
@@ -3343,7 +3350,7 @@ static int cm_lap_handler(struct cm_work *work)if (cm_create_response_msg_ah (work->port, work->mad_recv_wc, msg) ||ib_post_send_mad (msg,NULL )) -cm_free_msg (msg); +cm_free_response_msg (msg); goto deref;case IB_CM_LAP_RCVD : atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 441/800 IB/cm: Split cm_alloc_msg()
In reply to Greg Kroah-HartmanFrom: Jason Gunthorpe <[email protected]>
[ Upstream commit 4b4e586ebe37c8c7e2a4bf46dc4b742756fd788d ]
This is being used with two quite different flows, one attaches the message to the priv and the other does not.
Ensure the message attach is consistently done under the spinlock and ensure that the free on error always detaches the message from the cm_id_priv, also always under lock.
This makes read/write to the cm_id_priv->msg consistently locked and consistently NULL'd when the message is freed, even in all error paths.
--- drivers/infiniband/core/cm.c | 190 +++++++++++++++++++++-------------- 1 file changed, 115 insertions(+), 75 deletions(-)
drivers/infiniband/core/cm.c +115 -75
@@ -305,8 +305,7 @@ static inline void cm_deref_id(struct cm_id_private *cm_id_priv)complete (&cm_id_priv->comp); } -static int cm_alloc_msg (struct cm_id_private *cm_id_priv, -struct ib_mad_send_buf **msg) +static struct ib_mad_send_buf *cm_alloc_msg (struct cm_id_private *cm_id_priv) {struct ib_mad_agent *mad_agent;struct ib_mad_send_buf *m;
@@ -359,12 +358,42 @@ static int cm_alloc_msg(struct cm_id_private *cm_id_priv, m->retries = cm_id_priv->max_cm_retries;refcount_inc (&cm_id_priv->refcount); +spin_unlock_irqrestore (&cm.state_lock, flags2); m->context[0 ] = cm_id_priv; - *msg = m; +return m; out:spin_unlock_irqrestore (&cm.state_lock, flags2); -return ret; +return ERR_PTR (ret); +} + +static struct ib_mad_send_buf * +cm_alloc_priv_msg (struct cm_id_private *cm_id_priv) +{ +struct ib_mad_send_buf *msg; + +lockdep_assert_held (&cm_id_priv->lock); + + msg =cm_alloc_msg (cm_id_priv); +if (IS_ERR (msg)) +return msg; + cm_id_priv->msg = msg; +return msg; +} + +static void cm_free_priv_msg (struct ib_mad_send_buf *msg) +{ +struct cm_id_private *cm_id_priv = msg->context[0 ]; + +lockdep_assert_held (&cm_id_priv->lock); + +if (!WARN_ON (cm_id_priv->msg != msg)) + cm_id_priv->msg =NULL ; + +if (msg->ah) +rdma_destroy_ah (msg->ah,0 ); +cm_deref_id (cm_id_priv); +ib_free_send_mad (msg); } static struct ib_mad_send_buf *cm_alloc_response_msg_no_ah(struct cm_port *port,
@@ -1508,6 +1537,7 @@ int ib_send_cm_req(struct ib_cm_id *cm_id, struct ib_cm_req_param *param) {struct cm_id_private *cm_id_priv; +struct ib_mad_send_buf *msg;struct cm_req_msg *req_msg;unsigned long flags;int ret;
@@ -1559,31 +1589,34 @@ int ib_send_cm_req(struct ib_cm_id *cm_id, cm_id_priv->pkey = param->primary_path->pkey; cm_id_priv->qp_type = param->qp_type; - ret =cm_alloc_msg (cm_id_priv, &cm_id_priv->msg); -if (ret) - goto out; +spin_lock_irqsave (&cm_id_priv->lock, flags); + msg =cm_alloc_priv_msg (cm_id_priv); +if (IS_ERR (msg)) { + ret =PTR_ERR (msg); + goto out_unlock; + } - req_msg = (struct cm_req_msg *) cm_id_priv->msg->mad; + req_msg = (struct cm_req_msg *)msg->mad;cm_format_req (req_msg, cm_id_priv, param); cm_id_priv->tid = req_msg->hdr.tid; - cm_id_priv->msg->timeout_ms = cm_id_priv->timeout_ms; - cm_id_priv->msg->context[1 ] = (void *) (unsigned long )IB_CM_REQ_SENT ; + msg->timeout_ms = cm_id_priv->timeout_ms; + msg->context[1 ] = (void *)(unsigned long )IB_CM_REQ_SENT ; cm_id_priv->local_qpn =cpu_to_be32 (IBA_GET (CM_REQ_LOCAL_QPN , req_msg)); cm_id_priv->rq_psn =cpu_to_be32 (IBA_GET (CM_REQ_STARTING_PSN , req_msg));trace_icm_send_req (&cm_id_priv->id); -spin_lock_irqsave (&cm_id_priv->lock, flags); - ret =ib_post_send_mad (cm_id_priv->msg,NULL ); -if (ret) { -cm_free_msg (cm_id_priv->msg); -spin_unlock_irqrestore (&cm_id_priv->lock, flags); - goto out; - } + ret =ib_post_send_mad (msg,NULL ); +if (ret) + goto out_free;BUG_ON (cm_id->state !=IB_CM_IDLE ); cm_id->state =IB_CM_REQ_SENT ;spin_unlock_irqrestore (&cm_id_priv->lock, flags);return 0 ; +out_free: +cm_free_priv_msg (msg); +out_unlock: +spin_unlock_irqrestore (&cm_id_priv->lock, flags); out:return ret; }
@@ -2290,9 +2323,11 @@ int ib_send_cm_rep(struct ib_cm_id *cm_id, goto out; } - ret =cm_alloc_msg (cm_id_priv, &msg); -if (ret) + msg =cm_alloc_priv_msg (cm_id_priv); +if (IS_ERR (msg)) { + ret =PTR_ERR (msg); goto out; + } rep_msg = (struct cm_rep_msg *) msg->mad;cm_format_rep (rep_msg, cm_id_priv, param);
@@ -2301,14 +2336,10 @@ int ib_send_cm_rep(struct ib_cm_id *cm_id,trace_icm_send_rep (cm_id); ret =ib_post_send_mad (msg,NULL ); -if (ret) { -spin_unlock_irqrestore (&cm_id_priv->lock, flags); -cm_free_msg (msg); -return ret; - } +if (ret) + goto out_free; cm_id->state =IB_CM_REP_SENT ; - cm_id_priv->msg = msg; cm_id_priv->initiator_depth = param->initiator_depth; cm_id_priv->responder_resources = param->responder_resources; cm_id_priv->rq_psn =cpu_to_be32 (IBA_GET (CM_REP_STARTING_PSN , rep_msg));
@@ -2316,8 +2347,13 @@ int ib_send_cm_rep(struct ib_cm_id *cm_id,"IBTA declares QPN to be 24 bits, but it is 0x%X\n" , param->qp_num); cm_id_priv->local_qpn =cpu_to_be32 (param->qp_num &0xFFFFFF ); +spin_unlock_irqrestore (&cm_id_priv->lock, flags); +return 0 ; -out:spin_unlock_irqrestore (&cm_id_priv->lock, flags); +out_free: +cm_free_priv_msg (msg); +out: +spin_unlock_irqrestore (&cm_id_priv->lock, flags);return ret; }EXPORT_SYMBOL (ib_send_cm_rep);
@@ -2364,9 +2400,11 @@ int ib_send_cm_rtu(struct ib_cm_id *cm_id, goto error; } - ret =cm_alloc_msg (cm_id_priv, &msg); -if (ret) + msg =cm_alloc_msg (cm_id_priv); +if (IS_ERR (msg)) { + ret =PTR_ERR (msg); goto error; + }cm_format_rtu ((struct cm_rtu_msg *) msg->mad, cm_id_priv, private_data, private_data_len);
@@ -2664,10 +2702,10 @@ static int cm_send_dreq_locked(struct cm_id_private *cm_id_priv, cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)ib_cancel_mad (cm_id_priv->av.port->mad_agent, cm_id_priv->msg); - ret =cm_alloc_msg (cm_id_priv, &msg); -if (ret) { + msg =cm_alloc_priv_msg (cm_id_priv); +if (IS_ERR (msg)) {cm_enter_timewait (cm_id_priv); -return ret; +return PTR_ERR (msg); } cm_format_dreq((struct cm_dreq_msg *) msg->mad, cm_id_priv,
@@ -2679,12 +2717,11 @@ static int cm_send_dreq_locked(struct cm_id_private *cm_id_priv, ret =ib_post_send_mad (msg,NULL );if (ret) {cm_enter_timewait (cm_id_priv); -cm_free_msg (msg); +cm_free_priv_msg (msg);return ret; } cm_id_priv->id.state =IB_CM_DREQ_SENT ; - cm_id_priv->msg = msg;return 0 ; }
@@ -2739,9 +2776,9 @@ static int cm_send_drep_locked(struct cm_id_private *cm_id_priv,cm_set_private_data (cm_id_priv, private_data, private_data_len);cm_enter_timewait (cm_id_priv); - ret =cm_alloc_msg (cm_id_priv, &msg); -if (ret) -return ret; + msg =cm_alloc_msg (cm_id_priv); +if (IS_ERR (msg)) +return PTR_ERR (msg);cm_format_drep ((struct cm_drep_msg *) msg->mad, cm_id_priv, private_data, private_data_len);
@@ -2934,9 +2971,9 @@ static int cm_send_rej_locked(struct cm_id_private *cm_id_priv,case IB_CM_REP_RCVD :case IB_CM_MRA_REP_SENT :cm_reset_to_idle (cm_id_priv); - ret =cm_alloc_msg (cm_id_priv, &msg); -if (ret) -return ret; + msg =cm_alloc_msg (cm_id_priv); +if (IS_ERR (msg)) +return PTR_ERR (msg);cm_format_rej ((struct cm_rej_msg *)msg->mad, cm_id_priv, reason, ari, ari_length, private_data, private_data_len, state);
@@ -2944,9 +2981,9 @@ static int cm_send_rej_locked(struct cm_id_private *cm_id_priv,case IB_CM_REP_SENT :case IB_CM_MRA_REP_RCVD :cm_enter_timewait (cm_id_priv); - ret =cm_alloc_msg (cm_id_priv, &msg); -if (ret) -return ret; + msg =cm_alloc_msg (cm_id_priv); +if (IS_ERR (msg)) +return PTR_ERR (msg);cm_format_rej ((struct cm_rej_msg *)msg->mad, cm_id_priv, reason, ari, ari_length, private_data, private_data_len, state);
@@ -3124,13 +3161,15 @@ int ib_send_cm_mra(struct ib_cm_id *cm_id,default :trace_icm_send_mra_unknown_err (&cm_id_priv->id); ret = -EINVAL ; - goto error1; + goto error_unlock; }if (!(service_timeout &IB_CM_MRA_FLAG_DELAY )) { - ret =cm_alloc_msg (cm_id_priv, &msg); -if (ret) - goto error1; + msg =cm_alloc_msg (cm_id_priv); +if (IS_ERR (msg)) { + ret =PTR_ERR (msg); + goto error_unlock; + } cm_format_mra((struct cm_mra_msg *) msg->mad, cm_id_priv, msg_response, service_timeout,
@@ -3138,7 +3177,7 @@ int ib_send_cm_mra(struct ib_cm_id *cm_id,trace_icm_send_mra (cm_id); ret =ib_post_send_mad (msg,NULL );if (ret) - goto error2; + goto error_free_msg; } cm_id->state = cm_state;
@@ -3148,13 +3187,11 @@ int ib_send_cm_mra(struct ib_cm_id *cm_id,spin_unlock_irqrestore (&cm_id_priv->lock, flags);return 0 ; -error1:spin_unlock_irqrestore (&cm_id_priv->lock, flags); -kfree (data); -return ret; - -error2:spin_unlock_irqrestore (&cm_id_priv->lock, flags); -kfree (data); +error_free_msg:cm_free_msg (msg); +error_unlock: +spin_unlock_irqrestore (&cm_id_priv->lock, flags); +kfree (data);return ret; }EXPORT_SYMBOL (ib_send_cm_mra);
@@ -3490,38 +3527,41 @@ int ib_send_cm_sidr_req(struct ib_cm_id *cm_id, &cm_id_priv->av, cm_id_priv);if (ret) - goto out; +return ret; cm_id->service_id = param->service_id; cm_id->service_mask = ~cpu_to_be64 (0 ); cm_id_priv->timeout_ms = param->timeout_ms; cm_id_priv->max_cm_retries = param->max_cm_retries; - ret =cm_alloc_msg (cm_id_priv, &msg); -if (ret) - goto out; - -cm_format_sidr_req ((struct cm_sidr_req_msg *) msg->mad, cm_id_priv, - param); - msg->timeout_ms = cm_id_priv->timeout_ms; - msg->context[1 ] = (void *) (unsigned long )IB_CM_SIDR_REQ_SENT ;spin_lock_irqsave (&cm_id_priv->lock, flags); -if (cm_id->state ==IB_CM_IDLE ) { -trace_icm_send_sidr_req (&cm_id_priv->id); - ret =ib_post_send_mad (msg,NULL ); - }else { +if (cm_id->state !=IB_CM_IDLE ) { ret = -EINVAL ; + goto out_unlock; } -if (ret) { -spin_unlock_irqrestore (&cm_id_priv->lock, flags); -cm_free_msg (msg); - goto out; + msg =cm_alloc_priv_msg (cm_id_priv); +if (IS_ERR (msg)) { + ret =PTR_ERR (msg); + goto out_unlock; } + +cm_format_sidr_req ((struct cm_sidr_req_msg *)msg->mad, cm_id_priv, + param); + msg->timeout_ms = cm_id_priv->timeout_ms; + msg->context[1 ] = (void *)(unsigned long )IB_CM_SIDR_REQ_SENT ; + +trace_icm_send_sidr_req (&cm_id_priv->id); + ret =ib_post_send_mad (msg,NULL ); +if (ret) + goto out_free; cm_id->state =IB_CM_SIDR_REQ_SENT ; - cm_id_priv->msg = msg;spin_unlock_irqrestore (&cm_id_priv->lock, flags); -out: +return 0 ; +out_free: +cm_free_priv_msg (msg); +out_unlock: +spin_unlock_irqrestore (&cm_id_priv->lock, flags);return ret; }EXPORT_SYMBOL (ib_send_cm_sidr_req);
@@ -3668,9 +3708,9 @@ static int cm_send_sidr_rep_locked(struct cm_id_private *cm_id_priv,if (cm_id_priv->id.state !=IB_CM_SIDR_REQ_RCVD )return -EINVAL ; - ret =cm_alloc_msg (cm_id_priv, &msg); -if (ret) -return ret; + msg =cm_alloc_msg (cm_id_priv); +if (IS_ERR (msg)) +return PTR_ERR (msg);cm_format_sidr_rep ((struct cm_sidr_rep_msg *) msg->mad, cm_id_priv, param);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 442/800 Revert "IB/cm: Mark stale CM ids whenever the mad agent was unregistered"
In reply to Greg Kroah-HartmanFrom: Mark Zhang <[email protected]>
[ Upstream commit 3595c398f6dbab79a38550ff26104c6ec1035cd3 ]
This reverts commit 9db0ff53cb9b43ed75bacd42a89c1a0ab048b2b0, which wasn't a full fix and still causes to the following panic:
panic @ time 1605623870.843, thread 0xfffffeb63b552000: vm_fault_lookup: fault on nofault entry, addr: 0xfffffe811a94e000
time = 1605623870
cpuid = 9, TSC = 0xb7937acc1b6
Panic occurred in module kernel loaded at 0xffffffff80200000:Stack: --------------------------------------------------
kernel:vm_fault+0x19da
kernel:vm_fault_trap+0x6e
kernel:trap_pfault+0x1f1
kernel:trap+0x31e
kernel:cm_destroy_id+0x38c
kernel:rdma_destroy_id+0x127
kernel:sdp_shutdown_task+0x3ae
kernel:taskqueue_run_locked+0x10b
kernel:taskqueue_thread_loop+0x87
kernel:fork_exit+0x83--- drivers/infiniband/core/cm.c | 123 ++++------------------------------- 1 file changed, 14 insertions(+), 109 deletions(-)
drivers/infiniband/core/cm.c +14 -109
@@ -121,8 +121,6 @@ static struct ib_cm {__be32 random_id_operand;struct list_head timewait_list;struct workqueue_struct *wq; -/* Sync on cm change port state */ -spinlock_t state_lock; } cm;/* Counter indexes ordered by attribute ID */
@@ -203,8 +201,6 @@ struct cm_port {struct cm_device *cm_dev;struct ib_mad_agent *mad_agent;u32 port_num; -struct list_head cm_priv_prim_list; -struct list_head cm_priv_altr_list;struct cm_counter_group counter_group[CM_COUNTER_GROUPS ]; };
@@ -285,12 +281,6 @@ struct cm_id_private {u8 service_timeout;u8 target_ack_delay; -struct list_head prim_list; -struct list_head altr_list; -/* Indicates that the send port mad is registered and av is set */ -int prim_send_port_not_ready; -int altr_send_port_not_ready; -struct list_head work_list;atomic_t work_count;
@@ -310,47 +300,20 @@ static struct ib_mad_send_buf *cm_alloc_msg(struct cm_id_private *cm_id_priv)struct ib_mad_agent *mad_agent;struct ib_mad_send_buf *m;struct ib_ah *ah; -struct cm_av *av; -unsigned long flags, flags2; -int ret =0 ; -/* don't let the port to be released till the agent is down */ -spin_lock_irqsave (&cm.state_lock, flags2); -spin_lock_irqsave (&cm.lock, flags); -if (!cm_id_priv->prim_send_port_not_ready) - av = &cm_id_priv->av; -else if (!cm_id_priv->altr_send_port_not_ready && - (cm_id_priv->alt_av.port)) - av = &cm_id_priv->alt_av; -else { -pr_info ("%s: not valid CM id\n" , __func__); - ret = -ENODEV ; -spin_unlock_irqrestore (&cm.lock, flags); - goto out; - } -spin_unlock_irqrestore (&cm.lock, flags); -/* Make sure the port haven't released the mad yet */ mad_agent = cm_id_priv->av.port->mad_agent; -if (!mad_agent) { -pr_info ("%s: not a valid MAD agent\n" , __func__); - ret = -ENODEV ; - goto out; - } - ah =rdma_create_ah (mad_agent->qp->pd, &av->ah_attr,0 ); -if (IS_ERR (ah)) { - ret =PTR_ERR (ah); - goto out; - } + ah =rdma_create_ah (mad_agent->qp->pd, &cm_id_priv->av.ah_attr,0 ); +if (IS_ERR (ah)) +return (void *)ah; m =ib_create_send_mad (mad_agent, cm_id_priv->id.remote_cm_qpn, - av->pkey_index, + cm_id_priv->av.pkey_index,0 ,IB_MGMT_MAD_HDR ,IB_MGMT_MAD_DATA ,GFP_ATOMIC ,IB_MGMT_BASE_VERSION );if (IS_ERR (m)) {rdma_destroy_ah (ah,0 ); - ret =PTR_ERR (m); - goto out; +return m; }/* Timeout set by caller if response is expected. */
@@ -358,13 +321,8 @@ static struct ib_mad_send_buf *cm_alloc_msg(struct cm_id_private *cm_id_priv) m->retries = cm_id_priv->max_cm_retries;refcount_inc (&cm_id_priv->refcount); -spin_unlock_irqrestore (&cm.state_lock, flags2); m->context[0 ] = cm_id_priv;return m; - -out: -spin_unlock_irqrestore (&cm.state_lock, flags2); -return ERR_PTR (ret); } static struct ib_mad_send_buf *
@@ -517,21 +475,6 @@ static int cm_init_av_for_response(struct cm_port *port, struct ib_wc *wc, grh, &av->ah_attr); } -static void add_cm_id_to_port_list (struct cm_id_private *cm_id_priv, -struct cm_av *av,struct cm_port *port) -{ -unsigned long flags; - -spin_lock_irqsave (&cm.lock, flags); -if (&cm_id_priv->av == av) -list_add_tail (&cm_id_priv->prim_list, &port->cm_priv_prim_list); -else if (&cm_id_priv->alt_av == av) -list_add_tail (&cm_id_priv->altr_list, &port->cm_priv_altr_list); -else -WARN_ON (true); -spin_unlock_irqrestore (&cm.lock, flags); -} -static struct cm_port *get_cm_port_from_path (struct sa_path_rec *path,const struct ib_gid_attr *attr) {
@@ -575,8 +518,7 @@ get_cm_port_from_path(struct sa_path_rec *path, const struct ib_gid_attr *attr)static int cm_init_av_by_path (struct sa_path_rec *path,const struct ib_gid_attr *sgid_attr, -struct cm_av *av, -struct cm_id_private *cm_id_priv) +struct cm_av *av) {struct rdma_ah_attr new_ah_attr;struct cm_device *cm_dev;
@@ -610,7 +552,6 @@ static int cm_init_av_by_path(struct sa_path_rec *path,return ret; av->timeout = path->packet_life_time +1 ; -add_cm_id_to_port_list (cm_id_priv, av, port);rdma_move_ah_attr (&av->ah_attr, &new_ah_attr);return 0 ; }
@@ -890,8 +831,6 @@ static struct cm_id_private *cm_alloc_id_priv(struct ib_device *device,spin_lock_init (&cm_id_priv->lock);init_completion (&cm_id_priv->comp);INIT_LIST_HEAD (&cm_id_priv->work_list); -INIT_LIST_HEAD (&cm_id_priv->prim_list); -INIT_LIST_HEAD (&cm_id_priv->altr_list);atomic_set (&cm_id_priv->work_count,-1 );refcount_set (&cm_id_priv->refcount,1 );
@@ -1192,12 +1131,7 @@ retest:kfree (cm_id_priv->timewait_info); cm_id_priv->timewait_info =NULL ; } -if (!list_empty (&cm_id_priv->altr_list) && - (!cm_id_priv->altr_send_port_not_ready)) -list_del (&cm_id_priv->altr_list); -if (!list_empty (&cm_id_priv->prim_list) && - (!cm_id_priv->prim_send_port_not_ready)) -list_del (&cm_id_priv->prim_list); +WARN_ON (cm_id_priv->listen_sharecount);WARN_ON (!RB_EMPTY_NODE (&cm_id_priv->service_node));if (!RB_EMPTY_NODE (&cm_id_priv->sidr_id_node))
@@ -1565,13 +1499,12 @@ int ib_send_cm_req(struct ib_cm_id *cm_id, } ret =cm_init_av_by_path (param->primary_path, - param->ppath_sgid_attr, &cm_id_priv->av, - cm_id_priv); + param->ppath_sgid_attr, &cm_id_priv->av);if (ret) goto out;if (param->alternate_path) { ret =cm_init_av_by_path (param->alternate_path,NULL , - &cm_id_priv->alt_av, cm_id_priv); + &cm_id_priv->alt_av);if (ret) goto out; }
@@ -2203,8 +2136,7 @@ static int cm_req_handler(struct cm_work *work)sa_path_set_dmac (&work->path[0 ], cm_id_priv->av.ah_attr.roce.dmac); work->path[0 ].hop_limit = grh->hop_limit; - ret =cm_init_av_by_path (&work->path[0 ], gid_attr, &cm_id_priv->av, - cm_id_priv); + ret =cm_init_av_by_path (&work->path[0 ], gid_attr, &cm_id_priv->av);if (ret) {int err;
@@ -2223,7 +2155,7 @@ static int cm_req_handler(struct cm_work *work) }if (cm_req_has_alt_path (req_msg)) { ret =cm_init_av_by_path (&work->path[1 ],NULL , - &cm_id_priv->alt_av, cm_id_priv); + &cm_id_priv->alt_av);if (ret) { ib_send_cm_rej(&cm_id_priv->id, IB_CM_REJ_INVALID_ALT_GID,
@@ -3404,7 +3336,7 @@ static int cm_lap_handler(struct cm_work *work) goto unlock; ret =cm_init_av_by_path (param->alternate_path,NULL , - &cm_id_priv->alt_av, cm_id_priv); + &cm_id_priv->alt_av);if (ret) goto unlock;
@@ -3524,8 +3456,7 @@ int ib_send_cm_sidr_req(struct ib_cm_id *cm_id, cm_id_priv = container_of(cm_id, struct cm_id_private, id); ret =cm_init_av_by_path (param->path, param->sgid_attr, - &cm_id_priv->av, - cm_id_priv); + &cm_id_priv->av);if (ret)return ret;
@@ -4010,9 +3941,7 @@ out:static int cm_migrate (struct ib_cm_id *cm_id) {struct cm_id_private *cm_id_priv; -struct cm_av tmp_av;unsigned long flags; -int tmp_send_port_not_ready;int ret =0 ; cm_id_priv = container_of(cm_id, struct cm_id_private, id);
@@ -4021,14 +3950,7 @@ static int cm_migrate(struct ib_cm_id *cm_id) (cm_id->lap_state == IB_CM_LAP_UNINIT || cm_id->lap_state == IB_CM_LAP_IDLE)) { cm_id->lap_state =IB_CM_LAP_IDLE ; -/* Swap address vector */ - tmp_av = cm_id_priv->av; cm_id_priv->av = cm_id_priv->alt_av; - cm_id_priv->alt_av = tmp_av; -/* Swap port send ready state */ - tmp_send_port_not_ready = cm_id_priv->prim_send_port_not_ready; - cm_id_priv->prim_send_port_not_ready = cm_id_priv->altr_send_port_not_ready; - cm_id_priv->altr_send_port_not_ready = tmp_send_port_not_ready; } else ret = -EINVAL ;spin_unlock_irqrestore (&cm_id_priv->lock, flags);
@@ -4403,9 +4325,6 @@ static int cm_add_one(struct ib_device *ib_device) port->cm_dev = cm_dev; port->port_num = i; -INIT_LIST_HEAD (&port->cm_priv_prim_list); -INIT_LIST_HEAD (&port->cm_priv_altr_list); - ret =cm_create_port_fs (port);if (ret) goto error1;
@@ -4469,8 +4388,6 @@ static void cm_remove_one(struct ib_device *ib_device, void *client_data) {struct cm_device *cm_dev = client_data;struct cm_port *port; -struct cm_id_private *cm_id_priv; -struct ib_mad_agent *cur_mad_agent;struct ib_port_modify port_modify = { .clr_port_cap_mask =IB_PORT_CM_SUP };
@@ -4491,24 +4408,13 @@ static void cm_remove_one(struct ib_device *ib_device, void *client_data) port = cm_dev->port[i-1 ];ib_modify_port (ib_device, port->port_num,0 , &port_modify); -/* Mark all the cm_id's as not valid */ -spin_lock_irq (&cm.lock); -list_for_each_entry (cm_id_priv, &port->cm_priv_altr_list, altr_list) - cm_id_priv->altr_send_port_not_ready =1 ; -list_for_each_entry (cm_id_priv, &port->cm_priv_prim_list, prim_list) - cm_id_priv->prim_send_port_not_ready =1 ; -spin_unlock_irq (&cm.lock);/* * We flush the queue here after the going_down set, this * verify that no new works will be queued in the recv handler, * after that we can call the unregister_mad_agent */ flush_workqueue (cm.wq); -spin_lock_irq (&cm.state_lock); - cur_mad_agent = port->mad_agent; - port->mad_agent =NULL ; -spin_unlock_irq (&cm.state_lock); -ib_unregister_mad_agent (cur_mad_agent); +ib_unregister_mad_agent (port->mad_agent);cm_remove_port_fs (port);kfree (port); }
@@ -4523,7 +4429,6 @@ static int __init ib_cm_init(void)INIT_LIST_HEAD (&cm.device_list);rwlock_init (&cm.device_lock);spin_lock_init (&cm.lock); -spin_lock_init (&cm.state_lock); cm.listen_service_table =RB_ROOT ; cm.listen_service_id =be64_to_cpu (IB_CM_ASSIGN_SERVICE_ID ); cm.remote_id_table =RB_ROOT ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 443/800 IB/cm: Improve the calling of cm_init_av_for_lap and cm_init_av_by_path
In reply to Greg Kroah-HartmanFrom: Mark Zhang <[email protected]>
[ Upstream commit 7345201c39633fc4c82dae7315da7154efaf2459 ]
The cm_init_av_for_lap() and cm_init_av_by_path() function calls have the following issues:
1. Both of them might sleep and should not be called under spinlock.
2. The access of cm_id_priv->av should be under cm_id_priv->lock, which means it can't be initialized directly.
This patch splits the calling of 2 functions into two parts: first one initializes an AV outside of the spinlock, the second one copies AV to cm_id_priv->av under spinlock.
--- drivers/infiniband/core/cm.c | 105 +++++++++++++++++++---------------- 1 file changed, 58 insertions(+), 47 deletions(-)
drivers/infiniband/core/cm.c +58 -47
@@ -439,30 +439,12 @@ static void cm_set_private_data(struct cm_id_private *cm_id_priv, cm_id_priv->private_data_len = private_data_len; } -static int cm_init_av_for_lap (struct cm_port *port,struct ib_wc *wc, -struct ib_grh *grh,struct cm_av *av) +static void cm_init_av_for_lap (struct cm_port *port,struct ib_wc *wc, +struct rdma_ah_attr *ah_attr,struct cm_av *av) { -struct rdma_ah_attr new_ah_attr; -int ret; - av->port = port; av->pkey_index = wc->pkey_index; - -/* -* av->ah_attr might be initialized based on past wc during incoming -* connect request or while sending out connect request. So initialize -* a new ah_attr on stack. If initialization fails, old ah_attr is -* used for sending any responses. If initialization is successful, -* than new ah_attr is used by overwriting old one. -*/ - ret =ib_init_ah_attr_from_wc (port->cm_dev->ib_device, - port->port_num, wc, - grh, &new_ah_attr); -if (ret) -return ret; - -rdma_move_ah_attr (&av->ah_attr, &new_ah_attr); -return 0 ; +rdma_move_ah_attr (&av->ah_attr, ah_attr); } static int cm_init_av_for_response(struct cm_port *port, struct ib_wc *wc,
@@ -556,6 +538,20 @@ static int cm_init_av_by_path(struct sa_path_rec *path,return 0 ; } +/* Move av created by cm_init_av_by_path(), so av.dgid is not moved */ +static void cm_move_av_from_path (struct cm_av *dest,struct cm_av *src) +{ + dest->port = src->port; + dest->pkey_index = src->pkey_index; +rdma_move_ah_attr (&dest->ah_attr, &src->ah_attr); + dest->timeout = src->timeout; +} + +static void cm_destroy_av (struct cm_av *av) +{ +rdma_destroy_ah_attr (&av->ah_attr); +} +static u32 cm_local_id (__be32 local_id) {return (__force u32) (local_id ^ cm.random_id_operand);
@@ -1145,8 +1141,8 @@ retest:while ((work =cm_dequeue_work (cm_id_priv)) !=NULL )cm_free_work (work); -rdma_destroy_ah_attr (&cm_id_priv->av.ah_attr); -rdma_destroy_ah_attr (&cm_id_priv->alt_av.ah_attr); +cm_destroy_av (&cm_id_priv->av); +cm_destroy_av (&cm_id_priv->alt_av);kfree (cm_id_priv->private_data);kfree_rcu (cm_id_priv, rcu); }
@@ -1470,6 +1466,7 @@ static int cm_validate_req_param(struct ib_cm_req_param *param)int ib_send_cm_req (struct ib_cm_id *cm_id,struct ib_cm_req_param *param) { +struct cm_av av = {}, alt_av = {};struct cm_id_private *cm_id_priv;struct ib_mad_send_buf *msg;struct cm_req_msg *req_msg;
@@ -1485,8 +1482,7 @@ int ib_send_cm_req(struct ib_cm_id *cm_id,spin_lock_irqsave (&cm_id_priv->lock, flags);if (cm_id->state !=IB_CM_IDLE ||WARN_ON (cm_id_priv->timewait_info)) {spin_unlock_irqrestore (&cm_id_priv->lock, flags); - ret = -EINVAL ; - goto out; +return -EINVAL ; }spin_unlock_irqrestore (&cm_id_priv->lock, flags);
@@ -1495,18 +1491,20 @@ int ib_send_cm_req(struct ib_cm_id *cm_id,if (IS_ERR (cm_id_priv->timewait_info)) { ret =PTR_ERR (cm_id_priv->timewait_info); cm_id_priv->timewait_info =NULL ; - goto out; +return ret; } ret =cm_init_av_by_path (param->primary_path, - param->ppath_sgid_attr, &cm_id_priv->av); + param->ppath_sgid_attr, &av);if (ret) - goto out; +return ret;if (param->alternate_path) { ret =cm_init_av_by_path (param->alternate_path,NULL , - &cm_id_priv->alt_av); -if (ret) - goto out; + &alt_av); +if (ret) { +cm_destroy_av (&av); +return ret; + } } cm_id->service_id = param->service_id; cm_id->service_mask = ~cpu_to_be64 (0 );
@@ -1523,6 +1521,11 @@ int ib_send_cm_req(struct ib_cm_id *cm_id, cm_id_priv->qp_type = param->qp_type;spin_lock_irqsave (&cm_id_priv->lock, flags); + +cm_move_av_from_path (&cm_id_priv->av, &av); +if (param->alternate_path) +cm_move_av_from_path (&cm_id_priv->alt_av, &alt_av); + msg =cm_alloc_priv_msg (cm_id_priv);if (IS_ERR (msg)) { ret =PTR_ERR (msg);
@@ -1550,7 +1553,6 @@ out_free:cm_free_priv_msg (msg); out_unlock:spin_unlock_irqrestore (&cm_id_priv->lock, flags); -out:return ret; }EXPORT_SYMBOL (ib_send_cm_req);
@@ -3267,6 +3269,8 @@ static int cm_lap_handler(struct cm_work *work)struct cm_lap_msg *lap_msg;struct ib_cm_lap_event_param *param;struct ib_mad_send_buf *msg =NULL ; +struct rdma_ah_attr ah_attr; +struct cm_av alt_av = {};int ret;/* Currently Alternate path messages are not supported for
@@ -3295,7 +3299,25 @@ static int cm_lap_handler(struct cm_work *work) work->cm_event.private_data =IBA_GET_MEM_PTR (CM_LAP_PRIVATE_DATA , lap_msg); + ret =ib_init_ah_attr_from_wc (work->port->cm_dev->ib_device, + work->port->port_num, + work->mad_recv_wc->wc, + work->mad_recv_wc->recv_buf.grh, + &ah_attr); +if (ret) + goto deref; + + ret =cm_init_av_by_path (param->alternate_path,NULL , &alt_av); +if (ret) { +rdma_destroy_ah_attr (&ah_attr); +return -EINVAL ; + } +spin_lock_irq (&cm_id_priv->lock); +cm_init_av_for_lap (work->port, work->mad_recv_wc->wc, + &ah_attr, &cm_id_priv->av); +cm_move_av_from_path (&cm_id_priv->alt_av, &alt_av); +if (cm_id_priv->id.state !=IB_CM_ESTABLISHED ) goto unlock;
@@ -3329,17 +3351,6 @@ static int cm_lap_handler(struct cm_work *work) goto unlock; } - ret =cm_init_av_for_lap (work->port, work->mad_recv_wc->wc, - work->mad_recv_wc->recv_buf.grh, - &cm_id_priv->av); -if (ret) - goto unlock; - - ret =cm_init_av_by_path (param->alternate_path,NULL , - &cm_id_priv->alt_av); -if (ret) - goto unlock; - cm_id_priv->id.lap_state =IB_CM_LAP_RCVD ; cm_id_priv->tid = lap_msg->hdr.tid;cm_queue_work_unlock (cm_id_priv, work);
@@ -3447,6 +3458,7 @@ int ib_send_cm_sidr_req(struct ib_cm_id *cm_id, {struct cm_id_private *cm_id_priv;struct ib_mad_send_buf *msg; +struct cm_av av = {};unsigned long flags;int ret;
@@ -3455,17 +3467,16 @@ int ib_send_cm_sidr_req(struct ib_cm_id *cm_id,return -EINVAL ; cm_id_priv = container_of(cm_id, struct cm_id_private, id); - ret =cm_init_av_by_path (param->path, param->sgid_attr, - &cm_id_priv->av); + ret =cm_init_av_by_path (param->path, param->sgid_attr, &av);if (ret)return ret; +spin_lock_irqsave (&cm_id_priv->lock, flags); +cm_move_av_from_path (&cm_id_priv->av, &av); cm_id->service_id = param->service_id; cm_id->service_mask = ~cpu_to_be64 (0 ); cm_id_priv->timeout_ms = param->timeout_ms; cm_id_priv->max_cm_retries = param->max_cm_retries; - -spin_lock_irqsave (&cm_id_priv->lock, flags);if (cm_id->state !=IB_CM_IDLE ) { ret = -EINVAL ; goto out_unlock;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 444/800 drm/pl111: depend on CONFIG_VEXPRESS_CONFIG
In reply to Greg Kroah-HartmanFrom: Kees Cook <[email protected]>
[ Upstream commit 4dc7c97d04dcaa9f19482f70dcfdbeb52cc7193f ]
Avoid randconfig build failures by requiring VEXPRESS_CONFIG:
aarch64-linux-gnu-ld: drivers/gpu/drm/pl111/pl111_versatile.o: in function `pl111_vexpress_clcd_init':
pl111_versatile.c:(.text+0x220): undefined reference to `devm_regmap_init_vexpress_config'
--- drivers/gpu/drm/pl111/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/pl111/Kconfig +1 -1
@@ -2,7 +2,7 @@ config DRM_PL111 tristate "DRM Support for PL111 CLCD Controller" depends on DRM - depends on ARM || ARM64 || COMPILE_TEST + depends on VEXPRESS_CONFIG depends on COMMON_CLK select DRM_KMS_HELPER select DRM_KMS_CMA_HELPER
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 445/800 RDMA/rxe: Fix failure during driver load
In reply to Greg Kroah-HartmanFrom: Kamal Heib <[email protected]>
[ Upstream commit 32a25f2ea690dfaace19f7a3a916f5d7e1ddafe8 ]
To avoid the following failure when trying to load the rdma_rxe module while IPv6 is disabled, add a check for EAFNOSUPPORT and ignore the failure, also delete the needless debug print from rxe_setup_udp_tunnel().
$ modprobe rdma_rxe modprobe: ERROR: could not insert 'rdma_rxe': Operation not permitted
--- drivers/infiniband/sw/rxe/rxe_net.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/infiniband/sw/rxe/rxe_net.c +7 -3
@@ -207,10 +207,8 @@ static struct socket *rxe_setup_udp_tunnel(struct net *net, __be16 port,/* Create UDP socket */ err =udp_sock_create (net, &udp_cfg, &sock); -if (err <0 ) { -pr_err ("failed to create udp socket. err = %d\n" , err); +if (err <0 )return ERR_PTR (err); - } tnl_cfg.encap_type =1 ; tnl_cfg.encap_rcv = rxe_udp_encap_recv;
@@ -619,6 +617,12 @@ static int rxe_net_ipv6_init(void) recv_sockets.sk6 =rxe_setup_udp_tunnel (&init_net,htons (ROCE_V2_UDP_DPORT ), true); +if (PTR_ERR (recv_sockets.sk6) == -EAFNOSUPPORT ) { + recv_sockets.sk6 =NULL ; +pr_warn ("IPv6 is not supported, can not create a UDPv6 socket\n" ); +return 0 ; + } +if (IS_ERR (recv_sockets.sk6)) { recv_sockets.sk6 =NULL ;pr_err ("Failed to create IPv6 UDP tunnel\n" );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 446/800 drm/pl111: Actually fix CONFIG_VEXPRESS_CONFIG depends
In reply to Greg Kroah-HartmanFrom: Kees Cook <[email protected]>
[ Upstream commit 4e566003571244f508408f59ce78f6ac2ccdba8e ]
VEXPRESS_CONFIG needs to either be missing, built-in, or modular when pl111 is modular. Update the Kconfig to reflect the need.
--- drivers/gpu/drm/pl111/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/pl111/Kconfig +2 -1
@@ -2,7 +2,8 @@ config DRM_PL111 tristate "DRM Support for PL111 CLCD Controller" depends on DRM - depends on VEXPRESS_CONFIG + depends on ARM || ARM64 || COMPILE_TEST + depends on VEXPRESS_CONFIG || VEXPRESS_CONFIG=n depends on COMMON_CLK select DRM_KMS_HELPER select DRM_KMS_CMA_HELPER
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 447/800 drm/vc4: hdmi: Fix error path of hpd-gpios
In reply to Greg Kroah-HartmanFrom: Maxime Ripard <[email protected]>
[ Upstream commit e075a7811977ff51c917a65ed1896e08231d2615 ]
If the of_get_named_gpio_flags call fails in vc4_hdmi_bind, we jump to the err_unprepare_hsm label. That label will then call pm_runtime_disable and put_device on the DDC device.
We just retrieved the DDC device, so the latter is definitely justified. However at that point we still haven't called pm_runtime_enable, so the call to pm_runtime_disable is not supposed to be there.
--- drivers/gpu/drm/vc4/vc4_hdmi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/vc4/vc4_hdmi.c +2 -2
@@ -2000,7 +2000,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) &hpd_gpio_flags);if (vc4_hdmi->hpd_gpio <0 ) { ret = vc4_hdmi->hpd_gpio; - goto err_unprepare_hsm; + goto err_put_ddc; } vc4_hdmi->hpd_active_low = hpd_gpio_flags &OF_GPIO_ACTIVE_LOW ;
@@ -2041,8 +2041,8 @@ err_destroy_conn:vc4_hdmi_connector_destroy (&vc4_hdmi->connector); err_destroy_encoder:drm_encoder_cleanup (encoder); -err_unprepare_hsm:pm_runtime_disable (dev); +err_put_ddc:put_device (&vc4_hdmi->ddc->dev);return ret;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 448/800 clk: vc5: fix output disabling when enabling a FOD
In reply to Greg Kroah-HartmanFrom: Luca Ceresoli <[email protected]>
[ Upstream commit fc336ae622df0ec114dbe5551a4d2760c535ecd0 ]
On 5P49V6965, when an output is enabled we enable the corresponding FOD. When this happens for the first time, and specifically when writing register VC5_OUT_DIV_CONTROL in vc5_clk_out_prepare(), all other outputs are stopped for a short time and then restarted.
According to Renesas support this is intended: "The reason for that is VC6E has synced up all output function".
This behaviour can be disabled at least on VersaClock 6E devices, of which only the 5P49V6965 is currently implemented by this driver. This requires writing bit 7 (bypass_sync{1..4}) in register 0x20..0x50. Those registers are named "Unused Factory Reserved Register", and the bits are documented as "Skip VDDO<N> verification", which does not clearly explain the relation to FOD sync. However according to Renesas support as well as my testing setting this bit does prevent disabling of all clock outputs when enabling a FOD.
See "VersaClock ® 6E Family Register Descriptions and Programming Guide" (August 30, 2018), Table 116 "Power Up VDD check", page 58:
https://www.renesas.com/us/en/document/mau/versaclock-6e-family-register-descriptions-and-programming-guide
--- drivers/clk/clk-versaclock5.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-)
drivers/clk/clk-versaclock5.c +24 -3
@@ -69,7 +69,10 @@#define VC5_FEEDBACK_FRAC_DIV (n) (0x19 + (n))#define VC5_RC_CONTROL0 0x1e#define VC5_RC_CONTROL1 0x1f -/* Register 0x20 is factory reserved */ + +/* These registers are named "Unused Factory Reserved Registers" */ +#define VC5_RESERVED_X0 (idx) (0x20 + ((idx) * 0x10)) +#define VC5_RESERVED_X0_BYPASS_SYNC BIT(7)/* bypass_sync<idx> bit */ /* Output divider control for divider 1,2,3,4 */ #define VC5_OUT_DIV_CONTROL (idx) (0x21 + ((idx) * 0x10))
@@ -87,7 +90,6 @@#define VC5_OUT_DIV_SKEW_INT (idx, n) (0x2b + ((idx) * 0x10) + (n))#define VC5_OUT_DIV_INT (idx, n) (0x2d + ((idx) * 0x10) + (n))#define VC5_OUT_DIV_SKEW_FRAC (idx) (0x2f + ((idx) * 0x10)) -/* Registers 0x30, 0x40, 0x50 are factory reserved */ /* Clock control register for clock 1,2 */ #define VC5_CLK_OUTPUT_CFG (idx, n) (0x60 + ((idx) * 0x2) + (n))
@@ -140,6 +142,8 @@#define VC5_HAS_INTERNAL_XTAL BIT(0)/* chip has PFD requency doubler */ #define VC5_HAS_PFD_FREQ_DBL BIT(1) +/* chip has bits to disable FOD sync */ +#define VC5_HAS_BYPASS_SYNC_BIT BIT(2)/* Supported IDT VC5 models. */ enum vc5_model {
@@ -581,6 +585,23 @@ static int vc5_clk_out_prepare(struct clk_hw *hw)unsigned int src;int ret; +/* +* When enabling a FOD, all currently enabled FODs are briefly +* stopped in order to synchronize all of them. This causes a clock +* disruption to any unrelated chips that might be already using +* other clock outputs. Bypass the sync feature to avoid the issue, +* which is possible on the VersaClock 6E family via reserved +* registers. +*/ +if (vc5->chip_info->flags &VC5_HAS_BYPASS_SYNC_BIT ) { + ret =regmap_update_bits (vc5->regmap, +VC5_RESERVED_X0 (hwdata->num), +VC5_RESERVED_X0_BYPASS_SYNC , +VC5_RESERVED_X0_BYPASS_SYNC ); +if (ret) +return ret; + } +/* * If the input mux is disabled, enable it first and * select source from matching FOD.
@@ -1166,7 +1187,7 @@ static const struct vc5_chip_info idt_5p49v6965_info = { .model = IDT_VC6_5P49V6965, .clk_fod_cnt = 4, .clk_out_cnt = 5, - .flags = 0, + .flags = VC5_HAS_BYPASS_SYNC_BIT, };static const struct i2c_device_id vc5_id[] = {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 449/800 drm: qxl: ensure surf.data is ininitialized
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit fbbf23ddb2a1cc0c12c9f78237d1561c24006f50 ]
The object surf is not fully initialized and the uninitialized field surf.data is being copied by the call to qxl_bo_create via the call to qxl_gem_object_create. Set surf.data to zero to ensure garbage data from the stack is not being copied.
Addresses-Coverity: ("Uninitialized scalar variable")
--- drivers/gpu/drm/qxl/qxl_dumb.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/qxl/qxl_dumb.c +2 -0
@@ -58,6 +58,8 @@ int qxl_mode_dumb_create(struct drm_file *file_priv, surf.height = args->height; surf.stride = pitch; surf.format = format; + surf.data =0 ; + r = qxl_gem_object_create_with_handle(qdev, file_priv, QXL_GEM_DOMAIN_CPU, args->size, &surf, &qobj,
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 450/800 stmmac: prefetch right address
In reply to Greg Kroah-HartmanFrom: Matteo Croce <[email protected]>
[ Upstream commit 4744bf072b4640c5e2ea65c2361ad6c832f28fa8 ]
To support XDP, a headroom is prepended to the packet data. Consider this offset when doing a prefetch.
--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +1 -1
@@ -5138,7 +5138,7 @@ read_again:/* Buffer is good. Go on. */ -prefetch (page_address (buf->page)); +prefetch (page_address (buf->page) + buf->page_offset);if (buf->sec_page)prefetch (page_address (buf->sec_page));
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 451/800 net: stmmac: Fix potential integer overflow
In reply to Greg Kroah-HartmanFrom: Wong Vee Khee <[email protected]>
[ Upstream commit 52e597d3e2e6e5bfce47559eb22b955ac17b3826 ]
The commit d96febedfde2 ("net: stmmac: arrange Tx tail pointer update to stmmac_flush_tx_descriptors") introduced the following coverity warning:-
1. Unintentional integer overflow (OVERFLOW_BEFORE_WIDEN)
overflow_before_widen: Potentially overflowing expression 'tx_q->cur_tx * desc_size' with type 'unsigned int' (32 bits, unsigned) is evaluated using 32-bit arithmetic, and then used in a context that expects an expression of type dma_addr_t (64 bits, unsigned).
Fixed this by assigning tx_tail_addr to dma_addr_t type, as dma_addr_t datatype is decided by CONFIG_ARCH_DMA_ADDR_T_64_BIT.
--- drivers/net/ethernet/stmicro/stmmac/stmmac.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/stmmac.h +1 -1
@@ -75,7 +75,7 @@ struct stmmac_tx_queue {unsigned int cur_tx;unsigned int dirty_tx;dma_addr_t dma_tx_phy; -u32 tx_tail_addr; +dma_addr_t tx_tail_addr;u32 mss; };
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 452/800 tools/bpftool: Fix error return code in do_batch()
In reply to Greg Kroah-HartmanFrom: Zhihao Cheng <[email protected]>
[ Upstream commit ca16b429f39b4ce013bfa7e197f25681e65a2a42 ]
Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function.
--- tools/bpf/bpftool/main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tools/bpf/bpftool/main.c +3 -1
@@ -340,8 +340,10 @@ static int do_batch(int argc, char **argv) n_argc =make_args (buf, n_argv,BATCH_ARG_NB_MAX , lines);if (!n_argc)continue ; -if (n_argc <0 ) +if (n_argc <0 ) { + err = n_argc; goto err_close; + }if (json_output) {jsonw_start_object (json_wtr);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 453/800 ath10k: go to path err_unsupported when chip id is not supported
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 9e88dd431d2345acdb7a549f3e88aaf4c2a307a1 ]
When chip id is not supported, it go to path err_unsupported to print the error message.
--- drivers/net/wireless/ath/ath10k/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath10k/pci.c +1 -1
@@ -3701,7 +3701,7 @@ static int ath10k_pci_probe(struct pci_dev *pdev, goto err_unsupported;if (!ath10k_pci_chip_is_supported (pdev->device, bus_params.chip_id)) - goto err_free_irq; + goto err_unsupported; ret =ath10k_core_register (ar, &bus_params);if (ret) {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 454/800 ath10k: add missing error return code in ath10k_pci_probe()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit e2783e2f39ba99178dedfc1646d5cc0979d1bab3 ]
When chip_id is not supported, the resources will be freed on path err_unsupported, these resources will also be freed when calling ath10k_pci_remove(), it will cause double free, so return -ENODEV when it doesn't support the device with wrong chip_id.
--- drivers/net/wireless/ath/ath10k/pci.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath10k/pci.c +9 -3
@@ -3685,8 +3685,10 @@ static int ath10k_pci_probe(struct pci_dev *pdev,ath10k_pci_soc_read32 (ar,SOC_CHIP_ID_ADDRESS );if (bus_params.chip_id !=0xffffffff ) {if (!ath10k_pci_chip_is_supported (pdev->device, - bus_params.chip_id)) + bus_params.chip_id)) { + ret = -ENODEV ; goto err_unsupported; + } } }
@@ -3697,11 +3699,15 @@ static int ath10k_pci_probe(struct pci_dev *pdev, } bus_params.chip_id =ath10k_pci_soc_read32 (ar,SOC_CHIP_ID_ADDRESS ); -if (bus_params.chip_id ==0xffffffff ) +if (bus_params.chip_id ==0xffffffff ) { + ret = -ENODEV ; goto err_unsupported; + } -if (!ath10k_pci_chip_is_supported (pdev->device, bus_params.chip_id)) +if (!ath10k_pci_chip_is_supported (pdev->device, bus_params.chip_id)) { + ret = -ENODEV ; goto err_unsupported; + } ret =ath10k_core_register (ar, &bus_params);if (ret) {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 455/800 wireless: carl9170: fix LEDS build errors & warnings
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 272fdc0c4542fad173b44965be02a16d6db95499 ]
kernel test robot reports over 200 build errors and warnings that are due to this Kconfig problem when CARL9170=m, MAC80211=y, and LEDS_CLASS=m.
WARNING: unmet direct dependencies detected for MAC80211_LEDS
Depends on [n]: NET [=y] && WIRELESS [=y] && MAC80211 [=y] && (LEDS_CLASS [=m]=y || LEDS_CLASS [=m]=MAC80211 [=y]) Selected by [m]:
- CARL9170_LEDS [=y] && NETDEVICES [=y] && WLAN [=y] && WLAN_VENDOR_ATH [=y] && CARL9170 [=m]
CARL9170_LEDS selects MAC80211_LEDS even though its kconfig dependencies are not met. This happens because 'select' does not follow any Kconfig dependency chains.
Fix this by making CARL9170_LEDS depend on MAC80211_LEDS, where the latter supplies any needed dependencies on LEDS_CLASS.
--- drivers/net/wireless/ath/carl9170/Kconfig | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/net/wireless/ath/carl9170/Kconfig +3 -5
@@ -16,13 +16,11 @@ config CARL9170 config CARL9170_LEDS bool "SoftLED Support" - depends on CARL9170 - select MAC80211_LEDS - select LEDS_CLASS - select NEW_LEDS default y + depends on CARL9170 + depends on MAC80211_LEDS help - This option is necessary, if you want your device' LEDs to blink + This option is necessary, if you want your device's LEDs to blink. Say Y, unless you need the LEDs for firmware debugging.
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 456/800 ieee802154: hwsim: Fix possible memory leak in hwsim_subscribe_all_others
In reply to Greg Kroah-HartmanFrom: Dongliang Mu <[email protected]>
[ Upstream commit ab372c2293f5d0b279f31c8d768566ea37602dc9 ]
In hwsim_subscribe_all_others, the error handling code performs incorrectly if the second hwsim_alloc_edge fails. When this issue occurs, it goes to sub_fail, without cleaning the edges allocated before.
--- drivers/net/ieee802154/mac802154_hwsim.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ieee802154/mac802154_hwsim.c +2 -2
@@ -715,6 +715,8 @@ static int hwsim_subscribe_all_others(struct hwsim_phy *phy)return 0 ; +sub_fail: +hwsim_edge_unsubscribe_me (phy); me_fail:rcu_read_lock ();list_for_each_entry_rcu (e, &phy->edges, list) {
@@ -722,8 +724,6 @@ me_fail:hwsim_free_edge (e); }rcu_read_unlock (); -sub_fail: -hwsim_edge_unsubscribe_me (phy);return -ENOMEM ; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 457/800 clk: imx8mq: remove SYS PLL 1/2 clock gates
In reply to Greg Kroah-HartmanFrom: Lucas Stach <[email protected]>
[ Upstream commit c586f53ae159c6c1390f093a1ec94baef2df9f3a ]
Remove the PLL clock gates as the allowing to gate the sys1_pll_266m breaks the uSDHC module which is sporadically unable to enumerate devices after this change. Also it makes AMP clock management harder with no obvious benefit to Linux, so just revert the change.
--- drivers/clk/imx/clk-imx8mq.c | 56 ++++++++---------------- include/dt-bindings/clock/imx8mq-clock.h | 19 -------- 2 files changed, 18 insertions(+), 57 deletions(-)
drivers/clk/imx/clk-imx8mq.c +18 -38
@@ -358,46 +358,26 @@ static int imx8mq_clocks_probe(struct platform_device *pdev) hws[IMX8MQ_VIDEO2_PLL_OUT ] =imx_clk_hw_sscg_pll ("video2_pll_out" , video2_pll_out_sels,ARRAY_SIZE (video2_pll_out_sels),0 ,0 ,0 , base +0x54 ,0 );/* SYS PLL1 fixed output */ - hws[IMX8MQ_SYS1_PLL_40M_CG ] =imx_clk_hw_gate ("sys1_pll_40m_cg" ,"sys1_pll_out" , base +0x30 ,9 ); - hws[IMX8MQ_SYS1_PLL_80M_CG ] =imx_clk_hw_gate ("sys1_pll_80m_cg" ,"sys1_pll_out" , base +0x30 ,11 ); - hws[IMX8MQ_SYS1_PLL_100M_CG ] =imx_clk_hw_gate ("sys1_pll_100m_cg" ,"sys1_pll_out" , base +0x30 ,13 ); - hws[IMX8MQ_SYS1_PLL_133M_CG ] =imx_clk_hw_gate ("sys1_pll_133m_cg" ,"sys1_pll_out" , base +0x30 ,15 ); - hws[IMX8MQ_SYS1_PLL_160M_CG ] =imx_clk_hw_gate ("sys1_pll_160m_cg" ,"sys1_pll_out" , base +0x30 ,17 ); - hws[IMX8MQ_SYS1_PLL_200M_CG ] =imx_clk_hw_gate ("sys1_pll_200m_cg" ,"sys1_pll_out" , base +0x30 ,19 ); - hws[IMX8MQ_SYS1_PLL_266M_CG ] =imx_clk_hw_gate ("sys1_pll_266m_cg" ,"sys1_pll_out" , base +0x30 ,21 ); - hws[IMX8MQ_SYS1_PLL_400M_CG ] =imx_clk_hw_gate ("sys1_pll_400m_cg" ,"sys1_pll_out" , base +0x30 ,23 ); - hws[IMX8MQ_SYS1_PLL_800M_CG ] =imx_clk_hw_gate ("sys1_pll_800m_cg" ,"sys1_pll_out" , base +0x30 ,25 ); - - hws[IMX8MQ_SYS1_PLL_40M ] =imx_clk_hw_fixed_factor ("sys1_pll_40m" ,"sys1_pll_40m_cg" ,1 ,20 ); - hws[IMX8MQ_SYS1_PLL_80M ] =imx_clk_hw_fixed_factor ("sys1_pll_80m" ,"sys1_pll_80m_cg" ,1 ,10 ); - hws[IMX8MQ_SYS1_PLL_100M ] =imx_clk_hw_fixed_factor ("sys1_pll_100m" ,"sys1_pll_100m_cg" ,1 ,8 ); - hws[IMX8MQ_SYS1_PLL_133M ] =imx_clk_hw_fixed_factor ("sys1_pll_133m" ,"sys1_pll_133m_cg" ,1 ,6 ); - hws[IMX8MQ_SYS1_PLL_160M ] =imx_clk_hw_fixed_factor ("sys1_pll_160m" ,"sys1_pll_160m_cg" ,1 ,5 ); - hws[IMX8MQ_SYS1_PLL_200M ] =imx_clk_hw_fixed_factor ("sys1_pll_200m" ,"sys1_pll_200m_cg" ,1 ,4 ); - hws[IMX8MQ_SYS1_PLL_266M ] =imx_clk_hw_fixed_factor ("sys1_pll_266m" ,"sys1_pll_266m_cg" ,1 ,3 ); - hws[IMX8MQ_SYS1_PLL_400M ] =imx_clk_hw_fixed_factor ("sys1_pll_400m" ,"sys1_pll_400m_cg" ,1 ,2 ); - hws[IMX8MQ_SYS1_PLL_800M ] =imx_clk_hw_fixed_factor ("sys1_pll_800m" ,"sys1_pll_800m_cg" ,1 ,1 ); + hws[IMX8MQ_SYS1_PLL_40M ] =imx_clk_hw_fixed_factor ("sys1_pll_40m" ,"sys1_pll_out" ,1 ,20 ); + hws[IMX8MQ_SYS1_PLL_80M ] =imx_clk_hw_fixed_factor ("sys1_pll_80m" ,"sys1_pll_out" ,1 ,10 ); + hws[IMX8MQ_SYS1_PLL_100M ] =imx_clk_hw_fixed_factor ("sys1_pll_100m" ,"sys1_pll_out" ,1 ,8 ); + hws[IMX8MQ_SYS1_PLL_133M ] =imx_clk_hw_fixed_factor ("sys1_pll_133m" ,"sys1_pll_out" ,1 ,6 ); + hws[IMX8MQ_SYS1_PLL_160M ] =imx_clk_hw_fixed_factor ("sys1_pll_160m" ,"sys1_pll_out" ,1 ,5 ); + hws[IMX8MQ_SYS1_PLL_200M ] =imx_clk_hw_fixed_factor ("sys1_pll_200m" ,"sys1_pll_out" ,1 ,4 ); + hws[IMX8MQ_SYS1_PLL_266M ] =imx_clk_hw_fixed_factor ("sys1_pll_266m" ,"sys1_pll_out" ,1 ,3 ); + hws[IMX8MQ_SYS1_PLL_400M ] =imx_clk_hw_fixed_factor ("sys1_pll_400m" ,"sys1_pll_out" ,1 ,2 ); + hws[IMX8MQ_SYS1_PLL_800M ] =imx_clk_hw_fixed_factor ("sys1_pll_800m" ,"sys1_pll_out" ,1 ,1 );/* SYS PLL2 fixed output */ - hws[IMX8MQ_SYS2_PLL_50M_CG ] =imx_clk_hw_gate ("sys2_pll_50m_cg" ,"sys2_pll_out" , base +0x3c ,9 ); - hws[IMX8MQ_SYS2_PLL_100M_CG ] =imx_clk_hw_gate ("sys2_pll_100m_cg" ,"sys2_pll_out" , base +0x3c ,11 ); - hws[IMX8MQ_SYS2_PLL_125M_CG ] =imx_clk_hw_gate ("sys2_pll_125m_cg" ,"sys2_pll_out" , base +0x3c ,13 ); - hws[IMX8MQ_SYS2_PLL_166M_CG ] =imx_clk_hw_gate ("sys2_pll_166m_cg" ,"sys2_pll_out" , base +0x3c ,15 ); - hws[IMX8MQ_SYS2_PLL_200M_CG ] =imx_clk_hw_gate ("sys2_pll_200m_cg" ,"sys2_pll_out" , base +0x3c ,17 ); - hws[IMX8MQ_SYS2_PLL_250M_CG ] =imx_clk_hw_gate ("sys2_pll_250m_cg" ,"sys2_pll_out" , base +0x3c ,19 ); - hws[IMX8MQ_SYS2_PLL_333M_CG ] =imx_clk_hw_gate ("sys2_pll_333m_cg" ,"sys2_pll_out" , base +0x3c ,21 ); - hws[IMX8MQ_SYS2_PLL_500M_CG ] =imx_clk_hw_gate ("sys2_pll_500m_cg" ,"sys2_pll_out" , base +0x3c ,23 ); - hws[IMX8MQ_SYS2_PLL_1000M_CG ] =imx_clk_hw_gate ("sys2_pll_1000m_cg" ,"sys2_pll_out" , base +0x3c ,25 ); - - hws[IMX8MQ_SYS2_PLL_50M ] =imx_clk_hw_fixed_factor ("sys2_pll_50m" ,"sys2_pll_50m_cg" ,1 ,20 ); - hws[IMX8MQ_SYS2_PLL_100M ] =imx_clk_hw_fixed_factor ("sys2_pll_100m" ,"sys2_pll_100m_cg" ,1 ,10 ); - hws[IMX8MQ_SYS2_PLL_125M ] =imx_clk_hw_fixed_factor ("sys2_pll_125m" ,"sys2_pll_125m_cg" ,1 ,8 ); - hws[IMX8MQ_SYS2_PLL_166M ] =imx_clk_hw_fixed_factor ("sys2_pll_166m" ,"sys2_pll_166m_cg" ,1 ,6 ); - hws[IMX8MQ_SYS2_PLL_200M ] =imx_clk_hw_fixed_factor ("sys2_pll_200m" ,"sys2_pll_200m_cg" ,1 ,5 ); - hws[IMX8MQ_SYS2_PLL_250M ] =imx_clk_hw_fixed_factor ("sys2_pll_250m" ,"sys2_pll_250m_cg" ,1 ,4 ); - hws[IMX8MQ_SYS2_PLL_333M ] =imx_clk_hw_fixed_factor ("sys2_pll_333m" ,"sys2_pll_333m_cg" ,1 ,3 ); - hws[IMX8MQ_SYS2_PLL_500M ] =imx_clk_hw_fixed_factor ("sys2_pll_500m" ,"sys2_pll_500m_cg" ,1 ,2 ); - hws[IMX8MQ_SYS2_PLL_1000M ] =imx_clk_hw_fixed_factor ("sys2_pll_1000m" ,"sys2_pll_1000m_cg" ,1 ,1 ); + hws[IMX8MQ_SYS2_PLL_50M ] =imx_clk_hw_fixed_factor ("sys2_pll_50m" ,"sys2_pll_out" ,1 ,20 ); + hws[IMX8MQ_SYS2_PLL_100M ] =imx_clk_hw_fixed_factor ("sys2_pll_100m" ,"sys2_pll_out" ,1 ,10 ); + hws[IMX8MQ_SYS2_PLL_125M ] =imx_clk_hw_fixed_factor ("sys2_pll_125m" ,"sys2_pll_out" ,1 ,8 ); + hws[IMX8MQ_SYS2_PLL_166M ] =imx_clk_hw_fixed_factor ("sys2_pll_166m" ,"sys2_pll_out" ,1 ,6 ); + hws[IMX8MQ_SYS2_PLL_200M ] =imx_clk_hw_fixed_factor ("sys2_pll_200m" ,"sys2_pll_out" ,1 ,5 ); + hws[IMX8MQ_SYS2_PLL_250M ] =imx_clk_hw_fixed_factor ("sys2_pll_250m" ,"sys2_pll_out" ,1 ,4 ); + hws[IMX8MQ_SYS2_PLL_333M ] =imx_clk_hw_fixed_factor ("sys2_pll_333m" ,"sys2_pll_out" ,1 ,3 ); + hws[IMX8MQ_SYS2_PLL_500M ] =imx_clk_hw_fixed_factor ("sys2_pll_500m" ,"sys2_pll_out" ,1 ,2 ); + hws[IMX8MQ_SYS2_PLL_1000M ] =imx_clk_hw_fixed_factor ("sys2_pll_1000m" ,"sys2_pll_out" ,1 ,1 ); hws[IMX8MQ_CLK_MON_AUDIO_PLL1_DIV ] =imx_clk_hw_divider ("audio_pll1_out_monitor" ,"audio_pll1_bypass" , base +0x78 ,0 ,3 ); hws[IMX8MQ_CLK_MON_AUDIO_PLL2_DIV ] =imx_clk_hw_divider ("audio_pll2_out_monitor" ,"audio_pll2_bypass" , base +0x78 ,4 ,3 );
include/dt-bindings/clock/imx8mq-clock.h +0 -19
@@ -405,25 +405,6 @@#define IMX8MQ_VIDEO2_PLL1_REF_SEL 266 -#define IMX8MQ_SYS1_PLL_40M_CG 267 -#define IMX8MQ_SYS1_PLL_80M_CG 268 -#define IMX8MQ_SYS1_PLL_100M_CG 269 -#define IMX8MQ_SYS1_PLL_133M_CG 270 -#define IMX8MQ_SYS1_PLL_160M_CG 271 -#define IMX8MQ_SYS1_PLL_200M_CG 272 -#define IMX8MQ_SYS1_PLL_266M_CG 273 -#define IMX8MQ_SYS1_PLL_400M_CG 274 -#define IMX8MQ_SYS1_PLL_800M_CG 275 -#define IMX8MQ_SYS2_PLL_50M_CG 276 -#define IMX8MQ_SYS2_PLL_100M_CG 277 -#define IMX8MQ_SYS2_PLL_125M_CG 278 -#define IMX8MQ_SYS2_PLL_166M_CG 279 -#define IMX8MQ_SYS2_PLL_200M_CG 280 -#define IMX8MQ_SYS2_PLL_250M_CG 281 -#define IMX8MQ_SYS2_PLL_333M_CG 282 -#define IMX8MQ_SYS2_PLL_500M_CG 283 -#define IMX8MQ_SYS2_PLL_1000M_CG 284 -#define IMX8MQ_CLK_GPU_CORE 285#define IMX8MQ_CLK_GPU_SHADER 286#define IMX8MQ_CLK_M4_CORE 287
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 458/800 wcn36xx: Move hal_buf allocation to devm_kmalloc in probe
In reply to Greg Kroah-HartmanFrom: Bryan O'Donoghue <[email protected]>
[ Upstream commit ef48667557c53d4b51a1ee3090eab7699324c9de ]
Right now wcn->hal_buf is allocated in wcn36xx_start(). This is a problem since we should have setup all of the buffers we required by the time ieee80211_register_hw() is called.
struct ieee80211_ops callbacks may run prior to mac_start() and therefore wcn->hal_buf must be initialized.
This is easily remediated by moving the allocation to probe() taking the opportunity to tidy up freeing memory by using devm_kmalloc().
--- drivers/net/wireless/ath/wcn36xx/main.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-)
drivers/net/wireless/ath/wcn36xx/main.c +8 -13
@@ -293,23 +293,16 @@ static int wcn36xx_start(struct ieee80211_hw *hw) goto out_free_dxe_pool; } - wcn->hal_buf =kmalloc (WCN36XX_HAL_BUF_SIZE ,GFP_KERNEL ); -if (!wcn->hal_buf) { -wcn36xx_err ("Failed to allocate smd buf\n" ); - ret = -ENOMEM ; - goto out_free_dxe_ctl; - } - ret =wcn36xx_smd_load_nv (wcn);if (ret) {wcn36xx_err ("Failed to push NV to chip\n" ); - goto out_free_smd_buf; + goto out_free_dxe_ctl; } ret =wcn36xx_smd_start (wcn);if (ret) {wcn36xx_err ("Failed to start chip\n" ); - goto out_free_smd_buf; + goto out_free_dxe_ctl; }if (!wcn36xx_is_fw_version (wcn,1 ,2 ,2 ,24 )) {
@@ -336,8 +329,6 @@ static int wcn36xx_start(struct ieee80211_hw *hw) out_smd_stop:wcn36xx_smd_stop (wcn); -out_free_smd_buf: -kfree (wcn->hal_buf); out_free_dxe_ctl:wcn36xx_dxe_free_ctl_blks (wcn); out_free_dxe_pool:
@@ -372,8 +363,6 @@ static void wcn36xx_stop(struct ieee80211_hw *hw)wcn36xx_dxe_free_mem_pools (wcn);wcn36xx_dxe_free_ctl_blks (wcn); - -kfree (wcn->hal_buf); }static void wcn36xx_change_ps (struct wcn36xx *wcn,bool enable)
@@ -1401,6 +1390,12 @@ static int wcn36xx_probe(struct platform_device *pdev)mutex_init (&wcn->hal_mutex);mutex_init (&wcn->scan_lock); + wcn->hal_buf =devm_kmalloc (wcn->dev,WCN36XX_HAL_BUF_SIZE ,GFP_KERNEL ); +if (!wcn->hal_buf) { + ret = -ENOMEM ; + goto out_wq; + } + ret =dma_set_mask_and_coherent (wcn->dev,DMA_BIT_MASK (32 ));if (ret <0 ) {wcn36xx_err ("failed to set DMA mask: %d\n" , ret);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 459/800 net: wwan: Fix WWAN config symbols
In reply to Greg Kroah-Hartman[ Upstream commit 89212e160b81e778f829b89743570665810e3b13 ]
There is not strong reason to have both WWAN and WWAN_CORE symbols, Let's build the WWAN core framework when WWAN is selected, in the same way as for other subsystems.
This fixes issue with mhi_net selecting WWAN_CORE without WWAN and reported by kernel test robot:
Kconfig warnings: (for reference only)
WARNING: unmet direct dependencies detected for WWAN_CORE Depends on NETDEVICES && WWAN
Selected by
- MHI_NET && NETDEVICES && NET_CORE && MHI_BUS
--- drivers/net/Kconfig | 1 + drivers/net/wwan/Kconfig | 15 ++++++--------- drivers/net/wwan/Makefile | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-)
drivers/net/Kconfig +1 -0
@@ -431,6 +431,7 @@ config VSOCKMON config MHI_NET tristate "MHI network driver" depends on MHI_BUS + select WWAN help This is the network driver for MHI bus. It can be used with QCOM based WWAN modems (like SDX55). Say Y or M.
drivers/net/wwan/Kconfig +6 -9
@@ -3,15 +3,9 @@ # Wireless WAN device configuration # -menuconfig WWAN - bool "Wireless WAN" - help - This section contains Wireless WAN configuration for WWAN framework - and drivers. - -if WWAN +menu "Wireless WAN" -config WWAN_CORE +config WWAN tristate "WWAN Driver Core" help Say Y here if you want to use the WWAN driver core. This driver
@@ -20,9 +14,10 @@ config WWAN_CORE To compile this driver as a module, choose M here: the module will be called wwan. +if WWAN + config MHI_WWAN_CTRL tristate "MHI WWAN control driver for QCOM-based PCIe modems" - select WWAN_CORE depends on MHI_BUS help MHI WWAN CTRL allows QCOM-based PCIe modems to expose different modem
@@ -35,3 +30,5 @@ config MHI_WWAN_CTRL called mhi_wwan_ctrl. endif # WWAN + +endmenu
drivers/net/wwan/Makefile +1 -1
@@ -3,7 +3,7 @@ # Makefile for the Linux WWAN device drivers. # -obj-$(CONFIG_WWAN_CORE) += wwan.o +obj-$(CONFIG_WWAN) += wwan.o wwan-objs += wwan_core.o obj-$(CONFIG_MHI_WWAN_CTRL) += mhi_wwan_ctrl.o
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 460/800 drm/i915/selftests: Reorder tasklet_disable vs local_bh_disable
In reply to Greg Kroah-HartmanFrom: Chris Wilson <[email protected]>
[ Upstream commit 2328e1b35ac2bb003236c3268aabe456ffab8b56 ]
Due to a change in requirements that disallows tasklet_disable() being called from atomic context, rearrange the selftest to avoid doing so.
<3> [324.942939] BUG: sleeping function called from invalid context at kernel/softirq.c:888
<3> [324.942952] in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 5601, name: i915_selftest
<4> [324.942960] 1 lock held by i915_selftest/5601:
<4> [324.942963] #0: ffff888101d19240 (&dev->mutex){....}-{3:3}, at: device_driver_attach+0x18/0x50
<3> [324.942987] Preemption disabled at:
<3> [324.942990] [<ffffffffa026fbd2>] live_hold_reset.part.65+0xc2/0x2f0 [i915]
<4> [324.943255] CPU: 0 PID: 5601 Comm: i915_selftest Tainted: G U 5.13.0-rc5-CI-CI_DRM_10197+ #1
<4> [324.943259] Hardware name: Intel Corp. Geminilake/GLK RVP2 LP4SD (07), BIOS GELKRVPA.X64.0062.B30.1708222146 08/22/2017 <4> [324.943263] Call Trace:
<4> [324.943267] dump_stack+0x7f/0xad <4> [324.943276] ___might_sleep.cold.123+0xf2/0x106 <4> [324.943286] tasklet_unlock_wait+0x2e/0xb0 <4> [324.943291] ? ktime_get_raw+0x81/0x120 <4> [324.943305] live_hold_reset.part.65+0x1ab/0x2f0 [i915] <4> [324.943500] __i915_subtests.cold.7+0x42/0x92 [i915] <4> [324.943723] ? __i915_live_teardown+0x50/0x50 [i915] <4> [324.943922] ? __intel_gt_live_setup+0x30/0x30 [i915]
--- drivers/gpu/drm/i915/gt/selftest_execlists.c | 55 ++++++++++++-------- 1 file changed, 32 insertions(+), 23 deletions(-)
drivers/gpu/drm/i915/gt/selftest_execlists.c +32 -23
@@ -551,6 +551,32 @@ static int live_pin_rewind(void *arg)return err; } +static int engine_lock_reset_tasklet (struct intel_engine_cs *engine) +{ +tasklet_disable (&engine->execlists.tasklet); +local_bh_disable (); + +if (test_and_set_bit (I915_RESET_ENGINE + engine->id, + &engine->gt->reset.flags)) { +local_bh_enable (); +tasklet_enable (&engine->execlists.tasklet); + +intel_gt_set_wedged (engine->gt); +return -EBUSY ; + } + +return 0 ; +} + +static void engine_unlock_reset_tasklet (struct intel_engine_cs *engine) +{ +clear_and_wake_up_bit (I915_RESET_ENGINE + engine->id, + &engine->gt->reset.flags); + +local_bh_enable (); +tasklet_enable (&engine->execlists.tasklet); +} +static int live_hold_reset (void *arg) {struct intel_gt *gt = arg;
@@ -598,15 +624,9 @@ static int live_hold_reset(void *arg)/* We have our request executing, now remove it and reset */ -local_bh_disable (); -if (test_and_set_bit (I915_RESET_ENGINE + id, - >->reset.flags)) { -local_bh_enable (); -intel_gt_set_wedged (gt); - err = -EBUSY ; + err =engine_lock_reset_tasklet (engine); +if (err) goto out; - } -tasklet_disable (&engine->execlists.tasklet); engine->execlists.tasklet.callback (&engine->execlists.tasklet);GEM_BUG_ON (execlists_active (&engine->execlists) != rq);
@@ -618,10 +638,7 @@ static int live_hold_reset(void *arg)__intel_engine_reset_bh (engine,NULL );GEM_BUG_ON (rq->fence.error != -EIO ); -tasklet_enable (&engine->execlists.tasklet); -clear_and_wake_up_bit (I915_RESET_ENGINE + id, - >->reset.flags); -local_bh_enable (); +engine_unlock_reset_tasklet (engine);/* Check that we do not resubmit the held request */ if (!i915_request_wait (rq,0 ,HZ /5 )) {
@@ -4585,15 +4602,9 @@ static int reset_virtual_engine(struct intel_gt *gt,GEM_BUG_ON (engine == ve->engine);/* Take ownership of the reset and tasklet */ -local_bh_disable (); -if (test_and_set_bit (I915_RESET_ENGINE + engine->id, - >->reset.flags)) { -local_bh_enable (); -intel_gt_set_wedged (gt); - err = -EBUSY ; + err =engine_lock_reset_tasklet (engine); +if (err) goto out_heartbeat; - } -tasklet_disable (&engine->execlists.tasklet); engine->execlists.tasklet.callback (&engine->execlists.tasklet);GEM_BUG_ON (execlists_active (&engine->execlists) != rq);
@@ -4612,9 +4623,7 @@ static int reset_virtual_engine(struct intel_gt *gt,GEM_BUG_ON (rq->fence.error != -EIO );/* Release our grasp on the engine, letting CS flow again */ -tasklet_enable (&engine->execlists.tasklet); -clear_and_wake_up_bit (I915_RESET_ENGINE + engine->id, >->reset.flags); -local_bh_enable (); +engine_unlock_reset_tasklet (engine);/* Check that we do not resubmit the held request */ i915_request_get (rq);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 461/800 ssb: Fix error return code in ssb_bus_scan()
In reply to Greg Kroah-HartmanFrom: Zhen Lei <[email protected]>
[ Upstream commit 77a0989baa427dbd242c5784d05a53ca3d197d43 ]
Fix to return -EINVAL from the error handling case instead of 0, as done elsewhere in this function.
--- drivers/ssb/scan.c | 1 + 1 file changed, 1 insertion(+)
drivers/ssb/scan.c +1 -0
@@ -325,6 +325,7 @@ int ssb_bus_scan(struct ssb_bus *bus,if (bus->nr_devices >ARRAY_SIZE (bus->devices)) {pr_err ("More than %d ssb cores found (%d)\n" ,SSB_MAX_NR_CORES , bus->nr_devices); + err = -EINVAL ; goto err_unmap; }if (bus->bustype ==SSB_BUSTYPE_SSB ) {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 462/800 brcmfmac: fix setting of station info chains bitmask
In reply to Greg Kroah-HartmanFrom: Alvin Šipraga <[email protected]>
[ Upstream commit feb45643762172110cb3a44f99dd54304f33b711 ]
The sinfo->chains field is a bitmask for filled values in chain_signal and chain_signal_avg, not a count. Treat it as such so that the driver can properly report per-chain RSSI information.
Before (MIMO mode):
$ iw dev wlan0 station dump
...
signal: -51 [-51] dBmAfter (MIMO mode):
$ iw dev wlan0 station dump
...
signal: -53 [-53, -54] dBm--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +1 -2
@@ -2838,6 +2838,7 @@ brcmf_cfg80211_get_station(struct wiphy *wiphy, struct net_device *ndev, count_rssi =0 ;for (i =0 ; i <BRCMF_ANT_MAX ; i++) {if (sta_info_le.rssi[i]) { + sinfo->chains |=BIT (count_rssi); sinfo->chain_signal_avg[count_rssi] = sta_info_le.rssi[i]; sinfo->chain_signal[count_rssi] =
@@ -2848,8 +2849,6 @@ brcmf_cfg80211_get_station(struct wiphy *wiphy, struct net_device *ndev, }if (count_rssi) { sinfo->filled |=BIT_ULL (NL80211_STA_INFO_CHAIN_SIGNAL ); - sinfo->chains = count_rssi; - sinfo->filled |=BIT_ULL (NL80211_STA_INFO_SIGNAL ); total_rssi /= count_rssi; sinfo->signal = total_rssi;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 463/800 brcmfmac: correctly report average RSSI in station info
In reply to Greg Kroah-HartmanFrom: Alvin Šipraga <[email protected]>
[ Upstream commit 9a1590934d9a02e570636432b93052c0c035f31f ]
The rx_lastpkt_rssi field provided by the firmware is suitable for NL80211_STA_INFO_{SIGNAL,CHAIN_SIGNAL}, while the rssi field is an average. Fix up the assignments and set the correct STA_INFO bits. This lets userspace know that the average RSSI is part of the station info.
--- .../broadcom/brcm80211/brcmfmac/cfg80211.c | 36 ++++++++++--------- 1 file changed, 20 insertions(+), 16 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +20 -16
@@ -2767,8 +2767,9 @@ brcmf_cfg80211_get_station(struct wiphy *wiphy, struct net_device *ndev,struct brcmf_sta_info_le sta_info_le;u32 sta_flags;u32 is_tdls_peer; -s32 total_rssi; -s32 count_rssi; +s32 total_rssi_avg =0 ; +s32 total_rssi =0 ; +s32 count_rssi =0 ;int rssi;u32 i;
@@ -2834,24 +2835,27 @@ brcmf_cfg80211_get_station(struct wiphy *wiphy, struct net_device *ndev, sinfo->filled |=BIT_ULL (NL80211_STA_INFO_RX_BYTES ); sinfo->rx_bytes =le64_to_cpu (sta_info_le.rx_tot_bytes); } - total_rssi =0 ; - count_rssi =0 ;for (i =0 ; i <BRCMF_ANT_MAX ; i++) { -if (sta_info_le.rssi[i]) { - sinfo->chains |=BIT (count_rssi); - sinfo->chain_signal_avg[count_rssi] = - sta_info_le.rssi[i]; - sinfo->chain_signal[count_rssi] = - sta_info_le.rssi[i]; - total_rssi += sta_info_le.rssi[i]; - count_rssi++; - } +if (sta_info_le.rssi[i] ==0 || + sta_info_le.rx_lastpkt_rssi[i] ==0 ) +continue ; + sinfo->chains |=BIT (count_rssi); + sinfo->chain_signal[count_rssi] = + sta_info_le.rx_lastpkt_rssi[i]; + sinfo->chain_signal_avg[count_rssi] = + sta_info_le.rssi[i]; + total_rssi += sta_info_le.rx_lastpkt_rssi[i]; + total_rssi_avg += sta_info_le.rssi[i]; + count_rssi++; }if (count_rssi) { - sinfo->filled |=BIT_ULL (NL80211_STA_INFO_CHAIN_SIGNAL ); sinfo->filled |=BIT_ULL (NL80211_STA_INFO_SIGNAL ); - total_rssi /= count_rssi; - sinfo->signal = total_rssi; + sinfo->filled |=BIT_ULL (NL80211_STA_INFO_SIGNAL_AVG ); + sinfo->filled |=BIT_ULL (NL80211_STA_INFO_CHAIN_SIGNAL ); + sinfo->filled |= +BIT_ULL (NL80211_STA_INFO_CHAIN_SIGNAL_AVG ); + sinfo->signal = total_rssi / count_rssi; + sinfo->signal_avg = total_rssi_avg / count_rssi; }else if (test_bit (BRCMF_VIF_STATUS_CONNECTED , &ifp->vif->sme_state)) {memset (&scb_val,0 ,sizeof (scb_val));
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 464/800 brcmfmac: Fix a double-free in brcmf_sdio_bus_reset
In reply to Greg Kroah-HartmanFrom: Tong Tiangen <[email protected]>
[ Upstream commit 7ea7a1e05c7ff5ffc9f9ec1f0849f6ceb7fcd57c ]
brcmf_sdiod_remove has been called inside brcmf_sdiod_probe when fails, so there's no need to call another one. Otherwise, sdiodev->freezer would be double freed.
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +0 -1
@@ -4162,7 +4162,6 @@ static int brcmf_sdio_bus_reset(struct device *dev)if (ret) {brcmf_err ("Failed to probe after sdio device reset: ret %d\n" , ret); -brcmf_sdiod_remove (sdiodev); }return ret;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 465/800 brcmfmac: Delete second brcm folder hierarchy
In reply to Greg Kroah-HartmanFrom: Matthias Brugger <[email protected]>
[ Upstream commit 4a26aafe4886a4ec9965171c280ce16df30dc362 ]
BRCMF_FW_DEFAULT_PATH already defines the brcm folder, delete the second folder to match with Linux firmware repository layout.
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +2 -2
@@ -626,8 +626,8 @@ BRCMF_FW_DEF(4373, "brcmfmac4373-sdio");BRCMF_FW_DEF (43012 ,"brcmfmac43012-sdio" );/* firmware config files */ -MODULE_FIRMWARE (BRCMF_FW_DEFAULT_PATH "brcm/brcmfmac*-sdio.*.txt" ); -MODULE_FIRMWARE (BRCMF_FW_DEFAULT_PATH "brcm/brcmfmac*-pcie.*.txt" ); +MODULE_FIRMWARE (BRCMF_FW_DEFAULT_PATH "brcmfmac*-sdio.*.txt" ); +MODULE_FIRMWARE (BRCMF_FW_DEFAULT_PATH "brcmfmac*-pcie.*.txt" );static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = {BRCMF_FW_ENTRY (BRCM_CC_43143_CHIP_ID ,0xFFFFFFFF ,43143 ),
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 466/800 brcmsmac: mac80211_if: Fix a resource leak in an error handling path
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 9a25344d5177c2b9285532236dc3d10a091f39a8 ]
If 'brcms_attach()' fails, we must undo the previous 'ieee80211_alloc_hw()' as already done in the remove function.
--- .../wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c +7 -1
@@ -1220,6 +1220,7 @@ static int brcms_bcma_probe(struct bcma_device *pdev) {struct brcms_info *wl;struct ieee80211_hw *hw; +int ret; dev_info(&pdev->dev, "mfg %x core %x rev %d class %d irq %d\n", pdev->id.manuf, pdev->id.id, pdev->id.rev, pdev->id.class,
@@ -1244,11 +1245,16 @@ static int brcms_bcma_probe(struct bcma_device *pdev) wl =brcms_attach (pdev);if (!wl) {pr_err ("%s: brcms_attach failed!\n" , __func__); -return -ENODEV ; + ret = -ENODEV ; + goto err_free_ieee80211; }brcms_led_register (wl);return 0 ; + +err_free_ieee80211: +ieee80211_free_hw (hw); +return ret; }static int brcms_suspend (struct bcma_device *pdev)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 467/800 cw1200: Revert unnecessary patches that fix unreal use-after-free bugs
In reply to Greg Kroah-HartmanFrom: Hang Zhang <[email protected]>
[ Upstream commit 3f60f4685699aa6006e58e424637e8e413e0a94d ]
A previous commit 4f68ef64cd7f ("cw1200: Fix concurrency use-after-free bugs in cw1200_hw_scan()") tried to fix a seemingly use-after-free bug between cw1200_bss_info_changed() and cw1200_hw_scan(), where the former frees a sk_buff pointed to by frame.skb, and the latter accesses the sk_buff pointed to by frame.skb. However, this issue should be a false alarm because:
(1) "frame.skb" is not a shared variable between the above two functions, because "frame" is a local function variable, each of the two functions has its own local "frame" - they just happen to have the same variable name.
(2) the sk_buff(s) pointed to by these two "frame.skb" are also two different object instances, they are individually allocated by different dev_alloc_skb() within the two above functions. To free one object instance will not invalidate the access of another different one.
Based on these facts, the previous commit should be unnecessary. Moreover, it also introduced a missing unlock which was addressed in a subsequent commit 51c8d24101c7 ("cw1200: fix missing unlock on error in cw1200_hw_scan()"). Now that the original use-after-free is unreal, these two commits should be reverted. This patch performs the reversion.
--- drivers/net/wireless/st/cw1200/scan.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)
drivers/net/wireless/st/cw1200/scan.c +7 -10
@@ -75,30 +75,27 @@ int cw1200_hw_scan(struct ieee80211_hw *hw,if (req->n_ssids >WSM_SCAN_MAX_NUM_OF_SSIDS )return -EINVAL ; -/* will be unlocked in cw1200_scan_work() */ -down (&priv->scan.lock); -mutex_lock (&priv->conf_mutex); - frame.skb =ieee80211_probereq_get (hw, priv->vif->addr,NULL ,0 , req->ie_len); -if (!frame.skb) { -mutex_unlock (&priv->conf_mutex); -up (&priv->scan.lock); +if (!frame.skb)return -ENOMEM ; - }if (req->ie_len)skb_put_data (frame.skb, req->ie, req->ie_len); +/* will be unlocked in cw1200_scan_work() */ +down (&priv->scan.lock); +mutex_lock (&priv->conf_mutex); + ret =wsm_set_template_frame (priv, &frame);if (!ret) {/* Host want to be the probe responder. */ ret =wsm_set_probe_responder (priv, true); }if (ret) { -dev_kfree_skb (frame.skb);mutex_unlock (&priv->conf_mutex);up (&priv->scan.lock); +dev_kfree_skb (frame.skb);return ret; }
@@ -120,8 +117,8 @@ int cw1200_hw_scan(struct ieee80211_hw *hw, ++priv->scan.n_ssids; } -dev_kfree_skb (frame.skb);mutex_unlock (&priv->conf_mutex); +dev_kfree_skb (frame.skb);queue_work (priv->workqueue, &priv->scan.work);return 0 ; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 468/800 ath11k: Fix an error handling path in ath11k_core_fetch_board_data_api_n()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 515bda1d1e51c64edf2a384a58801f85a80a3f2d ]
All error paths but this one 'goto err' in order to release some resources.
Fix this.
--- drivers/net/wireless/ath/ath11k/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath11k/core.c +2 -1
@@ -488,7 +488,8 @@ static int ath11k_core_fetch_board_data_api_n(struct ath11k_base *ab,if (len <ALIGN (ie_len,4 )) {ath11k_err (ab,"invalid length for board ie_id %d ie_len %zu len %zu\n" , ie_id, ie_len, len); -return -EINVAL ; + ret = -EINVAL ; + goto err; }switch (ie_id) {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 469/800 ath10k: Fix an error code in ath10k_add_interface()
In reply to Greg Kroah-HartmanFrom: Yang Li <[email protected]>
[ Upstream commit e9ca70c735ce66fc6a0e02c8b6958434f74ef8de ]
When the code execute this if statement, the value of ret is 0. However, we can see from the ath10k_warn() log that the value of ret should be -EINVAL.
Clean up smatch warning:
drivers/net/wireless/ath/ath10k/mac.c:5596 ath10k_add_interface() warn:
missing error code 'ret'
--- drivers/net/wireless/ath/ath10k/mac.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/ath/ath10k/mac.c +1 -0
@@ -5592,6 +5592,7 @@ static int ath10k_add_interface(struct ieee80211_hw *hw,if (arvif->nohwcrypt && !test_bit (ATH10K_FLAG_RAW_MODE , &ar->dev_flags)) { + ret = -EINVAL ;ath10k_warn (ar,"cryptmode module param needed for sw crypto\n" ); goto err; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 470/800 ath11k: send beacon template after vdev_start/restart during csa
In reply to Greg Kroah-HartmanFrom: Seevalamuthu Mariappan <[email protected]>
[ Upstream commit 979ebc54cf13bd1e3eb6e21766d208d5de984fb8 ]
Firmware has added assert if beacon template is received after vdev_down. Firmware expects beacon template after vdev_start and before vdev_up. This change is needed to support MBSSID EMA cases in firmware.
Hence, Change the sequence in ath11k as expected from firmware. This new change is not causing any issues with older firmware.
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.5.0.1.r3-00011-QCAHKSWPL_SILICONZ-1
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.5.0.1.r4-00008-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath11k/mac.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/net/wireless/ath/ath11k/mac.c +5 -5
@@ -5379,11 +5379,6 @@ ath11k_mac_update_vif_chan(struct ath11k *ar,if (WARN_ON (!arvif->is_up))continue ; - ret =ath11k_mac_setup_bcn_tmpl (arvif); -if (ret) -ath11k_warn (ab,"failed to update bcn tmpl during csa: %d\n" , - ret); - ret =ath11k_mac_vdev_restart (arvif, &vifs[i].new_ctx->def);if (ret) { ath11k_warn(ab, "failed to restart vdev %d: %d\n",
@@ -5391,6 +5386,11 @@ ath11k_mac_update_vif_chan(struct ath11k *ar,continue ; } + ret =ath11k_mac_setup_bcn_tmpl (arvif); +if (ret) +ath11k_warn (ab,"failed to update bcn tmpl during csa: %d\n" , + ret); + ret =ath11k_wmi_vdev_up (arvif->ar, arvif->vdev_id, arvif->aid, arvif->bssid);if (ret) {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 471/800 wil6210: remove erroneous wiphy locking
In reply to Greg Kroah-HartmanFrom: Johannes Berg <[email protected]>
[ Upstream commit 8f78caa2264ece71c2e207cba023f28ab6665138 ]
We already hold the wiphy lock in all cases when we get here, so this would deadlock, remove the erroneous locking.
--- drivers/net/wireless/ath/wil6210/cfg80211.c | 2 -- 1 file changed, 2 deletions(-)
drivers/net/wireless/ath/wil6210/cfg80211.c +0 -2
@@ -2842,9 +2842,7 @@ void wil_p2p_wdev_free(struct wil6210_priv *wil) wil->radio_wdev = wil->main_ndev->ieee80211_ptr;mutex_unlock (&wil->vif_mutex);if (p2p_wdev) { -wiphy_lock (wil->wiphy);cfg80211_unregister_wdev (p2p_wdev); -wiphy_unlock (wil->wiphy);kfree (p2p_wdev); } }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 472/800 netlabel: Fix memory leak in netlbl_mgmt_add_common
In reply to Greg Kroah-HartmanFrom: Liu Shixin <[email protected]>
[ Upstream commit b8f6b0522c298ae9267bd6584e19b942a0636910 ]
Hulk Robot reported memory leak in netlbl_mgmt_add_common. The problem is non-freed map in case of netlbl_domhsh_add() failed.
BUG: memory leak
unreferenced object 0xffff888100ab7080 (size 96):
comm "syz-executor537", pid 360, jiffies 4294862456 (age 22.678s)
hex dump (first 32 bytes):
05 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
fe 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 ................
backtrace:
[<0000000008b40026>] netlbl_mgmt_add_common.isra.0+0xb2a/0x1b40
[<000000003be10950>] netlbl_mgmt_add+0x271/0x3c0
[<00000000c70487ed>] genl_family_rcv_msg_doit.isra.0+0x20e/0x320
[<000000001f2ff614>] genl_rcv_msg+0x2bf/0x4f0
[<0000000089045792>] netlink_rcv_skb+0x134/0x3d0
[<0000000020e96fdd>] genl_rcv+0x24/0x40
[<0000000042810c66>] netlink_unicast+0x4a0/0x6a0
[<000000002e1659f0>] netlink_sendmsg+0x789/0xc70
[<000000006e43415f>] sock_sendmsg+0x139/0x170
[<00000000680a73d7>] ____sys_sendmsg+0x658/0x7d0
[<0000000065cbb8af>] ___sys_sendmsg+0xf8/0x170
[<0000000019932b6c>] __sys_sendmsg+0xd3/0x190
[<00000000643ac172>] do_syscall_64+0x37/0x90
[<000000009b79d6dc>] entry_SYSCALL_64_after_hwframe+0x44/0xae--- net/netlabel/netlabel_mgmt.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
net/netlabel/netlabel_mgmt.c +10 -9
@@ -76,6 +76,7 @@ static const struct nla_policy netlbl_mgmt_genl_policy[NLBL_MGMT_A_MAX + 1] = {static int netlbl_mgmt_add_common (struct genl_info *info,struct netlbl_audit *audit_info) { +void *pmap =NULL ;int ret_val = -EINVAL ;struct netlbl_domaddr_map *addrmap =NULL ;struct cipso_v4_doi *cipsov4 =NULL ;
@@ -175,6 +176,7 @@ static int netlbl_mgmt_add_common(struct genl_info *info, ret_val = -ENOMEM ; goto add_free_addrmap; } + pmap = map; map->list.addr = addr->s_addr & mask->s_addr; map->list.mask = mask->s_addr; map->list.valid =1 ;
@@ -183,10 +185,8 @@ static int netlbl_mgmt_add_common(struct genl_info *info, map->def.cipso = cipsov4; ret_val =netlbl_af4list_add (&map->list, &addrmap->list4); -if (ret_val !=0 ) { -kfree (map); - goto add_free_addrmap; - } +if (ret_val !=0 ) + goto add_free_map; entry->family =AF_INET ; entry->def.type =NETLBL_NLTYPE_ADDRSELECT ;
@@ -223,6 +223,7 @@ static int netlbl_mgmt_add_common(struct genl_info *info, ret_val = -ENOMEM ; goto add_free_addrmap; } + pmap = map; map->list.addr = *addr; map->list.addr.s6_addr32[0 ] &= mask->s6_addr32[0 ]; map->list.addr.s6_addr32[1 ] &= mask->s6_addr32[1 ];
@@ -235,10 +236,8 @@ static int netlbl_mgmt_add_common(struct genl_info *info, map->def.calipso = calipso; ret_val =netlbl_af6list_add (&map->list, &addrmap->list6); -if (ret_val !=0 ) { -kfree (map); - goto add_free_addrmap; - } +if (ret_val !=0 ) + goto add_free_map; entry->family =AF_INET6 ; entry->def.type =NETLBL_NLTYPE_ADDRSELECT ;
@@ -248,10 +247,12 @@ static int netlbl_mgmt_add_common(struct genl_info *info, ret_val =netlbl_domhsh_add (entry, audit_info);if (ret_val !=0 ) - goto add_free_addrmap; + goto add_free_map;return 0 ; +add_free_map: +kfree (pmap); add_free_addrmap:kfree (addrmap); add_doi_put_def:
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 473/800 RDMA/mlx5: Dont add slave port to unaffiliated list
In reply to Greg Kroah-HartmanFrom: Leon Romanovsky <[email protected]>
[ Upstream commit 7ce6095e3bff8e20ce018b050960b527e298f7df ]
The mlx5_ib_bind_slave_port() doesn't remove multiport device from the unaffiliated list, but mlx5_ib_unbind_slave_port() did it. This unbalanced flow caused to the situation where mlx5_ib_unaffiliated_port_list was changed during iteration.
--- drivers/infiniband/hw/mlx5/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/infiniband/hw/mlx5/main.c +2 -2
@@ -3178,8 +3178,6 @@ static void mlx5_ib_unbind_slave_port(struct mlx5_ib_dev *ibdev, port->mp.mpi =NULL ; -list_add_tail (&mpi->list, &mlx5_ib_unaffiliated_port_list); -spin_unlock (&port->mp.mpi_lock); err =mlx5_nic_vport_unaffiliate_multiport (mpi->mdev);
@@ -3328,6 +3326,8 @@ static void mlx5_ib_cleanup_multiport_master(struct mlx5_ib_dev *dev)mlx5_ib_dbg (dev,"unbinding port_num: %u\n" , i +1 );mlx5_ib_unbind_slave_port (dev, dev->port[i].mp.mpi); +list_add_tail (&dev->port[i].mp.mpi->list, + &mlx5_ib_unaffiliated_port_list); } } }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 474/800 netfilter: nft_exthdr: check for IPv6 packet before further processing
In reply to Greg Kroah-HartmanFrom: Pablo Neira Ayuso <[email protected]>
[ Upstream commit cdd73cc545c0fb9b1a1f7b209f4f536e7990cff4 ]
ipv6_find_hdr() does not validate that this is an IPv6 packet. Add a sanity check for calling ipv6_find_hdr() to make sure an IPv6 packet is passed for parsing.
--- net/netfilter/nft_exthdr.c | 3 +++ 1 file changed, 3 insertions(+)
net/netfilter/nft_exthdr.c +3 -0
@@ -42,6 +42,9 @@ static void nft_exthdr_ipv6_eval(const struct nft_expr *expr,unsigned int offset =0 ;int err; +if (pkt->skb->protocol !=htons (ETH_P_IPV6 )) + goto err; + err =ipv6_find_hdr (pkt->skb, &offset, priv->type,NULL ,NULL );if (priv->flags &NFT_EXTHDR_F_PRESENT ) {nft_reg_store8 (dest, err >=0 );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 475/800 netfilter: nft_osf: check for TCP packet before further processing
In reply to Greg Kroah-HartmanFrom: Pablo Neira Ayuso <[email protected]>
[ Upstream commit 8f518d43f89ae00b9cf5460e10b91694944ca1a8 ]
The osf expression only supports for TCP packets, add a upfront sanity check to skip packet parsing if this is not a TCP packet.
--- net/netfilter/nft_osf.c | 5 +++++ 1 file changed, 5 insertions(+)
net/netfilter/nft_osf.c +5 -0
@@ -28,6 +28,11 @@ static void nft_osf_eval(const struct nft_expr *expr, struct nft_regs *regs,struct nf_osf_data data;struct tcphdr _tcph; +if (pkt->tprot !=IPPROTO_TCP ) { + regs->verdict.code =NFT_BREAK ; +return ; + } + tcp =skb_header_pointer (skb,ip_hdrlen (skb),sizeof (struct tcphdr ), &_tcph);if (!tcp) {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 476/800 netfilter: nft_tproxy: restrict support to TCP and UDP transport protocols
In reply to Greg Kroah-HartmanFrom: Pablo Neira Ayuso <[email protected]>
[ Upstream commit 52f0f4e178c757b3d356087376aad8bd77271828 ]
Add unfront check for TCP and UDP packets before performing further processing.
--- net/netfilter/nft_tproxy.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
net/netfilter/nft_tproxy.c +8 -1
@@ -30,6 +30,12 @@ static void nft_tproxy_eval_v4(const struct nft_expr *expr,__be16 tport =0 ;struct sock *sk; +if (pkt->tprot !=IPPROTO_TCP && + pkt->tprot !=IPPROTO_UDP ) { + regs->verdict.code =NFT_BREAK ; +return ; + } + hp =skb_header_pointer (skb,ip_hdrlen (skb),sizeof (_hdr), &_hdr);if (!hp) { regs->verdict.code =NFT_BREAK ;
@@ -91,7 +97,8 @@ static void nft_tproxy_eval_v6(const struct nft_expr *expr,memset (&taddr,0 ,sizeof (taddr)); -if (!pkt->tprot_set) { +if (pkt->tprot !=IPPROTO_TCP && + pkt->tprot !=IPPROTO_UDP ) { regs->verdict.code =NFT_BREAK ;return ; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 477/800 RDMA/rxe: Fix qp reference counting for atomic ops
In reply to Greg Kroah-HartmanFrom: Bob Pearson <[email protected]>
[ Upstream commit 15ae1375ea91ae2dee6f12d71a79d8c0a10a30bf ]
Currently the rdma_rxe driver attempts to protect atomic responder resources by taking a reference to the qp which is only freed when the resource is recycled for a new read or atomic operation. This means that in normal circumstances there is almost always an extra qp reference once an atomic operation has been executed which prevents cleaning up the qp and associated pd and cqs when the qp is destroyed.
This patch removes the call to rxe_add_ref() in send_atomic_ack() and the call to rxe_drop_ref() in free_rd_atomic_resource(). If the qp is destroyed while a peer is retrying an atomic op it will cause the operation to fail which is acceptable.
--- drivers/infiniband/sw/rxe/rxe_qp.c | 1 - drivers/infiniband/sw/rxe/rxe_resp.c | 2 -- 2 files changed, 3 deletions(-)
drivers/infiniband/sw/rxe/rxe_qp.c +0 -1
@@ -136,7 +136,6 @@ static void free_rd_atomic_resources(struct rxe_qp *qp)void free_rd_atomic_resource (struct rxe_qp *qp,struct resp_res *res) {if (res->type ==RXE_ATOMIC_MASK ) { -rxe_drop_ref (qp);kfree_skb (res->atomic.skb); }else if (res->type ==RXE_READ_MASK ) {if (res->read.mr)
drivers/infiniband/sw/rxe/rxe_resp.c +0 -2
@@ -966,8 +966,6 @@ static int send_atomic_ack(struct rxe_qp *qp, struct rxe_pkt_info *pkt, goto out; } -rxe_add_ref (qp); - res = &qp->resp.resources[qp->resp.res_head];free_rd_atomic_resource (qp, res);rxe_advance_resp_resource (qp);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 478/800 selftests/bpf: Whitelist test_progs.h from .gitignore
In reply to Greg Kroah-HartmanFrom: Daniel Xu <[email protected]>
[ Upstream commit 809ed84de8b3f2fd7b1d06efb94bf98fd318a7d7 ]
Somehow test_progs.h was being included by the existing rule:
/test_progs*
This is bad because:
1) test_progs.h is a checked in file
2) grep-like tools like ripgrep[0] respect gitignore and test_progs.h was being hidden from searches
[0]: https://github.com/BurntSushi/ripgrep
--- tools/testing/selftests/bpf/.gitignore | 1 + 1 file changed, 1 insertion(+)
tools/testing/selftests/bpf/.gitignore +1 -0
@@ -10,6 +10,7 @@ FEATURE-DUMP.libbpf fixdep test_dev_cgroup /test_progs* +!test_progs.h test_verifier_log feature test_sock
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 479/800 selftests/bpf: Fix ringbuf test fetching map FD
In reply to Greg Kroah-HartmanFrom: Andrii Nakryiko <[email protected]>
[ Upstream commit 0c38740c08962ab109267cb23f4a40df2ccf2bbf ]
Seems like 4d1b62986125 ("selftests/bpf: Convert few tests to light skeleton.") and 704e2beba23c ("selftests/bpf: Test ringbuf mmap read-only and read-write restrictions") were done independently on bpf and bpf-next trees and are in conflict with each other, despite a clean merge. Fix fetching of ringbuf's map_fd to use light skeleton properly.
--- tools/testing/selftests/bpf/prog_tests/ringbuf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/bpf/prog_tests/ringbuf.c +1 -1
@@ -102,7 +102,7 @@ void test_ringbuf(void)if (CHECK (err !=0 ,"skel_load" ,"skeleton load failed\n" )) goto cleanup; - rb_fd =bpf_map__fd (skel->maps.ringbuf); + rb_fd = skel->maps.ringbuf.map_fd;/* good read/write cons_pos */ mmap_ptr =mmap (NULL , page_size,PROT_READ |PROT_WRITE ,MAP_SHARED , rb_fd,0 );ASSERT_OK_PTR (mmap_ptr,"rw_cons_pos" );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 480/800 xsk: Fix missing validation for skb and unaligned mode
In reply to Greg Kroah-HartmanFrom: Magnus Karlsson <[email protected]>
[ Upstream commit 2f99619820c2269534eb2c0cde44870313c6d353 ]
Fix a missing validation of a Tx descriptor when executing in skb mode and the umem is in unaligned mode. A descriptor could point to a buffer straddling the end of the umem, thus effectively tricking the kernel to read outside the allowed umem region. This could lead to a kernel crash if that part of memory is not mapped.
In zero-copy mode, the descriptor validation code rejects such descriptors by checking a bit in the DMA address that tells us if the next page is physically contiguous or not. For the last page in the umem, this bit is not set, therefore any descriptor pointing to a packet straddling this last page boundary will be rejected. However, the skb path does not use this bit since it copies out data and can do so to two different pages. (It also does not have the array of DMA address, so it cannot even store this bit.) The code just returned that the packet is always physically contiguous. But this is unfortunately also returned for the last page in the umem, which means that packets that cross the end of the umem are being allowed, which they should not be.
Fix this by introducing a check for this in the SKB path only, not penalizing the zero-copy path.
--- include/net/xsk_buff_pool.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
include/net/xsk_buff_pool.h +7 -2
@@ -147,11 +147,16 @@ static inline bool xp_desc_crosses_non_contig_pg(struct xsk_buff_pool *pool, {bool cross_pg = (addr & (PAGE_SIZE -1 )) + len >PAGE_SIZE ; -if (pool->dma_pages_cnt && cross_pg) { +if (likely (!cross_pg)) +return false; + +if (pool->dma_pages_cnt) {return !(pool->dma_pages[addr >>PAGE_SHIFT ] &XSK_NEXT_PG_CONTIG_MASK ); } -return false; + +/* skb path */ +return addr + len > pool->addrs_cnt; }static inline u64 xp_aligned_extract_addr (struct xsk_buff_pool *pool,u64 addr)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 481/800 xsk: Fix broken Tx ring validation
In reply to Greg Kroah-HartmanFrom: Magnus Karlsson <[email protected]>
[ Upstream commit f654fae47e83e56b454fbbfd0af0a4f232e356d6 ]
Fix broken Tx ring validation for AF_XDP. The commit under the Fixes tag, fixed an off-by-one error in the validation but introduced another error. Descriptors are now let through even if they straddle a chunk boundary which they are not allowed to do in aligned mode. Worse is that they are let through even if they straddle the end of the umem itself, tricking the kernel to read data outside the allowed umem region which might or might not be mapped at all.
Fix this by reintroducing the old code, but subtract the length by one to fix the off-by-one error that the original patch was addressing. The test chunk != chunk_end makes sure packets do not straddle chunk boundraries. Note that packets of zero length are allowed in the interface, therefore the test if the length is non-zero.
--- net/xdp/xsk_queue.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
net/xdp/xsk_queue.h +7 -4
@@ -128,12 +128,15 @@ static inline bool xskq_cons_read_addr_unchecked(struct xsk_queue *q, u64 *addr)static inline bool xp_aligned_validate_desc (struct xsk_buff_pool *pool,struct xdp_desc *desc) { -u64 chunk; - -if (desc->len > pool->chunk_size) -return false; +u64 chunk, chunk_end; chunk =xp_aligned_extract_addr (pool, desc->addr); +if (likely (desc->len)) { + chunk_end =xp_aligned_extract_addr (pool, desc->addr + desc->len -1 ); +if (chunk != chunk_end) +return false; + } +if (chunk >= pool->addrs_cnt)return false;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 482/800 bpf: Fix libelf endian handling in resolv_btfids
In reply to Greg Kroah-HartmanFrom: Tony Ambardar <[email protected]>
[ Upstream commit 61e8aeda9398925f8c6fc290585bdd9727d154c4 ]
The vmlinux ".BTF_ids" ELF section is declared in btf_ids.h to hold a list of zero-filled BTF IDs, which is then patched at link-time with correct values by resolv_btfids. The section is flagged as "allocable" to preclude compression, but notably the section contents (BTF IDs) are untyped.
When patching the BTF IDs, resolve_btfids writes in host-native endianness and relies on libelf for any required translation on reading and updating vmlinux. However, since the type of the .BTF_ids section content defaults to ELF_T_BYTE (i.e. unsigned char), no translation occurs. This results in incorrect patched values when cross-compiling to non-native endianness, and can manifest as kernel Oops and test failures which are difficult to troubleshoot [1].
Explicitly set the type of patched data to ELF_T_WORD, the architecture- neutral ELF type corresponding to the u32 BTF IDs. This enables libelf to transparently perform any needed endian conversions.
--- tools/bpf/resolve_btfids/main.c | 3 +++ 1 file changed, 3 insertions(+)
tools/bpf/resolve_btfids/main.c +3 -0
@@ -655,6 +655,9 @@ static int symbols_patch(struct object *obj)if (sets_patch (obj))return -1 ; +/* Set type to ensure endian translation occurs. */ + obj->efile.idlist->d_type =ELF_T_WORD ; +elf_flagdata (obj->efile.idlist,ELF_C_SET ,ELF_F_DIRTY ); err =elf_update (obj->efile.elf,ELF_C_WRITE );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 483/800 RDMA/rtrs-srv: Set minimal max_send_wr and max_recv_wr
In reply to Greg Kroah-HartmanFrom: Jack Wang <[email protected]>
[ Upstream commit 5e91eabf66c854f16ca2e954e5c68939bc81601e ]
Currently rtrs when create_qp use a coarse numbers (bigger in general), which leads to hardware create more resources which only waste memory with no benefits.
For max_send_wr, we don't really need alway max_qp_wr size when creating qp, reduce it to cq_size.
For max_recv_wr, cq_size is enough.
With the patch when sess_queue_depth=128, per session (2 paths) memory consumption reduced from 188 MB to 65MB
When always_invalidate is enabled, we need send more wr, so treat it special.
--- drivers/infiniband/ulp/rtrs/rtrs-srv.c | 38 +++++++++++++++++--------- 1 file changed, 25 insertions(+), 13 deletions(-)
drivers/infiniband/ulp/rtrs/rtrs-srv.c +25 -13
@@ -1605,7 +1605,7 @@ static int create_con(struct rtrs_srv_sess *sess,struct rtrs_sess *s = &sess->s;struct rtrs_srv_con *con; -u32 cq_size, wr_queue_size; +u32 cq_size, max_send_wr, max_recv_wr, wr_limit;int err, cq_vector; con =kzalloc (sizeof (*con),GFP_KERNEL );
@@ -1626,30 +1626,42 @@ static int create_con(struct rtrs_srv_sess *sess,* All receive and all send (each requiring invalidate) * + 2 for drain and heartbeat */ - wr_queue_size =SERVICE_CON_QUEUE_DEPTH *3 +2 ; - cq_size = wr_queue_size; + max_send_wr =SERVICE_CON_QUEUE_DEPTH *2 +2 ; + max_recv_wr =SERVICE_CON_QUEUE_DEPTH +2 ; + cq_size = max_send_wr + max_recv_wr; }else { -/* -* If we have all receive requests posted and -* all write requests posted and each read request -* requires an invalidate request + drain -* and qp gets into error state. -*/ - cq_size = srv->queue_depth *3 +1 ;/* * In theory we might have queue_depth * 32 * outstanding requests if an unsafe global key is used * and we have queue_depth read requests each consisting * of 32 different addresses. div 3 for mlx5. */ - wr_queue_size = sess->s.dev->ib_dev->attrs.max_qp_wr /3 ; + wr_limit = sess->s.dev->ib_dev->attrs.max_qp_wr /3 ; +/* when always_invlaidate enalbed, we need linv+rinv+mr+imm */ +if (always_invalidate) + max_send_wr = +min_t (int, wr_limit, + srv->queue_depth * (1 +4 ) +1 ); +else + max_send_wr = +min_t (int, wr_limit, + srv->queue_depth * (1 +2 ) +1 ); + + max_recv_wr = srv->queue_depth +1 ; +/* +* If we have all receive requests posted and +* all write requests posted and each read request +* requires an invalidate request + drain +* and qp gets into error state. +*/ + cq_size = max_send_wr + max_recv_wr; } -atomic_set (&con->sq_wr_avail, wr_queue_size); +atomic_set (&con->sq_wr_avail, max_send_wr); cq_vector =rtrs_srv_get_next_cq_vector (sess);/* TODO: SOFTIRQ can be faster, but be careful with softirq context */ err =rtrs_cq_qp_create (&sess->s, &con->c,1 , cq_vector, cq_size, - wr_queue_size, wr_queue_size, + max_send_wr, max_recv_wr,IB_POLL_WORKQUEUE );if (err) {rtrs_err (s,"rtrs_cq_qp_create(), err: %d\n" , err);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 484/800 RDMA/hns: Clear extended doorbell info before using
In reply to Greg Kroah-HartmanFrom: Xi Wang <[email protected]>
[ Upstream commit 7e78dd816e458fbc2928a068d70009178d5d070d ]
Both of HIP08 and HIP09 require the extended doorbell information to be cleared before being used.
--- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 21 +++++++++++++++++++++ drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 1 + 2 files changed, 22 insertions(+)
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +21 -0
@@ -1619,6 +1619,22 @@ static void hns_roce_function_clear(struct hns_roce_dev *hr_dev) } } +static int hns_roce_clear_extdb_list_info (struct hns_roce_dev *hr_dev) +{ +struct hns_roce_cmq_desc desc; +int ret; + +hns_roce_cmq_setup_basic_desc (&desc,HNS_ROCE_OPC_CLEAR_EXTDB_LIST_INFO , + false); + ret =hns_roce_cmq_send (hr_dev, &desc,1 ); +if (ret) +ibdev_err (&hr_dev->ib_dev, +"failed to clear extended doorbell info, ret = %d.\n" , + ret); + +return ret; +} +static int hns_roce_query_fw_ver (struct hns_roce_dev *hr_dev) {struct hns_roce_query_fw_info *resp;
@@ -2732,6 +2748,11 @@ static int hns_roce_v2_init(struct hns_roce_dev *hr_dev)struct hns_roce_v2_priv *priv = hr_dev->priv;int ret; +/* The hns ROCEE requires the extdb info to be cleared before using */ + ret =hns_roce_clear_extdb_list_info (hr_dev); +if (ret) +return ret; + ret =get_hem_table (hr_dev);if (ret)return ret;
drivers/infiniband/hw/hns/hns_roce_hw_v2.h +1 -0
@@ -248,6 +248,7 @@ enum hns_roce_opcode_type {HNS_ROCE_OPC_CLR_SCCC =0x8509 ,HNS_ROCE_OPC_QUERY_SCCC =0x850a ,HNS_ROCE_OPC_RESET_SCCC =0x850b , +HNS_ROCE_OPC_CLEAR_EXTDB_LIST_INFO =0x850d ,HNS_ROCE_OPC_QUERY_VF_RES =0x850e ,HNS_ROCE_OPC_CFG_GMV_TBL =0x850f , HNS_ROCE_OPC_CFG_GMV_BT = 0x8510,
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 485/800 samples/bpf: Fix Segmentation fault for xdp_redirect command
In reply to Greg Kroah-HartmanFrom: Wang Hai <[email protected]>
[ Upstream commit 85102ba58b4125ebad941d7555c3c248b23efd16 ]
A Segmentation fault error is caused when the following command is executed.
$ sudo ./samples/bpf/xdp_redirect lo Segmentation fault
This command is missing a device <IFNAME|IFINDEX> as an argument, resulting in out-of-bounds access from argv.
If the number of devices for the xdp_redirect parameter is not 2, we should report an error and exit.
--- samples/bpf/xdp_redirect_user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
samples/bpf/xdp_redirect_user.c +1 -1
@@ -130,7 +130,7 @@ int main(int argc, char **argv)if (!(xdp_flags &XDP_FLAGS_SKB_MODE )) xdp_flags |=XDP_FLAGS_DRV_MODE ; -if (optind == argc) { +if (optind +2 != argc) {printf ("usage: %s <IFNAME|IFINDEX>_IN <IFNAME|IFINDEX>_OUT\n" , argv[0 ]);return 1 ; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 486/800 samples/bpf: Fix the error return code of xdp_redirects main()
In reply to Greg Kroah-HartmanFrom: Wang Hai <[email protected]>
[ Upstream commit 7c6090ee2a7b3315410cfc83a94c3eb057407b25 ]
Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function.
If bpf_map_update_elem() failed, main() should return a negative error.
--- samples/bpf/xdp_redirect_user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
samples/bpf/xdp_redirect_user.c +1 -1
@@ -213,5 +213,5 @@ int main(int argc, char **argv)poll_stats (2 , ifindex_out); out: -return 0 ; +return ret; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 487/800 net: pxa168_eth: Fix a potential data race in pxa168_eth_remove
In reply to Greg Kroah-HartmanFrom: Pavel Machek <[email protected]>
[ Upstream commit bd70957438f0cc4879cbdff8bbc8614bc1cddf49 ]
Commit 0571a753cb07 cancelled delayed work too late, keeping small race. Cancel work sooner to close it completely.
--- drivers/net/ethernet/marvell/pxa168_eth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/marvell/pxa168_eth.c +1 -1
@@ -1528,6 +1528,7 @@ static int pxa168_eth_remove(struct platform_device *pdev)struct net_device *dev =platform_get_drvdata (pdev);struct pxa168_eth_private *pep =netdev_priv (dev); +cancel_work_sync (&pep->tx_timeout_task);if (pep->htpr) {dma_free_coherent (pep->dev->dev.parent,HASH_ADDR_TABLE_SIZE , pep->htpr, pep->htpr_dma);
@@ -1539,7 +1540,6 @@ static int pxa168_eth_remove(struct platform_device *pdev)clk_disable_unprepare (pep->clk);mdiobus_unregister (pep->smi_bus);mdiobus_free (pep->smi_bus); -cancel_work_sync (&pep->tx_timeout_task);unregister_netdev (dev);free_netdev (dev);return 0 ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 488/800 mt76: mt7915: fix a signedness bug in mt7915_mcu_apply_tx_dpd()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 861fad474ec7638aeca46a508da4ea81612374b9 ]
"idx" needs to be signed for the error handling to work.
--- drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +2 -1
@@ -3440,8 +3440,9 @@ int mt7915_mcu_apply_tx_dpd(struct mt7915_phy *phy) {struct mt7915_dev *dev = phy->dev;struct cfg80211_chan_def *chandef = &phy->mt76->chandef; -u16 total =2 , idx, center_freq = chandef->center_freq1; +u16 total =2 , center_freq = chandef->center_freq1;u8 *cal = dev->cal, *eep = dev->mt76.eeprom.data; +int idx;if (!(eep[MT_EE_DO_PRE_CAL ] &MT_EE_WIFI_CAL_DPD ))return 0 ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 489/800 mt76: fix possible NULL pointer dereference in mt76_tx
In reply to Greg Kroah-HartmanFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit d7400a2f3e295b8cee692c7a66e10f60015a3c37 ]
Even if this is not a real issue since mt76_tx is never run with wcid set to NULL, fix a theoretical NULL pointer dereference in mt76_tx routine
--- drivers/net/wireless/mediatek/mt76/tx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/tx.c +1 -1
@@ -285,7 +285,7 @@ mt76_tx(struct mt76_phy *phy, struct ieee80211_sta *sta,skb_set_queue_mapping (skb, qid); } -if (!(wcid->tx_info &MT_WCID_TX_INFO_SET )) +if (wcid && !(wcid->tx_info &MT_WCID_TX_INFO_SET ))ieee80211_get_tx_rates (info->control.vif, sta, skb, info->control.rates,1 );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 490/800 mt76: mt7615: fix NULL pointer dereference in tx_prepare_skb()
In reply to Greg Kroah-HartmanFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit 8d3cdc1bbb1d355f0ebef973175ae5fd74286feb ]
Fix theoretical NULL pointer dereference in mt7615_tx_prepare_skb and mt7663_usb_sdio_tx_prepare_skb routines. This issue has been identified by code analysis.
--- drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c | 5 +++-- drivers/net/wireless/mediatek/mt76/mt7615/usb_sdio.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c +3 -2
@@ -131,20 +131,21 @@ int mt7615_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, struct mt76_tx_info *tx_info) { struct mt7615_dev *dev = container_of(mdev, struct mt7615_dev, mt76); - struct mt7615_sta *msta = container_of(wcid, struct mt7615_sta, wcid);struct ieee80211_tx_info *info =IEEE80211_SKB_CB (tx_info->skb);struct ieee80211_key_conf *key = info->control.hw_key;int pid, id;u8 *txwi = (u8 *)txwi_ptr;struct mt76_txwi_cache *t; +struct mt7615_sta *msta;void *txp; + msta = wcid ? container_of(wcid, struct mt7615_sta, wcid) : NULL;if (!wcid) wcid = &dev->mt76.global_wcid; pid =mt76_tx_status_skb_add (mdev, wcid, tx_info->skb); -if (info->flags &IEEE80211_TX_CTL_RATE_CTRL_PROBE ) { +if ((info->flags &IEEE80211_TX_CTL_RATE_CTRL_PROBE ) && msta) {struct mt7615_phy *phy = &dev->phy;if ((info->hw_queue &MT_TX_HW_QUEUE_EXT_PHY ) && mdev->phy2)
drivers/net/wireless/mediatek/mt76/mt7615/usb_sdio.c +3 -2
@@ -191,14 +191,15 @@ int mt7663_usb_sdio_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,struct ieee80211_sta *sta, struct mt76_tx_info *tx_info) { - struct mt7615_sta *msta = container_of(wcid, struct mt7615_sta, wcid); struct mt7615_dev *dev = container_of(mdev, struct mt7615_dev, mt76);struct sk_buff *skb = tx_info->skb;struct ieee80211_tx_info *info =IEEE80211_SKB_CB (skb); +struct mt7615_sta *msta;int pad; + msta = wcid ? container_of(wcid, struct mt7615_sta, wcid) : NULL;if ((info->flags &IEEE80211_TX_CTL_RATE_CTRL_PROBE ) && - !msta->rate_probe) { + msta && !msta->rate_probe) {/* request to configure sampling rate */ spin_lock_bh (&dev->mt76.lock); mt7615_mac_set_rates(&dev->phy, msta, &info->control.rates[0],
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 491/800 mt76: mt7921: fix mt7921_wfsys_reset sequence
In reply to Greg Kroah-HartmanFrom: Sean Wang <[email protected]>
[ Upstream commit 20eb83c749609199443972cf80fb6004fc36afc6 ]
WiFi subsytem reset should control MT_WFSYS_SW_RST_B and then poll the same register until the bit WFSYS_SW_INIT_DONE bit is set.
--- drivers/net/wireless/mediatek/mt76/mt7921/dma.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7921/dma.c +3 -3
@@ -313,9 +313,9 @@ static int mt7921_dma_reset(struct mt7921_dev *dev, bool force)int mt7921_wfsys_reset (struct mt7921_dev *dev) { -mt76_set (dev,0x70002600 ,BIT (0 )); -msleep (200 ); -mt76_clear (dev,0x70002600 ,BIT (0 )); +mt76_clear (dev,MT_WFSYS_SW_RST_B ,WFSYS_SW_RST_B ); +msleep (50 ); +mt76_set (dev,MT_WFSYS_SW_RST_B ,WFSYS_SW_RST_B );if (!__mt76_poll_msec (&dev->mt76,MT_WFSYS_SW_RST_B ,WFSYS_SW_INIT_DONE ,WFSYS_SW_INIT_DONE ,500 ))
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 492/800 mt76: mt7921: Dont alter Rx path classifier
In reply to Greg Kroah-HartmanFrom: Sean Wang <[email protected]>
[ Upstream commit 2c80c02a682aefc073df2cfbb48c77c74579cb4a ]
Keep Rx path classifier the mt7921 firmware prefers to allow frames pass through MCU.
--- .../net/wireless/mediatek/mt76/mt7921/init.c | 18 ------------------ 1 file changed, 18 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7921/init.c +0 -18
@@ -116,30 +116,12 @@ mt7921_init_wiphy(struct ieee80211_hw *hw)static void mt7921_mac_init_band (struct mt7921_dev *dev,u8 band) { -u32 mask, set; -mt76_rmw_field (dev,MT_TMAC_CTCR0 (band),MT_TMAC_CTCR0_INS_DDLMT_REFTIME ,0x3f );mt76_set (dev,MT_TMAC_CTCR0 (band),MT_TMAC_CTCR0_INS_DDLMT_VHT_SMPDU_EN |MT_TMAC_CTCR0_INS_DDLMT_EN ); - mask =MT_MDP_RCFR0_MCU_RX_MGMT | -MT_MDP_RCFR0_MCU_RX_CTL_NON_BAR | -MT_MDP_RCFR0_MCU_RX_CTL_BAR ; - set =FIELD_PREP (MT_MDP_RCFR0_MCU_RX_MGMT ,MT_MDP_TO_HIF ) | -FIELD_PREP (MT_MDP_RCFR0_MCU_RX_CTL_NON_BAR ,MT_MDP_TO_HIF ) | -FIELD_PREP (MT_MDP_RCFR0_MCU_RX_CTL_BAR ,MT_MDP_TO_HIF ); -mt76_rmw (dev,MT_MDP_BNRCFR0 (band), mask, set); - - mask =MT_MDP_RCFR1_MCU_RX_BYPASS | -MT_MDP_RCFR1_RX_DROPPED_UCAST | -MT_MDP_RCFR1_RX_DROPPED_MCAST ; - set =FIELD_PREP (MT_MDP_RCFR1_MCU_RX_BYPASS ,MT_MDP_TO_HIF ) | -FIELD_PREP (MT_MDP_RCFR1_RX_DROPPED_UCAST ,MT_MDP_TO_HIF ) | -FIELD_PREP (MT_MDP_RCFR1_RX_DROPPED_MCAST ,MT_MDP_TO_HIF ); -mt76_rmw (dev,MT_MDP_BNRCFR1 (band), mask, set); -mt76_set (dev,MT_WF_RMAC_MIB_TIME0 (band),MT_WF_RMAC_MIB_RXTIME_EN );mt76_set (dev,MT_WF_RMAC_MIB_AIRTIME0 (band),MT_WF_RMAC_MIB_RXTIME_EN );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 493/800 mt76: connac: fw_own rely on all packet memory all being free
In reply to Greg Kroah-HartmanFrom: Sean Wang <[email protected]>
[ Upstream commit 4bfa291251623486711693a69d9eaa539478d340 ]
If the device is MMIO-based, we must ensure all TxD/TxP on the host memory all being consumed by the device prior to safely switching to fw_own state.
--- drivers/net/wireless/mediatek/mt76/mt76_connac.h | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/wireless/mediatek/mt76/mt76_connac.h +4 -0
@@ -127,8 +127,12 @@ mt76_connac_pm_unref(struct mt76_connac_pm *pm)static inline bool mt76_connac_skip_fw_pmctrl (struct mt76_phy *phy,struct mt76_connac_pm *pm) { +struct mt76_dev *dev = phy->dev;bool ret; +if (dev->token_count) +return true; +spin_lock_bh (&pm->wake.lock); ret = pm->wake.count ||test_and_set_bit (MT76_STATE_PM , &phy->state);spin_unlock_bh (&pm->wake.lock);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 494/800 mt76: connac: fix WoW with disconnetion and bitmap pattern
In reply to Greg Kroah-HartmanFrom: YN Chen <[email protected]>
[ Upstream commit 193e5f22eeb2a9661bff8bc0d8519e6ded48c807 ]
Update MCU command usage to fix WoW configuration with disconnection and bitmap pattern and to avoid magic number.
--- drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c | 11 +++++++---- drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h | 8 ++++++++ 2 files changed, 15 insertions(+), 4 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c +7 -4
@@ -1939,7 +1939,7 @@ mt76_connac_mcu_set_wow_pattern(struct mt76_dev *dev, ptlv->index = index;memcpy (ptlv->pattern, pattern->pattern, pattern->pattern_len); -memcpy (ptlv->mask, pattern->mask, pattern->pattern_len /8 ); +memcpy (ptlv->mask, pattern->mask,DIV_ROUND_UP (pattern->pattern_len,8 ));return mt76_mcu_skb_send_msg (dev, skb,MCU_UNI_CMD_SUSPEND , true); }
@@ -1974,14 +1974,17 @@ mt76_connac_mcu_set_wow_ctrl(struct mt76_phy *phy, struct ieee80211_vif *vif, };if (wowlan->magic_pkt) - req.wow_ctrl_tlv.trigger |=BIT (0 ); + req.wow_ctrl_tlv.trigger |=UNI_WOW_DETECT_TYPE_MAGIC ;if (wowlan->disconnect) - req.wow_ctrl_tlv.trigger |=BIT (2 ); + req.wow_ctrl_tlv.trigger |= (UNI_WOW_DETECT_TYPE_DISCONNECT | +UNI_WOW_DETECT_TYPE_BCN_LOST );if (wowlan->nd_config) {mt76_connac_mcu_sched_scan_req (phy, vif, wowlan->nd_config); - req.wow_ctrl_tlv.trigger |=BIT (5 ); + req.wow_ctrl_tlv.trigger |=UNI_WOW_DETECT_TYPE_SCH_SCAN_HIT ;mt76_connac_mcu_sched_scan_enable (phy, vif, suspend); } +if (wowlan->n_patterns) + req.wow_ctrl_tlv.trigger |=UNI_WOW_DETECT_TYPE_BITMAP ;if (mt76_is_mmio (dev)) req.wow_ctrl_tlv.wakeup_hif =WOW_PCIE ;
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h +8 -0
@@ -590,6 +590,14 @@ enum { UNI_OFFLOAD_OFFLOAD_BMC_RPY_DETECT, }; +#define UNI_WOW_DETECT_TYPE_MAGIC BIT(0) +#define UNI_WOW_DETECT_TYPE_ANY BIT(1) +#define UNI_WOW_DETECT_TYPE_DISCONNECT BIT(2) +#define UNI_WOW_DETECT_TYPE_GTK_REKEY_FAIL BIT(3) +#define UNI_WOW_DETECT_TYPE_BCN_LOST BIT(4) +#define UNI_WOW_DETECT_TYPE_SCH_SCAN_HIT BIT(5) +#define UNI_WOW_DETECT_TYPE_BITMAP BIT(6) +enum {UNI_SUSPEND_MODE_SETTING ,UNI_SUSPEND_WOW_CTRL ,
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 495/800 mt76: mt7921: consider the invalid value for to_rssi
In reply to Greg Kroah-HartmanFrom: Sean Wang <[email protected]>
[ Upstream commit edb5aebc1c3db312e74e1dcf75b8626ee5300596 ]
It is possible the RCPI from the certain antenna is an invalid value, especially packets are receiving while the system is frequently entering deep sleep mode, so consider calculating RSSI with the reasonable upper bound to avoid report the wrong value to the mac80211 layer.
--- drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7921/mac.c +7 -4
@@ -444,16 +444,19 @@ int mt7921_mac_fill_rx(struct mt7921_dev *dev, struct sk_buff *skb) status->chain_signal[1 ] =to_rssi (MT_PRXV_RCPI1 , v1); status->chain_signal[2 ] =to_rssi (MT_PRXV_RCPI2 , v1); status->chain_signal[3 ] =to_rssi (MT_PRXV_RCPI3 , v1); - status->signal = status->chain_signal[0 ]; - -for (i =1 ; i <hweight8 (mphy->antenna_mask); i++) { -if (!(status->chains &BIT (i))) + status->signal =-128 ; +for (i =0 ; i <hweight8 (mphy->antenna_mask); i++) { +if (!(status->chains &BIT (i)) || + status->chain_signal[i] >=0 )continue ; status->signal =max (status->signal, status->chain_signal[i]); } +if (status->signal ==-128 ) + status->flag |=RX_FLAG_NO_SIGNAL_VAL ; + stbc =FIELD_GET (MT_PRXV_STBC , v0); gi =FIELD_GET (MT_PRXV_SGI , v0); cck = false;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 496/800 mt76: mt7921: add back connection monitor support
In reply to Greg Kroah-HartmanFrom: Sean Wang <[email protected]>
[ Upstream commit 10de032a31683585292cd10b598d896d7bcf276f ]
Hw beacon cmd to the mt7921 firmware doesn't only filter out the beacon, but also performs its own connection monitoring, including periodic keep-alives to the AP and probing the AP on beacon loss. Will indicate the host with the event when the firmware detects the connection is lost.
--- .../net/wireless/mediatek/mt76/mt7921/init.c | 4 +++ .../net/wireless/mediatek/mt76/mt7921/mcu.c | 32 +++++++++++++------ 2 files changed, 27 insertions(+), 9 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7921/init.c +4 -0
@@ -73,6 +73,7 @@ static void mt7921_init_wiphy(struct ieee80211_hw *hw) {struct mt7921_phy *phy =mt7921_hw_phy (hw); +struct mt7921_dev *dev = phy->dev;struct wiphy *wiphy = hw->wiphy; hw->queues =4 ;
@@ -110,6 +111,9 @@ mt7921_init_wiphy(struct ieee80211_hw *hw)ieee80211_hw_set (hw,SUPPORTS_PS );ieee80211_hw_set (hw,SUPPORTS_DYNAMIC_PS ); +if (dev->pm.enable) +ieee80211_hw_set (hw,CONNECTION_MONITOR ); + hw->max_tx_fragments =4 ; }
drivers/net/wireless/mediatek/mt76/mt7921/mcu.c +23 -9
@@ -450,22 +450,33 @@ mt7921_mcu_scan_event(struct mt7921_dev *dev, struct sk_buff *skb) }static void -mt7921_mcu_beacon_loss_event (struct mt7921_dev *dev,struct sk_buff *skb) +mt7921_mcu_connection_loss_iter (void *priv,u8 *mac, +struct ieee80211_vif *vif) +{ +struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv; +struct mt76_connac_beacon_loss_event *event = priv; + +if (mvif->idx != event->bss_idx) +return ; + +if (!(vif->driver_flags &IEEE80211_VIF_BEACON_FILTER )) +return ; + +ieee80211_connection_loss (vif); +} + +static void +mt7921_mcu_connection_loss_event (struct mt7921_dev *dev,struct sk_buff *skb) {struct mt76_connac_beacon_loss_event *event; -struct mt76_phy *mphy; -u8 band_idx =0 ;/* DBDC support */ +struct mt76_phy *mphy = &dev->mt76.phy;skb_pull (skb,sizeof (struct mt7921_mcu_rxd )); event = (struct mt76_connac_beacon_loss_event *)skb->data; -if (band_idx && dev->mt76.phy2) - mphy = dev->mt76.phy2; -else - mphy = &dev->mt76.phy;ieee80211_iterate_active_interfaces_atomic (mphy->hw,IEEE80211_IFACE_ITER_RESUME_ALL , - mt76_connac_mcu_beacon_loss_iter, event); + mt7921_mcu_connection_loss_iter, event); } static void
@@ -530,7 +541,7 @@ mt7921_mcu_rx_unsolicited_event(struct mt7921_dev *dev, struct sk_buff *skb)switch (rxd->eid) {case MCU_EVENT_BSS_BEACON_LOSS : -mt7921_mcu_beacon_loss_event (dev, skb); +mt7921_mcu_connection_loss_event (dev, skb);break ;case MCU_EVENT_SCHED_SCAN_DONE :case MCU_EVENT_SCAN_DONE :
@@ -1368,6 +1379,7 @@ mt7921_pm_interface_iter(void *priv, u8 *mac, struct ieee80211_vif *vif) {struct mt7921_phy *phy = priv;struct mt7921_dev *dev = phy->dev; +struct ieee80211_hw *hw =mt76_hw (dev);int ret;if (dev->pm.enable)
@@ -1380,9 +1392,11 @@ mt7921_pm_interface_iter(void *priv, u8 *mac, struct ieee80211_vif *vif)if (dev->pm.enable) { vif->driver_flags |=IEEE80211_VIF_BEACON_FILTER ; +ieee80211_hw_set (hw,CONNECTION_MONITOR );mt76_set (dev,MT_WF_RFCR (0 ),MT_WF_RFCR_DROP_OTHER_BEACON ); }else { vif->driver_flags &= ~IEEE80211_VIF_BEACON_FILTER ; +__clear_bit (IEEE80211_HW_CONNECTION_MONITOR , hw->flags);mt76_clear (dev,MT_WF_RFCR (0 ),MT_WF_RFCR_DROP_OTHER_BEACON ); } }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 497/800 mt76: mt7921: fix invalid register access in wake_work
In reply to Greg Kroah-HartmanFrom: Sean Wang <[email protected]>
[ Upstream commit f86625ae0e35924ed495cdf0ff2d3133cb6e3010 ]
Make sure mt7921_pm_wake_work wouldn't be scheduled after the driver is in suspend mode to fix the following the kernel crash.
[ 3515.390012] mt7921e 0000:01:00.0: calling pci_pm_suspend+0x0/0x22c @ 2869, parent: 0000:00:00.0 [ 3515.390015] mt7921e 0000:01:00.0: mt7921_pci_suspend + [ 3515.396395] anx7625 3-0058: anx7625_suspend+0x0/0x6c returned 0 after 0 usecs [ 3515.405965] mt7921e 0000:01:00.0: mt7921_pci_suspend - [ 3515.411336] usb 1-1.4: usb_dev_suspend+0x0/0x2c returned 0 after 1 usecs [ 3515.411513] SError Interrupt on CPU7, code 0xbe000011 -- SError [ 3515.411515] CPU: 7 PID: 2849 Comm: kworker/u16:27 Not tainted 5.4.114 #44 [ 3515.411516] Hardware name: MediaTek Asurada rev1 board (DT) [ 3515.411517] Workqueue: mt76 mt7921_pm_wake_work [mt7921e] [ 3515.411518] pstate: 80c00009 (Nzcv daif +PAN +UAO) [ 3515.411519] pc : mt76_mmio_rr+0x30/0xf0 [mt76] [ 3515.411520] lr : mt7921_rr+0x38/0x44 [mt7921e] [ 3515.411520] sp : ffffffc015813c50 [ 3515.411521] x29: ffffffc015813c50 x28: 0000000000000402 [ 3515.411522] x27: ffffffe5a2012138 x26: ffffffe5a1eea018 [ 3515.411524] x25: 00000000328be505 x24: 00000000000a0002 [ 3515.411525] x23: 0000000000000006 x22: ffffffbd29b7a300 [ 3515.411527] x21: ffffffbd29b7a300 x20: 00000000000e0010 [ 3515.411528] x19: 00000000eac08f43 x18: 0000000000000000 [ 3515.411529] x17: 0000000000000000 x16: ffffffe5a16b2914 [ 3515.411531] x15: 0000000000000010 x14: 0000000000000010 [ 3515.411532] x13: 00000000003dd3a2 x12: 0000000000010000 [ 3515.411533] x11: ffffffe597abec14 x10: 0000000000000010 [ 3515.411535] x9 : ffffffe597abeba8 x8 : ffffffc013ce0010 [ 3515.411536] x7 : 000000b2b5593519 x6 : 0000000000300000 [ 3515.411537] x5 : 0000000000000000 x4 : 0000000000000032 [ 3515.411539] x3 : 0000000000000000 x2 : 0000000000000004 [ 3515.411540] x1 : 00000000000e0010 x0 : ffffffbd29b7a300 [ 3515.411542] Kernel panic - not syncing: Asynchronous SError Interrupt [ 3515.411543] CPU: 7 PID: 2849 Comm: kworker/u16:27 Not tainted 5.4.114 #44 [ 3515.411544] Hardware name: MediaTek Asurada rev1 board (DT) [ 3515.411544] Workqueue: mt76 mt7921_pm_wake_work [mt7921e] [ 3515.411545] Call trace: [ 3515.411546] dump_backtrace+0x0/0x14c [ 3515.411546] show_stack+0x20/0x2c [ 3515.411547] dump_stack+0xa0/0xfc [ 3515.411548] panic+0x154/0x350 [ 3515.411548] panic+0x0/0x350 [ 3515.411549] arm64_serror_panic+0x78/0x84 [ 3515.411550] do_serror+0x0/0x118 [ 3515.411550] do_serror+0xa4/0x118 [ 3515.411551] el1_error+0x84/0xf8 [ 3515.411552] mt76_mmio_rr+0x30/0xf0 [mt76] [ 3515.411552] mt7921_rr+0x38/0x44 [mt7921e] [ 3515.411553] __mt76_poll_msec+0x5c/0x9c [mt76] [ 3515.411554] __mt7921_mcu_drv_pmctrl+0x50/0x94 [mt7921e] [ 3515.411555] mt7921_mcu_drv_pmctrl+0x38/0xb0 [mt7921e] [ 3515.411555] mt7921_pm_wake_work+0x34/0xd4 [mt7921e] [ 3515.411556] process_one_work+0x208/0x3c8 [ 3515.411557] worker_thread+0x23c/0x3e8 [ 3515.411557] kthread+0x144/0x178 [ 3515.411558] ret_from_fork+0x10/0x18 [ 3515.418831] SMP: stopping secondary CPUs [ 3515.418832] Kernel Offset: 0x2590c00000 from 0xffffffc010000000 [ 3515.418832] PHYS_OFFSET: 0xffffffc400000000 [ 3515.418833] CPU features: 0x080026,2a80aa18 [ 3515.418834] Memory Limit: none
[DL] 00000000 00000000 010701
--- .../net/wireless/mediatek/mt76/mt76_connac.h | 1 + .../wireless/mediatek/mt76/mt76_connac_mac.c | 6 +++++ .../net/wireless/mediatek/mt76/mt7921/pci.c | 25 +++++++++++++------ 3 files changed, 24 insertions(+), 8 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76_connac.h +1 -0
@@ -45,6 +45,7 @@ enum {struct mt76_connac_pm {bool enable; +bool suspended;spinlock_t txq_lock;struct {
drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c +6 -0
@@ -17,6 +17,9 @@ int mt76_connac_pm_wake(struct mt76_phy *phy, struct mt76_connac_pm *pm)if (!test_bit (MT76_STATE_PM , &phy->state))return 0 ; +if (pm->suspended) +return 0 ; +queue_work (dev->wq, &pm->wake_work); if (!wait_event_timeout(pm->wait, !test_bit(MT76_STATE_PM, &phy->state),
@@ -40,6 +43,9 @@ void mt76_connac_power_save_sched(struct mt76_phy *phy,if (!pm->enable)return ; +if (pm->suspended) +return ; + pm->last_activity = jiffies;if (!test_bit (MT76_STATE_PM , &phy->state)) {
drivers/net/wireless/mediatek/mt76/mt7921/pci.c +17 -8
@@ -188,21 +188,26 @@ static int mt7921_pci_suspend(struct pci_dev *pdev, pm_message_t state) {struct mt76_dev *mdev =pci_get_drvdata (pdev); struct mt7921_dev *dev = container_of(mdev, struct mt7921_dev, mt76); +struct mt76_connac_pm *pm = &dev->pm;bool hif_suspend;int i, err; - err =mt76_connac_pm_wake (&dev->mphy, &dev->pm); + pm->suspended = true; +cancel_delayed_work_sync (&pm->ps_work); +cancel_work_sync (&pm->wake_work); + + err =mt7921_mcu_drv_pmctrl (dev);if (err <0 ) -return err; + goto restore_suspend; hif_suspend = !test_bit (MT76_STATE_SUSPEND , &dev->mphy.state);if (hif_suspend) { err =mt76_connac_mcu_set_hif_suspend (mdev, true);if (err) -return err; + goto restore_suspend; } -if (!dev->pm.enable) +if (!pm->enable)mt76_connac_mcu_set_deep_sleep (&dev->mt76, true);napi_disable (&mdev->tx_napi);
@@ -231,27 +236,30 @@ static int mt7921_pci_suspend(struct pci_dev *pdev, pm_message_t state) err =mt7921_mcu_fw_pmctrl (dev);if (err) - goto restore; + goto restore_napi;pci_save_state (pdev); err =pci_set_power_state (pdev,pci_choose_state (pdev, state));if (err) - goto restore; + goto restore_napi;return 0 ; -restore: +restore_napi:mt76_for_each_q_rx (mdev, i) {napi_enable (&mdev->napi[i]); }napi_enable (&mdev->tx_napi); -if (!dev->pm.enable) +if (!pm->enable)mt76_connac_mcu_set_deep_sleep (&dev->mt76, false);if (hif_suspend)mt76_connac_mcu_set_hif_suspend (mdev, false); +restore_suspend: + pm->suspended = false; +return err; }
@@ -261,6 +269,7 @@ static int mt7921_pci_resume(struct pci_dev *pdev) struct mt7921_dev *dev = container_of(mdev, struct mt7921_dev, mt76);int i, err; + dev->pm.suspended = false; err =pci_set_power_state (pdev,PCI_D0 );if (err)return err;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 498/800 mt76: mt7921: fix OMAC idx usage
In reply to Greg Kroah-HartmanFrom: Sean Wang <[email protected]>
[ Upstream commit 213f87289ea01514acdbfeed9f65bcb5f12aef70 ]
OMAC idx have to be same with BSS idx according to firmware usage.
--- .../net/wireless/mediatek/mt76/mt7921/main.c | 55 +------------------ 1 file changed, 1 insertion(+), 54 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7921/main.c +1 -54
@@ -223,54 +223,6 @@ static void mt7921_stop(struct ieee80211_hw *hw)mt7921_mutex_release (dev); } -static inline int get_free_idx (u32 mask,u8 start,u8 end) -{ -return ffs (~mask &GENMASK (end, start)); -} - -static int get_omac_idx (enum nl80211_iftype type,u64 mask) -{ -int i; - -switch (type) { -case NL80211_IFTYPE_STATION : -/* prefer hw bssid slot 1-3 */ - i =get_free_idx (mask,HW_BSSID_1 ,HW_BSSID_3 ); -if (i) -return i -1 ; - -/* next, try to find a free repeater entry for the sta */ - i =get_free_idx (mask >>REPEATER_BSSID_START ,0 , -REPEATER_BSSID_MAX -REPEATER_BSSID_START ); -if (i) -return i +32 -1 ; - - i =get_free_idx (mask,EXT_BSSID_1 ,EXT_BSSID_MAX ); -if (i) -return i -1 ; - -if (~mask &BIT (HW_BSSID_0 )) -return HW_BSSID_0 ; - -break ; -case NL80211_IFTYPE_MONITOR : -/* ap uses hw bssid 0 and ext bssid */ -if (~mask &BIT (HW_BSSID_0 )) -return HW_BSSID_0 ; - - i =get_free_idx (mask,EXT_BSSID_1 ,EXT_BSSID_MAX ); -if (i) -return i -1 ; - -break ; -default : -WARN_ON (1 ); -break ; - } - -return -1 ; -} -static int mt7921_add_interface (struct ieee80211_hw *hw,struct ieee80211_vif *vif) {
@@ -292,12 +244,7 @@ static int mt7921_add_interface(struct ieee80211_hw *hw, goto out; } - idx =get_omac_idx (vif->type, phy->omac_mask); -if (idx <0 ) { - ret = -ENOSPC ; - goto out; - } - mvif->mt76.omac_idx = idx; + mvif->mt76.omac_idx = mvif->mt76.idx; mvif->phy = phy; mvif->mt76.band_idx =0 ; mvif->mt76.wmm_idx = mvif->mt76.idx %MT7921_MAX_WMM_SETS ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 499/800 mt76: mt7921: avoid unnecessary consecutive WiFi resets
In reply to Greg Kroah-HartmanFrom: Sean Wang <[email protected]>
[ Upstream commit f07ac384b4579f294bb1e0380ed501156219ed71 ]
Avoid unnecessary consecutive WiFi resets by dropping reset request when reset work is working.
--- drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 5 ++++- drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h | 1 + 2 files changed, 5 insertions(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7921/mac.c +4 -1
@@ -1272,6 +1272,7 @@ void mt7921_mac_reset_work(struct work_struct *work) hw =mt76_hw (dev);dev_err (dev->mt76.dev,"chip reset\n" ); + dev->hw_full_reset = true;ieee80211_stop_queues (hw);cancel_delayed_work_sync (&dev->mphy.mac_work);
@@ -1296,6 +1297,7 @@ void mt7921_mac_reset_work(struct work_struct *work)ieee80211_scan_completed (dev->mphy.hw, &info); } + dev->hw_full_reset = false;ieee80211_wake_queues (hw); ieee80211_iterate_active_interfaces(hw, IEEE80211_IFACE_ITER_RESUME_ALL,
@@ -1306,7 +1308,8 @@ void mt7921_reset(struct mt76_dev *mdev) { struct mt7921_dev *dev = container_of(mdev, struct mt7921_dev, mt76); -queue_work (dev->mt76.wq, &dev->reset_work); +if (!dev->hw_full_reset) +queue_work (dev->mt76.wq, &dev->reset_work); } static void
drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h +1 -0
@@ -156,6 +156,7 @@ struct mt7921_dev {u16 chainmask;struct work_struct reset_work; +bool hw_full_reset;struct list_head sta_poll_list;spinlock_t sta_poll_lock;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 500/800 mt76: mt7921: do not schedule hw reset if the device is not running
In reply to Greg Kroah-HartmanFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit d74c4b5667425c35d74906795a08e02e29df5b46 ]
Do not schedule hw full reset if the device is not fully initialized (e.g if the channel has not been configured yet). This patch fixes the kernel crash reported below
[ 44.440266] mt7921e 0000:01:00.0: chip reset failed [ 44.527575] Unable to handle kernel paging request at virtual address ffffffc02f3e0000 [ 44.535771] Mem abort info: [ 44.538646] ESR = 0x96000006 [ 44.541792] EC = 0x25: DABT (current EL), IL = 32 bits [ 44.547268] SET = 0, FnV = 0 [ 44.550413] EA = 0, S1PTW = 0 [ 44.553648] Data abort info: [ 44.556613] ISV = 0, ISS = 0x00000006 [ 44.560563] CM = 0, WnR = 0 [ 44.563619] swapper pgtable: 4k pages, 39-bit VAs, pgdp=0000000000955000 [ 44.570530] [ffffffc02f3e0000] pgd=100000003ffff003, p4d=100000003ffff003, pud=100000003ffff003, pmd=0000000000000000 [ 44.581489] Internal error: Oops: 96000006 [#1] SMP [ 44.606406] CPU: 0 PID: 0 Comm: swapper/0 Tainted: G W 5.13.0-rc1-espressobin-12875-g6dc7f82ebc26 #33 [ 44.617264] Hardware name: Globalscale Marvell ESPRESSOBin Board (DT) [ 44.623905] pstate: 600000c5 (nZCv daIF -PAN -UAO -TCO BTYPE=--) [ 44.630100] pc : __queue_work+0x1f0/0x500 [ 44.634249] lr : __queue_work+0x1e8/0x500 [ 44.638384] sp : ffffffc010003d70 [ 44.641798] x29: ffffffc010003d70 x28: 0000000000000000 x27: ffffff8003989200 [ 44.649166] x26: ffffffc010c08510 x25: 0000000000000002 x24: ffffffc010ad90b0 [ 44.656533] x23: ffffffc010c08508 x22: 0000000000000012 x21: 0000000000000000 [ 44.663899] x20: ffffff8006385238 x19: ffffffc02f3e0000 x18: 00000000000003c9 [ 44.671266] x17: 0000000000000000 x16: 0000000000000000 x15: 000009b1a8a3bf90 [ 44.678632] x14: 0098968000000000 x13: 0000000000000000 x12: 0000000000000325 [ 44.685998] x11: ffffff803fda1928 x10: 0000000000000001 x9 : ffffffc010003e98 [ 44.693365] x8 : 0000000000000032 x7 : fff8000000000000 x6 : 0000000000000035 [ 44.700732] x5 : 0000000000000000 x4 : 0000000000000000 x3 : ffffffc010adf700 [ 44.708098] x2 : ffffff8006385238 x1 : 000000007fffffff x0 : 0000000000000000 [ 44.715465] Call trace: [ 44.717982] __queue_work+0x1f0/0x500 [ 44.721760] delayed_work_timer_fn+0x18/0x20 [ 44.726167] call_timer_fn+0x2c/0x178 [ 44.729947] run_timer_softirq+0x488/0x5c8 [ 44.734172] _stext+0x11c/0x378 [ 44.737411] irq_exit+0x100/0x108 [ 44.740830] __handle_domain_irq+0x60/0xb0 [ 44.745059] gic_handle_irq+0x70/0x2b4 [ 44.748929] el1_irq+0xb8/0x13c [ 44.752167] arch_cpu_idle+0x14/0x30 [ 44.755858] default_idle_call+0x38/0x168 [ 44.759994] do_idle+0x1fc/0x210 [ 44.763325] cpu_startup_entry+0x20/0x58 [ 44.767372] rest_init+0xb8/0xc8 [ 44.770703] arch_call_rest_init+0xc/0x14 [ 44.774841] start_kernel+0x408/0x424 [ 44.778623] Code: aa1403e0 97fff54f aa0003f5 b5fff500 (f9400275) [ 44.784907] ---[ end trace be73c3142d8c36a9 ]--- [ 44.789668] Kernel panic - not syncing: Oops: Fatal exception in interrupt
--- drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7921/mac.c +3 -0
@@ -1308,6 +1308,9 @@ void mt7921_reset(struct mt76_dev *mdev) { struct mt7921_dev *dev = container_of(mdev, struct mt7921_dev, mt76); +if (!test_bit (MT76_STATE_RUNNING , &dev->mphy.state)) +return ; +if (!dev->hw_full_reset)queue_work (dev->mt76.wq, &dev->reset_work); }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 501/800 mt76: testmode: fix memory leak in mt76_testmode_alloc_skb
In reply to Greg Kroah-HartmanFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit fe2c3b1fc64ea0c7a5b2ca2f671b4572ff99baf8 ]
Free all pending frames in case of failure in mt76_testmode_alloc_skb routine
--- drivers/net/wireless/mediatek/mt76/testmode.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/testmode.c +4 -1
@@ -158,8 +158,11 @@ int mt76_testmode_alloc_skb(struct mt76_phy *phy, u32 len) frag_len =MT_TXP_MAX_LEN ; frag =alloc_skb (frag_len,GFP_KERNEL ); -if (!frag) +if (!frag) { +mt76_testmode_free_skb (phy); +dev_kfree_skb (head);return -ENOMEM ; + }__skb_put_zero (frag, frag_len); head->len += frag->len;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 502/800 mt76: testmode: remove undefined behaviour in mt76_testmode_alloc_skb
In reply to Greg Kroah-HartmanFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit 223cea6d3c974acd393bfac2d168b2945a6cf1e5 ]
Get rid of an undefined behaviour in mt76_testmode_alloc_skb routine allocating skb frames
--- drivers/net/wireless/mediatek/mt76/testmode.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/net/wireless/mediatek/mt76/testmode.c +2 -6
@@ -168,12 +168,8 @@ int mt76_testmode_alloc_skb(struct mt76_phy *phy, u32 len) head->len += frag->len; head->data_len += frag->len; -if (*frag_tail) { - (*frag_tail)->next = frag; - frag_tail = &frag; - }else { - *frag_tail = frag; - } + *frag_tail = frag; + frag_tail = &(*frag_tail)->next; }mt76_testmode_free_skb (phy);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 503/800 mt76: mt7615: fix potential overflow on large shift
In reply to Greg Kroah-HartmanFrom: Ryder Lee <[email protected]>
[ Upstream commit 3253f8fddd954aba9ac88ce3c34551dcca505b21 ]
Fix the following static checker warning:
error: undefined (user controlled) shift '(((1))) << (c->omac_idx)'
--- drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +3 -0
@@ -411,6 +411,9 @@ mt7615_mcu_rx_csa_notify(struct mt7615_dev *dev, struct sk_buff *skb) c = (struct mt7615_mcu_csa_notify *)skb->data; +if (c->omac_idx >EXT_BSSID_MAX ) +return ; +if (ext_phy && ext_phy->omac_mask &BIT_ULL (c->omac_idx)) mphy = dev->mt76.phy2;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 504/800 mt76: mt7915: fix MT_EE_CAL_GROUP_SIZE
In reply to Greg Kroah-HartmanFrom: Ryder Lee <[email protected]>
[ Upstream commit ee8ba94f9cc9afab570fd71ad421292f6360983c ]
Fix wrong offset for pre-calibration data.
--- drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h +1 -1
@@ -33,7 +33,7 @@ enum mt7915_eeprom_field {#define MT_EE_WIFI_CAL_GROUP BIT(0)#define MT_EE_WIFI_CAL_DPD GENMASK(2, 1)#define MT_EE_CAL_UNIT 1024 -#define MT_EE_CAL_GROUP_SIZE (44 * MT_EE_CAL_UNIT) +#define MT_EE_CAL_GROUP_SIZE (49 * MT_EE_CAL_UNIT + 16)#define MT_EE_CAL_DPD_SIZE (54 * MT_EE_CAL_UNIT)#define MT_EE_WIFI_CONF0_TX_PATH GENMASK(2, 0)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 505/800 mt76: mt7921: wake the device before dumping power table
In reply to Greg Kroah-HartmanFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit 271fa685365842962f56651c9d1a33a0d0d3b30b ]
Always wake the device up before dumping the single_sku power table otherwise the device can hang.
--- drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c +3 -0
@@ -184,7 +184,10 @@ mt7921_txpwr(struct seq_file *s, void *data)struct mt7921_txpwr txpwr;int ret; +mt7921_mutex_acquire (dev); ret =mt7921_get_txpwr_info (dev, &txpwr); +mt7921_mutex_release (dev); +if (ret)return ret;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 506/800 mt76: mt7915: fix rx fcs error count in testmode
In reply to Greg Kroah-HartmanFrom: Shayne Chen <[email protected]>
[ Upstream commit 89043529c8b833d87391f1844e9d1cc1643393eb ]
FCS error packets are filtered by default and won't be reported to driver, so that RX fcs error and PER in testmode always show zero. Fix this issue by reading fcs error count from hw counter.
We did't fix this issue by disabling fcs error rx filter since it may let HW suffer some SER errors.
--- .../wireless/mediatek/mt76/mt7915/testmode.c | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/testmode.c +19 -2
@@ -464,10 +464,17 @@ mt7915_tm_set_tx_frames(struct mt7915_phy *phy, bool en)static void mt7915_tm_set_rx_frames (struct mt7915_phy *phy,bool en) { -if (en) +mt7915_tm_set_trx (phy,TM_MAC_RX_RXV , false); + +if (en) { +struct mt7915_dev *dev = phy->dev; +mt7915_tm_update_channel (phy); -mt7915_tm_set_trx (phy,TM_MAC_RX_RXV , en); +/* read-clear */ +mt76_rr (dev,MT_MIB_SDR3 (phy != &dev->phy)); +mt7915_tm_set_trx (phy,TM_MAC_RX_RXV , en); + } } static int
@@ -690,7 +697,11 @@ static int mt7915_tm_dump_stats(struct mt76_phy *mphy, struct sk_buff *msg) { struct mt7915_phy *phy = mphy->priv; +struct mt7915_dev *dev = phy->dev; +bool ext_phy = phy != &dev->phy; +enum mt76_rxq_id q;void *rx, *rssi; +u16 fcs_err;int i; rx =nla_nest_start (msg,MT76_TM_STATS_ATTR_LAST_RX );
@@ -735,6 +746,12 @@ mt7915_tm_dump_stats(struct mt76_phy *mphy, struct sk_buff *msg)nla_nest_end (msg, rx); + fcs_err =mt76_get_field (dev,MT_MIB_SDR3 (ext_phy), +MT_MIB_SDR3_FCS_ERR_MASK ); + q = ext_phy ?MT_RXQ_EXT :MT_RXQ_MAIN ; + mphy->test.rx_stats.packets[q] += fcs_err; + mphy->test.rx_stats.fcs_error[q] += fcs_err; +return 0 ; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 507/800 mt76: mt7921: fix kernel warning when reset on vif is not sta
In reply to Greg Kroah-HartmanFrom: Sean Wang <[email protected]>
[ Upstream commit 78b0328ff8c46fce64eb969d2572c3f631735dc1 ]
ieee80211_disconnect is only called for the staton mode.
[ 714.050429] WARNING: CPU: 1 PID: 382 at net/mac80211/mlme.c:2787 ieee80211_disconnect+0x108/0x118 [mac80211] [ 714.116704] Hardware name: MediaTek Asurada rev1 board (DT) [ 714.122303] Workqueue: mt76 mt7921_mac_reset_work [mt7921e] [ 714.127877] pstate: 20c00009 (nzCv daif +PAN +UAO) [ 714.132761] pc : ieee80211_disconnect+0x108/0x118 [mac80211] [ 714.138430] lr : mt7921_vif_connect_iter+0x28/0x54 [mt7921e] [ 714.144083] sp : ffffffc0107cbbd0 [ 714.147394] x29: ffffffc0107cbbd0 x28: ffffffb26c9cb928 [ 714.152706] x27: ffffffb26c9cbd98 x26: 0000000000000000 [ 714.158017] x25: 0000000000000003 x24: ffffffb26c9c9c38 [ 714.163328] x23: ffffffb26c9c9c38 x22: ffffffb26c9c8860 [ 714.168639] x21: ffffffb23b940000 x20: ffffffb26c9c8860 [ 714.173950] x19: 0000000000000001 x18: 000000000000b67e [ 714.179261] x17: 00000000064dd409 x16: ffffffd739cb28f0 [ 714.184571] x15: 0000000000000000 x14: 0000000000000227 [ 714.189881] x13: 0000000000000400 x12: ffffffd73a4eb060 [ 714.195191] x11: 0000000000000000 x10: 0000000000000000 [ 714.200502] x9 : ffffffd703a0a000 x8 : 0000000000000006 [ 714.205812] x7 : 2828282828282828 x6 : ffffffb200440396 [ 714.211122] x5 : 0000000000000000 x4 : 0000000000000004 [ 714.216432] x3 : 0000000000000000 x2 : ffffffb23b940c90 [ 714.221743] x1 : 0000000000000001 x0 : ffffffb23b940c90 [ 714.227054] Call trace: [ 714.229594] ieee80211_disconnect+0x108/0x118 [mac80211] [ 714.234913] mt7921_vif_connect_iter+0x28/0x54 [mt7921e] [ 714.240313] __iterate_interfaces+0xc4/0xdc [mac80211] [ 714.245541] ieee80211_iterate_interfaces+0x4c/0x68 [mac80211] [ 714.251381] mt7921_mac_reset_work+0x410/0x468 [mt7921e] [ 714.256696] process_one_work+0x208/0x3c8 [ 714.260706] worker_thread+0x23c/0x3e8 [ 714.264456] kthread+0x140/0x17c [ 714.267685] ret_from_fork+0x10/0x18
--- drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7921/mac.c +2 -1
@@ -1199,7 +1199,8 @@ mt7921_vif_connect_iter(void *priv, u8 *mac,struct mt7921_vif *mvif = (struct mt7921_vif *)vif->drv_priv;struct mt7921_dev *dev = mvif->phy->dev; -ieee80211_disconnect (vif, true); +if (vif->type ==NL80211_IFTYPE_STATION ) +ieee80211_disconnect (vif, true);mt76_connac_mcu_uni_add_dev (&dev->mphy, vif, &mvif->sta.wcid, true);mt7921_mcu_set_tx (dev, vif);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 508/800 mt76: mt7921: fix the coredump is being truncated
In reply to Greg Kroah-HartmanFrom: Sean Wang <[email protected]>
[ Upstream commit 723885a6750102e5d807429b3d06aa6b0d29cc66 ]
Fix the maximum size of the coredump generated with current mt7921 firmware. Otherwise, a truncated coredump would be reported to userland via dev_coredumpv.
Also, there is an additional error handling enhanced in the patch to avoid the possible invalid buffer access when the system failed to create the buffer to hold the coredump.
--- drivers/net/wireless/mediatek/mt76/mt76_connac.h | 2 +- drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76_connac.h +1 -1
@@ -12,7 +12,7 @@#define MT76_CONNAC_MAX_SCAN_MATCH 16#define MT76_CONNAC_COREDUMP_TIMEOUT (HZ / 20) -#define MT76_CONNAC_COREDUMP_SZ (128 * 1024) +#define MT76_CONNAC_COREDUMP_SZ (1300 * 1024)enum {CMD_CBW_20MHZ =IEEE80211_STA_RX_BW_20 ,
drivers/net/wireless/mediatek/mt76/mt7921/mac.c +6 -3
@@ -1504,7 +1504,7 @@ void mt7921_coredump_work(struct work_struct *work)break ;skb_pull (skb,sizeof (struct mt7921_mcu_rxd )); -if (data + skb->len - dump >MT76_CONNAC_COREDUMP_SZ ) { +if (!dump || data + skb->len - dump >MT76_CONNAC_COREDUMP_SZ ) {dev_kfree_skb (skb);continue ; }
@@ -1514,7 +1514,10 @@ void mt7921_coredump_work(struct work_struct *work)dev_kfree_skb (skb); } -dev_coredumpv (dev->mt76.dev, dump,MT76_CONNAC_COREDUMP_SZ , -GFP_KERNEL ); + +if (dump) +dev_coredumpv (dev->mt76.dev, dump,MT76_CONNAC_COREDUMP_SZ , +GFP_KERNEL ); +mt7921_reset (&dev->mt76); }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 509/800 net: ethernet: aeroflex: fix UAF in greth_of_remove
In reply to Greg Kroah-HartmanFrom: Pavel Skripkin <[email protected]>
[ Upstream commit e3a5de6d81d8b2199935c7eb3f7d17a50a7075b7 ]
static int greth_of_remove(struct platform_device *of_dev) {
...
struct greth_private *greth = netdev_priv(ndev); ... unregister_netdev(ndev); free_netdev(ndev); of_iounmap(&of_dev->resource[0], greth->regs, resource_size(&of_dev->resource[0]));
...
}
greth is netdev private data, but it is used
after free_netdev(). It can cause use-after-free when accessing greth pointer. So, fix it by moving free_netdev() after of_iounmap() call.
--- drivers/net/ethernet/aeroflex/greth.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/aeroflex/greth.c +2 -1
@@ -1539,10 +1539,11 @@ static int greth_of_remove(struct platform_device *of_dev)mdiobus_unregister (greth->mdio);unregister_netdev (ndev); -free_netdev (ndev);of_iounmap (&of_dev->resource[0 ], greth->regs,resource_size (&of_dev->resource[0 ])); +free_netdev (ndev); +return 0 ; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 510/800 net: ethernet: ezchip: fix UAF in nps_enet_remove
In reply to Greg Kroah-HartmanFrom: Pavel Skripkin <[email protected]>
[ Upstream commit e4b8700e07a86e8eab6916aa5c5ba99042c34089 ]
priv is netdev private data, but it is used
after free_netdev(). It can cause use-after-free when accessing priv pointer. So, fix it by moving free_netdev() after netif_napi_del() call.
--- drivers/net/ethernet/ezchip/nps_enet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/ezchip/nps_enet.c +1 -1
@@ -642,8 +642,8 @@ static s32 nps_enet_remove(struct platform_device *pdev)struct nps_enet_priv *priv =netdev_priv (ndev);unregister_netdev (ndev); -free_netdev (ndev);netif_napi_del (&priv->napi); +free_netdev (ndev);return 0 ; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 511/800 net: ethernet: ezchip: fix error handling
In reply to Greg Kroah-HartmanFrom: Pavel Skripkin <[email protected]>
[ Upstream commit 0de449d599594f5472e00267d651615c7f2c6c1d ]
As documented at drivers/base/platform.c for platform_get_irq:
* Gets an IRQ for a platform device and prints an error message if finding the
* IRQ fails. Device drivers should check the return value for errors so as to
* not pass a negative integer value to the request_irq() APIs.
So, the driver should check that platform_get_irq() return value is _negative_, not that it's equal to zero, because -ENXIO (return value from request_irq() if irq was not found) will
pass this check and it leads to passing negative irq to request_irq()
--- drivers/net/ethernet/ezchip/nps_enet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/ezchip/nps_enet.c +1 -1
@@ -607,7 +607,7 @@ static s32 nps_enet_probe(struct platform_device *pdev)/* Get IRQ number */ priv->irq =platform_get_irq (pdev,0 ); -if (!priv->irq) { +if (priv->irq <0 ) {dev_err (dev,"failed to retrieve <irq Rx-Tx> value from device tree\n" ); err = -ENODEV ; goto out_netdev;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 512/800 selftests/bpf: Retry for EAGAIN in udp_redir_to_connected()
In reply to Greg Kroah-HartmanFrom: Cong Wang <[email protected]>
[ Upstream commit a7e65fe7d8201527129206754db1a2db6a6b2fde ]
We use non-blocking sockets for testing sockmap redirections, and got some random EAGAIN errors from UDP tests.
There is no guarantee the packet would be immediately available to receive as soon as it is sent out, even on the local host. For UDP, this is especially true because it does not lock the sock during BH (unlike the TCP path). This is probably why we only saw this error in UDP cases.
No matter how hard we try to make the queue empty check accurate, it is always possible for recvmsg() to beat ->sk_data_ready(). Therefore, we should just retry in case of EAGAIN.
--- tools/testing/selftests/bpf/prog_tests/sockmap_listen.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
tools/testing/selftests/bpf/prog_tests/sockmap_listen.c +6 -1
@@ -1610,6 +1610,7 @@ static void udp_redir_to_connected(int family, int sotype, int sock_mapfd,struct sockaddr_storage addr;int c0, c1, p0, p1;unsigned int pass; +int retries =100 ;socklen_t len;int err, n;u64 value;
@@ -1686,9 +1687,13 @@ static void udp_redir_to_connected(int family, int sotype, int sock_mapfd,if (pass !=1 )FAIL ("%s: want pass count 1, have %d" , log_prefix, pass); +again: n =read (mode ==REDIR_INGRESS ? p0 : c0, &b,1 ); -if (n <0 ) +if (n <0 ) { +if (errno ==EAGAIN && retries--) + goto again;FAIL_ERRNO ("%s: read" , log_prefix); + }if (n ==0 )FAIL ("%s: incomplete read" , log_prefix);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 513/800 udp: Fix a memory leak in udp_read_sock()
In reply to Greg Kroah-HartmanFrom: Cong Wang <[email protected]>
[ Upstream commit e00a5c331bf57f41fcfdc5da4f5caeafe5e54c1d ]
sk_psock_verdict_recv() clones the skb and uses the clone afterward, so udp_read_sock() should free the skb after using it, regardless of error or not.
This fixes a real kmemleak.
--- net/ipv4/udp.c | 2 ++ 1 file changed, 2 insertions(+)
net/ipv4/udp.c +2 -0
@@ -1798,11 +1798,13 @@ int udp_read_sock(struct sock *sk, read_descriptor_t *desc,if (used <=0 ) {if (!copied) copied = used; +kfree_skb (skb);break ; }else if (used <= skb->len) { copied += used; } +kfree_skb (skb);if (!desc->count)break ; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 514/800 skmsg: Clear skb redirect pointer before dropping it
In reply to Greg Kroah-HartmanFrom: Cong Wang <[email protected]>
[ Upstream commit 30b9c54a707db4155735cf71f4600241c1b7b6ff ]
When we drop skb inside sk_psock_skb_redirect(), we have to clear its skb->_sk_redir pointer too, otherwise kfree_skb() would misinterpret it as a valid skb->_skb_refdst and dst_release() would eventually complain.
--- net/core/skmsg.c | 2 ++ 1 file changed, 2 insertions(+)
net/core/skmsg.c +2 -0
@@ -866,12 +866,14 @@ static void sk_psock_skb_redirect(struct sk_buff *skb)* a socket that is in this state so we drop the skb. */ if (!psock_other ||sock_flag (sk_other,SOCK_DEAD )) { +skb_bpf_redirect_clear (skb);kfree_skb (skb);return ; }spin_lock_bh (&psock_other->ingress_lock);if (!sk_psock_test_state (psock_other,SK_PSOCK_TX_ENABLED )) {spin_unlock_bh (&psock_other->ingress_lock); +skb_bpf_redirect_clear (skb);kfree_skb (skb);return ; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 515/800 skmsg: Fix a memory leak in sk_psock_verdict_apply()
In reply to Greg Kroah-HartmanFrom: Cong Wang <[email protected]>
[ Upstream commit 0cf6672b23c8aa9d9274798dd63cbf6ede77ef90 ]
If the dest psock does not set SK_PSOCK_TX_ENABLED, the skb can't be queued anywhere so must be dropped.
This one is found during code review.
--- net/core/skmsg.c | 5 +++++ 1 file changed, 5 insertions(+)
net/core/skmsg.c +5 -0
@@ -947,8 +947,13 @@ static void sk_psock_verdict_apply(struct sk_psock *psock,if (sk_psock_test_state (psock,SK_PSOCK_TX_ENABLED )) {skb_queue_tail (&psock->ingress_skb, skb);schedule_work (&psock->work); + err =0 ; }spin_unlock_bh (&psock->ingress_lock); +if (err <0 ) { +skb_bpf_redirect_clear (skb); + goto out_free; + } }break ;case __SK_REDIRECT:
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 516/800 skmsg: Teach sk_psock_verdict_apply() to return errors
In reply to Greg Kroah-HartmanFrom: Cong Wang <[email protected]>
[ Upstream commit 1581a6c1c3291a8320b080f4411345f60229976d ]
Currently sk_psock_verdict_apply() is void, but it handles some error conditions too. Its caller is impossible to learn whether it succeeds or fails, especially sk_psock_verdict_recv().
Make it return int to indicate error cases and propagate errors to callers properly.
--- net/core/skmsg.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-)
net/core/skmsg.c +14 -9
@@ -847,7 +847,7 @@ out: }EXPORT_SYMBOL_GPL (sk_psock_msg_verdict); -static void sk_psock_skb_redirect (struct sk_buff *skb) +static int sk_psock_skb_redirect (struct sk_buff *skb) {struct sk_psock *psock_other;struct sock *sk_other;
@@ -858,7 +858,7 @@ static void sk_psock_skb_redirect(struct sk_buff *skb)*/ if (unlikely (!sk_other)) {kfree_skb (skb); -return ; +return -EIO ; } psock_other =sk_psock (sk_other);/* This error indicates the socket is being torn down or had another
@@ -868,19 +868,20 @@ static void sk_psock_skb_redirect(struct sk_buff *skb)if (!psock_other ||sock_flag (sk_other,SOCK_DEAD )) {skb_bpf_redirect_clear (skb);kfree_skb (skb); -return ; +return -EIO ; }spin_lock_bh (&psock_other->ingress_lock);if (!sk_psock_test_state (psock_other,SK_PSOCK_TX_ENABLED )) {spin_unlock_bh (&psock_other->ingress_lock);skb_bpf_redirect_clear (skb);kfree_skb (skb); -return ; +return -EIO ; }skb_queue_tail (&psock_other->ingress_skb, skb);schedule_work (&psock_other->work);spin_unlock_bh (&psock_other->ingress_lock); +return 0 ; }static void sk_psock_tls_verdict_apply (struct sk_buff *skb,struct sock *sk,int verdict)
@@ -917,14 +918,15 @@ int sk_psock_tls_strp_read(struct sk_psock *psock, struct sk_buff *skb) }EXPORT_SYMBOL_GPL (sk_psock_tls_strp_read); -static void sk_psock_verdict_apply (struct sk_psock *psock, -struct sk_buff *skb,int verdict) +static int sk_psock_verdict_apply (struct sk_psock *psock,struct sk_buff *skb, +int verdict) {struct sock *sk_other; -int err = -EIO ; +int err =0 ;switch (verdict) {case __SK_PASS: + err = -EIO ; sk_other = psock->sk;if (sock_flag (sk_other,SOCK_DEAD ) || !sk_psock_test_state (psock,SK_PSOCK_TX_ENABLED )) {
@@ -957,13 +959,15 @@ static void sk_psock_verdict_apply(struct sk_psock *psock, }break ;case __SK_REDIRECT: -sk_psock_skb_redirect (skb); + err =sk_psock_skb_redirect (skb);break ;case __SK_DROP:default : out_free:kfree_skb (skb); } + +return err; }static void sk_psock_write_space (struct sock *sk)
@@ -1130,7 +1134,8 @@ static int sk_psock_verdict_recv(read_descriptor_t *desc, struct sk_buff *skb, ret =sk_psock_map_verd (ret,skb_bpf_redirect_fetch (skb)); skb->sk =NULL ; } -sk_psock_verdict_apply (psock, skb, ret); +if (sk_psock_verdict_apply (psock, skb, ret) <0 ) + len =0 ; out:rcu_read_unlock ();return len;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 517/800 vrf: do not push non-ND strict packets with a source LLA through packet taps again
In reply to Greg Kroah-HartmanFrom: Antoine Tenart <[email protected]>
[ Upstream commit 603113c514e95c3350598bc3cccbd03af7ea4ab2 ]
Non-ND strict packets with a source LLA go through the packet taps again, while non-ND strict packets with other source addresses do not, and we can see a clone of those packets on the vrf interface (we should not). This is due to a series of changes:
Commit 6f12fa775530[1] made non-ND strict packets not being pushed again in the packet taps. This changed with commit 205704c618af[2] for those packets having a source LLA, as they need a lookup with the orig_iif.
The issue now is those packets do not skip the 'vrf_ip6_rcv' function to the end (as the ones without a source LLA) and go through the check to call packet taps again. This check was changed by commit 6f12fa775530[1] and do not exclude non-strict packets anymore. Packets matching 'need_strict && !is_ndisc && is_ll_src' are now being sent through the packet taps again. This can be seen by dumping packets on the vrf interface.
Fix this by having the same code path for all non-ND strict packets and selectively lookup with the orig_iif for those with a source LLA. This has the effect to revert to the pre-205704c618af[2] condition, which should also be easier to maintain.
[1] 6f12fa775530 ("vrf: mark skb for multicast or link-local as enslaved to VRF")
[2] 205704c618af ("vrf: packets with lladdr src needs dst at input with orig_iif when needs strict")
--- drivers/net/vrf.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/net/vrf.c +7 -7
@@ -1366,22 +1366,22 @@ static struct sk_buff *vrf_ip6_rcv(struct net_device *vrf_dev,int orig_iif = skb->skb_iif;bool need_strict =rt6_need_strict (&ipv6_hdr (skb)->daddr);bool is_ndisc =ipv6_ndisc_frame (skb); -bool is_ll_src;/* loopback, multicast & non-ND link-local traffic; do not push through * packet taps again. Reset pkt_type for upper layers to process skb. -* for packets with lladdr src, however, skip so that the dst can be -* determine at input using original ifindex in the case that daddr -* needs strict +* For strict packets with a source LLA, determine the dst using the +* original ifindex. */ - is_ll_src =ipv6_addr_type (&ipv6_hdr (skb)->saddr) &IPV6_ADDR_LINKLOCAL ; -if (skb->pkt_type ==PACKET_LOOPBACK || - (need_strict && !is_ndisc && !is_ll_src)) { +if (skb->pkt_type ==PACKET_LOOPBACK || (need_strict && !is_ndisc)) { skb->dev = vrf_dev; skb->skb_iif = vrf_dev->ifindex;IP6CB (skb)->flags |=IP6SKB_L3SLAVE ; +if (skb->pkt_type ==PACKET_LOOPBACK ) skb->pkt_type =PACKET_HOST ; +else if (ipv6_addr_type (&ipv6_hdr (skb)->saddr) &IPV6_ADDR_LINKLOCAL ) +vrf_ip6_input_dst (skb, vrf_dev, orig_iif); + goto out; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 518/800 net: sched: add barrier to ensure correct ordering for lockless qdisc
In reply to Greg Kroah-HartmanFrom: Yunsheng Lin <[email protected]>
[ Upstream commit 89837eb4b2463c556a123437f242d6c2bc62ce81 ]
The spin_trylock() was assumed to contain the implicit barrier needed to ensure the correct ordering between STATE_MISSED setting/clearing and STATE_MISSED checking in commit a90c57f2cedd ("net: sched: fix packet stuck problem for lockless qdisc").
But it turns out that spin_trylock() only has load-acquire semantic, for strongly-ordered system(like x86), the compiler barrier implicitly contained in spin_trylock() seems enough to ensure the correct ordering. But for weakly-orderly system (like arm64), the store-release semantic is needed to ensure the correct ordering as clear_bit() and test_bit() is store operation, see queued_spin_lock().
So add the explicit barrier to ensure the correct ordering for the above case.
--- include/net/sch_generic.h | 12 ++++++++++++ 1 file changed, 12 insertions(+)
include/net/sch_generic.h +12 -0
@@ -163,6 +163,12 @@ static inline bool qdisc_run_begin(struct Qdisc *qdisc)if (spin_trylock (&qdisc->seqlock)) goto nolock_empty; +/* Paired with smp_mb__after_atomic() to make sure +* STATE_MISSED checking is synchronized with clearing +* in pfifo_fast_dequeue(). +*/ +smp_mb__before_atomic (); +/* If the MISSED flag is set, it means other thread has * set the MISSED flag before second spin_trylock(), so * we can return false here to avoid multi cpus doing
@@ -180,6 +186,12 @@ static inline bool qdisc_run_begin(struct Qdisc *qdisc)*/ set_bit (__QDISC_STATE_MISSED, &qdisc->state); +/* spin_trylock() only has load-acquire semantic, so use +* smp_mb__after_atomic() to ensure STATE_MISSED is set +* before doing the second spin_trylock(). +*/ +smp_mb__after_atomic (); +/* Retry again in case other CPU may not see the new flag * after it releases the lock at the end of qdisc_run_end(). */
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 519/800 selftests: tls: clean up uninitialized warnings
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit baa00119d69e3318da8d99867fc1170ebddf09ce ]
A bunch of tests uses uninitialized stack memory as random data to send. This is harmless but generates compiler warnings. Explicitly init the buffers with random data.
--- tools/testing/selftests/net/tls.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
tools/testing/selftests/net/tls.c +20 -0
@@ -25,6 +25,18 @@#define TLS_PAYLOAD_MAX_LEN 16384#define SOL_TLS 282 +static void memrnd (void *s,size_t n) +{ +int *dword = s; +char *byte; + +for (; n >=4 ; n -=4 ) + *dword++ =rand (); + byte = (void *)dword; +while (n--) + *byte++ =rand (); +} +FIXTURE (tls_basic) {int fd, cfd;
@@ -308,6 +320,8 @@ TEST_F(tls, recv_max)char recv_mem[TLS_PAYLOAD_MAX_LEN ];char buf[TLS_PAYLOAD_MAX_LEN ]; +memrnd (buf,sizeof (buf)); +EXPECT_GE (send (self->fd, buf, send_len,0 ),0 );EXPECT_NE (recv (self->cfd, recv_mem, send_len,0 ),-1 );EXPECT_EQ (memcmp (buf, recv_mem, send_len),0 );
@@ -588,6 +602,8 @@ TEST_F(tls, recvmsg_single_max)struct iovec vec;struct msghdr hdr; +memrnd (send_mem,sizeof (send_mem)); +EXPECT_EQ (send (self->fd, send_mem, send_len,0 ), send_len); vec.iov_base = (char *)recv_mem; vec.iov_len =TLS_PAYLOAD_MAX_LEN ;
@@ -610,6 +626,8 @@ TEST_F(tls, recvmsg_multiple)struct msghdr hdr;int i; +memrnd (buf,sizeof (buf)); +EXPECT_EQ (send (self->fd, buf, send_len,0 ), send_len);for (i =0 ; i < msg_iovlen; i++) { iov_base[i] = (char *)malloc (iov_len);
@@ -634,6 +652,8 @@ TEST_F(tls, single_send_multiple_recv)char send_mem[TLS_PAYLOAD_MAX_LEN *2 ];char recv_mem[TLS_PAYLOAD_MAX_LEN *2 ]; +memrnd (send_mem,sizeof (send_mem)); +EXPECT_GE (send (self->fd, send_mem, total_len,0 ),0 );memset (recv_mem,0 , total_len);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 520/800 selftests: tls: fix chacha+bidir tests
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 291c53e4dacd3a2cc3152d8af37f07f8496c594a ]
ChaCha support did not adjust the bidirectional test. We need to set up KTLS in reverse direction correctly, otherwise these two cases will fail:
tls.12_chacha.bidir
tls.13_chacha.bidir
--- tools/testing/selftests/net/tls.c | 67 ++++++++++++++++++------------- 1 file changed, 39 insertions(+), 28 deletions(-)
tools/testing/selftests/net/tls.c +39 -28
@@ -25,6 +25,35 @@#define TLS_PAYLOAD_MAX_LEN 16384#define SOL_TLS 282 +struct tls_crypto_info_keys { +union { +struct tls12_crypto_info_aes_gcm_128 aes128; +struct tls12_crypto_info_chacha20_poly1305 chacha20; + }; +size_t len; +}; + +static void tls_crypto_info_init (uint16_t tls_version,uint16_t cipher_type, +struct tls_crypto_info_keys *tls12) +{ +memset (tls12,0 ,sizeof (*tls12)); + +switch (cipher_type) { +case TLS_CIPHER_CHACHA20_POLY1305 : + tls12->len =sizeof (struct tls12_crypto_info_chacha20_poly1305 ); + tls12->chacha20.info.version = tls_version; + tls12->chacha20.info.cipher_type = cipher_type; +break ; +case TLS_CIPHER_AES_GCM_128 : + tls12->len =sizeof (struct tls12_crypto_info_aes_gcm_128 ); + tls12->aes128.info.version = tls_version; + tls12->aes128.info.cipher_type = cipher_type; +break ; +default : +break ; + } +} +static void memrnd (void *s,size_t n) {int *dword = s;
@@ -145,33 +174,16 @@ FIXTURE_VARIANT_ADD(tls, 13_chacha)FIXTURE_SETUP (tls) { -union { -struct tls12_crypto_info_aes_gcm_128 aes128; -struct tls12_crypto_info_chacha20_poly1305 chacha20; - } tls12; +struct tls_crypto_info_keys tls12;struct sockaddr_in addr;socklen_t len;int sfd, ret; -size_t tls12_sz; self->notls = false; len =sizeof (addr); -memset (&tls12,0 ,sizeof (tls12)); -switch (variant->cipher_type) { -case TLS_CIPHER_CHACHA20_POLY1305 : - tls12_sz =sizeof (struct tls12_crypto_info_chacha20_poly1305 ); - tls12.chacha20.info.version = variant->tls_version; - tls12.chacha20.info.cipher_type = variant->cipher_type; -break ; -case TLS_CIPHER_AES_GCM_128 : - tls12_sz =sizeof (struct tls12_crypto_info_aes_gcm_128 ); - tls12.aes128.info.version = variant->tls_version; - tls12.aes128.info.cipher_type = variant->cipher_type; -break ; -default : - tls12_sz =0 ; - } +tls_crypto_info_init (variant->tls_version, variant->cipher_type, + &tls12); addr.sin_family =AF_INET ; addr.sin_addr.s_addr =htonl (INADDR_ANY );
@@ -199,7 +211,7 @@ FIXTURE_SETUP(tls)if (!self->notls) { ret =setsockopt (self->fd,SOL_TLS ,TLS_TX , &tls12, - tls12_sz); + tls12.len);ASSERT_EQ (ret,0 ); }
@@ -212,7 +224,7 @@ FIXTURE_SETUP(tls)ASSERT_EQ (ret,0 ); ret =setsockopt (self->cfd,SOL_TLS ,TLS_RX , &tls12, - tls12_sz); + tls12.len);ASSERT_EQ (ret,0 ); }
@@ -854,18 +866,17 @@ TEST_F(tls, bidir)int ret;if (!self->notls) { -struct tls12_crypto_info_aes_gcm_128 tls12; +struct tls_crypto_info_keys tls12; -memset (&tls12,0 ,sizeof (tls12)); - tls12.info.version = variant->tls_version; - tls12.info.cipher_type =TLS_CIPHER_AES_GCM_128 ; +tls_crypto_info_init (variant->tls_version, variant->cipher_type, + &tls12); ret =setsockopt (self->fd,SOL_TLS ,TLS_RX , &tls12, -sizeof (tls12)); + tls12.len);ASSERT_EQ (ret,0 ); ret =setsockopt (self->cfd,SOL_TLS ,TLS_TX , &tls12, -sizeof (tls12)); + tls12.len);ASSERT_EQ (ret,0 ); }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 521/800 tls: prevent oversized sendfile() hangs by ignoring MSG_MORE
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit d452d48b9f8b1a7f8152d33ef52cfd7fe1735b0a ]
We got multiple reports that multi_chunk_sendfile test case from tls selftest fails. This was sort of expected, as the original fix was never applied (see it in the first Link:). The test in question uses sendfile() with count larger than the size of the underlying file. This will make splice set MSG_MORE on all sendpage calls, meaning TLS will never close and flush the last partial record.
Eric seem to have addressed a similar problem in
commit 35f9c09fe9c7 ("tcp: tcp_sendpages() should call tcp_push() once") by introducing MSG_SENDPAGE_NOTLAST. Unlike MSG_MORE MSG_SENDPAGE_NOTLAST is not set on the last call
of a "pipefull" of data (PIPE_DEF_BUFFERS == 16,
so every 16 pages or whenever we run out of data).
Having a break every 16 pages should be fine, TLS can pack exactly 4 pages into a record, so for aligned reads there should be no difference, unaligned may see one extra record per sendpage().
Sticking to TCP semantics seems preferable to modifying splice, but we can revisit it if real life scenarios show a regression.
--- net/tls/tls_sw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/tls/tls_sw.c +1 -1
@@ -1153,7 +1153,7 @@ static int tls_sw_do_sendpage(struct sock *sk, struct page *page,int ret =0 ;bool eor; - eor = !(flags & (MSG_MORE |MSG_SENDPAGE_NOTLAST )); + eor = !(flags &MSG_SENDPAGE_NOTLAST );sk_clear_bit (SOCKWQ_ASYNC_NOSPACE , sk);/* Call the sk_stream functions to manage the sndbuf mem. */
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 522/800 netfilter: nf_tables: memleak in hw offload abort path
In reply to Greg Kroah-HartmanFrom: Pablo Neira Ayuso <[email protected]>
[ Upstream commit 3c5e44622011b9ea21bd425875dcccfc9a158f5f ]
Release flow from the abort path, this is easy to reproduce since b72920f6e4a9 ("netfilter: nftables: counter hardware offload support"). If the preparation phase fails, then the abort path is exercised without releasing the flow rule object.
unreferenced object 0xffff8881f0fa7700 (size 128):
comm "nft", pid 1335, jiffies 4294931120 (age 4163.740s) hex dump (first 32 bytes):
08 e4 de 13 82 88 ff ff 98 e4 de 13 82 88 ff ff ................
48 e4 de 13 82 88 ff ff 01 00 00 00 00 00 00 00 H...............
backtrace:
[<00000000634547e7>] flow_rule_alloc+0x26/0x80
[<00000000c8426156>] nft_flow_rule_create+0xc9/0x3f0 [nf_tables]
[<0000000075ff8e46>] nf_tables_newrule+0xc79/0x10a0 [nf_tables]
[<00000000ba65e40e>] nfnetlink_rcv_batch+0xaac/0xf90 [nfnetlink]
[<00000000505c614a>] nfnetlink_rcv+0x1bb/0x1f0 [nfnetlink]
[<00000000eb78e1fe>] netlink_unicast+0x34b/0x480
[<00000000a8f72c94>] netlink_sendmsg+0x3af/0x690
[<000000009cb1ddf4>] sock_sendmsg+0x96/0xa0
[<0000000039d06e44>] ____sys_sendmsg+0x3fe/0x440
[<00000000137e82ca>] ___sys_sendmsg+0xd8/0x140
[<000000000c6bf6a6>] __sys_sendmsg+0xb3/0x130
[<0000000043bd6268>] do_syscall_64+0x40/0xb0
[<00000000afdebc2d>] entry_SYSCALL_64_after_hwframe+0x44/0xaeRemove flow rule release from the offload commit path, otherwise error from the offload commit phase might trigger a double-free due to the execution of the abort_offload -> abort. After this patch, the abort path takes care of releasing the flow rule.
This fix also needs to move the nft_flow_rule_create() call before the transaction object is added otherwise the abort path might find a NULL pointer to the flow rule object for the NFT_CHAIN_HW_OFFLOAD case.
While at it, rename BASIC-like goto tags to slightly more meaningful names rather than adding a new "err3" tag.
--- net/netfilter/nf_tables_api.c | 51 +++++++++++++++++++------------ net/netfilter/nf_tables_offload.c | 17 ----------- 2 files changed, 31 insertions(+), 37 deletions(-)
net/netfilter/nf_tables_api.c +31 -20
@@ -3243,9 +3243,9 @@ static int nf_tables_newrule(struct sk_buff *skb, const struct nfnl_info *info,u8 genmask =nft_genmask_next (info->net);struct nft_rule *rule, *old_rule =NULL ;struct nft_expr_info *expr_info =NULL ; +struct nft_flow_rule *flow =NULL ;int family = nfmsg->nfgen_family;struct net *net = info->net; -struct nft_flow_rule *flow;struct nft_userdata *udata;struct nft_table *table;struct nft_chain *chain;
@@ -3340,13 +3340,13 @@ static int nf_tables_newrule(struct sk_buff *skb, const struct nfnl_info *info,nla_for_each_nested (tmp, nla[NFTA_RULE_EXPRESSIONS ], rem) { err = -EINVAL ;if (nla_type (tmp) !=NFTA_LIST_ELEM ) - goto err1; + goto err_release_expr;if (n ==NFT_RULE_MAXEXPRS ) - goto err1; + goto err_release_expr; err =nf_tables_expr_parse (&ctx, tmp, &expr_info[n]);if (err <0 ) {NL_SET_BAD_ATTR (extack, tmp); - goto err1; + goto err_release_expr; } size += expr_info[n].ops->size; n++;
@@ -3355,7 +3355,7 @@ static int nf_tables_newrule(struct sk_buff *skb, const struct nfnl_info *info,/* Check for overflow of dlen field */ err = -EFBIG ;if (size >=1 <<12 ) - goto err1; + goto err_release_expr;if (nla[NFTA_RULE_USERDATA ]) { ulen =nla_len (nla[NFTA_RULE_USERDATA ]);
@@ -3366,7 +3366,7 @@ static int nf_tables_newrule(struct sk_buff *skb, const struct nfnl_info *info, err = -ENOMEM ; rule =kzalloc (sizeof (*rule) + size + usize,GFP_KERNEL );if (rule ==NULL ) - goto err1; + goto err_release_expr;nft_activate_next (net, rule);
@@ -3385,7 +3385,7 @@ static int nf_tables_newrule(struct sk_buff *skb, const struct nfnl_info *info, err =nf_tables_newexpr (&ctx, &expr_info[i], expr);if (err <0 ) {NL_SET_BAD_ATTR (extack, expr_info[i].attr); - goto err2; + goto err_release_rule; }if (expr_info[i].ops->validate)
@@ -3395,16 +3395,24 @@ static int nf_tables_newrule(struct sk_buff *skb, const struct nfnl_info *info, expr =nft_expr_next (expr); } +if (chain->flags &NFT_CHAIN_HW_OFFLOAD ) { + flow =nft_flow_rule_create (net, rule); +if (IS_ERR (flow)) { + err =PTR_ERR (flow); + goto err_release_rule; + } + } +if (info->nlh->nlmsg_flags &NLM_F_REPLACE ) { trans =nft_trans_rule_add (&ctx,NFT_MSG_NEWRULE , rule);if (trans ==NULL ) { err = -ENOMEM ; - goto err2; + goto err_destroy_flow_rule; } err =nft_delrule (&ctx, old_rule);if (err <0 ) {nft_trans_destroy (trans); - goto err2; + goto err_destroy_flow_rule; }list_add_tail_rcu (&rule->list, &old_rule->list);
@@ -3412,7 +3420,7 @@ static int nf_tables_newrule(struct sk_buff *skb, const struct nfnl_info *info, trans =nft_trans_rule_add (&ctx,NFT_MSG_NEWRULE , rule);if (!trans) { err = -ENOMEM ; - goto err2; + goto err_destroy_flow_rule; }if (info->nlh->nlmsg_flags &NLM_F_APPEND ) {
@@ -3430,21 +3438,19 @@ static int nf_tables_newrule(struct sk_buff *skb, const struct nfnl_info *info,kvfree (expr_info); chain->use++; +if (flow) +nft_trans_flow_rule (trans) = flow; +if (nft_net->validate_state ==NFT_VALIDATE_DO )return nft_table_validate (net, table); -if (chain->flags &NFT_CHAIN_HW_OFFLOAD ) { - flow =nft_flow_rule_create (net, rule); -if (IS_ERR (flow)) -return PTR_ERR (flow); - -nft_trans_flow_rule (trans) = flow; - } -return 0 ; -err2: + +err_destroy_flow_rule: +nft_flow_rule_destroy (flow); +err_release_rule:nf_tables_rule_release (&ctx, rule); -err1: +err_release_expr:for (i =0 ; i < n; i++) {if (expr_info[i].ops) {module_put (expr_info[i].ops->type->owner);
@@ -8839,11 +8845,16 @@ static int __nf_tables_abort(struct net *net, enum nfnl_abort_action action)nft_rule_expr_deactivate (&trans->ctx,nft_trans_rule (trans),NFT_TRANS_ABORT ); +if (trans->ctx.chain->flags &NFT_CHAIN_HW_OFFLOAD ) +nft_flow_rule_destroy (nft_trans_flow_rule (trans));break ;case NFT_MSG_DELRULE : trans->ctx.chain->use++;nft_clear (trans->ctx.net,nft_trans_rule (trans));nft_rule_expr_activate (&trans->ctx,nft_trans_rule (trans)); +if (trans->ctx.chain->flags &NFT_CHAIN_HW_OFFLOAD ) +nft_flow_rule_destroy (nft_trans_flow_rule (trans)); +nft_trans_destroy (trans);break ;case NFT_MSG_NEWSET :
net/netfilter/nf_tables_offload.c +0 -17
@@ -594,23 +594,6 @@ int nft_flow_rule_offload_commit(struct net *net) } } -list_for_each_entry (trans, &nft_net->commit_list, list) { -if (trans->ctx.family !=NFPROTO_NETDEV ) -continue ; - -switch (trans->msg_type) { -case NFT_MSG_NEWRULE : -case NFT_MSG_DELRULE : -if (!(trans->ctx.chain->flags &NFT_CHAIN_HW_OFFLOAD )) -continue ; - -nft_flow_rule_destroy (nft_trans_flow_rule (trans)); -break ; -default : -break ; - } - } -return err; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 523/800 netfilter: nf_tables_offload: check FLOW_DISSECTOR_KEY_BASIC in VLAN transfer logic
In reply to Greg Kroah-HartmanFrom: Pablo Neira Ayuso <[email protected]>
[ Upstream commit ea45fdf82cc90430bb7c280e5e53821e833782c5 ]
The VLAN transfer logic should actually check for FLOW_DISSECTOR_KEY_BASIC, not FLOW_DISSECTOR_KEY_CONTROL. Moreover, do not fallback to case 2) .n_proto is set to 802.1q or 802.1ad, if FLOW_DISSECTOR_KEY_BASIC is unset.
--- net/netfilter/nf_tables_offload.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)
net/netfilter/nf_tables_offload.c +7 -10
@@ -54,15 +54,10 @@ static void nft_flow_rule_transfer_vlan(struct nft_offload_ctx *ctx, struct nft_flow_rule *flow) {struct nft_flow_match *match = &flow->match; -struct nft_offload_ethertype ethertype; - -if (match->dissector.used_keys &BIT (FLOW_DISSECTOR_KEY_CONTROL ) && - match->key.basic.n_proto !=htons (ETH_P_8021Q ) && - match->key.basic.n_proto !=htons (ETH_P_8021AD )) -return ; - - ethertype.value = match->key.basic.n_proto; - ethertype.mask = match->mask.basic.n_proto; +struct nft_offload_ethertype ethertype = { + .value = match->key.basic.n_proto, + .mask = match->mask.basic.n_proto, + }; if (match->dissector.used_keys & BIT(FLOW_DISSECTOR_KEY_VLAN) && (match->key.vlan.vlan_tpid == htons(ETH_P_8021Q) ||
@@ -76,7 +71,9 @@ static void nft_flow_rule_transfer_vlan(struct nft_offload_ctx *ctx, match->dissector.offset[FLOW_DISSECTOR_KEY_CVLAN ] = offsetof(struct nft_flow_key , cvlan); match->dissector.used_keys |=BIT (FLOW_DISSECTOR_KEY_CVLAN ); - }else { + }else if (match->dissector.used_keys &BIT (FLOW_DISSECTOR_KEY_BASIC ) && + (match->key.basic.n_proto ==htons (ETH_P_8021Q ) || + match->key.basic.n_proto ==htons (ETH_P_8021AD ))) { match->key.basic.n_proto = match->key.vlan.vlan_tpid; match->mask.basic.n_proto = match->mask.vlan.vlan_tpid; match->key.vlan.vlan_tpid = ethertype.value;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 524/800 mptcp: fix bad handling of 32 bit ack wrap-around
In reply to Greg Kroah-HartmanFrom: Paolo Abeni <[email protected]>
[ Upstream commit 1502328f17ab0684ca5ed6764433aa0a83bdaf95 ]
When receiving 32 bits DSS ack from the peer, the MPTCP need to expand them to 64 bits value. The current code is buggy WRT detecting 32 bits ack wrap-around: when the wrap-around happens the current unsigned 32 bit ack value is lower than the previous one.
Additionally check for possible reverse wrap and make the helper visible, so that we could re-use it for the next patch.
--- net/mptcp/options.c | 29 +++++++++++++++-------------- net/mptcp/protocol.h | 8 ++++++++ 2 files changed, 23 insertions(+), 14 deletions(-)
net/mptcp/options.c +15 -14
@@ -896,19 +896,20 @@ reset:return false; } -static u64 expand_ack (u64 old_ack,u64 cur_ack,bool use_64bit) +u64 __mptcp_expand_seq (u64 old_seq,u64 cur_seq) { -u32 old_ack32, cur_ack32; - -if (use_64bit) -return cur_ack; - - old_ack32 = (u32 )old_ack; - cur_ack32 = (u32 )cur_ack; - cur_ack = (old_ack &GENMASK_ULL (63 ,32 )) + cur_ack32; -if (unlikely (before (cur_ack32, old_ack32))) -return cur_ack + (1LL <<32 ); -return cur_ack; +u32 old_seq32, cur_seq32; + + old_seq32 = (u32 )old_seq; + cur_seq32 = (u32 )cur_seq; + cur_seq = (old_seq &GENMASK_ULL (63 ,32 )) + cur_seq32; +if (unlikely (cur_seq32 < old_seq32 &&before (old_seq32, cur_seq32))) +return cur_seq + (1LL <<32 ); + +/* reverse wrap could happen, too */ +if (unlikely (cur_seq32 > old_seq32 &&after (old_seq32, cur_seq32))) +return cur_seq - (1LL <<32 ); +return cur_seq; } static void ack_update_msk(struct mptcp_sock *msk,
@@ -926,7 +927,7 @@ static void ack_update_msk(struct mptcp_sock *msk,* more dangerous than missing an ack */ old_snd_una = msk->snd_una; - new_snd_una =expand_ack (old_snd_una, mp_opt->data_ack, mp_opt->ack64); + new_snd_una =mptcp_expand_seq (old_snd_una, mp_opt->data_ack, mp_opt->ack64);/* ACK for data not even sent yet? Ignore. */ if (after64 (new_snd_una, snd_nxt))
@@ -963,7 +964,7 @@ bool mptcp_update_rcv_data_fin(struct mptcp_sock *msk, u64 data_fin_seq, bool usreturn false;WRITE_ONCE (msk->rcv_data_fin_seq, -expand_ack (READ_ONCE (msk->ack_seq), data_fin_seq, use_64bit)); +mptcp_expand_seq (READ_ONCE (msk->ack_seq), data_fin_seq, use_64bit));WRITE_ONCE (msk->rcv_data_fin,1 );return true;
net/mptcp/protocol.h +8 -0
@@ -593,6 +593,14 @@ int mptcp_setsockopt(struct sock *sk, int level, int optname,int mptcp_getsockopt (struct sock *sk,int level,int optname,char __user *optval,int __user *option); +u64 __mptcp_expand_seq (u64 old_seq,u64 cur_seq); +static inline u64 mptcp_expand_seq (u64 old_seq,u64 cur_seq,bool use_64bit) +{ +if (use_64bit) +return cur_seq; + +return __mptcp_expand_seq (old_seq, cur_seq); +}void __mptcp_check_push (struct sock *sk,struct sock *ssk);void __mptcp_data_acked (struct sock *sk);void __mptcp_error_report (struct sock *sk);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 525/800 mptcp: fix 32 bit DSN expansion
In reply to Greg Kroah-HartmanFrom: Paolo Abeni <[email protected]>
[ Upstream commit 5957a8901db44c03540505ccedd95031c21ef2f2 ]
The current implementation of 32 bit DSN expansion is buggy. After the previous patch, we can simply reuse the newly introduced helper to do the expansion safely.
--- net/mptcp/subflow.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-)
net/mptcp/subflow.c +1 -16
@@ -775,15 +775,6 @@ enum mapping_status {MAPPING_DUMMY }; -static u64 expand_seq (u64 old_seq,u16 old_data_len,u64 seq) -{ -if ((u32 )seq == (u32 )old_seq) -return old_seq; - -/* Assume map covers data not mapped yet. */ -return seq | ((old_seq + old_data_len +1 ) &GENMASK_ULL (63 ,32 )); -} -static void dbg_bad_map (struct mptcp_subflow_context *subflow,u32 ssn) { pr_debug("Bad mapping: ssn=%d map_seq=%d map_data_len=%d",
@@ -907,13 +898,7 @@ static enum mapping_status get_mapping_status(struct sock *ssk, data_len--; } -if (!mpext->dsn64) { - map_seq =expand_seq (subflow->map_seq, subflow->map_data_len, - mpext->data_seq); -pr_debug ("expanded seq=%llu" , subflow->map_seq); - }else { - map_seq = mpext->data_seq; - } + map_seq =mptcp_expand_seq (READ_ONCE (msk->ack_seq), mpext->data_seq, mpext->dsn64);WRITE_ONCE (mptcp_sk (subflow->conn)->use_64bit_ack, !!mpext->dsn64);if (subflow->map_valid) {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 526/800 net: mana: Fix a memory leak in an error handling path in mana_create_txq()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit b90788459cd6d140171b046f0b37fad341ade0a3 ]
If this test fails we must free some resources as in all the other error handling paths of this function.
--- drivers/net/ethernet/microsoft/mana/mana_en.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/ethernet/microsoft/mana/mana_en.c +4 -2
@@ -1230,8 +1230,10 @@ static int mana_create_txq(struct mana_port_context *apc, cq->gdma_id = cq->gdma_cq->id; -if (WARN_ON (cq->gdma_id >= gc->max_num_cqs)) -return -EINVAL ; +if (WARN_ON (cq->gdma_id >= gc->max_num_cqs)) { + err = -EINVAL ; + goto out; + } gc->cq_table[cq->gdma_id] = cq->gdma_cq;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 527/800 net: dsa: mv88e6xxx: Fix adding vlan 0
In reply to Greg Kroah-HartmanFrom: Eldar Gasanov <[email protected]>
[ Upstream commit b8b79c414eca4e9bcab645e02cb92c48db974ce9 ]
8021q module adds vlan 0 to all interfaces when it starts. When 8021q module is loaded it isn't possible to create bond with mv88e6xxx interfaces, bonding module dipslay error "Couldn't add bond vlan ids", because it tries to add vlan 0 to slave interfaces.
There is unexpected behavior in the switch. When a PVID is assigned to a port the switch changes VID to PVID in ingress frames with VID 0 on the port. Expected that the switch doesn't assign PVID to tagged frames with VID 0. But there isn't a way to change this behavior in the switch.
--- drivers/net/dsa/mv88e6xxx/chip.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/dsa/mv88e6xxx/chip.c +3 -3
@@ -1618,9 +1618,6 @@ static int mv88e6xxx_port_check_hw_vlan(struct dsa_switch *ds, int port,struct mv88e6xxx_vtu_entry vlan;int i, err; -if (!vid) -return -EOPNOTSUPP ; -/* DSA and CPU ports have to be members of multiple vlans */ if (dsa_is_dsa_port (ds, port) ||dsa_is_cpu_port (ds, port))return 0 ;
@@ -2109,6 +2106,9 @@ static int mv88e6xxx_port_vlan_add(struct dsa_switch *ds, int port,u8 member;int err; +if (!vlan->vid) +return 0 ; + err =mv88e6xxx_port_vlan_prepare (ds, port, vlan);if (err)return err;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 528/800 pkt_sched: sch_qfq: fix qfq_change_class() error path
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 0cd58e5c53babb9237b741dbef711f0a9eb6d3fd ]
If qfq_change_class() is unable to allocate memory for qfq_aggregate, it frees the class that has been inserted in the class hash table, but does not unhash it.
Defer the insertion after the problematic allocation.
BUG: KASAN: use-after-free in hlist_add_head include/linux/list.h:884 [inline]
BUG: KASAN: use-after-free in qdisc_class_hash_insert+0x200/0x210 net/sched/sch_api.c:731
Write of size 8 at addr ffff88814a534f10 by task syz-executor.4/31478
CPU: 0 PID: 31478 Comm: syz-executor.4 Not tainted 5.13.0-rc6-syzkaller #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011
Call Trace:
__dump_stack lib/dump_stack.c:79 [inline]
dump_stack+0x141/0x1d7 lib/dump_stack.c:120
print_address_description.constprop.0.cold+0x5b/0x2f8 mm/kasan/report.c:233
__kasan_report mm/kasan/report.c:419 [inline]
kasan_report.cold+0x7c/0xd8 mm/kasan/report.c:436
hlist_add_head include/linux/list.h:884 [inline]
qdisc_class_hash_insert+0x200/0x210 net/sched/sch_api.c:731
qfq_change_class+0x96c/0x1990 net/sched/sch_qfq.c:489
tc_ctl_tclass+0x514/0xe50 net/sched/sch_api.c:2113
rtnetlink_rcv_msg+0x44e/0xad0 net/core/rtnetlink.c:5564
netlink_rcv_skb+0x153/0x420 net/netlink/af_netlink.c:2504
netlink_unicast_kernel net/netlink/af_netlink.c:1314 [inline]
netlink_unicast+0x533/0x7d0 net/netlink/af_netlink.c:1340
netlink_sendmsg+0x856/0xd90 net/netlink/af_netlink.c:1929
sock_sendmsg_nosec net/socket.c:654 [inline]
sock_sendmsg+0xcf/0x120 net/socket.c:674
____sys_sendmsg+0x6e8/0x810 net/socket.c:2350
___sys_sendmsg+0xf3/0x170 net/socket.c:2404
__sys_sendmsg+0xe5/0x1b0 net/socket.c:2433
do_syscall_64+0x3a/0xb0 arch/x86/entry/common.c:47
entry_SYSCALL_64_after_hwframe+0x44/0xae
RIP: 0033:0x4665d9
Code: ff ff c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 40 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 bc ff ff ff f7 d8 64 89 01 48
RSP: 002b:00007fdc7b5f0188 EFLAGS: 00000246 ORIG_RAX: 000000000000002e
RAX: ffffffffffffffda RBX: 000000000056bf80 RCX: 00000000004665d9
RDX: 0000000000000000 RSI: 00000000200001c0 RDI: 0000000000000003
RBP: 00007fdc7b5f01d0 R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000002
R13: 00007ffcf7310b3f R14: 00007fdc7b5f0300 R15: 0000000000022000
Allocated by task 31445:
kasan_save_stack+0x1b/0x40 mm/kasan/common.c:38
kasan_set_track mm/kasan/common.c:46 [inline]
set_alloc_info mm/kasan/common.c:428 [inline]
____kasan_kmalloc mm/kasan/common.c:507 [inline]
____kasan_kmalloc mm/kasan/common.c:466 [inline]
__kasan_kmalloc+0x9b/0xd0 mm/kasan/common.c:516
kmalloc include/linux/slab.h:556 [inline]
kzalloc include/linux/slab.h:686 [inline]
qfq_change_class+0x705/0x1990 net/sched/sch_qfq.c:464
tc_ctl_tclass+0x514/0xe50 net/sched/sch_api.c:2113
rtnetlink_rcv_msg+0x44e/0xad0 net/core/rtnetlink.c:5564
netlink_rcv_skb+0x153/0x420 net/netlink/af_netlink.c:2504
netlink_unicast_kernel net/netlink/af_netlink.c:1314 [inline]
netlink_unicast+0x533/0x7d0 net/netlink/af_netlink.c:1340
netlink_sendmsg+0x856/0xd90 net/netlink/af_netlink.c:1929
sock_sendmsg_nosec net/socket.c:654 [inline]
sock_sendmsg+0xcf/0x120 net/socket.c:674
____sys_sendmsg+0x6e8/0x810 net/socket.c:2350
___sys_sendmsg+0xf3/0x170 net/socket.c:2404
__sys_sendmsg+0xe5/0x1b0 net/socket.c:2433
do_syscall_64+0x3a/0xb0 arch/x86/entry/common.c:47
entry_SYSCALL_64_after_hwframe+0x44/0xae
Freed by task 31445:
kasan_save_stack+0x1b/0x40 mm/kasan/common.c:38
kasan_set_track+0x1c/0x30 mm/kasan/common.c:46
kasan_set_free_info+0x20/0x30 mm/kasan/generic.c:357
____kasan_slab_free mm/kasan/common.c:360 [inline]
____kasan_slab_free mm/kasan/common.c:325 [inline]
__kasan_slab_free+0xfb/0x130 mm/kasan/common.c:368
kasan_slab_free include/linux/kasan.h:212 [inline]
slab_free_hook mm/slub.c:1583 [inline]
slab_free_freelist_hook+0xdf/0x240 mm/slub.c:1608
slab_free mm/slub.c:3168 [inline]
kfree+0xe5/0x7f0 mm/slub.c:4212
qfq_change_class+0x10fb/0x1990 net/sched/sch_qfq.c:518
tc_ctl_tclass+0x514/0xe50 net/sched/sch_api.c:2113
rtnetlink_rcv_msg+0x44e/0xad0 net/core/rtnetlink.c:5564
netlink_rcv_skb+0x153/0x420 net/netlink/af_netlink.c:2504
netlink_unicast_kernel net/netlink/af_netlink.c:1314 [inline]
netlink_unicast+0x533/0x7d0 net/netlink/af_netlink.c:1340
netlink_sendmsg+0x856/0xd90 net/netlink/af_netlink.c:1929
sock_sendmsg_nosec net/socket.c:654 [inline]
sock_sendmsg+0xcf/0x120 net/socket.c:674
____sys_sendmsg+0x6e8/0x810 net/socket.c:2350
___sys_sendmsg+0xf3/0x170 net/socket.c:2404
__sys_sendmsg+0xe5/0x1b0 net/socket.c:2433
do_syscall_64+0x3a/0xb0 arch/x86/entry/common.c:47
entry_SYSCALL_64_after_hwframe+0x44/0xae
The buggy address belongs to the object at ffff88814a534f00
which belongs to the cache kmalloc-128 of size 128
The buggy address is located 16 bytes inside of
128-byte region [ffff88814a534f00, ffff88814a534f80)
The buggy address belongs to the page:
page:ffffea0005294d00 refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x14a534
flags: 0x57ff00000000200(slab|node=1|zone=2|lastcpupid=0x7ff)
raw: 057ff00000000200 ffffea00004fee00 0000000600000006 ffff8880110418c0
raw: 0000000000000000 0000000000100010 00000001ffffffff 0000000000000000
page dumped because: kasan: bad access detected
page_owner tracks the page as allocated
page last allocated via order 0, migratetype Unmovable, gfp_mask 0x12cc0(GFP_KERNEL|__GFP_NOWARN|__GFP_NORETRY), pid 29797, ts 604817765317, free_ts 604810151744
prep_new_page mm/page_alloc.c:2358 [inline]
get_page_from_freelist+0x1033/0x2b60 mm/page_alloc.c:3994
__alloc_pages+0x1b2/0x500 mm/page_alloc.c:5200
alloc_pages+0x18c/0x2a0 mm/mempolicy.c:2272
alloc_slab_page mm/slub.c:1646 [inline]
allocate_slab+0x2c5/0x4c0 mm/slub.c:1786
new_slab mm/slub.c:1849 [inline]
new_slab_objects mm/slub.c:2595 [inline]
___slab_alloc+0x4a1/0x810 mm/slub.c:2758
__slab_alloc.constprop.0+0xa7/0xf0 mm/slub.c:2798
slab_alloc_node mm/slub.c:2880 [inline]
slab_alloc mm/slub.c:2922 [inline]
__kmalloc+0x315/0x330 mm/slub.c:4050
kmalloc include/linux/slab.h:561 [inline]
kzalloc include/linux/slab.h:686 [inline]
__register_sysctl_table+0x112/0x1090 fs/proc/proc_sysctl.c:1318
mpls_dev_sysctl_register+0x1b7/0x2d0 net/mpls/af_mpls.c:1421
mpls_add_dev net/mpls/af_mpls.c:1472 [inline]
mpls_dev_notify+0x214/0x8b0 net/mpls/af_mpls.c:1588
notifier_call_chain+0xb5/0x200 kernel/notifier.c:83
call_netdevice_notifiers_info+0xb5/0x130 net/core/dev.c:2121
call_netdevice_notifiers_extack net/core/dev.c:2133 [inline]
call_netdevice_notifiers net/core/dev.c:2147 [inline]
register_netdevice+0x106b/0x1500 net/core/dev.c:10312
veth_newlink+0x585/0xac0 drivers/net/veth.c:1547
__rtnl_newlink+0x1062/0x1710 net/core/rtnetlink.c:3452
rtnl_newlink+0x64/0xa0 net/core/rtnetlink.c:3500
page last free stack trace:
reset_page_owner include/linux/page_owner.h:24 [inline]
free_pages_prepare mm/page_alloc.c:1298 [inline]
free_pcp_prepare+0x223/0x300 mm/page_alloc.c:1342
free_unref_page_prepare mm/page_alloc.c:3250 [inline]
free_unref_page+0x12/0x1d0 mm/page_alloc.c:3298
__vunmap+0x783/0xb60 mm/vmalloc.c:2566
free_work+0x58/0x70 mm/vmalloc.c:80
process_one_work+0x98d/0x1600 kernel/workqueue.c:2276
worker_thread+0x64c/0x1120 kernel/workqueue.c:2422
kthread+0x3b1/0x4a0 kernel/kthread.c:313
ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:294
Memory state around the buggy address:
ffff88814a534e00: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
ffff88814a534e80: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
>ffff88814a534f00: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
^
ffff88814a534f80: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
ffff88814a535000: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00--- net/sched/sch_qfq.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
net/sched/sch_qfq.c +3 -5
@@ -485,11 +485,6 @@ static int qfq_change_class(struct Qdisc *sch, u32 classid, u32 parentid,if (cl->qdisc != &noop_qdisc)qdisc_hash_add (cl->qdisc, true); -sch_tree_lock (sch); -qdisc_class_hash_insert (&q->clhash, &cl->common); -sch_tree_unlock (sch); - -qdisc_class_hash_grow (sch, &q->clhash); set_change_agg:sch_tree_lock (sch);
@@ -507,8 +502,11 @@ set_change_agg: }if (existing)qfq_deact_rm_from_agg (q, cl); +else +qdisc_class_hash_insert (&q->clhash, &cl->common);qfq_add_to_agg (q, new_agg, cl);sch_tree_unlock (sch); +qdisc_class_hash_grow (sch, &q->clhash); *arg = (unsigned long )cl;return 0 ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 529/800 xfrm: Fix xfrm offload fallback fail case
In reply to Greg Kroah-HartmanFrom: Ayush Sawal <[email protected]>
[ Upstream commit dd72fadf2186fc8a6018f97fe72f4d5ca05df440 ]
In case of xfrm offload, if xdo_dev_state_add() of driver returns -EOPNOTSUPP, xfrm offload fallback is failed.
In xfrm state_add() both xso->dev and xso->real_dev are initialized to dev and when err(-EOPNOTSUPP) is returned only xso->dev is set to null.
So in this scenario the condition in func validate_xmit_xfrm(), if ((x->xso.dev != dev) && (x->xso.real_dev == dev))
return skb;
returns true, due to which skb is returned without calling esp_xmit() below which has fallback code. Hence the CRYPTO_FALLBACK is failing.
So fixing this with by keeping x->xso.real_dev as NULL when err is returned in func xfrm_dev_state_add().
--- net/xfrm/xfrm_device.c | 1 + 1 file changed, 1 insertion(+)
net/xfrm/xfrm_device.c +1 -0
@@ -268,6 +268,7 @@ int xfrm_dev_state_add(struct net *net, struct xfrm_state *x, xso->num_exthdrs =0 ; xso->flags =0 ; xso->dev =NULL ; + xso->real_dev =NULL ;dev_put (dev);if (err != -EOPNOTSUPP )
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 530/800 netfilter: nf_tables: skip netlink portID validation if zero
In reply to Greg Kroah-HartmanFrom: Pablo Neira Ayuso <[email protected]>
[ Upstream commit 534799097a777e82910f77a4f9d289c815a9a64e ]
nft_table_lookup() allows us to obtain the table object by the name and the family. The netlink portID validation needs to be skipped for the dump path, since the ownership only applies to commands to update the given table. Skip validation if the specified netlink PortID is zero when calling nft_table_lookup().
--- net/netfilter/nf_tables_api.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nf_tables_api.c +1 -1
@@ -571,7 +571,7 @@ static struct nft_table *nft_table_lookup(const struct net *net, table->family == family && nft_active_genmask(table, genmask)) {if (nft_table_has_owner (table) && - table->nlpid != nlpid) + nlpid && table->nlpid != nlpid)return ERR_PTR (-EPERM );return table;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 531/800 netfilter: nf_tables: do not allow to delete table with owner by handle
In reply to Greg Kroah-HartmanFrom: Pablo Neira Ayuso <[email protected]>
[ Upstream commit e31f072ffab0397a328b31a9589dcf9733dc9c72 ]
nft_table_lookup_byhandle() also needs to validate the netlink PortID owner when deleting a table by handle.
--- net/netfilter/nf_tables_api.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
net/netfilter/nf_tables_api.c +9 -3
@@ -583,7 +583,7 @@ static struct nft_table *nft_table_lookup(const struct net *net,static struct nft_table *nft_table_lookup_byhandle (const struct net *net,const struct nlattr *nla, -u8 genmask) +u8 genmask,u32 nlpid) {struct nftables_pernet *nft_net;struct nft_table *table;
@@ -591,8 +591,13 @@ static struct nft_table *nft_table_lookup_byhandle(const struct net *net, nft_net =nft_pernet (net);list_for_each_entry (table, &nft_net->tables, list) {if (be64_to_cpu (nla_get_be64 (nla)) == table->handle && -nft_active_genmask (table, genmask)) +nft_active_genmask (table, genmask)) { +if (nft_table_has_owner (table) && + nlpid && table->nlpid != nlpid) +return ERR_PTR (-EPERM ); +return table; + } }return ERR_PTR (-ENOENT );
@@ -1279,7 +1284,8 @@ static int nf_tables_deltable(struct sk_buff *skb, const struct nfnl_info *info,if (nla[NFTA_TABLE_HANDLE ]) { attr = nla[NFTA_TABLE_HANDLE ]; - table =nft_table_lookup_byhandle (net, attr, genmask); + table =nft_table_lookup_byhandle (net, attr, genmask, +NETLINK_CB (skb).portid); }else { attr = nla[NFTA_TABLE_NAME ]; table = nft_table_lookup(net, attr, family, genmask,
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 532/800 iwlwifi: increase PNVM load timeout
In reply to Greg Kroah-HartmanFrom: Luca Coelho <[email protected]>
[ Upstream commit 5cc816ef9db1fe03f73e56e9d8f118add9c6efe4 ]
The FW has a watchdog of 200ms in the PNVM load flow, so the driver should have a slightly higher timeout. Change the timeout from 100ms to 250ms.
--- drivers/net/wireless/intel/iwlwifi/fw/pnvm.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/intel/iwlwifi/fw/pnvm.h +2 -2
@@ -1,7 +1,7 @@/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ /****************************************************************************** * -* Copyright(c) 2020 Intel Corporation +* Copyright(c) 2020-2021 Intel Corporation * *****************************************************************************/
@@ -10,7 +10,7 @@#include "fw/notif-wait.h" -#define MVM_UCODE_PNVM_TIMEOUT (HZ / 10) +#define MVM_UCODE_PNVM_TIMEOUT (HZ / 4)int iwl_pnvm_load (struct iwl_trans *trans,struct iwl_notif_wait_data *notif_wait);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 533/800 bpf: Fix regression on BPF_OBJ_GET with non-O_RDWR flags
In reply to Greg Kroah-HartmanFrom: Maciej Żenczykowski <[email protected]>
[ Upstream commit 5dec6d96d12d33900ec315972c8e47a73bcc378d ]
This reverts commit d37300ed1821 ("bpf: program: Refuse non-O_RDWR flags in BPF_OBJ_GET"). It breaks Android userspace which expects to be able to fetch programs with just read permissions.
Side-note: another option to fix it would be to extend bpf_prog_new_fd() and to pass in used file mode flags in the same way as we do for maps via bpf_map_new_fd(). Meaning, they'd end up in anon_inode_getfd() and thus would be retained for prog fd operations with bpf() syscall. Right now these flags are not checked with progs since they are immutable for their lifetime (as opposed to maps which can be updated from user space). In future this could potentially change with new features, but at that point it's still fine to do the bpf_prog_new_fd() extension when needed. For a simple stable fix, a revert is less churn.
--- kernel/bpf/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/bpf/inode.c +1 -1
@@ -543,7 +543,7 @@ int bpf_obj_get_user(const char __user *pathname, int flags)return PTR_ERR (raw);if (type ==BPF_TYPE_PROG ) - ret = (f_flags !=O_RDWR ) ? -EINVAL :bpf_prog_new_fd (raw); + ret =bpf_prog_new_fd (raw);else if (type ==BPF_TYPE_MAP ) ret =bpf_map_new_fd (raw, f_flags);else if (type ==BPF_TYPE_LINK )
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 534/800 rtw88: 8822c: fix lc calibration timing
In reply to Greg Kroah-HartmanFrom: Po-Hao Huang <[email protected]>
[ Upstream commit 05684fd583e1acc34dddea283838fbfbed4904a0 ]
Before this patch, we use value from 2 seconds ago to decide whether we should do lc calibration.
Although this don't happen frequently, fix flow to the way it should be.
--- drivers/net/wireless/realtek/rtw88/rtw8822c.c | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-)
drivers/net/wireless/realtek/rtw88/rtw8822c.c +12 -10
@@ -4371,26 +4371,28 @@ static void rtw8822c_pwrtrack_set(struct rtw_dev *rtwdev, u8 rf_path) } } -static void rtw8822c_pwr_track_path (struct rtw_dev *rtwdev, -struct rtw_swing_table *swing_table, -u8 path) +static void rtw8822c_pwr_track_stats (struct rtw_dev *rtwdev,u8 path) { -struct rtw_dm_info *dm_info = &rtwdev->dm_info; -u8 thermal_value, delta; +u8 thermal_value;if (rtwdev->efuse.thermal_meter[path] ==0xff )return ; thermal_value =rtw_read_rf (rtwdev, path,RF_T_METER ,0x7e ); -rtw_phy_pwrtrack_avg (rtwdev, thermal_value, path); +} - delta =rtw_phy_pwrtrack_get_delta (rtwdev, path); +static void rtw8822c_pwr_track_path (struct rtw_dev *rtwdev, +struct rtw_swing_table *swing_table, +u8 path) +{ +struct rtw_dm_info *dm_info = &rtwdev->dm_info; +u8 delta; + delta =rtw_phy_pwrtrack_get_delta (rtwdev, path); dm_info->delta_power_index[path] =rtw_phy_pwrtrack_get_pwridx (rtwdev, swing_table, path, path, delta); -rtw8822c_pwrtrack_set (rtwdev, path); }
@@ -4401,12 +4403,12 @@ static void __rtw8822c_pwr_track(struct rtw_dev *rtwdev)rtw_phy_config_swing_table (rtwdev, &swing_table); +for (i =0 ; i < rtwdev->hal.rf_path_num; i++) +rtw8822c_pwr_track_stats (rtwdev, i);if (rtw_phy_pwrtrack_need_lck (rtwdev))rtw8822c_do_lck (rtwdev); -for (i =0 ; i < rtwdev->hal.rf_path_num; i++)rtw8822c_pwr_track_path (rtwdev, &swing_table, i); - }static void rtw8822c_pwr_track (struct rtw_dev *rtwdev)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 535/800 vxlan: add missing rcu_read_lock() in neigh_reduce()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 85e8b032d6ebb0f698a34dd22c2f13443d905888 ]
syzbot complained in neigh_reduce(), because rcu_read_lock_bh() is treated differently than rcu_read_lock()
WARNING: suspicious RCU usage
5.13.0-rc6-syzkaller #0 Not tainted
-----------------------------include/net/addrconf.h:313 suspicious rcu_dereference_check() usage!
other info that might help us debug this:
rcu_scheduler_active = 2, debug_locks = 1
3 locks held by kworker/0:0/5:
#0: ffff888011064d38 ((wq_completion)events){+.+.}-{0:0}, at: arch_atomic64_set arch/x86/include/asm/atomic64_64.h:34 [inline] #0: ffff888011064d38 ((wq_completion)events){+.+.}-{0:0}, at: atomic64_set include/asm-generic/atomic-instrumented.h:856 [inline] #0: ffff888011064d38 ((wq_completion)events){+.+.}-{0:0}, at: atomic_long_set include/asm-generic/atomic-long.h:41 [inline] #0: ffff888011064d38 ((wq_completion)events){+.+.}-{0:0}, at: set_work_data kernel/workqueue.c:617 [inline] #0: ffff888011064d38 ((wq_completion)events){+.+.}-{0:0}, at: set_work_pool_and_clear_pending kernel/workqueue.c:644 [inline] #0: ffff888011064d38 ((wq_completion)events){+.+.}-{0:0}, at: process_one_work+0x871/0x1600 kernel/workqueue.c:2247 #1: ffffc90000ca7da8 ((work_completion)(&port->wq)){+.+.}-{0:0}, at: process_one_work+0x8a5/0x1600 kernel/workqueue.c:2251 #2: ffffffff8bf795c0 (rcu_read_lock_bh){....}-{1:2}, at: __dev_queue_xmit+0x1da/0x3130 net/core/dev.c:4180
stack backtrace: CPU: 0 PID: 5 Comm: kworker/0:0 Not tainted 5.13.0-rc6-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Workqueue: events ipvlan_process_multicast Call Trace: __dump_stack lib/dump_stack.c:79 [inline] dump_stack+0x141/0x1d7 lib/dump_stack.c:120 __in6_dev_get include/net/addrconf.h:313 [inline] __in6_dev_get include/net/addrconf.h:311 [inline] neigh_reduce drivers/net/vxlan.c:2167 [inline] vxlan_xmit+0x34d5/0x4c30 drivers/net/vxlan.c:2919 __netdev_start_xmit include/linux/netdevice.h:4944 [inline] netdev_start_xmit include/linux/netdevice.h:4958 [inline] xmit_one net/core/dev.c:3654 [inline] dev_hard_start_xmit+0x1eb/0x920 net/core/dev.c:3670 __dev_queue_xmit+0x2133/0x3130 net/core/dev.c:4246 ipvlan_process_multicast+0xa99/0xd70 drivers/net/ipvlan/ipvlan_core.c:287 process_one_work+0x98d/0x1600 kernel/workqueue.c:2276 worker_thread+0x64c/0x1120 kernel/workqueue.c:2422 kthread+0x3b1/0x4a0 kernel/kthread.c:313 ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:294
--- drivers/net/vxlan.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/vxlan.c +2 -0
@@ -2164,6 +2164,7 @@ static int neigh_reduce(struct net_device *dev, struct sk_buff *skb, __be32 vni)struct neighbour *n;struct nd_msg *msg; +rcu_read_lock (); in6_dev =__in6_dev_get (dev);if (!in6_dev) goto out;
@@ -2215,6 +2216,7 @@ static int neigh_reduce(struct net_device *dev, struct sk_buff *skb, __be32 vni) } out: +rcu_read_unlock ();consume_skb (skb);return NETDEV_TX_OK ; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 536/800 bpf: Fix integer overflow in argument calculation for bpf_map_area_alloc
In reply to Greg Kroah-HartmanFrom: Bui Quang Minh <[email protected]>
[ Upstream commit 7dd5d437c258bbf4cc15b35229e5208b87b8b4e0 ]
In 32-bit architecture, the result of sizeof() is a 32-bit integer so the expression becomes the multiplication between 2 32-bit integer which can potentially leads to integer overflow. As a result, bpf_map_area_alloc() allocates less memory than needed.
Fix this by casting 1 operand to u64.
--- kernel/bpf/devmap.c | 4 ++-- net/core/sock_map.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
kernel/bpf/devmap.c +2 -2
@@ -92,7 +92,7 @@ static struct hlist_head *dev_map_create_hash(unsigned int entries,int i;struct hlist_head *hash; - hash =bpf_map_area_alloc (entries *sizeof (*hash), numa_node); + hash =bpf_map_area_alloc ((u64 ) entries *sizeof (*hash), numa_node);if (hash !=NULL )for (i =0 ; i < entries; i++)INIT_HLIST_HEAD (&hash[i]);
@@ -143,7 +143,7 @@ static int dev_map_init_map(struct bpf_dtab *dtab, union bpf_attr *attr)spin_lock_init (&dtab->index_lock); }else { - dtab->netdev_map =bpf_map_area_alloc (dtab->map.max_entries * + dtab->netdev_map =bpf_map_area_alloc ((u64 ) dtab->map.max_entries *sizeof (struct bpf_dtab_netdev *), dtab->map.numa_node);if (!dtab->netdev_map)
net/core/sock_map.c +1 -1
@@ -48,7 +48,7 @@ static struct bpf_map *sock_map_alloc(union bpf_attr *attr)bpf_map_init_from_attr (&stab->map, attr);raw_spin_lock_init (&stab->lock); - stab->sks =bpf_map_area_alloc (stab->map.max_entries * + stab->sks =bpf_map_area_alloc ((u64 ) stab->map.max_entries *sizeof (struct sock *), stab->map.numa_node);if (!stab->sks) {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 537/800 mptcp: avoid race on msk state changes
In reply to Greg Kroah-HartmanFrom: Paolo Abeni <[email protected]>
[ Upstream commit 490274b47468793e3e157c2df6b2da0e646cc4a9 ]
The msk socket state is currently updated in a few spots without owning the msk socket lock itself.
Some of such operations are safe, as they happens before exposing the msk socket to user-space and can't race with other changes.
A couple of them, at connect time, can actually race with close() or shutdown(), leaving breaking the socket state machine.
This change addresses the issue moving such update under the msk socket lock with the usual:
<acquire spinlock>
<check sk lock onwers>
<ev defer to release_cb>
scheme.
--- net/mptcp/protocol.c | 5 +++++ net/mptcp/protocol.h | 2 ++ net/mptcp/subflow.c | 30 ++++++++++++++++++++++-------- 3 files changed, 29 insertions(+), 8 deletions(-)
net/mptcp/protocol.c +5 -0
@@ -2946,6 +2946,11 @@ static void mptcp_release_cb(struct sock *sk)spin_lock_bh (&sk->sk_lock.slock); } +/* be sure to set the current sk state before tacking actions +* depending on sk_state +*/ +if (test_and_clear_bit (MPTCP_CONNECTED , &mptcp_sk (sk)->flags)) +__mptcp_set_connected (sk);if (test_and_clear_bit (MPTCP_CLEAN_UNA , &mptcp_sk (sk)->flags))__mptcp_clean_una_wakeup (sk);if (test_and_clear_bit (MPTCP_ERROR_REPORT , &mptcp_sk (sk)->flags))
net/mptcp/protocol.h +2 -0
@@ -109,6 +109,7 @@#define MPTCP_ERROR_REPORT 8#define MPTCP_RETRANSMIT 9#define MPTCP_WORK_SYNC_SETSOCKOPT 10 +#define MPTCP_CONNECTED 11static inline bool before64 (__u64 seq1,__u64 seq2) {
@@ -579,6 +580,7 @@ void mptcp_get_options(const struct sk_buff *skb, struct mptcp_options_received *mp_opt);void mptcp_finish_connect (struct sock *sk); +void __mptcp_set_connected (struct sock *sk);static inline bool mptcp_is_fully_established (struct sock *sk) { return inet_sk_state_load(sk) == TCP_ESTABLISHED &&
net/mptcp/subflow.c +22 -8
@@ -371,6 +371,24 @@ static bool subflow_use_different_dport(struct mptcp_sock *msk, const struct socreturn inet_sk (sk)->inet_dport !=inet_sk ((struct sock *)msk)->inet_dport; } +void __mptcp_set_connected (struct sock *sk) +{ +if (sk->sk_state ==TCP_SYN_SENT ) { +inet_sk_state_store (sk,TCP_ESTABLISHED ); + sk->sk_state_change (sk); + } +} + +static void mptcp_set_connected (struct sock *sk) +{ +mptcp_data_lock (sk); +if (!sock_owned_by_user (sk)) +__mptcp_set_connected (sk); +else +set_bit (MPTCP_CONNECTED , &mptcp_sk (sk)->flags); +mptcp_data_unlock (sk); +} +static void subflow_finish_connect (struct sock *sk,const struct sk_buff *skb) {struct mptcp_subflow_context *subflow =mptcp_subflow_ctx (sk);
@@ -379,10 +397,6 @@ static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb) subflow->icsk_af_ops->sk_rx_dst_set (sk, skb); -if (inet_sk_state_load (parent) ==TCP_SYN_SENT ) { -inet_sk_state_store (parent,TCP_ESTABLISHED ); - parent->sk_state_change (parent); - }/* be sure no special action on any packet other than syn-ack */ if (subflow->conn_finished)
@@ -411,6 +425,7 @@ static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb) subflow->remote_key);MPTCP_INC_STATS (sock_net (sk),MPTCP_MIB_MPCAPABLEACTIVEACK );mptcp_finish_connect (sk); +mptcp_set_connected (parent); }else if (subflow->request_join) {u8 hmac[SHA256_DIGEST_SIZE ];
@@ -451,6 +466,7 @@ static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb) }else if (mptcp_check_fallback (sk)) { fallback:mptcp_rcv_space_init (mptcp_sk (parent), sk); +mptcp_set_connected (parent); }return ;
@@ -558,6 +574,7 @@ static void mptcp_sock_destruct(struct sock *sk)static void mptcp_force_close (struct sock *sk) { +/* the msk is not yet exposed to user-space */ inet_sk_state_store (sk,TCP_CLOSE );sk_common_release (sk); }
@@ -1474,10 +1491,7 @@ static void subflow_state_change(struct sock *sk)mptcp_rcv_space_init (mptcp_sk (parent), sk);pr_fallback (mptcp_sk (parent)); subflow->conn_finished =1 ; -if (inet_sk_state_load (parent) ==TCP_SYN_SENT ) { -inet_sk_state_store (parent,TCP_ESTABLISHED ); - parent->sk_state_change (parent); - } +mptcp_set_connected (parent); }/* as recvmsg() does not acquire the subflow socket for ssk selection
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 538/800 ip6_tunnel: fix GRE6 segmentation
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit a6e3f2985a80ef6a45a17d2d9d9151f17ea3ce07 ]
Commit 6c11fbf97e69 ("ip6_tunnel: add MPLS transmit support") moved assiging inner_ipproto down from ipxip6_tnl_xmit() to its callee ip6_tnl_xmit(). The latter is also used by GRE.
Since commit 38720352412a ("gre: Use inner_proto to obtain inner header protocol") GRE had been depending on skb->inner_protocol during segmentation. It sets it in gre_build_header() and reads it in gre_gso_segment(). Changes to ip6_tnl_xmit() overwrite the protocol, resulting in GSO skbs getting dropped.
Note that inner_protocol is a union with inner_ipproto, GRE uses the former while the change switched it to the latter (always setting it to just IPPROTO_GRE).
Restore the original location of skb_set_inner_ipproto(), it is unclear why it was moved in the first place.
--- net/ipv6/ip6_tunnel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/ipv6/ip6_tunnel.c +2 -2
@@ -1239,8 +1239,6 @@ route_lookup:if (max_headroom > dev->needed_headroom) dev->needed_headroom = max_headroom; -skb_set_inner_ipproto (skb, proto); - err =ip6_tnl_encap (skb, t, &proto, fl6);if (err)return err;
@@ -1377,6 +1375,8 @@ ipxip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev,if (iptunnel_handle_offloads (skb,SKB_GSO_IPXIP6 ))return -1 ; +skb_set_inner_ipproto (skb, protocol); + err =ip6_tnl_xmit (skb, dev, dsfield, &fl6, encap_limit, &mtu, protocol);if (err !=0 ) {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 539/800 net/ipv4: swap flow ports when validating source
In reply to Greg Kroah-HartmanFrom: Miao Wang <[email protected]>
[ Upstream commit c69f114d09891adfa3e301a35d9e872b8b7b5a50 ]
When doing source address validation, the flowi4 struct used for fib_lookup should be in the reverse direction to the given skb. fl4_dport and fl4_sport returned by fib4_rules_early_flow_dissect should thus be swapped.
--- net/ipv4/fib_frontend.c | 2 ++ 1 file changed, 2 insertions(+)
net/ipv4/fib_frontend.c +2 -0
@@ -371,6 +371,8 @@ static int __fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst, fl4.flowi4_proto =0 ; fl4.fl4_sport =0 ; fl4.fl4_dport =0 ; + }else { +swap (fl4.fl4_sport, fl4.fl4_dport); }if (fib_lookup (net, &fl4, &res,0 ))
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 540/800 net: broadcom: bcm4908_enet: reset DMA rings sw indexes properly
In reply to Greg Kroah-HartmanFrom: Rafał Miłecki <[email protected]>
[ Upstream commit ddeacc4f6494e07cbb6f033627926623f3e7a9d0 ]
Resetting software indexes in bcm4908_dma_alloc_buf_descs() is not enough as it's called during device probe only. Driver resets DMA on every .ndo_open callback and it's required to reset indexes then.
This fixes inconsistent rings state and stalled traffic after interface down & up sequence.
--- drivers/net/ethernet/broadcom/bcm4908_enet.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/broadcom/bcm4908_enet.c +3 -3
@@ -174,9 +174,6 @@ static int bcm4908_dma_alloc_buf_descs(struct bcm4908_enet *enet,if (!ring->slots) goto err_free_buf_descs; - ring->read_idx =0 ; - ring->write_idx =0 ; -return 0 ; err_free_buf_descs:
@@ -304,6 +301,9 @@ static void bcm4908_enet_dma_ring_init(struct bcm4908_enet *enet,enet_write (enet, ring->st_ram_block +ENET_DMA_CH_STATE_RAM_BASE_DESC_PTR , (uint32_t )ring->dma_addr); + + ring->read_idx =0 ; + ring->write_idx =0 ; }static void bcm4908_enet_dma_uninit (struct bcm4908_enet *enet)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 541/800 net: ti: am65-cpsw-nuss: Fix crash when changing number of TX queues
In reply to Greg Kroah-HartmanFrom: Vignesh Raghavendra <[email protected]>
[ Upstream commit ce8eb4c728ef40b554b4f3d8963f11ed44502e00 ]
When changing number of TX queues using ethtool:
# ethtool -L eth0 tx 1 [ 135.301047] Unable to handle kernel paging request at virtual address 00000000af5d0000 [...] [ 135.525128] Call trace: [ 135.525142] dma_release_from_dev_coherent+0x2c/0xb0 [ 135.525148] dma_free_attrs+0x54/0xe0 [ 135.525156] k3_cppi_desc_pool_destroy+0x50/0xa0 [ 135.525164] am65_cpsw_nuss_remove_tx_chns+0x88/0xdc [ 135.525171] am65_cpsw_set_channels+0x3c/0x70 [...]
This is because k3_cppi_desc_pool_destroy() which is called after k3_udma_glue_release_tx_chn() in am65_cpsw_nuss_remove_tx_chns() references struct device that is unregistered at the end of k3_udma_glue_release_tx_chn()
Therefore the right order is to call k3_cppi_desc_pool_destroy() and destroy desc pool before calling k3_udma_glue_release_tx_chn(). Fix this throughout the driver.
--- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/net/ethernet/ti/am65-cpsw-nuss.c +9 -9
@@ -1506,12 +1506,12 @@ static void am65_cpsw_nuss_free_tx_chns(void *data)for (i =0 ; i < common->tx_ch_num; i++) {struct am65_cpsw_tx_chn *tx_chn = &common->tx_chns[i]; -if (!IS_ERR_OR_NULL (tx_chn->tx_chn)) -k3_udma_glue_release_tx_chn (tx_chn->tx_chn); -if (!IS_ERR_OR_NULL (tx_chn->desc_pool))k3_cppi_desc_pool_destroy (tx_chn->desc_pool); +if (!IS_ERR_OR_NULL (tx_chn->tx_chn)) +k3_udma_glue_release_tx_chn (tx_chn->tx_chn); +memset (tx_chn,0 ,sizeof (*tx_chn)); } }
@@ -1531,12 +1531,12 @@ void am65_cpsw_nuss_remove_tx_chns(struct am65_cpsw_common *common)netif_napi_del (&tx_chn->napi_tx); -if (!IS_ERR_OR_NULL (tx_chn->tx_chn)) -k3_udma_glue_release_tx_chn (tx_chn->tx_chn); -if (!IS_ERR_OR_NULL (tx_chn->desc_pool))k3_cppi_desc_pool_destroy (tx_chn->desc_pool); +if (!IS_ERR_OR_NULL (tx_chn->tx_chn)) +k3_udma_glue_release_tx_chn (tx_chn->tx_chn); +memset (tx_chn,0 ,sizeof (*tx_chn)); } }
@@ -1624,11 +1624,11 @@ static void am65_cpsw_nuss_free_rx_chns(void *data) rx_chn = &common->rx_chns; -if (!IS_ERR_OR_NULL (rx_chn->rx_chn)) -k3_udma_glue_release_rx_chn (rx_chn->rx_chn); -if (!IS_ERR_OR_NULL (rx_chn->desc_pool))k3_cppi_desc_pool_destroy (rx_chn->desc_pool); + +if (!IS_ERR_OR_NULL (rx_chn->rx_chn)) +k3_udma_glue_release_rx_chn (rx_chn->rx_chn); }static int am65_cpsw_nuss_init_rx_chns (struct am65_cpsw_common *common)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 542/800 tc-testing: fix list handling
In reply to Greg Kroah-HartmanFrom: Marcelo Ricardo Leitner <[email protected]>
[ Upstream commit b4fd096cbb871340be837491fa1795864a48b2d9 ]
python lists don't have an 'add' method, but 'append'.
--- tools/testing/selftests/tc-testing/plugin-lib/scapyPlugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/tc-testing/plugin-lib/scapyPlugin.py +1 -1
@@ -36,7 +36,7 @@ class SubPlugin(TdcPlugin): for k in scapy_keys: if k not in scapyinfo: keyfail = True - missing_keys.add(k) + missing_keys.append(k) if keyfail: print('{}: Scapy block present in the test, but is missing info:' .format(self.sub_class))
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 543/800 RDMA/hns: Force rewrite inline flag of WQE
In reply to Greg Kroah-HartmanFrom: Lang Cheng <[email protected]>
[ Upstream commit e13026578b727becf2614f34a4f35e7f0ed21be1 ]
When a non-inline WR reuses a WQE that was used for inline last time, the remaining inline flag should be cleared.
--- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +2 -2
@@ -274,8 +274,6 @@ static int set_rc_inl(struct hns_roce_qp *qp, const struct ib_send_wr *wr, dseg +=sizeof (struct hns_roce_v2_rc_send_wqe ); -roce_set_bit (rc_sq_wqe->byte_4,V2_RC_SEND_WQE_BYTE_4_INLINE_S ,1 ); -if (msg_len <=HNS_ROCE_V2_MAX_RC_INL_INN_SZ ) {roce_set_bit (rc_sq_wqe->byte_20,V2_RC_SEND_WQE_BYTE_20_INL_TYPE_S ,0 );
@@ -320,6 +318,8 @@ static int set_rwqe_data_seg(struct ib_qp *ibqp, const struct ib_send_wr *wr,V2_RC_SEND_WQE_BYTE_20_MSG_START_SGE_IDX_S , (*sge_ind) & (qp->sge.sge_cnt - 1)); +roce_set_bit (rc_sq_wqe->byte_4,V2_RC_SEND_WQE_BYTE_4_INLINE_S , + !!(wr->send_flags &IB_SEND_INLINE ));if (wr->send_flags &IB_SEND_INLINE )return set_rc_inl (qp, wr, rc_sq_wqe, sge_ind);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 544/800 RDMA/hns: Fix uninitialized variable
In reply to Greg Kroah-HartmanFrom: Yixing Liu <[email protected]>
[ Upstream commit 2a38c0f10e6d7d28e06ff1eb1f350804c4850275 ]
A random value will be returned if the condition below is not met, so it needs to be initialized.
--- drivers/infiniband/hw/hns/hns_roce_mr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/hns/hns_roce_mr.c +1 -1
@@ -776,7 +776,7 @@ int hns_roce_mtr_map(struct hns_roce_dev *hr_dev, struct hns_roce_mtr *mtr,struct ib_device *ibdev = &hr_dev->ib_dev;struct hns_roce_buf_region *r;unsigned int i, mapped_cnt; -int ret; +int ret =0 ;/* * Only use the first page address as root ba when hopnum is 0, this
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 545/800 ieee802154: hwsim: Fix memory leak in hwsim_add_one
In reply to Greg Kroah-HartmanFrom: Dongliang Mu <[email protected]>
[ Upstream commit 28a5501c3383f0e6643012c187b7c2027ef42aea ]
No matter from hwsim_remove or hwsim_del_radio_nl, hwsim_del fails to remove the entry in the edges list. Take the example below, phy0, phy1 and e0 will be deleted, resulting in e1 not freed and accessed in the future.
hwsim_phys
|
------------------------------
| |phy0 (edges) phy1 (edges)
----> e1 (idx = 1) ----> e0 (idx = 0)
Fix this by deleting and freeing all the entries in the edges list between hwsim_edge_unsubscribe_me and list_del(&phy->list).
--- drivers/net/ieee802154/mac802154_hwsim.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/ieee802154/mac802154_hwsim.c +5 -0
@@ -824,12 +824,17 @@ err_pib:static void hwsim_del (struct hwsim_phy *phy) {struct hwsim_pib *pib; +struct hwsim_edge *e;hwsim_edge_unsubscribe_me (phy);list_del (&phy->list);rcu_read_lock (); +list_for_each_entry_rcu (e, &phy->edges, list) { +list_del_rcu (&e->list); +hwsim_free_edge (e); + } pib =rcu_dereference (phy->pib);rcu_read_unlock ();
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 546/800 ieee802154: hwsim: avoid possible crash in hwsim_del_edge_nl()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 0303b30375dff5351a79cc2c3c87dfa4fda29bed ]
Both MAC802154_HWSIM_ATTR_RADIO_ID and MAC802154_HWSIM_ATTR_RADIO_EDGE must be present to avoid a crash.
--- drivers/net/ieee802154/mac802154_hwsim.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ieee802154/mac802154_hwsim.c +1 -1
@@ -480,7 +480,7 @@ static int hwsim_del_edge_nl(struct sk_buff *msg, struct genl_info *info)struct hwsim_edge *e;u32 v0, v1; -if (!info->attrs[MAC802154_HWSIM_ATTR_RADIO_ID ] && +if (!info->attrs[MAC802154_HWSIM_ATTR_RADIO_ID ] || !info->attrs[MAC802154_HWSIM_ATTR_RADIO_EDGE ])return -EINVAL ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 547/800 bpf: Fix null ptr deref with mixed tail calls and subprogs
In reply to Greg Kroah-HartmanFrom: John Fastabend <[email protected]>
[ Upstream commit 7506d211b932870155bcb39e3dd9e39fab45a7c7 ]
The sub-programs prog->aux->poke_tab[] is populated in jit_subprogs() and then used when emitting 'BPF_JMP|BPF_TAIL_CALL' insn->code from the individual JITs. The poke_tab[] to use is stored in the insn->imm by the code adding it to that array slot. The JIT then uses imm to find the right entry for an individual instruction. In the x86 bpf_jit_comp.c this is done by calling emit_bpf_tail_call_direct with the poke_tab[] of the imm value.
However, we observed the below null-ptr-deref when mixing tail call programs with subprog programs. For this to happen we just need to mix bpf-2-bpf calls and tailcalls with some extra calls or instructions that would be patched later by one of the fixup routines. So whats happening?
Before the fixup_call_args() -- where the jit op is done -- various code patching is done by do_misc_fixups(). This may increase the insn count, for example when we patch map_lookup_up using map_gen_lookup hook. This does two things. First, it means the instruction index, insn_idx field, of a tail call instruction will move by a 'delta'.
In verifier code,
struct bpf_jit_poke_descriptor desc = {
.reason = BPF_POKE_REASON_TAIL_CALL, .tail_call.map = BPF_MAP_PTR(aux->map_ptr_state), .tail_call.key = bpf_map_key_immediate(aux), .insn_idx = i + delta,
};
Then subprog start values subprog_info[i].start will be updated with the delta and any poke descriptor index will also be updated with the delta in adjust_poke_desc(). If we look at the adjust subprog starts though we see its only adjusted when the delta occurs before the new instructions,
/* NOTE: fake 'exit' subprog should be updated as well. */
for (i = 0; i <= env->subprog_cnt; i++) {
if (env->subprog_info[i].start <= off)
continue;Earlier subprograms are not changed because their start values are not moved. But, adjust_poke_desc() does the offset + delta indiscriminately. The result is poke descriptors are potentially corrupted.
Then in jit_subprogs() we only populate the poke_tab[]
when the above insn_idx is less than the next subprogram start. From above we corrupted our insn_idx so we might incorrectly assume a poke descriptor is not used in a subprogram omitting it from the subprogram. And finally when the jit runs it does the deref of poke_tab when emitting the instruction and crashes with below. Because earlier step omitted the poke descriptor.
The fix is straight forward with above context. Simply move same logic from adjust_subprog_starts() into adjust_poke_descs() and only adjust insn_idx when needed.
[ 82.396354] bpf_testmod: version magic '5.12.0-rc2alu+ SMP preempt mod_unload ' should be '5.12.0+ SMP preempt mod_unload ' [ 82.623001] loop10: detected capacity change from 0 to 8 [ 88.487424] ================================================================== [ 88.487438] BUG: KASAN: null-ptr-deref in do_jit+0x184a/0x3290 [ 88.487455] Write of size 8 at addr 0000000000000008 by task test_progs/5295 [ 88.487471] CPU: 7 PID: 5295 Comm: test_progs Tainted: G I 5.12.0+ #386 [ 88.487483] Hardware name: Dell Inc. Precision 5820 Tower/002KVM, BIOS 1.9.2 01/24/2019 [ 88.487490] Call Trace: [ 88.487498] dump_stack+0x93/0xc2 [ 88.487515] kasan_report.cold+0x5f/0xd8 [ 88.487530] ? do_jit+0x184a/0x3290 [ 88.487542] do_jit+0x184a/0x3290 ... [ 88.487709] bpf_int_jit_compile+0x248/0x810 ... [ 88.487765] bpf_check+0x3718/0x5140 ... [ 88.487920] bpf_prog_load+0xa22/0xf10
--- kernel/bpf/verifier.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
kernel/bpf/verifier.c +4 -2
@@ -11459,7 +11459,7 @@ static void adjust_subprog_starts(struct bpf_verifier_env *env, u32 off, u32 len } } -static void adjust_poke_descs (struct bpf_prog *prog,u32 len) +static void adjust_poke_descs (struct bpf_prog *prog,u32 off,u32 len) {struct bpf_jit_poke_descriptor *tab = prog->aux->poke_tab;int i, sz = prog->aux->size_poke_tab;
@@ -11467,6 +11467,8 @@ static void adjust_poke_descs(struct bpf_prog *prog, u32 len)for (i =0 ; i < sz; i++) { desc = &tab[i]; +if (desc->insn_idx <= off) +continue ; desc->insn_idx += len -1 ; } }
@@ -11487,7 +11489,7 @@ static struct bpf_prog *bpf_patch_insn_data(struct bpf_verifier_env *env, u32 ofif (adjust_insn_aux_data (env, new_prog, off, len))return NULL ;adjust_subprog_starts (env, off, len); -adjust_poke_descs (new_prog, len); +adjust_poke_descs (new_prog, off, len);return new_prog; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 548/800 drm/msm/dp: handle irq_hpd with sink_count = 0 correctly
In reply to Greg Kroah-HartmanFrom: Kuogee Hsieh <[email protected]>
[ Upstream commit f21c8a276c2daddddf58d483b49b01d0603f0316 ]
irq_hpd interrupt should be handled after dongle plugged in and before dongle unplugged. Hence irq_hpd interrupt is enabled at the end of the plugin handle and disabled at the beginning of unplugged handle. Current irq_hpd with sink_count = 0 is wrongly handled same as the dongle unplugged which tears down the mainlink and disables the phy. This patch fixes this problem by only tearing down the mainlink but keeping phy enabled at irq_hpd with sink_count = 0 handle so that next irq_hpd with sink_count =1 can be handled by setup mainlink only. This patch also set dongle into D3 (power off) state at end of handling irq_hpd with sink_count = 0.
Changes in v2:
-- add ctrl->phy_Power_count
Changes in v3:
-- del ctrl->phy_Power_count
-- add phy_power_off to dp_ctrl_off_link_stream()
Changes in v4:
-- return immediately if clock disable failed at dp_ctrl_off_link_stream()
Changes in v5:
-- set dongle to D3 (power off) state at dp_ctrl_off_link_stream()
Changes in v6:
-- add Fixes tag
--- drivers/gpu/drm/msm/dp/dp_catalog.c | 5 +-- drivers/gpu/drm/msm/dp/dp_ctrl.c | 55 ++++++++++++++++++++++++++++ drivers/gpu/drm/msm/dp/dp_ctrl.h | 2 + drivers/gpu/drm/msm/dp/dp_display.c | 57 +++++++++++++++++++++-------- 4 files changed, 101 insertions(+), 18 deletions(-)
drivers/gpu/drm/msm/dp/dp_catalog.c +2 -3
@@ -582,10 +582,9 @@ void dp_catalog_ctrl_hpd_config(struct dp_catalog *dp_catalog)u32 reftimer =dp_read_aux (catalog,REG_DP_DP_HPD_REFTIMER ); -/* enable HPD interrupts */ +/* enable HPD plug and unplug interrupts */ dp_catalog_hpd_config_intr (dp_catalog, -DP_DP_HPD_PLUG_INT_MASK |DP_DP_IRQ_HPD_INT_MASK - |DP_DP_HPD_UNPLUG_INT_MASK |DP_DP_HPD_REPLUG_INT_MASK , true); +DP_DP_HPD_PLUG_INT_MASK |DP_DP_HPD_UNPLUG_INT_MASK , true);/* Configure REFTIMER and enable it */ reftimer |=DP_DP_HPD_REFTIMER_ENABLE ;
drivers/gpu/drm/msm/dp/dp_ctrl.c +55 -0
61 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_ctrl.h +2 -0
@@ -23,6 +23,8 @@ int dp_ctrl_host_init(struct dp_ctrl *dp_ctrl, bool flip, bool reset);void dp_ctrl_host_deinit (struct dp_ctrl *dp_ctrl);int dp_ctrl_on_link (struct dp_ctrl *dp_ctrl);int dp_ctrl_on_stream (struct dp_ctrl *dp_ctrl); +int dp_ctrl_off_link_stream (struct dp_ctrl *dp_ctrl); +void dp_ctrl_off_phy (struct dp_ctrl *dp_ctrl);int dp_ctrl_off (struct dp_ctrl *dp_ctrl);void dp_ctrl_push_idle (struct dp_ctrl *dp_ctrl);void dp_ctrl_isr (struct dp_ctrl *dp_ctrl);
drivers/gpu/drm/msm/dp/dp_display.c +42 -15
105 lines not on this page · raw message
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 549/800 drm/msm/disp/dpu1: avoid perf update in frame done event
In reply to Greg Kroah-HartmanFrom: Krishna Manikandan <[email protected]>
[ Upstream commit a1f2ba60eace242fd034173db3762f342a824a2e ]
Crtc perf update from frame event work can result in wrong bandwidth and clock update from dpu if the work is scheduled after the swap state has happened.
Avoid such issues by moving perf update to complete commit once the frame is accepted by the hardware.
--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +1 -3
@@ -407,9 +407,6 @@ static void dpu_crtc_frame_event_work(struct kthread_work *work) fevent->event); } -if (fevent->event &DPU_ENCODER_FRAME_EVENT_DONE ) -dpu_core_perf_crtc_update (crtc,0 , false); -if (fevent->event & (DPU_ENCODER_FRAME_EVENT_DONE |DPU_ENCODER_FRAME_EVENT_ERROR )) frame_done = true;
@@ -477,6 +474,7 @@ static void dpu_crtc_frame_event_cb(void *data, u32 event)void dpu_crtc_complete_commit (struct drm_crtc *crtc) {trace_dpu_crtc_complete_commit (DRMID (crtc)); +dpu_core_perf_crtc_update (crtc,0 , false);_dpu_crtc_complete_flip (crtc); }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 550/800 drm/msm: Fix error return code in msm_drm_init()
In reply to Greg Kroah-HartmanFrom: Zhen Lei <[email protected]>
[ Upstream commit a1c9b1e3bdd6d8dc43c18699772fb6cf4497d45a ]
Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function.
--- drivers/gpu/drm/msm/msm_drv.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/msm/msm_drv.c +1 -0
@@ -523,6 +523,7 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv) priv->event_thread[i].worker =kthread_create_worker (0 ,"crtc_event:%d" , priv->event_thread[i].crtc_id);if (IS_ERR (priv->event_thread[i].worker)) { + ret =PTR_ERR (priv->event_thread[i].worker);DRM_DEV_ERROR (dev,"failed to create crtc_event kthread\n" ); goto err_msm_uninit; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 551/800 drm/msm/dpu: Fix error return code in dpu_mdss_init()
In reply to Greg Kroah-HartmanFrom: Zhen Lei <[email protected]>
[ Upstream commit e020ac961ce5d038de66dc7f6ffca98899e9a3f3 ]
The error code returned by platform_get_irq() is stored in 'irq', it's forgotten to be copied to 'ret' before being returned. As a result, the value 0 of 'ret' is returned incorrectly.
After the above fix is completed, initializing the local variable 'ret' to 0 is no longer needed, remove it.
In addition, when dpu_mdss_init() is successfully returned, the value of 'ret' is always 0. Therefore, replace "return ret" with "return 0" to make the code clearer.
--- drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c +5 -3
@@ -225,7 +225,7 @@ int dpu_mdss_init(struct drm_device *dev)struct msm_drm_private *priv = dev->dev_private;struct dpu_mdss *dpu_mdss;struct dss_module_power *mp; -int ret =0 ; +int ret;int irq; dpu_mdss =devm_kzalloc (dev->dev,sizeof (*dpu_mdss),GFP_KERNEL );
@@ -253,8 +253,10 @@ int dpu_mdss_init(struct drm_device *dev) goto irq_domain_error; irq =platform_get_irq (pdev,0 ); -if (irq <0 ) +if (irq <0 ) { + ret = irq; goto irq_error; + }irq_set_chained_handler_and_data (irq, dpu_mdss_irq, dpu_mdss);
@@ -263,7 +265,7 @@ int dpu_mdss_init(struct drm_device *dev)pm_runtime_enable (dev->dev); -return ret; +return 0 ; irq_error:_dpu_mdss_irq_domain_fini (dpu_mdss);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 552/800 mac80211: remove iwlwifi specific workaround NDPs of null_response
In reply to Greg Kroah-HartmanFrom: Ping-Ke Shih <[email protected]>
[ Upstream commit 744757e46bf13ec3a7b3507d17ab3faab9516d43 ]
Remove the remaining workaround that is not removed by the commit e41eb3e408de ("mac80211: remove iwlwifi specific workaround that broke sta NDP tx")
--- net/mac80211/sta_info.c | 5 ----- 1 file changed, 5 deletions(-)
net/mac80211/sta_info.c +0 -5
@@ -1398,11 +1398,6 @@ static void ieee80211_send_null_response(struct sta_info *sta, int tid,struct ieee80211_tx_info *info;struct ieee80211_chanctx_conf *chanctx_conf; -/* Don't send NDPs when STA is connected HE */ -if (sdata->vif.type ==NL80211_IFTYPE_STATION && - !(sdata->u.mgd.flags &IEEE80211_STA_DISABLE_HE )) -return ; -if (qos) { fc = cpu_to_le16(IEEE80211_FTYPE_DATA | IEEE80211_STYPE_QOS_NULLFUNC |
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 553/800 net: bcmgenet: Fix attaching to PYH failed on RPi 4B
In reply to Greg Kroah-HartmanFrom: Jian-Hong Pan <[email protected]>
[ Upstream commit b2ac9800cfe0f8da16abc4e74e003440361c112e ]
The Broadcom UniMAC MDIO bus from mdio-bcm-unimac module comes too late. So, GENET cannot find the ethernet PHY on UniMAC MDIO bus. This leads GENET fail to attach the PHY as following log:
bcmgenet fd580000.ethernet: GENET 5.0 EPHY: 0x0000
...
could not attach to PHY
bcmgenet fd580000.ethernet eth0: failed to connect to PHY uart-pl011 fe201000.serial: no DMA platform data
libphy: bcmgenet MII bus: probed
...
unimac-mdio unimac-mdio.-19: Broadcom UniMAC MDIO bus
This patch adds the soft dependency to load mdio-bcm-unimac module before genet module to avoid the issue.
--- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/broadcom/genet/bcmgenet.c +1 -0
@@ -4296,3 +4296,4 @@ MODULE_AUTHOR("Broadcom Corporation");MODULE_DESCRIPTION ("Broadcom GENET Ethernet controller driver" );MODULE_ALIAS ("platform:bcmgenet" );MODULE_LICENSE ("GPL" ); +MODULE_SOFTDEP ("pre: mdio-bcm-unimac" );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 554/800 ipv6: exthdrs: do not blindly use init_net
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit bcc3f2a829b9edbe3da5fb117ee5a63686d31834 ]
I see no reason why max_dst_opts_cnt and max_hbh_opts_cnt are fetched from the initial net namespace.
The other sysctls (max_dst_opts_len & max_hbh_opts_len) are in fact already using the current ns.
Note: it is not clear why ipv6_destopt_rcv() use two ways to get to the netns :
1) dev_net(dst->dev)
Originally used to increment IPSTATS_MIB_INHDRERRORS
2) dev_net(skb->dev)
Tom used this variant in his patch.
Maybe this calls to use ipv6_skb_net() instead ?
--- net/ipv6/exthdrs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/ipv6/exthdrs.c +2 -2
@@ -306,7 +306,7 @@ fail_and_free:#endif if (ip6_parse_tlv (tlvprocdestopt_lst, skb, - init_net.ipv6.sysctl.max_dst_opts_cnt)) { + net->ipv6.sysctl.max_dst_opts_cnt)) { skb->transport_header += extlen; opt =IP6CB (skb);#if IS_ENABLED (CONFIG_IPV6_MIP6 )
@@ -1037,7 +1037,7 @@ fail_and_free: opt->flags |=IP6SKB_HOPBYHOP ;if (ip6_parse_tlv (tlvprochopopt_lst, skb, - init_net.ipv6.sysctl.max_hbh_opts_cnt)) { + net->ipv6.sysctl.max_hbh_opts_cnt)) { skb->transport_header += extlen; opt =IP6CB (skb); opt->nhoff =sizeof (struct ipv6hdr );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 555/800 can: j1939: j1939_sk_setsockopt(): prevent allocation of j1939 filter for optlen == 0
In reply to Greg Kroah-HartmanFrom: Norbert Slusarek <[email protected]>
[ Upstream commit aaf473d0100f64abc88560e2bea905805bcf2a8e ]
If optval != NULL and optlen == 0 are specified for SO_J1939_FILTER in j1939_sk_setsockopt(), memdup_sockptr() will return ZERO_PTR for 0 size allocation. The new filter will be mistakenly assigned ZERO_PTR. This patch checks for optlen != 0 and filter will be assigned NULL in case of optlen == 0.
--- net/can/j1939/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/can/j1939/socket.c +1 -1
@@ -676,7 +676,7 @@ static int j1939_sk_setsockopt(struct socket *sock, int level, int optname,switch (optname) {case SO_J1939_FILTER : -if (!sockptr_is_null (optval)) { +if (!sockptr_is_null (optval) && optlen !=0 ) {struct j1939_filter *f;int c;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 556/800 bpf: Do not change gso_size during bpf_skb_change_proto()
In reply to Greg Kroah-HartmanFrom: Maciej Żenczykowski <[email protected]>
[ Upstream commit 364745fbe981a4370f50274475da4675661104df ]
This is technically a backwards incompatible change in behaviour, but I'm going to argue that it is very unlikely to break things, and likely to fix *far* more then it breaks.
In no particular order, various reasons follow:
(a) I've long had a bug assigned to myself to debug a super rare kernel crash on Android Pixel phones which can (per stacktrace) be traced back to BPF clat IPv6 to IPv4 protocol conversion causing some sort of ugly failure much later on during transmit deep in the GSO engine, AFAICT precisely because of this change to gso_size, though I've never been able to manually reproduce it. I believe it may be related to the particular network offload support of attached USB ethernet dongle being used for tethering off of an IPv6-only cellular connection. The reason might be we end up with more segments than max permitted, or with a GSO packet with only one segment... (either way we break some assumption and hit a BUG_ON)
(b) There is no check that the gso_size is > 20 when reducing it by 20, so we might end up with a negative (or underflowing) gso_size or a gso_size of 0. This can't possibly be good. Indeed this is probably somehow exploitable (or at least can result in a kernel crash) by delivering crafted packets and perhaps triggering an infinite loop or a divide by zero... As a reminder: gso_size (MSS) is related to MTU, but not directly derived from it: gso_size/MSS may be significantly smaller then one would get by deriving from local MTU. And on some NICs (which do loose MTU checking on receive, it may even potentially be larger, for example my work pc with 1500 MTU can receive 1520 byte frames [and sometimes does due to bugs in a vendor plat46 implementation]). Indeed even just going from 21 to 1 is potentially problematic because it increases the number of segments by a factor of 21 (think DoS, or some other crash due to too many segments).
(c) It's always safe to not increase the gso_size, because it doesn't result in the max packet size increasing. So the skb_increase_gso_size() call was always unnecessary for correctness (and outright undesirable, see later). As such the only part which is potentially dangerous (ie. could cause backwards compatibility issues) is the removal of the skb_decrease_gso_size() call.
(d) If the packets are ultimately destined to the local device, then there is absolutely no benefit to playing around with gso_size. It only matters if the packets will egress the device. ie. we're either forwarding, or transmitting from the device.
(e) This logic only triggers for packets which are GSO. It does not trigger for skbs which are not GSO. It will not convert a non-GSO MTU sized packet into a GSO packet (and you don't even know what the MTU is, so you can't even fix it). As such your transmit path must *already* be able to handle an MTU 20 bytes larger then your receive path (for IPv4 to IPv6 translation) - and indeed 28 bytes larger due to IPv4 fragments. Thus removing the skb_decrease_gso_size() call doesn't actually increase the size of the packets your transmit side must be able to handle. ie. to handle non-GSO max-MTU packets, the IPv4/IPv6 device/ route MTUs must already be set correctly. Since for example with an IPv4 egress MTU of 1500, IPv4 to IPv6 translation will already build 1520 byte IPv6 frames, so you need a 1520 byte device MTU. This means if your IPv6 device's egress MTU is 1280, your IPv4 route must be 1260 (and actually 1252, because of the need to handle fragments). This is to handle normal non-GSO packets. Thus the reduction is simply not needed for GSO packets, because when they're correctly built, they will already be the right size.
(f) TSO/GSO should be able to exactly undo GRO: the number of packets (TCP segments) should not be modified, so that TCP's MSS counting works correctly (this matters for congestion control). If protocol conversion changes the gso_size, then the number of TCP segments may increase or decrease. Packet loss after protocol conversion can result in partial loss of MSS segments that the sender sent. How's the sending TCP stack going to react to receiving ACKs/SACKs in the middle of the segments it sent?
(g) skb_{decrease,increase}_gso_size() are already no-ops for GSO_BY_FRAGS case (besides triggering WARN_ON_ONCE). This means you already cannot guarantee that gso_size (and thus resulting packet MTU) is changed. ie. you must assume it won't be changed.
(h) changing gso_size is outright buggy for UDP GSO packets, where framing matters (I believe that's also the case for SCTP, but it's already excluded by [g]). So the only remaining case is TCP, which also doesn't want it (see [f]).
(i) see also the reasoning on the previous attempt at fixing this (commit fa7b83bf3b156c767f3e4a25bbf3817b08f3ff8e) which shows that the current behaviour causes TCP packet loss:
In the forwarding path GRO -> BPF 6 to 4 -> GSO for TCP traffic, the coalesced packet payload can be > MSS, but < MSS + 20.
bpf_skb_proto_6_to_4() will upgrade the MSS and it can be > the payload length. After then tcp_gso_segment checks for the payload length if it is <= MSS. The condition is causing the packet to be dropped.
tcp_gso_segment():
[...]
mss = skb_shinfo(skb)->gso_size;
if (unlikely(skb->len <= mss)) goto out;
[...]Thus changing the gso_size is simply a very bad idea. Increasing is unnecessary and buggy, and decreasing can go negative.
--- net/core/filter.c | 4 ---- 1 file changed, 4 deletions(-)
net/core/filter.c +0 -4
@@ -3263,8 +3263,6 @@ static int bpf_skb_proto_4_to_6(struct sk_buff *skb) shinfo->gso_type |=SKB_GSO_TCPV6 ; } -/* Due to IPv6 header, MSS needs to be downgraded. */ -skb_decrease_gso_size (shinfo, len_diff);/* Header must be checked, and gso_segs recomputed. */ shinfo->gso_type |=SKB_GSO_DODGY ; shinfo->gso_segs =0 ;
@@ -3304,8 +3302,6 @@ static int bpf_skb_proto_6_to_4(struct sk_buff *skb) shinfo->gso_type |=SKB_GSO_TCPV4 ; } -/* Due to IPv4 header, MSS can be upgraded. */ -skb_increase_gso_size (shinfo, len_diff);/* Header must be checked, and gso_segs recomputed. */ shinfo->gso_type |=SKB_GSO_DODGY ; shinfo->gso_segs =0 ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 557/800 i40e: Fix error handling in i40e_vsi_open
In reply to Greg Kroah-HartmanFrom: Dinghao Liu <[email protected]>
[ Upstream commit 9c04cfcd4aad232e36306cdc5c74cd9fc9148a7e ]
When vsi->type == I40E_VSI_FDIR, we have caught the return value of i40e_vsi_request_irq() but without further handling. Check and execute memory clean on failure just like the other i40e_vsi_request_irq().
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/intel/i40e/i40e_main.c +2 -0
@@ -8703,6 +8703,8 @@ int i40e_vsi_open(struct i40e_vsi *vsi)dev_driver_string (&pf->pdev->dev), dev_name(&pf->pdev->dev)); err =i40e_vsi_request_irq (vsi, int_name); +if (err) + goto err_setup_rx; }else { err = -EINVAL ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 558/800 i40e: Fix autoneg disabling for non-10GBaseT links
In reply to Greg Kroah-HartmanFrom: Mateusz Palczewski <[email protected]>
[ Upstream commit 9262793e59f0423437166a879a73d056b1fe6f9a ]
Disabling autonegotiation was allowed only for 10GBaseT PHY. The condition was changed to check if link media type is BaseT.
--- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +1 -2
@@ -1262,8 +1262,7 @@ static int i40e_set_link_ksettings(struct net_device *netdev,if (ethtool_link_ksettings_test_link_mode (&safe_ks, supported, Autoneg) && - hw->phy.link_info.phy_type != -I40E_PHY_TYPE_10GBASE_T ) { + hw->phy.media_type !=I40E_MEDIA_TYPE_BASET ) {netdev_info (netdev,"Autoneg cannot be disabled on this phy\n" ); err = -EINVAL ; goto done;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 559/800 i40e: Fix missing rtnl locking when setting up pf switch
In reply to Greg Kroah-HartmanFrom: Jan Sokolowski <[email protected]>
[ Upstream commit 956e759d5f8e0859e86b951a8779c60af633aafd ]
A recent change that made i40e use new udp_tunnel infrastructure uses a method that expects to be called under rtnl lock.
However, not all codepaths do the lock prior to calling i40e_setup_pf_switch.
Fix that by adding additional rtnl locking and unlocking.
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_main.c +11 -4
@@ -32,7 +32,7 @@ static void i40e_vsi_reinit_locked(struct i40e_vsi *vsi);static void i40e_handle_reset_warning (struct i40e_pf *pf,bool lock_acquired);static int i40e_add_vsi (struct i40e_vsi *vsi);static int i40e_add_veb (struct i40e_veb *veb,struct i40e_vsi *vsi); -static int i40e_setup_pf_switch (struct i40e_pf *pf,bool reinit); +static int i40e_setup_pf_switch (struct i40e_pf *pf,bool reinit,bool lock_acquired);static int i40e_setup_misc_vector (struct i40e_pf *pf);static void i40e_determine_queue_usage (struct i40e_pf *pf);static int i40e_setup_pf_filter_control (struct i40e_pf *pf);
@@ -10571,7 +10571,7 @@ static void i40e_rebuild(struct i40e_pf *pf, bool reinit, bool lock_acquired)#endif /* CONFIG_I40E_DCB */ if (!lock_acquired)rtnl_lock (); - ret =i40e_setup_pf_switch (pf, reinit); + ret =i40e_setup_pf_switch (pf, reinit, true);if (ret) goto end_unlock;
@@ -14629,10 +14629,11 @@ int i40e_fetch_switch_configuration(struct i40e_pf *pf, bool printconfig)* i40e_setup_pf_switch - Setup the HW switch on startup or after reset * @pf: board private structure * @reinit: if the Main VSI needs to re-initialized. +* @lock_acquired: indicates whether or not the lock has been acquired * * Returns 0 on success, negative value on failure **/ -static int i40e_setup_pf_switch (struct i40e_pf *pf,bool reinit) +static int i40e_setup_pf_switch (struct i40e_pf *pf,bool reinit,bool lock_acquired) {u16 flags =0 ;int ret;
@@ -14734,9 +14735,15 @@ static int i40e_setup_pf_switch(struct i40e_pf *pf, bool reinit)i40e_ptp_init (pf); +if (!lock_acquired) +rtnl_lock (); +/* repopulate tunnel port filters */ udp_tunnel_nic_reset_ntf (pf->vsi[pf->lan_vsi]->netdev); +if (!lock_acquired) +rtnl_unlock (); +return ret; }
@@ -15530,7 +15537,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) pf->flags |= I40E_FLAG_VEB_MODE_ENABLED; }#endif - err =i40e_setup_pf_switch (pf, false); + err =i40e_setup_pf_switch (pf, false, false);if (err) {dev_info (&pdev->dev,"setup_pf_switch failed: %d\n" , err); goto err_vsis;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 560/800 RDMA/hns: Add a check to ensure integer mtu is positive
In reply to Greg Kroah-HartmanFrom: Weihang Li <[email protected]>
[ Upstream commit fe331da0f210c60342b042a03fe53f1b564b412b ]
GCC may reports an running time assert error when a value calculated from ib_mtu_enum_to_int() is using as 'val' in FIELD_PREDP:
include/linux/compiler_types.h:328:38: error: call to '__compiletime_assert_1524' declared with attribute error: FIELD_PREP:
value too large for the field
So a check is added about whether integer mtu from ib_mtu_enum_to_int() is negative to avoid this warning.
--- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +10 -5
@@ -4499,12 +4499,13 @@ static int modify_qp_init_to_rtr(struct ib_qp *ibqp,struct ib_device *ibdev = &hr_dev->ib_dev;dma_addr_t trrl_ba;dma_addr_t irrl_ba; -enum ib_mtu mtu; +enum ib_mtu ib_mtu;u8 lp_pktn_ini;u64 *mtts;u8 *dmac;u8 *smac;u32 port; +int mtu;int ret; ret =config_qp_rq_buf (hr_dev, hr_qp, context, qpc_mask);
@@ -4588,19 +4589,23 @@ static int modify_qp_init_to_rtr(struct ib_qp *ibqp,roce_set_field (qpc_mask->byte_52_udpspn_dmac,V2_QPC_BYTE_52_DMAC_M ,V2_QPC_BYTE_52_DMAC_S ,0 ); - mtu =get_mtu (ibqp, attr); - hr_qp->path_mtu = mtu; + ib_mtu =get_mtu (ibqp, attr); + hr_qp->path_mtu = ib_mtu; + + mtu =ib_mtu_enum_to_int (ib_mtu); +if (WARN_ON (mtu <0 )) +return -EINVAL ;if (attr_mask &IB_QP_PATH_MTU ) {roce_set_field (context->byte_24_mtu_tc,V2_QPC_BYTE_24_MTU_M , -V2_QPC_BYTE_24_MTU_S , mtu); +V2_QPC_BYTE_24_MTU_S , ib_mtu);roce_set_field (qpc_mask->byte_24_mtu_tc,V2_QPC_BYTE_24_MTU_M ,V2_QPC_BYTE_24_MTU_S ,0 ); }#define MAX_LP_MSG_LEN 65536/* MTU * (2 ^ LP_PKTN_INI) shouldn't be bigger than 64KB */ - lp_pktn_ini =ilog2 (MAX_LP_MSG_LEN /ib_mtu_enum_to_int (mtu)); + lp_pktn_ini =ilog2 (MAX_LP_MSG_LEN / mtu);roce_set_field (context->byte_56_dqpn_err,V2_QPC_BYTE_56_LP_PKTN_INI_M ,V2_QPC_BYTE_56_LP_PKTN_INI_S , lp_pktn_ini);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 561/800 RDMA/hns: Add window selection field of congestion control
In reply to Greg Kroah-HartmanFrom: Yixing Liu <[email protected]>
[ Upstream commit 7ae61c5f16671ecaf23526feb6892c8249d0c2d7 ]
The window selection field is necessary for congestion control of HIP09, it is got from firmware and then filled into QPC. Some algorithms need it to decide whether to limit the number of windows.
--- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 12 ++++++++++++ drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 2 ++ 2 files changed, 14 insertions(+)
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +12 -0
@@ -4777,6 +4777,11 @@ enum { DIP_VALID, }; +enum { +WND_LIMIT , +WND_UNLIMIT , +}; +static int check_cong_type (struct ib_qp *ibqp,struct hns_roce_congestion_algorithm *cong_alg) {
@@ -4788,21 +4793,25 @@ static int check_cong_type(struct ib_qp *ibqp, cong_alg->alg_sel =CONG_DCQCN ; cong_alg->alg_sub_sel =UNSUPPORT_CONG_LEVEL ; cong_alg->dip_vld =DIP_INVALID ; + cong_alg->wnd_mode_sel =WND_LIMIT ;break ;case CONG_TYPE_LDCP : cong_alg->alg_sel =CONG_WINDOW ; cong_alg->alg_sub_sel =CONG_LDCP ; cong_alg->dip_vld =DIP_INVALID ; + cong_alg->wnd_mode_sel =WND_UNLIMIT ;break ;case CONG_TYPE_HC3 : cong_alg->alg_sel =CONG_WINDOW ; cong_alg->alg_sub_sel =CONG_HC3 ; cong_alg->dip_vld =DIP_INVALID ; + cong_alg->wnd_mode_sel =WND_LIMIT ;break ;case CONG_TYPE_DIP : cong_alg->alg_sel =CONG_DCQCN ; cong_alg->alg_sub_sel =UNSUPPORT_CONG_LEVEL ; cong_alg->dip_vld =DIP_VALID ; + cong_alg->wnd_mode_sel =WND_LIMIT ;break ;default : ibdev_err(&hr_dev->ib_dev,
@@ -4843,6 +4852,9 @@ static int fill_cong_field(struct ib_qp *ibqp, const struct ib_qp_attr *attr,hr_reg_write (&qpc_mask->ext,QPCEX_CONG_ALG_SUB_SEL ,0 );hr_reg_write (&context->ext,QPCEX_DIP_CTX_IDX_VLD , cong_field.dip_vld);hr_reg_write (&qpc_mask->ext,QPCEX_DIP_CTX_IDX_VLD ,0 ); +hr_reg_write (&context->ext,QPCEX_SQ_RQ_NOT_FORBID_EN , + cong_field.wnd_mode_sel); +hr_reg_clear (&qpc_mask->ext,QPCEX_SQ_RQ_NOT_FORBID_EN );/* if dip is disabled, there is no need to set dip idx */ if (cong_field.dip_vld ==0 )
drivers/infiniband/hw/hns/hns_roce_hw_v2.h +2 -0
@@ -964,6 +964,7 @@ struct hns_roce_v2_qp_context {#define QPCEX_CONG_ALG_SUB_SEL QPCEX_FIELD_LOC(1, 1)#define QPCEX_DIP_CTX_IDX_VLD QPCEX_FIELD_LOC(2, 2)#define QPCEX_DIP_CTX_IDX QPCEX_FIELD_LOC(22, 3) +#define QPCEX_SQ_RQ_NOT_FORBID_EN QPCEX_FIELD_LOC(23, 23)#define QPCEX_STASH QPCEX_FIELD_LOC(82, 82)#define V2_QP_RWE_S 1/* rdma write enable */
@@ -1643,6 +1644,7 @@ struct hns_roce_congestion_algorithm {u8 alg_sel;u8 alg_sub_sel;u8 dip_vld; +u8 wnd_mode_sel; };#define V2_QUERY_PF_CAPS_D_CEQ_DEPTH_S 0
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 562/800 Revert "ibmvnic: simplify reset_long_term_buff function"
In reply to Greg Kroah-HartmanFrom: Sukadev Bhattiprolu <[email protected]>
[ Upstream commit 0ec13aff058a82426c8d44b688c804cc4a5a0a3d ]
This reverts commit 1c7d45e7b2c29080bf6c8cd0e213cc3cbb62a054.
We tried to optimize the number of hcalls we send and skipped sending the REQUEST_MAP calls for some maps. However during resets, we need to resend all the maps to the VIOS since the VIOS does not remember the old values. In fact we may have failed over to a new VIOS which will not have any of the mappings.
When we send packets with map ids the VIOS does not know about, it triggers a FATAL reset. While the client does recover from the FATAL error reset, we are seeing a large number of such resets. Handling FATAL resets is lot more unnecessary work than issuing a few more hcalls so revert the commit and resend the maps to the VIOS.
--- drivers/net/ethernet/ibm/ibmvnic.c | 46 ++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 8 deletions(-)
drivers/net/ethernet/ibm/ibmvnic.c +38 -8
@@ -257,12 +257,40 @@ static void free_long_term_buff(struct ibmvnic_adapter *adapter,dma_free_coherent (dev, ltb->size, ltb->buff, ltb->addr); } -static int reset_long_term_buff (struct ibmvnic_long_term_buff *ltb) +static int reset_long_term_buff (struct ibmvnic_adapter *adapter, +struct ibmvnic_long_term_buff *ltb) { -if (!ltb->buff) -return -EINVAL ; +struct device *dev = &adapter->vdev->dev; +int rc;memset (ltb->buff,0 , ltb->size); + +mutex_lock (&adapter->fw_lock); + adapter->fw_done_rc =0 ; + +reinit_completion (&adapter->fw_done); + rc =send_request_map (adapter, ltb->addr, ltb->size, ltb->map_id); +if (rc) { +mutex_unlock (&adapter->fw_lock); +return rc; + } + + rc =ibmvnic_wait_for_completion (adapter, &adapter->fw_done,10000 ); +if (rc) { +dev_info (dev, +"Reset failed, long term map request timed out or aborted\n" ); +mutex_unlock (&adapter->fw_lock); +return rc; + } + +if (adapter->fw_done_rc) { +dev_info (dev, +"Reset failed, attempting to free and reallocate buffer\n" ); +free_long_term_buff (adapter, ltb); +mutex_unlock (&adapter->fw_lock); +return alloc_long_term_buff (adapter, ltb, ltb->size); + } +mutex_unlock (&adapter->fw_lock);return 0 ; }
@@ -484,7 +512,8 @@ static int reset_rx_pools(struct ibmvnic_adapter *adapter) rx_pool->size * rx_pool->buff_size); }else { - rc =reset_long_term_buff (&rx_pool->long_term_buff); + rc =reset_long_term_buff (adapter, + &rx_pool->long_term_buff); }if (rc)
@@ -607,11 +636,12 @@ static int init_rx_pools(struct net_device *netdev)return 0 ; } -static int reset_one_tx_pool (struct ibmvnic_tx_pool *tx_pool) +static int reset_one_tx_pool (struct ibmvnic_adapter *adapter, +struct ibmvnic_tx_pool *tx_pool) {int rc, i; - rc =reset_long_term_buff (&tx_pool->long_term_buff); + rc =reset_long_term_buff (adapter, &tx_pool->long_term_buff);if (rc)return rc;
@@ -638,10 +668,10 @@ static int reset_tx_pools(struct ibmvnic_adapter *adapter) tx_scrqs = adapter->num_active_tx_pools;for (i =0 ; i < tx_scrqs; i++) { - rc =reset_one_tx_pool (&adapter->tso_pool[i]); + rc =reset_one_tx_pool (adapter, &adapter->tso_pool[i]);if (rc)return rc; - rc =reset_one_tx_pool (&adapter->tx_pool[i]); + rc =reset_one_tx_pool (adapter, &adapter->tx_pool[i]);if (rc)return rc; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 563/800 Revert "ibmvnic: remove duplicate napi_schedule call in open function"
In reply to Greg Kroah-HartmanFrom: Dany Madden <[email protected]>
[ Upstream commit 2ca220f92878470c6ba03f9946e412323093cc94 ]
This reverts commit 7c451f3ef676c805a4b77a743a01a5c21a250a73.
When a vnic interface is taken down and then up, connectivity is not restored. We bisected it to this commit. Reverting this commit until we can fully investigate the issue/benefit of the change.
--- drivers/net/ethernet/ibm/ibmvnic.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/ethernet/ibm/ibmvnic.c +5 -0
@@ -1210,6 +1210,11 @@ static int __ibmvnic_open(struct net_device *netdev)netif_tx_start_all_queues (netdev); +if (prev_state ==VNIC_CLOSED ) { +for (i =0 ; i < adapter->req_rx_queues; i++) +napi_schedule (&adapter->napi[i]); + } + adapter->state =VNIC_OPEN ;return rc; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 564/800 ibmvnic: clean pending indirect buffs during reset
In reply to Greg Kroah-HartmanFrom: Sukadev Bhattiprolu <[email protected]>
[ Upstream commit 65d6470d139a6c1655fccb5cbacbeaba8e8ad2f8 ]
We batch subordinate command response queue (scrq) descriptors that we need to send to the VIOS using an "indirect" buffer. If after we queue one or more scrqs in the indirect buffer encounter an error (say fail to allocate an skb), we leave the queued scrq descriptors in the indirect buffer until the next call to ibmvnic_xmit().
On the next call to ibmvnic_xmit(), it is possible that the adapter is going through a reset and it is possible that the long term buffers have been unmapped on the VIOS side. If we proceed to flush (send) the packets that are in the indirect buffer, we will end up using the old map ids and this can cause the VIOS to trigger an unnecessary FATAL error reset.
Instead of flushing packets remaining on the indirect_buff, discard (clean) them instead.
--- drivers/net/ethernet/ibm/ibmvnic.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/ethernet/ibm/ibmvnic.c +6 -2
@@ -106,6 +106,8 @@ static void release_crq_queue(struct ibmvnic_adapter *);static int __ibmvnic_set_mac (struct net_device *,u8 *);static int init_crq_queue (struct ibmvnic_adapter *adapter);static int send_query_phys_parms (struct ibmvnic_adapter *adapter); +static void ibmvnic_tx_scrq_clean_buffer (struct ibmvnic_adapter *adapter, +struct ibmvnic_sub_crq_queue *tx_scrq);struct ibmvnic_stat {char name[ETH_GSTRING_LEN ];
@@ -668,6 +670,7 @@ static int reset_tx_pools(struct ibmvnic_adapter *adapter) tx_scrqs = adapter->num_active_tx_pools;for (i =0 ; i < tx_scrqs; i++) { +ibmvnic_tx_scrq_clean_buffer (adapter, adapter->tx_scrq[i]); rc =reset_one_tx_pool (adapter, &adapter->tso_pool[i]);if (rc)return rc;
@@ -1618,7 +1621,8 @@ static void ibmvnic_tx_scrq_clean_buffer(struct ibmvnic_adapter *adapter, ind_bufp->index =0 ;if (atomic_sub_return (entries, &tx_scrq->used) <= (adapter->req_tx_entries_per_subcrq /2 ) && -__netif_subqueue_stopped (adapter->netdev, queue_num)) { +__netif_subqueue_stopped (adapter->netdev, queue_num) && + !test_bit (0 , &adapter->resetting)) {netif_wake_subqueue (adapter->netdev, queue_num);netdev_dbg (adapter->netdev,"Started queue %d\n" , queue_num);
@@ -1711,7 +1715,6 @@ static netdev_tx_t ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev) tx_send_failed++; tx_dropped++; ret =NETDEV_TX_OK ; -ibmvnic_tx_scrq_flush (adapter, tx_scrq); goto out; }
@@ -3175,6 +3178,7 @@ static void release_sub_crqs(struct ibmvnic_adapter *adapter, bool do_h_free)netdev_dbg (adapter->netdev,"Releasing tx_scrq[%d]\n" , i); +ibmvnic_tx_scrq_clean_buffer (adapter, adapter->tx_scrq[i]);if (adapter->tx_scrq[i]->irq) {free_irq (adapter->tx_scrq[i]->irq, adapter->tx_scrq[i]);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 565/800 ibmvnic: account for bufs already saved in indir_buf
In reply to Greg Kroah-HartmanFrom: Sukadev Bhattiprolu <[email protected]>
[ Upstream commit 72368f8b2b9e4106072a2728bed3367d54641c22 ]
This fixes a crash in replenish_rx_pool() when called from ibmvnic_poll() after a previous call to replenish_rx_pool() encountered an error when allocating a socket buffer.
Thanks to Rick Lindsley and Dany Madden for helping debug the crash.
--- drivers/net/ethernet/ibm/ibmvnic.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/net/ethernet/ibm/ibmvnic.c +8 -1
@@ -328,7 +328,14 @@ static void replenish_rx_pool(struct ibmvnic_adapter *adapter, rx_scrq = adapter->rx_scrq[pool->index]; ind_bufp = &rx_scrq->ind_buf; -for (i =0 ; i < count; ++i) { + +/* netdev_skb_alloc() could have failed after we saved a few skbs +* in the indir_buf and we would not have sent them to VIOS yet. +* To account for them, start the loop at ind_bufp->index rather +* than 0. If we pushed all the skbs to VIOS, ind_bufp->index will +* be 0. +*/ +for (i = ind_bufp->index; i < count; ++i) { skb =netdev_alloc_skb (adapter->netdev, pool->buff_size);if (!skb) {dev_err (dev,"Couldn't replenish rx buff\n" );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 566/800 ibmvnic: set ltb->buff to NULL after freeing
In reply to Greg Kroah-HartmanFrom: Sukadev Bhattiprolu <[email protected]>
[ Upstream commit 552a33729f1a7cc5115d0752064fe9abd6e3e336 ]
free_long_term_buff() checks ltb->buff to decide whether we have a long term buffer to free. So set ltb->buff to NULL afer freeing. While here, also clear ->map_id, fix up some coding style and log an error.
--- drivers/net/ethernet/ibm/ibmvnic.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-)
drivers/net/ethernet/ibm/ibmvnic.c +15 -11
@@ -211,12 +211,11 @@ static int alloc_long_term_buff(struct ibmvnic_adapter *adapter,mutex_lock (&adapter->fw_lock); adapter->fw_done_rc =0 ;reinit_completion (&adapter->fw_done); - rc =send_request_map (adapter, ltb->addr, - ltb->size, ltb->map_id); + + rc =send_request_map (adapter, ltb->addr, ltb->size, ltb->map_id);if (rc) { -dma_free_coherent (dev, ltb->size, ltb->buff, ltb->addr); -mutex_unlock (&adapter->fw_lock); -return rc; +dev_err (dev,"send_request_map failed, rc = %d\n" , rc); + goto out; } rc =ibmvnic_wait_for_completion (adapter, &adapter->fw_done,10000 );
@@ -224,20 +223,23 @@ static int alloc_long_term_buff(struct ibmvnic_adapter *adapter,dev_err (dev,"Long term map request aborted or timed out,rc = %d\n" , rc); -dma_free_coherent (dev, ltb->size, ltb->buff, ltb->addr); -mutex_unlock (&adapter->fw_lock); -return rc; + goto out; }if (adapter->fw_done_rc) {dev_err (dev,"Couldn't map long term buffer,rc = %d\n" , adapter->fw_done_rc); + rc =-1 ; + goto out; + } + rc =0 ; +out: +if (rc) {dma_free_coherent (dev, ltb->size, ltb->buff, ltb->addr); -mutex_unlock (&adapter->fw_lock); -return -1 ; + ltb->buff =NULL ; }mutex_unlock (&adapter->fw_lock); -return 0 ; +return rc; } static void free_long_term_buff(struct ibmvnic_adapter *adapter,
@@ -257,6 +259,8 @@ static void free_long_term_buff(struct ibmvnic_adapter *adapter, adapter->reset_reason != VNIC_RESET_TIMEOUT)send_request_unmap (adapter, ltb->map_id);dma_free_coherent (dev, ltb->size, ltb->buff, ltb->addr); + ltb->buff =NULL ; + ltb->map_id =0 ; } static int reset_long_term_buff(struct ibmvnic_adapter *adapter,
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 567/800 ibmvnic: free tx_pool if tso_pool alloc fails
In reply to Greg Kroah-HartmanFrom: Sukadev Bhattiprolu <[email protected]>
[ Upstream commit f6ebca8efa52e4ae770f0325d618e7bcf08ada0c ]
Free tx_pool and clear it, if allocation of tso_pool fails.
release_tx_pools() assumes we have both tx and tso_pools if ->tx_pool is non-NULL. If allocation of tso_pool fails in init_tx_pools(), the assumption will not be true and we would end up dereferencing ->tx_buff, ->free_map fields from a NULL pointer.
--- drivers/net/ethernet/ibm/ibmvnic.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/ethernet/ibm/ibmvnic.c +4 -1
@@ -778,8 +778,11 @@ static int init_tx_pools(struct net_device *netdev) adapter->tso_pool =kcalloc (tx_subcrqs,sizeof (struct ibmvnic_tx_pool ),GFP_KERNEL ); -if (!adapter->tso_pool) +if (!adapter->tso_pool) { +kfree (adapter->tx_pool); + adapter->tx_pool =NULL ;return -1 ; + } adapter->num_active_tx_pools = tx_subcrqs;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 568/800 RDMA/cma: Protect RMW with qp_mutex
In reply to Greg Kroah-HartmanFrom: Håkon Bugge <[email protected]>
[ Upstream commit ca0c448d2b9f43e3175835d536853854ef544e22 ]
The struct rdma_id_private contains three bit-fields, tos_set, timeout_set, and min_rnr_timer_set. These are set by accessor functions without any synchronization. If two or all accessor functions are invoked in close proximity in time, there will be Read-Modify-Write from several contexts to the same variable, and the result will be intermittent.
Fixed by protecting the bit-fields by the qp_mutex in the accessor functions.
The consumer of timeout_set and min_rnr_timer_set is in rdma_init_qp_attr(), which is called with qp_mutex held for connected QPs. Explicit locking is added for the consumers of tos and tos_set.
This commit depends on ("RDMA/cma: Remove unnecessary INIT->INIT transition"), since the call to rdma_init_qp_attr() from cma_init_conn_qp() does not hold the qp_mutex.
--- drivers/infiniband/core/cma.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)
drivers/infiniband/core/cma.c +19 -1
@@ -2472,8 +2472,10 @@ static int cma_iw_listen(struct rdma_id_private *id_priv, int backlog)if (IS_ERR (id))return PTR_ERR (id); +mutex_lock (&id_priv->qp_mutex); id->tos = id_priv->tos; id->tos_set = id_priv->tos_set; +mutex_unlock (&id_priv->qp_mutex); id->afonly = id_priv->afonly; id_priv->cm_id.iw = id;
@@ -2534,8 +2536,10 @@ static int cma_listen_on_dev(struct rdma_id_private *id_priv,cma_id_get (id_priv); dev_id_priv->internal_id =1 ; dev_id_priv->afonly = id_priv->afonly; +mutex_lock (&id_priv->qp_mutex); dev_id_priv->tos_set = id_priv->tos_set; dev_id_priv->tos = id_priv->tos; +mutex_unlock (&id_priv->qp_mutex); ret =rdma_listen (&dev_id_priv->id, id_priv->backlog);if (ret)
@@ -2582,8 +2586,10 @@ void rdma_set_service_type(struct rdma_cm_id *id, int tos)struct rdma_id_private *id_priv; id_priv = container_of(id, struct rdma_id_private, id); +mutex_lock (&id_priv->qp_mutex); id_priv->tos = (u8 ) tos; id_priv->tos_set = true; +mutex_unlock (&id_priv->qp_mutex); }EXPORT_SYMBOL (rdma_set_service_type);
@@ -2610,8 +2616,10 @@ int rdma_set_ack_timeout(struct rdma_cm_id *id, u8 timeout)return -EINVAL ; id_priv = container_of(id, struct rdma_id_private, id); +mutex_lock (&id_priv->qp_mutex); id_priv->timeout = timeout; id_priv->timeout_set = true; +mutex_unlock (&id_priv->qp_mutex);return 0 ; }
@@ -2647,8 +2655,10 @@ int rdma_set_min_rnr_timer(struct rdma_cm_id *id, u8 min_rnr_timer)return -EINVAL ; id_priv = container_of(id, struct rdma_id_private, id); +mutex_lock (&id_priv->qp_mutex); id_priv->min_rnr_timer = min_rnr_timer; id_priv->min_rnr_timer_set = true; +mutex_unlock (&id_priv->qp_mutex);return 0 ; }
@@ -3034,8 +3044,11 @@ static int cma_resolve_iboe_route(struct rdma_id_private *id_priv)u8 default_roce_tos = id_priv->cma_dev->default_roce_tos[id_priv->id.port_num -rdma_start_port (id_priv->cma_dev->device)]; -u8 tos = id_priv->tos_set ? id_priv->tos : default_roce_tos; +u8 tos; +mutex_lock (&id_priv->qp_mutex); + tos = id_priv->tos_set ? id_priv->tos : default_roce_tos; +mutex_unlock (&id_priv->qp_mutex); work =kzalloc (sizeof *work,GFP_KERNEL );if (!work)
@@ -3082,8 +3095,10 @@ static int cma_resolve_iboe_route(struct rdma_id_private *id_priv)* PacketLifeTime = local ACK timeout/2 * as a reasonable approximation for RoCE networks. */ +mutex_lock (&id_priv->qp_mutex); route->path_rec->packet_life_time = id_priv->timeout_set ? id_priv->timeout -1 :CMA_IBOE_PACKET_LIFETIME ; +mutex_unlock (&id_priv->qp_mutex);if (!route->path_rec->mtu) { ret = -EINVAL ;
@@ -4107,8 +4122,11 @@ static int cma_connect_iw(struct rdma_id_private *id_priv,if (IS_ERR (cm_id))return PTR_ERR (cm_id); +mutex_lock (&id_priv->qp_mutex); cm_id->tos = id_priv->tos; cm_id->tos_set = id_priv->tos_set; +mutex_unlock (&id_priv->qp_mutex); + id_priv->cm_id.iw = cm_id; memcpy(&cm_id->local_addr, cma_src_addr(id_priv),
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 569/800 net: macsec: fix the length used to copy the key for offloading
In reply to Greg Kroah-HartmanFrom: Antoine Tenart <[email protected]>
[ Upstream commit 1f7fe5121127e037b86592ba42ce36515ea0e3f7 ]
The key length used when offloading macsec to Ethernet or PHY drivers was set to MACSEC_KEYID_LEN (16), which is an issue as:
- This was never meant to be the key length.
- The key length can be > 16.
Fix this by using MACSEC_MAX_KEY_LEN to store the key (the max length accepted in uAPI) and secy->key_len to copy it.
--- drivers/net/macsec.c | 4 ++-- include/net/macsec.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/net/macsec.c +2 -2
@@ -1819,7 +1819,7 @@ static int macsec_add_rxsa(struct sk_buff *skb, struct genl_info *info) ctx.sa.rx_sa = rx_sa; ctx.secy = secy;memcpy (ctx.sa.key,nla_data (tb_sa[MACSEC_SA_ATTR_KEY ]), -MACSEC_KEYID_LEN ); + secy->key_len); err =macsec_offload (ops->mdo_add_rxsa, &ctx);if (err)
@@ -2061,7 +2061,7 @@ static int macsec_add_txsa(struct sk_buff *skb, struct genl_info *info) ctx.sa.tx_sa = tx_sa; ctx.secy = secy;memcpy (ctx.sa.key,nla_data (tb_sa[MACSEC_SA_ATTR_KEY ]), -MACSEC_KEYID_LEN ); + secy->key_len); err =macsec_offload (ops->mdo_add_txsa, &ctx);if (err)
include/net/macsec.h +1 -1
@@ -241,7 +241,7 @@ struct macsec_context {struct macsec_rx_sc *rx_sc;struct {unsigned char assoc_num; -u8 key[MACSEC_KEYID_LEN ]; +u8 key[MACSEC_MAX_KEY_LEN ];union {struct macsec_rx_sa *rx_sa;struct macsec_tx_sa *tx_sa;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 570/800 net: phy: mscc: fix macsec key length
In reply to Greg Kroah-HartmanFrom: Antoine Tenart <[email protected]>
[ Upstream commit c309217f91f2d2097c2a0a832d9bff50b88c81dc ]
The key length used to store the macsec key was set to MACSEC_KEYID_LEN (16), which is an issue as:
- This was never meant to be the key length.
- The key length can be > 16.
Fix this by using MACSEC_MAX_KEY_LEN instead (the max length accepted in uAPI).
--- drivers/net/phy/mscc/mscc_macsec.c | 2 +- drivers/net/phy/mscc/mscc_macsec.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/phy/mscc/mscc_macsec.c +1 -1
@@ -501,7 +501,7 @@ static u32 vsc8584_macsec_flow_context_id(struct macsec_flow *flow) }/* Derive the AES key to get a key for the hash autentication */ -static int vsc8584_macsec_derive_key (const u8 key[MACSEC_KEYID_LEN ], +static int vsc8584_macsec_derive_key (const u8 key[MACSEC_MAX_KEY_LEN ],u16 key_len,u8 hkey[16 ]) {const u8 input[AES_BLOCK_SIZE ] = {0 };
drivers/net/phy/mscc/mscc_macsec.h +1 -1
@@ -81,7 +81,7 @@ struct macsec_flow {/* Highest takes precedence [0..15] */ u8 priority; -u8 key[MACSEC_KEYID_LEN ]; +u8 key[MACSEC_MAX_KEY_LEN ];union {struct macsec_rx_sa *rx_sa;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 571/800 net: atlantic: fix the macsec key length
In reply to Greg Kroah-HartmanFrom: Antoine Tenart <[email protected]>
[ Upstream commit d67fb4772d9a6cfd10f1109f0e7b1e6eb58c8e16 ]
The key length used to store the macsec key was set to MACSEC_KEYID_LEN (16), which is an issue as:
- This was never meant to be the key length.
- The key length can be > 16.
Fix this by using MACSEC_MAX_KEY_LEN instead (the max length accepted in uAPI).
--- drivers/net/ethernet/aquantia/atlantic/aq_macsec.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/aquantia/atlantic/aq_macsec.h +2 -2
@@ -91,7 +91,7 @@ struct aq_macsec_txsc {u32 hw_sc_idx;unsigned long tx_sa_idx_busy;const struct macsec_secy *sw_secy; -u8 tx_sa_key[MACSEC_NUM_AN ][MACSEC_KEYID_LEN ]; +u8 tx_sa_key[MACSEC_NUM_AN ][MACSEC_MAX_KEY_LEN ];struct aq_macsec_tx_sc_stats stats;struct aq_macsec_tx_sa_stats tx_sa_stats[MACSEC_NUM_AN ]; };
@@ -101,7 +101,7 @@ struct aq_macsec_rxsc {unsigned long rx_sa_idx_busy;const struct macsec_secy *sw_secy;const struct macsec_rx_sc *sw_rxsc; -u8 rx_sa_key[MACSEC_NUM_AN ][MACSEC_KEYID_LEN ]; +u8 rx_sa_key[MACSEC_NUM_AN ][MACSEC_MAX_KEY_LEN ];struct aq_macsec_rx_sa_stats rx_sa_stats[MACSEC_NUM_AN ]; };
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 572/800 ipv6: fix out-of-bound access in ip6_parse_tlv()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 624085a31c1ad6a80b1e53f686bf6ee92abbf6e8 ]
First problem is that optlen is fetched without checking there is more than one byte to parse.
Fix this by taking care of IPV6_TLV_PAD1 before fetching optlen (under appropriate sanity checks against len)
Second problem is that IPV6_TLV_PADN checks of zero padding are performed before the check of remaining length.
--- net/ipv6/exthdrs.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-)
net/ipv6/exthdrs.c +13 -14
@@ -135,18 +135,23 @@ static bool ip6_parse_tlv(const struct tlvtype_proc *procs, len -=2 ;while (len >0 ) { -int optlen = nh[off +1 ] +2 ; -int i; +int optlen, i; -switch (nh[off]) { -case IPV6_TLV_PAD1 : - optlen =1 ; +if (nh[off] ==IPV6_TLV_PAD1 ) { padlen++;if (padlen >7 ) goto bad; -break ; + off++; + len--; +continue ; + } +if (len <2 ) + goto bad; + optlen = nh[off +1 ] +2 ; +if (optlen > len) + goto bad; -case IPV6_TLV_PADN : +if (nh[off] ==IPV6_TLV_PADN ) {/* RFC 2460 states that the purpose of PadN is * to align the containing header to multiples * of 8. 7 is therefore the highest valid value.
@@ -163,12 +168,7 @@ static bool ip6_parse_tlv(const struct tlvtype_proc *procs,if (nh[off + i] !=0 ) goto bad; } -break ; - -default :/* Other TLV code so scan list */ -if (optlen > len) - goto bad; - + }else { tlv_count++;if (tlv_count > max_count) goto bad;
@@ -188,7 +188,6 @@ static bool ip6_parse_tlv(const struct tlvtype_proc *procs,return false; padlen =0 ; -break ; } off += optlen; len -= optlen;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 573/800 e1000e: Check the PCIm state
In reply to Greg Kroah-HartmanFrom: Sasha Neftin <[email protected]>
[ Upstream commit 2e7256f12cdb16eaa2515b6231d665044a07c51a ]
Complete to commit def4ec6dce393e ("e1000e: PCIm function state support") Check the PCIm state only on CSME systems. There is no point to do this check on non CSME systems.
This patch fixes a generation a false-positive warning:
"Error in exiting dmoff"
--- drivers/net/ethernet/intel/e1000e/netdev.c | 24 ++++++++++++---------- 1 file changed, 13 insertions(+), 11 deletions(-)
drivers/net/ethernet/intel/e1000e/netdev.c +13 -11
@@ -5223,18 +5223,20 @@ static void e1000_watchdog_task(struct work_struct *work)pm_runtime_resume (netdev->dev.parent);/* Checking if MAC is in DMoff state*/ - pcim_state =er32 (STATUS ); -while (pcim_state &E1000_STATUS_PCIM_STATE ) { -if (tries++ == dmoff_exit_timeout) { -e_dbg ("Error in exiting dmoff\n" ); -break ; - } -usleep_range (10000 ,20000 ); +if (er32 (FWSM ) &E1000_ICH_FWSM_FW_VALID ) { pcim_state =er32 (STATUS ); - -/* Checking if MAC exited DMoff state */ -if (!(pcim_state &E1000_STATUS_PCIM_STATE )) -e1000_phy_hw_reset (&adapter->hw); +while (pcim_state &E1000_STATUS_PCIM_STATE ) { +if (tries++ == dmoff_exit_timeout) { +e_dbg ("Error in exiting dmoff\n" ); +break ; + } +usleep_range (10000 ,20000 ); + pcim_state =er32 (STATUS ); + +/* Checking if MAC exited DMoff state */ +if (!(pcim_state &E1000_STATUS_PCIM_STATE )) +e1000_phy_hw_reset (&adapter->hw); + } }/* update snapshot of PHY registers on LSC */
Signature · 1 line
2.30.2