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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1EF44C433EF for ; Wed, 6 Jul 2022 15:29:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A87BF6B0073; Wed, 6 Jul 2022 11:29:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A375F6B0074; Wed, 6 Jul 2022 11:29:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 927466B0075; Wed, 6 Jul 2022 11:29:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 84C506B0073 for ; Wed, 6 Jul 2022 11:29:41 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 5D5B060B7A for ; Wed, 6 Jul 2022 15:29:41 +0000 (UTC) X-FDA: 79657059762.20.371146C Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) by imf08.hostedemail.com (Postfix) with ESMTP id 0940D16001F for ; Wed, 6 Jul 2022 15:29:40 +0000 (UTC) Received: by mail-qk1-f175.google.com with SMTP id z16so11278500qkj.7 for ; Wed, 06 Jul 2022 08:29:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=zgqmupWSA1fD/GxHJn7/xXzaduophMUVTO6mV0inObM=; b=rOiNUcWOSfRxnYNCrMSGGWj68zNAWVY6sDoP86+yXCi32/zb8G1iepHHiSyEfI74lW 5eZEQyIB+ye1hyO9XZqED4bBVRtxtVs6YLbJyxTbn6osLr4438ZoF0tPqKL+bUYVyUkX jY2nf5dcyuJTs14zHrQeoSEEXFXoInZhJRtOylBTUwuJsNgim1mPJfml4VJiePJ6PyVb wWxi81+ErPFl7LSMMf/rcaPFvqw76tRP5/5MzDlwucYRjW0aP64lj6gqoH/e1k6Zdn+K BggPSpx0zR0lFzHIsL935crbbqXsgEb9LABXO+VVLTr9VXETbLNXOMQmCTX9p6XoIzqD HvVg== X-Gm-Message-State: AJIora/F+0KAVO9A2jr9bWC5p90jEB1RQ4CvmSK9xBGVX9qniXOpPGd3 8fZhXzyh7nKQKMMgi+gwnKY= X-Google-Smtp-Source: AGRyM1sUDcVPOXU/q7khwVncg5hfWORIYmbSwRgF/gGzjSQupsuyHm9Hzz9/OG40OhQO11SMJb7CIg== X-Received: by 2002:a05:620a:2681:b0:67e:909f:d5ac with SMTP id c1-20020a05620a268100b0067e909fd5acmr26921398qkp.125.1657121380153; Wed, 06 Jul 2022 08:29:40 -0700 (PDT) Received: from dev0025.ash9.facebook.com (fwdproxy-ash-020.fbsv.net. [2a03:2880:20ff:14::face:b00c]) by smtp.gmail.com with ESMTPSA id a21-20020a05620a16d500b006a7502d0070sm28116438qkn.21.2022.07.06.08.29.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Jul 2022 08:29:39 -0700 (PDT) Date: Wed, 6 Jul 2022 08:29:37 -0700 From: David Vernet To: Adam Sindelar Cc: Andrew Morton , Suren Baghdasaryan , linux-mm@kvack.org, Adam Sindelar , kernel-team@fb.com Subject: Re: [PATCH v4] selftests/vm: fix errno handling in mrelease_test Message-ID: <20220706152937.j3ejwofwofnsgsxs@dev0025.ash9.facebook.com> References: <20220706141602.10159-1-adam@wowsignal.io> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220706141602.10159-1-adam@wowsignal.io> User-Agent: NeoMutt/20211029 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1657121381; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zgqmupWSA1fD/GxHJn7/xXzaduophMUVTO6mV0inObM=; b=AWuxrMADXH2JVBzbuxc4qvwqBUEPqfo24MFhUd6wfVjjIZ6RIVrxdz4+fg8d761JDV6onX JKprChTK3fBS4UMGazfA5YmB6A+S0z5qaUaXFkpUV7Feof9TvvwsFIrbO2XkoPDobbSXhg 2dgb/2ClEsAO9kvj7D6srB9AYV9VXPo= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf08.hostedemail.com: domain of dcvernet@gmail.com designates 209.85.222.175 as permitted sender) smtp.mailfrom=dcvernet@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1657121381; a=rsa-sha256; cv=none; b=YwLwq5qi4QxEsQcCjNVll4nRUc/hP7ioTjs3/1gD+x0JLaVdPOEIYXD5EEkThr57XbgOPD UwaaJAIqIrdHkZuh6Bt2/O1Mas6X/u7He2/TSMQB9WqDuSoIWPlOu4vpg7CEA8K6J+ah+6 zPJxY/2nDMTcjf2+u/HVeBMeSOuvKpE= X-Rspam-User: X-Rspamd-Server: rspam07 Authentication-Results: imf08.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf08.hostedemail.com: domain of dcvernet@gmail.com designates 209.85.222.175 as permitted sender) smtp.mailfrom=dcvernet@gmail.com X-Stat-Signature: tm4tyd7xrsjio1cd9qzw3heccgybnam6 X-Rspamd-Queue-Id: 0940D16001F X-HE-Tag: 1657121380-524616 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Wed, Jul 06, 2022 at 04:16:02PM +0200, Adam Sindelar wrote: > mrelease_test should return KSFT_SKIP when process_mrelease is not > defined, but due to a perror call consuming the errno, it returns > KSFT_FAIL. > > This patch decides the exit codes before calling perror. > > Fixes: 33776141b812 ("selftests: vm: add process_mrelease tests") > > Signed-off-by: Adam Sindelar > --- > v1->v2: Fixed second instance in the same file > v2->v3: Fixed remaining instances of errno mishandling > v3->v4: Added a "Fixes:" line for the log > > tools/testing/selftests/vm/mrelease_test.c | 16 +++++++++++----- > 1 file changed, 11 insertions(+), 5 deletions(-) > > diff --git a/tools/testing/selftests/vm/mrelease_test.c b/tools/testing/selftests/vm/mrelease_test.c > index 96671c2f7d48..6c62966ab5db 100644 > --- a/tools/testing/selftests/vm/mrelease_test.c > +++ b/tools/testing/selftests/vm/mrelease_test.c > @@ -62,19 +62,22 @@ static int alloc_noexit(unsigned long nr_pages, int pipefd) > /* The process_mrelease calls in this test are expected to fail */ > static void run_negative_tests(int pidfd) > { > + int res; > /* Test invalid flags. Expect to fail with EINVAL error code. */ > if (!syscall(__NR_process_mrelease, pidfd, (unsigned int)-1) || > errno != EINVAL) { > + res = (errno == ENOSYS ? KSFT_SKIP : KSFT_FAIL); > perror("process_mrelease with wrong flags"); > - exit(errno == ENOSYS ? KSFT_SKIP : KSFT_FAIL); > + exit(res); > } > /* > * Test reaping while process is alive with no pending SIGKILL. > * Expect to fail with EINVAL error code. > */ > if (!syscall(__NR_process_mrelease, pidfd, 0) || errno != EINVAL) { > + res = (errno == ENOSYS ? KSFT_SKIP : KSFT_FAIL); > perror("process_mrelease on a live process"); > - exit(errno == ENOSYS ? KSFT_SKIP : KSFT_FAIL); > + exit(res); > } > } > > @@ -100,8 +103,9 @@ int main(void) > > /* Test a wrong pidfd */ > if (!syscall(__NR_process_mrelease, -1, 0) || errno != EBADF) { > + res = (errno == ENOSYS ? KSFT_SKIP : KSFT_FAIL); > perror("process_mrelease with wrong pidfd"); > - exit(errno == ENOSYS ? KSFT_SKIP : KSFT_FAIL); > + exit(res); > } > > /* Start the test with 1MB child memory allocation */ > @@ -156,8 +160,9 @@ int main(void) > run_negative_tests(pidfd); > > if (kill(pid, SIGKILL)) { > + res = (errno == ENOSYS ? KSFT_SKIP : KSFT_FAIL); > perror("kill"); > - exit(errno == ENOSYS ? KSFT_SKIP : KSFT_FAIL); > + exit(res); > } > > success = (syscall(__NR_process_mrelease, pidfd, 0) == 0); > @@ -172,9 +177,10 @@ int main(void) > if (errno == ESRCH) { > retry = (size <= MAX_SIZE_MB); > } else { > + res = (errno == ENOSYS ? KSFT_SKIP : KSFT_FAIL); > perror("process_mrelease"); > waitpid(pid, NULL, 0); > - exit(errno == ENOSYS ? KSFT_SKIP : KSFT_FAIL); > + exit(res); > } > } > > -- > 2.35.1 > Thanks, Adam. Looks great. Reviewed-by: David Vernet