From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0FEE0C46470 for ; Tue, 7 Aug 2018 06:51:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BD4B0217D1 for ; Tue, 7 Aug 2018 06:51:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BD4B0217D1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.vnet.ibm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388576AbeHGJEk (ORCPT ); Tue, 7 Aug 2018 05:04:40 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:55320 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727224AbeHGJEk (ORCPT ); Tue, 7 Aug 2018 05:04:40 -0400 Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w776nStY049023 for ; Tue, 7 Aug 2018 02:51:47 -0400 Received: from e06smtp03.uk.ibm.com (e06smtp03.uk.ibm.com [195.75.94.99]) by mx0a-001b2d01.pphosted.com with ESMTP id 2kq60j977b-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 07 Aug 2018 02:51:47 -0400 Received: from localhost by e06smtp03.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 7 Aug 2018 07:51:45 +0100 Received: from b06cxnps3074.portsmouth.uk.ibm.com (9.149.109.194) by e06smtp03.uk.ibm.com (192.168.101.133) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Tue, 7 Aug 2018 07:51:43 +0100 Received: from d06av26.portsmouth.uk.ibm.com (d06av26.portsmouth.uk.ibm.com [9.149.105.62]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w776pgIq45416548 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 7 Aug 2018 06:51:42 GMT Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 68A77AE045; Tue, 7 Aug 2018 09:51:36 +0100 (BST) Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A4F8EAE051; Tue, 7 Aug 2018 09:51:35 +0100 (BST) Received: from rapoport-lnx (unknown [9.148.206.72]) by d06av26.portsmouth.uk.ibm.com (Postfix) with ESMTPS; Tue, 7 Aug 2018 09:51:35 +0100 (BST) Date: Tue, 7 Aug 2018 09:51:39 +0300 From: Mike Rapoport To: Thiago Jung Bauermann Cc: linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Shuah Khan , Andrea Arcangeli , Prakash Sangappa Subject: Re: [PATCH v2 3/4] userfaultfd: selftest: Skip test if a feature isn't supported References: <20180803220046.4019-1-bauerman@linux.ibm.com> <20180803220046.4019-4-bauerman@linux.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180803220046.4019-4-bauerman@linux.ibm.com> User-Agent: Mutt/1.5.24 (2015-08-30) X-TM-AS-GCONF: 00 x-cbid: 18080706-0012-0000-0000-000002963B88 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18080706-0013-0000-0000-000020C93EB1 Message-Id: <20180807065138.GC20140@rapoport-lnx> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-08-07_02:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 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-1808070071 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Aug 03, 2018 at 07:00:45PM -0300, Thiago Jung Bauermann wrote: > 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(-) > > 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(); > } > > /* -- Sincerely yours, Mike.