Unverified Commit 3c02090e authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12316 backport some LTS patches 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Jian <liujian56@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/XQK3OC7PPCLFU2CUT7KRSUEBY7QCUIOA/ 
backport some LTS patches.

Benjamin Coddington (1):
  SUNRPC: Fix a race to wake a sync task

Eric Dumazet (2):
  net: linkwatch: use system_unbound_wq
  net: busy-poll: use ktime_get_ns() instead of local_clock()


-- 
2.34.1
 
https://gitee.com/openeuler/kernel/issues/IAYZ0U 
 
Link:https://gitee.com/openeuler/kernel/pulls/12316

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents d30414e1 579f1b1c

include/net/busy_poll.h

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static inline bool sk_can_busy_loop(struct sock *sk) 
static inline unsigned long busy_loop_current_time(void)

{

#ifdef CONFIG_NET_RX_BUSY_POLL

	return (unsigned long)(local_clock() >> 10);

	return (unsigned long)(ktime_get_ns() >> 10);

#else

	return 0;

#endif

net/core/link_watch.c

+2 −2
Original line number Diff line number Diff line
@@ -135,9 +135,9 @@ static void linkwatch_schedule_work(int urgent) 
	 * override the existing timer.

	 */

	if (test_bit(LW_URGENT, &linkwatch_flags))

		mod_delayed_work(system_wq, &linkwatch_work, 0);

		mod_delayed_work(system_unbound_wq, &linkwatch_work, 0);

	else

		schedule_delayed_work(&linkwatch_work, delay);

		queue_delayed_work(system_unbound_wq, &linkwatch_work, delay);

}

net/sunrpc/sched.c

+3 −1
Original line number Diff line number Diff line
@@ -349,9 +349,11 @@ static void rpc_make_runnable(struct workqueue_struct *wq, 
	if (RPC_IS_ASYNC(task)) {

		INIT_WORK(&task->u.tk_work, rpc_async_schedule);

		queue_work(wq, &task->u.tk_work);

	} else

	} else {

		smp_mb__after_atomic();

		wake_up_bit(&task->tk_runstate, RPC_TASK_QUEUED);

	}

}



/*

 * Prepare for sleeping on a wait queue.