Commit aef3b8b8 authored by Uladzislau Rezki (Sony)'s avatar Uladzislau Rezki (Sony) Committed by Joel Fernandes (Google)
Browse files

net/sysctl: Rename kvfree_rcu() to kvfree_rcu_mightsleep() 



The kfree_rcu() and kvfree_rcu() macros' single-argument forms are
deprecated.  Therefore switch to the new kfree_rcu_mightsleep() and
kvfree_rcu_mightsleep() variants. The goal is to avoid accidental use
of the single-argument forms, which can introduce functionality bugs in
atomic contexts and latency bugs in non-atomic contexts.

Acked-by: default avatarJakub Kicinski <kuba@kernel.org>
Cc: Eric Dumazet <edumazet@google.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: default avatarUladzislau Rezki (Sony) <urezki@gmail.com>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
Signed-off-by: default avatarJoel Fernandes (Google) <joel@joelfernandes.org>
parent c779b972

net/core/sysctl_net_core.c

+2 −2
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ static int rps_sock_flow_sysctl(struct ctl_table *table, int write, 
			if (orig_sock_table) {

				static_branch_dec(&rps_needed);

				static_branch_dec(&rfs_needed);

				kvfree_rcu(orig_sock_table);

				kvfree_rcu_mightsleep(orig_sock_table);

			}

		}

	}
@@ -215,7 +215,7 @@ static int flow_limit_cpu_sysctl(struct ctl_table *table, int write, 
				     lockdep_is_held(&flow_limit_update_mutex));

			if (cur && !cpumask_test_cpu(i, mask)) {

				RCU_INIT_POINTER(sd->flow_limit, NULL);

				kfree_rcu(cur);

				kfree_rcu_mightsleep(cur);

			} else if (!cur && cpumask_test_cpu(i, mask)) {

				cur = kzalloc_node(len, GFP_KERNEL,

						   cpu_to_node(i));