Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Tue, 6 Nov 2018 16:13:25 -0300
From:   Arnaldo Carvalho de Melo <acme@kernel.org>
To:     Davidlohr Bueso <dave@stgolabs.net>
Cc:     akpm@linux-foundation.org, jbaron@akamai.com,
        linux-kernel@vger.kernel.org, Davidlohr Bueso <dbueso@suse.de>
Subject: Re: [PATCH 1/2] perf-bench: Add epoll parallel epoll_wait benchmark
Message-ID: <20181106191325.GM7077@kernel.org>
References: <20181106152226.20883-1-dave@stgolabs.net>
 <20181106152226.20883-2-dave@stgolabs.net>
 <20181106182349.thdkpvshkna5vd7o@linux-r8p5>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20181106182349.thdkpvshkna5vd7o@linux-r8p5>
User-Agent: Mutt/1.9.2 (2017-12-15)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Em Tue, Nov 06, 2018 at 10:23:49AM -0800, Davidlohr Bueso escreveu:
> Mind this fixlet for using et/oneshot and the multiq option.

Yes sir, applied the fixup to the first patch in the series, applied the
second, tested, merged.

- Arnaldo
 
> diff --git a/tools/perf/bench/epoll-wait.c b/tools/perf/bench/epoll-wait.c
> index c4c5ef60feb4..4e4efc5cfe22 100644
> --- a/tools/perf/bench/epoll-wait.c
> +++ b/tools/perf/bench/epoll-wait.c
> @@ -215,13 +215,13 @@ static void *workerfn(void *arg)
> 
> 		if (et) {
> 			ev.events = EPOLLIN | EPOLLET;
> -			ret = epoll_ctl(epollfd, EPOLL_CTL_ADD, fd, &ev);
> +			ret = epoll_ctl(efd, EPOLL_CTL_ADD, fd, &ev);
> 		}
> 
> 		if (oneshot) {
> 			/* rearm the file descriptor with a new event mask */
> 			ev.events |= EPOLLIN | EPOLLONESHOT;
> -			ret = epoll_ctl(epollfd, EPOLL_CTL_MOD, fd, &ev);
> +			ret = epoll_ctl(efd, EPOLL_CTL_MOD, fd, &ev);
> 		}
> 
> 		ops++;
> @@ -249,7 +249,7 @@ static void nest_epollfd(struct worker *w)
> 
> 	for (i = 0; i < nested; i++) {
> 		epollfdp[i] = epoll_create(1);
> -		if (epollfd < 0)
> +		if (epollfdp[i] < 0)
> 			err(EXIT_FAILURE, "epoll_create");
> 	}
>