linux-kernel - Re: [PATCH 1/2] perf-bench: Add epoll parallel epoll

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: <20181106182349.thdkpvshkna5vd7o@linux-r8p5>
Date:   Tue, 6 Nov 2018 10:23:49 -0800
From:   Davidlohr Bueso <dave@...olabs.net>
To:     acme@...nel.org
Cc:     akpm@...ux-foundation.org, jbaron@...mai.com,
        linux-kernel@...r.kernel.org, Davidlohr Bueso <dbueso@...e.de>
Subject: Re: [PATCH 1/2] perf-bench: Add epoll parallel epoll_wait benchmark

Mind this fixlet for using et/oneshot and the multiq option.

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");
 	}