From patchwork Tue Jun 19 15:43:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 139231 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp5430873lji; Tue, 19 Jun 2018 09:43:30 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJKEkk4YCngeLJjt1tOlLpcOzdho0zDLlON9GmH1+u5VnwtfKThrKBHGEFXXwpwCA3KDYkp X-Received: by 2002:ac8:32fa:: with SMTP id a55-v6mr16015239qtb.342.1529426609946; Tue, 19 Jun 2018 09:43:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529426609; cv=none; d=google.com; s=arc-20160816; b=S6UHzHgtfUkX8M7uJBwyg/nEoU7bf+aMhkr+szb/BHoOEHwZUx67OUK+e7OZ84opjh VbLpXbOHNTvS1QG5kUs8mjiXC2trdQfitViFeEiQzbZYogM2PENIQxNkZfXWDuNCE9Y1 pu/gOroDIdbKjrU106ZqauVUyi8RO9Ao7cNOkGC11HPewti8jLdZYPKXUS6o/gHcnnKF mIXB0igP5wMi7EPkNDZxPnnqK9wwLt8oJeJtuxTYIUjaG0dDoPsM8y5EgeClGIdzvROA AdsIpQ8R8aS/BHuvwPKGs5ZMR+jJ0XnkhGXjwwLYPlk5KQcT+p0G7qJsoWbFR4ZGWhFl 5ltA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=gZiyT2VjOkpq5sgxHHEJi98NXSG86xo2rIHJvQ5uoec=; b=fRWDKakJ1ltCR4/pvhUcUVTDZUL9XnXY2x6H7jJp56KtHcxYcFKahocZSMriciQAn3 3oFQakYEdvZqGDADWwYzjGb0p1DEESFI8dLth5IPIewN64FxUi36ro2vSzGqaF259Zfr 28rToatHIzNTM5m3kG4Hd8/TlAz/d0hy/YbTiQVSiO2ceOhhs1Dwm+Dbmcb7K8j16Zgb Rc/Hw0PfBgpsqUCz+Arc+698BzAMqygk3j9Bh4QFOmNjRWqSe79CjAz6AG/n9g4ugjD2 j1e6kskpuKQSDFEUnznJd3nztirq8V+Ow1YVqY2gaeLM5U5Vx8P0+4QmVWsBOxUt8VWl J2xg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hU8KUjAr; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id t22-v6si139699qtj.175.2018.06.19.09.43.29 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 19 Jun 2018 09:43:29 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hU8KUjAr; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:43765 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVJj7-0003mB-CN for patch@linaro.org; Tue, 19 Jun 2018 12:43:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46060) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVJ50-0004fj-TN for qemu-devel@nongnu.org; Tue, 19 Jun 2018 12:02:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fVJ4x-0007eX-0e for qemu-devel@nongnu.org; Tue, 19 Jun 2018 12:02:02 -0400 Received: from mail-wm0-x22c.google.com ([2a00:1450:400c:c09::22c]:50616) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fVJ4w-0007eA-NM for qemu-devel@nongnu.org; Tue, 19 Jun 2018 12:01:58 -0400 Received: by mail-wm0-x22c.google.com with SMTP id e16-v6so1285070wmd.0 for ; Tue, 19 Jun 2018 09:01:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gZiyT2VjOkpq5sgxHHEJi98NXSG86xo2rIHJvQ5uoec=; b=hU8KUjArFLzAMK5jKqnFHMM1l/UyNvQTySG5kOfUF4lgrj9Ei2ArM0/T67f+gW6pAv JEyCl0Ix8gtC0xPRaiRqBo9RhI6wDFf9XwauW7lWxz6c1ENhaQEm+p26nsBSfIYWTcrf 4G2nfUCDM4NYTUaejprOxrdEQqIfabLQKxDQs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gZiyT2VjOkpq5sgxHHEJi98NXSG86xo2rIHJvQ5uoec=; b=dWB0u/J6JgH5URXieT0znzC4zn5YIURdNeAOOOMe973SeB9axZSzzqmFEg9PuO1XTP /MAAhh7FPAslYBEy198qMWvUkvEd554bm5+2oEUs9YDJz12YWKpgp9NRB3aE9Nt6TYVp 1AJ6p2y12Uyk8bYCdgPtdX2xrxirtr4uWkPFrJYcU98BAgV+MQ7R+Olhl/AlXfErljSR 4FQolE6SZ3e0Bm5WxFgt1cF7rMbts9wh6MsuUs334qT2CdG2xNm9pqGZdYO15mFJZEHc mRSisitf7NTd/IOJ+rujbjbjbEIGoKMt+Fs9yoaDTXhKsIu22bpYAyl/8l3DA2yxM1Ow 1exA== X-Gm-Message-State: APt69E3IPPH7LR5jAcSBRq5rp8OzayYRkbLu8mZ+8Z4lra6SLbaEmX0e 5jxmqToPPIfE1jXcSodeZNdidA== X-Received: by 2002:a1c:e546:: with SMTP id c67-v6mr10219703wmh.108.1529424117499; Tue, 19 Jun 2018 09:01:57 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id k36-v6sm74740wrc.20.2018.06.19.09.01.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Jun 2018 09:01:55 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 64C913E0A3C; Tue, 19 Jun 2018 16:44:36 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 19 Jun 2018 16:43:50 +0100 Message-Id: <20180619154435.18898-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180619154435.18898-1-alex.bennee@linaro.org> References: <20180619154435.18898-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::22c Subject: [Qemu-devel] [PULL 11/56] tests/tcg/multiarch: enable additional linux-test tests X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: agraf@suse.de, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, qemu-devel@nongnu.org, f4bug@amsat.org, cota@braap.org, famz@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Un-comment the remaining tests. I removed the itimer value tests because I'm fairly sure a re-arming timer will always have a different value in it when you grab it. I've also fixed up the clone thread flags as QEMU will only allow a clone to use flags which match glibc. However the test is still racey so it remains disabled by default - it can be run by passing any additional parameters on the command line. Signed-off-by: Alex Bennée Tested-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- v3 - make clone flags match CLONE_THREAD_FLAGS v4 - disable test_clone for default case -- 2.17.1 diff --git a/tests/tcg/multiarch/linux-test.c b/tests/tcg/multiarch/linux-test.c index 4457bd04ba..6f2c531474 100644 --- a/tests/tcg/multiarch/linux-test.c +++ b/tests/tcg/multiarch/linux-test.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ +#define _GNU_SOURCE #include #include #include @@ -58,8 +59,8 @@ static void error1(const char *filename, int line, const char *fmt, ...) static int __chk_error(const char *filename, int line, int ret) { if (ret < 0) { - error1(filename, line, "%m (ret=%d, errno=%d)", - ret, errno); + error1(filename, line, "%m (ret=%d, errno=%d/%s)", + ret, errno, strerror(errno)); } return ret; } @@ -216,6 +217,7 @@ static void test_fork(void) pid = chk_error(fork()); if (pid == 0) { /* child */ + sleep(2); exit(2); } chk_error(waitpid(pid, &status, 0)); @@ -320,7 +322,6 @@ static void test_socket(void) chk_error(close(server_fd)); } -#if 0 #define WCOUNT_MAX 512 static void test_pipe(void) @@ -355,7 +356,7 @@ static void test_pipe(void) } if (FD_ISSET(fds[1], &wfds)) { ch = 'a'; - chk_error(write(fds[0], &ch, 1)); + chk_error(write(fds[1], &ch, 1)); wcount++; } } @@ -387,28 +388,41 @@ static int thread2_func(void *arg) return 0; } -void test_clone(void) +static void wait_for_child(pid_t pid) +{ + int status; + chk_error(waitpid(pid, &status, 0)); +} + +/* For test_clone we must match the clone flags used by glibc, see + * CLONE_THREAD_FLAGS in the QEMU source code. + */ +static void test_clone(void) { uint8_t *stack1, *stack2; - int pid1, pid2, status1, status2; + pid_t pid1, pid2; stack1 = malloc(STACK_SIZE); pid1 = chk_error(clone(thread1_func, stack1 + STACK_SIZE, - CLONE_VM | CLONE_FS | CLONE_FILES | SIGCHLD, "hello1")); + CLONE_VM | CLONE_FS | CLONE_FILES | + CLONE_SIGHAND | CLONE_THREAD | CLONE_SYSVSEM, + "hello1")); stack2 = malloc(STACK_SIZE); pid2 = chk_error(clone(thread2_func, stack2 + STACK_SIZE, - CLONE_VM | CLONE_FS | CLONE_FILES | SIGCHLD, "hello2")); + CLONE_VM | CLONE_FS | CLONE_FILES | + CLONE_SIGHAND | CLONE_THREAD | CLONE_SYSVSEM, + "hello2")); - while (waitpid(pid1, &status1, 0) != pid1); + wait_for_child(pid1); free(stack1); - while (waitpid(pid2, &status2, 0) != pid2); + wait_for_child(pid2); free(stack2); + if (thread1_res != 5 || thread2_res != 6) error("clone"); } -#endif /***********************************/ @@ -449,12 +463,10 @@ static void test_signal(void) it.it_value.tv_usec = 10 * 1000; chk_error(setitimer(ITIMER_REAL, &it, NULL)); chk_error(getitimer(ITIMER_REAL, &oit)); - if (oit.it_value.tv_sec != it.it_value.tv_sec || - oit.it_value.tv_usec != it.it_value.tv_usec) - error("itimer"); while (alarm_count < 5) { usleep(10 * 1000); + getitimer(ITIMER_REAL, &oit); } it.it_interval.tv_sec = 0; @@ -463,9 +475,6 @@ static void test_signal(void) it.it_value.tv_usec = 0; memset(&oit, 0xff, sizeof(oit)); chk_error(setitimer(ITIMER_REAL, &it, &oit)); - if (oit.it_value.tv_sec != 0 || - oit.it_value.tv_usec != 10 * 1000) - error("setitimer"); /* SIGSEGV test */ act.sa_sigaction = sig_segv; @@ -503,10 +512,16 @@ static void test_shm(void) int main(int argc, char **argv) { test_file(); + test_pipe(); test_fork(); test_time(); test_socket(); - // test_clone(); + + if (argc > 1) { + printf("test_clone still considered buggy\n"); + test_clone(); + } + test_signal(); test_shm(); return 0;