From patchwork Fri Aug 3 22:00:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thiago Jung Bauermann X-Patchwork-Id: 10555511 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 40074174A for ; Fri, 3 Aug 2018 22:01:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 330302C722 for ; Fri, 3 Aug 2018 22:01:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 278D82C74E; Fri, 3 Aug 2018 22:01:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A06982C722 for ; Fri, 3 Aug 2018 22:01:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729968AbeHCX72 (ORCPT ); Fri, 3 Aug 2018 19:59:28 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:39536 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732106AbeHCX72 (ORCPT ); Fri, 3 Aug 2018 19:59:28 -0400 Received: from pps.filterd (m0098393.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w73Ls0kj010791 for ; Fri, 3 Aug 2018 18:01:19 -0400 Received: from e36.co.us.ibm.com (e36.co.us.ibm.com [32.97.110.154]) by mx0a-001b2d01.pphosted.com with ESMTP id 2kmuj8qx4f-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 03 Aug 2018 18:01:18 -0400 Received: from localhost by e36.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 3 Aug 2018 16:01:17 -0600 Received: from b03cxnp07028.gho.boulder.ibm.com (9.17.130.15) by e36.co.us.ibm.com (192.168.1.136) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Fri, 3 Aug 2018 16:01:16 -0600 Received: from b03ledav004.gho.boulder.ibm.com (b03ledav004.gho.boulder.ibm.com [9.17.130.235]) by b03cxnp07028.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w73M1FMO14680546 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 3 Aug 2018 15:01:15 -0700 Received: from b03ledav004.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 17F6C7805E; Fri, 3 Aug 2018 16:01:15 -0600 (MDT) Received: from b03ledav004.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0B3A578063; Fri, 3 Aug 2018 16:01:13 -0600 (MDT) Received: from morokweng.localdomain.com (unknown [9.85.156.5]) by b03ledav004.gho.boulder.ibm.com (Postfix) with ESMTP; Fri, 3 Aug 2018 16:01:12 -0600 (MDT) From: Thiago Jung Bauermann To: linux-kselftest@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Shuah Khan , Andrea Arcangeli , Mike Rapoport , Prakash Sangappa , Thiago Jung Bauermann Subject: [PATCH v2 3/4] userfaultfd: selftest: Skip test if a feature isn't supported Date: Fri, 3 Aug 2018 19:00:45 -0300 X-Mailer: git-send-email 2.14.4 In-Reply-To: <20180803220046.4019-1-bauerman@linux.ibm.com> References: <20180803220046.4019-1-bauerman@linux.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18080322-0020-0000-0000-00000E49029D X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00009479; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000266; SDB=6.01069606; UDB=6.00550094; IPR=6.00848260; MB=3.00022492; MTD=3.00000008; XFM=3.00000015; UTC=2018-08-03 22:01:17 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18080322-0021-0000-0000-000062846324 Message-Id: <20180803220046.4019-4-bauerman@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-08-03_08:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1808030236 Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If userfaultfd runs on a system that doesn't support some feature it is trying to test, it currently ends with error code 1 which indicates test failure: # ./userfaultfd anon 10 10 nr_pages: 160, nr_pages_per_cpu: 80 bounces: 9, mode: rnd poll, userfaults: 7 59 bounces: 8, mode: poll, userfaults: 0 0 bounces: 7, mode: rnd racing ver, userfaults: 45 2 bounces: 6, mode: racing ver, userfaults: 3 1 bounces: 5, mode: rnd ver, userfaults: 55 32 bounces: 4, mode: ver, userfaults: 69 0 bounces: 3, mode: rnd racing, userfaults: 1 1 bounces: 2, mode: racing, userfaults: 65 0 bounces: 1, mode: rnd, userfaults: 44 1 bounces: 0, mode:, userfaults: 3 2 testing UFFDIO_ZEROPAGE: done. testing signal delivery: UFFDIO_API # echo $? 1 Make each test return KSFT_SKIP instead, which is more accurate since it is not a real test failure and try to run the other tests which may still work: # ./userfaultfd anon 10 10 nr_pages: 160, nr_pages_per_cpu: 80 bounces: 9, mode: rnd poll, userfaults: 65 27 bounces: 8, mode: poll, userfaults: 0 0 bounces: 7, mode: rnd racing ver, userfaults: 60 29 bounces: 6, mode: racing ver, userfaults: 58 1 bounces: 5, mode: rnd ver, userfaults: 69 3 bounces: 4, mode: ver, userfaults: 35 27 bounces: 3, mode: rnd racing, userfaults: 44 0 bounces: 2, mode: racing, userfaults: 40 25 bounces: 1, mode: rnd, userfaults: 2 1 bounces: 0, mode:, userfaults: 0 1 testing UFFDIO_ZEROPAGE: done. testing signal delivery: UFFDIO_API: Invalid argument testing events (fork, remap, remove): userfaults: 160 # echo $? 0 While at it, also improve the error message of the ioctl(UFFDIO_API) call. Signed-off-by: Thiago Jung Bauermann Acked-by: Mike Rapoport --- tools/testing/selftests/vm/userfaultfd.c | 42 +++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 12 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/tools/testing/selftests/vm/userfaultfd.c b/tools/testing/selftests/vm/userfaultfd.c index d728bd1cb33c..c84e44ddf314 100644 --- a/tools/testing/selftests/vm/userfaultfd.c +++ b/tools/testing/selftests/vm/userfaultfd.c @@ -647,8 +647,11 @@ static int userfaultfd_open(int features) uffdio_api.api = UFFD_API; uffdio_api.features = features; if (ioctl(uffd, UFFDIO_API, &uffdio_api)) { - fprintf(stderr, "UFFDIO_API\n"); - return 1; + int errnum = errno; + + perror("UFFDIO_API"); + + return errnum == EINVAL ? KSFT_SKIP : 1; } if (uffdio_api.api != UFFD_API) { fprintf(stderr, "UFFDIO_API error %Lu\n", uffdio_api.api); @@ -854,6 +857,7 @@ static int userfaultfd_zeropage_test(void) { struct uffdio_register uffdio_register; unsigned long expected_ioctls; + int err; printf("testing UFFDIO_ZEROPAGE: "); fflush(stdout); @@ -861,8 +865,10 @@ static int userfaultfd_zeropage_test(void) if (uffd_test_ops->release_pages(area_dst)) return 1; - if (userfaultfd_open(0)) - return 1; + err = userfaultfd_open(0); + if (err) + return err; + uffdio_register.range.start = (unsigned long) area_dst; uffdio_register.range.len = nr_pages * page_size; uffdio_register.mode = UFFDIO_REGISTER_MODE_MISSING; @@ -904,8 +910,10 @@ static int userfaultfd_events_test(void) features = UFFD_FEATURE_EVENT_FORK | UFFD_FEATURE_EVENT_REMAP | UFFD_FEATURE_EVENT_REMOVE; - if (userfaultfd_open(features)) - return 1; + err = userfaultfd_open(features); + if (err) + return err; + fcntl(uffd, F_SETFL, uffd_flags | O_NONBLOCK); uffdio_register.range.start = (unsigned long) area_dst; @@ -963,8 +971,9 @@ static int userfaultfd_sig_test(void) return 1; features = UFFD_FEATURE_EVENT_FORK|UFFD_FEATURE_SIGBUS; - if (userfaultfd_open(features)) - return 1; + err = userfaultfd_open(features); + if (err) + return err; fcntl(uffd, F_SETFL, uffd_flags | O_NONBLOCK); uffdio_register.range.start = (unsigned long) area_dst; @@ -1029,8 +1038,9 @@ static int userfaultfd_stress(void) if (!area_dst) return 1; - if (userfaultfd_open(0)) - return 1; + err = userfaultfd_open(0); + if (err) + return err; count_verify = malloc(nr_pages * sizeof(unsigned long long)); if (!count_verify) { @@ -1201,8 +1211,16 @@ static int userfaultfd_stress(void) return err; close(uffd); - return userfaultfd_zeropage_test() || userfaultfd_sig_test() - || userfaultfd_events_test(); + + err = userfaultfd_zeropage_test(); + if (err && err != KSFT_SKIP) + return err; + + err = userfaultfd_sig_test(); + if (err && err != KSFT_SKIP) + return err; + + return userfaultfd_events_test(); } /*