From patchwork Thu May 17 17:46:43 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: 136177 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp247498lji; Thu, 17 May 2018 10:59:36 -0700 (PDT) X-Google-Smtp-Source: AB8JxZq10vXnMdhkOaEjJOIBZTiizNVwRDOsh0Rqgre1FosmV8Hc2+2APFR5qi6m9WeT0G1j6TRA X-Received: by 2002:a37:1f08:: with SMTP id f8-v6mr5710322qkf.402.1526579975970; Thu, 17 May 2018 10:59:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526579975; cv=none; d=google.com; s=arc-20160816; b=xnbbELSol/eLqYF2iMDHQ9XrhApeisfwcEdDwt3IScYnYE8b5GnbRv97EA2Vy2O7Qm nVLAAA36TKNx+MCVomZ3YUgqF6+tTpwrmeP3dr4jp1A9u2AFvfOYm+pTdEcoDmWcTXVQ p78AmzGv8LepMyAssOKJ0gTGYArZNQjdNLlHwtaoeC73VGSfeBvwjQySF0eHCs4af63/ t0rB9C4qJ05fsmdypCODwpQuKb+uzvUoKuiHhx/AANgR5xDT5qU63e8eFMQGKFBSOMDx bOuchn8d4qCRT2+BiN6JxQ6w/M6KQPvAF8wq4vveFHkSNDn6nT9dyIsolcmVNGP6IfIl GOvw== 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=1KjlQhzDqIP23Us+7ZOKNHKx7NRYOZPWBkrgX5jLsjE=; b=MTZQd6laRZRKgxkOpcz3mAWU6Mio7xgRemzYU7YZ8m0sQhD4HW5uyOXx72f7wbi5lB hoE+qarZNYrZQxGv2z0jFNuke+3ooX2gSRBtfuB+43CEGsurQmxuMzVSfEUjRkl4N+sR EoSMoyNYy2WhgfT0YaUhajD769nHo7t9dB4InmYNIPPJyQWTxx1MoFULturskAaXX+OY 2O6XR6e+qHbgFUbQrROZ9Vlxeb318+lWBw22eFvbBixFIGx2nnR4Truptfvj3u6Elwd1 guvFGu2aLyMvISOYZI0rj1P+B+BXm7Rd21K8IxOnS49xuxI3DgrveHKM493J2GlKRolR ioZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=bTXk0VI/; 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 a123-v6si1326204qkd.341.2018.05.17.10.59.35 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 17 May 2018 10:59:35 -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=bTXk0VI/; 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]:38482 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJNBf-00076i-5Y for patch@linaro.org; Thu, 17 May 2018 13:59:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50967) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJN06-0006KN-M2 for qemu-devel@nongnu.org; Thu, 17 May 2018 13:47:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJN05-0003aC-CL for qemu-devel@nongnu.org; Thu, 17 May 2018 13:47:38 -0400 Received: from mail-wr0-x22a.google.com ([2a00:1450:400c:c0c::22a]:38319) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fJN05-0003Zm-2b for qemu-devel@nongnu.org; Thu, 17 May 2018 13:47:37 -0400 Received: by mail-wr0-x22a.google.com with SMTP id 94-v6so6546618wrf.5 for ; Thu, 17 May 2018 10:47:36 -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=1KjlQhzDqIP23Us+7ZOKNHKx7NRYOZPWBkrgX5jLsjE=; b=bTXk0VI/L9BgLcWixieOUXuTovHr+L3Jh9GitG0zWTkxV5YGgyOnhFBGb++PoeUb4C N2Onx6iw4/WYQU8PhmKmvwBLCpYf4YGR8MRRCBcfikC/WPxev32U+DWtFEbvCPTcwhPH v55TuiAd6EfJK+bQLBVHlNbt6OXNhKlexVoMI= 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=1KjlQhzDqIP23Us+7ZOKNHKx7NRYOZPWBkrgX5jLsjE=; b=EOgmWtkfphCOtSMTJGL9gzmFK1UCCY6/kxca7kwgnTGrrDi4TMjmgxfYpskgcI+OnJ YPWy/zPH/6qm6Cb9a7yavoTF/4Yqu76enQeJede0gQo0QjMs0fyhSbJlVwdGALvPxY6H NQSF2VSKqc2om+d751hfTcWsT4cb+0vYAHrbfpFTtyMPRJqnX1BHB88CnoCcQ6rFO5el vC++4liohw5+51xI1aP7aIK8Y2MMoOnCY5oP0/L8oCoORZDcs7B0mSXmLQiEcgENROJH oaxjq1LtbiHCZR681QwrnJWVyvN8VuHDsltdk5LSt64ms0i9SjUecT9+TvGh05ZfZFSN x2Yw== X-Gm-Message-State: ALKqPwcrd2co9fwMfaREcfZZRY5Z3gWRdcIIL379B21obkz7LMPdkJxZ c68RA8YR5v8hRdnu2TUvB8bjKw== X-Received: by 2002:adf:a58a:: with SMTP id g10-v6mr5367356wrc.233.1526579255853; Thu, 17 May 2018 10:47:35 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id q194-v6sm8986806wmd.26.2018.05.17.10.47.25 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 May 2018 10:47:30 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id DF00F3E0E1C; Thu, 17 May 2018 18:47:19 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Thu, 17 May 2018 18:46:43 +0100 Message-Id: <20180517174718.10107-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180517174718.10107-1-alex.bennee@linaro.org> References: <20180517174718.10107-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:c0c::22a Subject: [Qemu-devel] [PATCH v4 14/49] 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: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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 --- tests/tcg/multiarch/linux-test.c | 51 +++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 18 deletions(-) -- 2.17.0 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;