netdev - Re: pktgen

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <b6fcc0a0612010151s4231cae6n9252f8816406e1d2@mail.gmail.com>
Date:	Fri, 1 Dec 2006 12:51:53 +0300
From:	"Alexey Dobriyan" <adobriyan@...il.com>
To:	"Robert Olsson" <Robert.Olsson@...a.slu.se>
Cc:	"David Miller" <davem@...emloft.net>, greearb@...delatech.com,
	pavol.gono@...il.com, netdev@...r.kernel.org
Subject: Re: pktgen

On 12/1/06, Robert Olsson <Robert.Olsson@...a.slu.se> wrote:
> David Miller writes:
>  > Agreed.
>  >
>  > Robert, please fix this by using a completion so that we can
>  > wait for the threads to start up, something like this:
>
> Included. It passes my test but Alexey and others test.

Confused now. Is my "t->control &= ~(T_TERMINATE);" fix deprecated by
completions?

> --- a/net/core/pktgen.c
> +++ b/net/core/pktgen.c
> @@ -147,6 +147,7 @@
>  #include <linux/proc_fs.h>
>  #include <linux/seq_file.h>
>  #include <linux/wait.h>
> +#include <linux/completion.h>
>  #include <linux/etherdevice.h>
>  #include <net/checksum.h>
>  #include <net/ipv6.h>
> @@ -160,7 +161,7 @@
>  #include <asm/div64.h>		/* do_div */
>  #include <asm/timex.h>
>
> -#define VERSION  "pktgen v2.68: Packet Generator for packet performance
> testing.\n"
> +#define VERSION  "pktgen v2.69: Packet Generator for packet performance
> testing.\n"
>
>  /* #define PG_DEBUG(a) a */
>  #define PG_DEBUG(a)
> @@ -206,6 +207,11 @@ static struct proc_dir_entry *pg_proc_di
>  #define VLAN_TAG_SIZE(x) ((x)->vlan_id == 0xffff ? 0 : 4)
>  #define SVLAN_TAG_SIZE(x) ((x)->svlan_id == 0xffff ? 0 : 4)
>
> +struct pktgen_thread_info {
> +       struct pktgen_thread *t;
> +       struct completion *c;
> +};
> +
>  struct flow_state {
>  	__u32 cur_daddr;
>  	int count;
> @@ -3264,10 +3270,11 @@ out:;
>   * Main loop of the thread goes here
>   */
>
> -static void pktgen_thread_worker(struct pktgen_thread *t)
> +static void pktgen_thread_worker(struct pktgen_thread_info *info)
>  {
>  	DEFINE_WAIT(wait);
>  	struct pktgen_dev *pkt_dev = NULL;
> +	struct pktgen_thread *t = info->t;
>  	int cpu = t->cpu;
>  	sigset_t tmpsig;
>  	u32 max_before_softirq;
> @@ -3307,6 +3314,8 @@ static void pktgen_thread_worker(struct
>  	__set_current_state(TASK_INTERRUPTIBLE);
>  	mb();
>
> +        complete(info->c);
> +
>  	while (1) {
>
>  		__set_current_state(TASK_RUNNING);
> @@ -3518,6 +3527,8 @@ static struct pktgen_thread *__init pktg
>  static int __init pktgen_create_thread(const char *name, int cpu)
>  {
>  	int err;
> +	struct pktgen_thread_info info;
> +        struct completion started;
>  	struct pktgen_thread *t = NULL;
>  	struct proc_dir_entry *pe;
>
> @@ -3558,7 +3569,11 @@ static int __init pktgen_create_thread(c
>
>  	t->removed = 0;
>
> -	err = kernel_thread((void *)pktgen_thread_worker, (void *)t,
> +	init_completion(&started);
> +        info.t = t;
> +        info.c = &started;
> +
> +	err = kernel_thread((void *)pktgen_thread_worker, (void *)&info,
>  			  CLONE_FS | CLONE_FILES | CLONE_SIGHAND);
>  	if (err < 0) {
>  		printk("pktgen: kernel_thread() failed for cpu %d\n", t->cpu);
> @@ -3568,6 +3583,7 @@ static int __init pktgen_create_thread(c
>  		return err;
>  	}
>
> +	wait_for_completion(&started);
>  	return 0;
>  }
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html