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

!11865 pktgen: use cpus_read_lock() in pg_net_init() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Wang Liang <wangliang74@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/FRSEQYRQGGEV2VCIISR3MWB7OWSHRHLM/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAR4B3 
 
Link:https://gitee.com/openeuler/kernel/pulls/11865

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 01e8febb fbe81680

net/core/pktgen.c

+4 −1
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ 
#include <linux/uaccess.h>

#include <asm/dma.h>

#include <asm/div64.h>		/* do_div */

#include <linux/cpu.h>



#define VERSION	"2.75"

#define IP_NAME_SZ 32
@@ -3605,7 +3606,7 @@ static int pktgen_thread_worker(void *arg) 
	struct pktgen_dev *pkt_dev = NULL;

	int cpu = t->cpu;



	WARN_ON(smp_processor_id() != cpu);

	WARN_ON_ONCE(smp_processor_id() != cpu);



	init_waitqueue_head(&t->queue);

	complete(&t->start_done);
@@ -3941,6 +3942,7 @@ static int __net_init pg_net_init(struct net *net) 
		goto remove;

	}



	cpus_read_lock();

	for_each_online_cpu(cpu) {

		int err;
@@ -3949,6 +3951,7 @@ static int __net_init pg_net_init(struct net *net) 
			pr_warn("Cannot create thread for cpu %d (%d)\n",

				   cpu, err);

	}

	cpus_read_unlock();



	if (list_empty(&pn->pktgen_threads)) {

		pr_err("Initialization failed for all threads\n");