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 C6B28C43334 for ; Tue, 5 Jul 2022 16:41:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 52A186B0071; Tue, 5 Jul 2022 12:41:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4DAB76B0073; Tue, 5 Jul 2022 12:41:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3C96E6B0074; Tue, 5 Jul 2022 12:41:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 2D10B6B0071 for ; Tue, 5 Jul 2022 12:41:46 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay11.hostedemail.com (Postfix) with ESMTP id 0DE07801A8 for ; Tue, 5 Jul 2022 16:41:46 +0000 (UTC) X-FDA: 79653612612.05.4D3F4ED Received: from mail-qk1-f174.google.com (mail-qk1-f174.google.com [209.85.222.174]) by imf03.hostedemail.com (Postfix) with ESMTP id DCA6720010 for ; Tue, 5 Jul 2022 16:41:42 +0000 (UTC) Received: by mail-qk1-f174.google.com with SMTP id v6so9132071qkh.2 for ; Tue, 05 Jul 2022 09:41:42 -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=tYpa972OxK+53nH2hieZ8THCXyBQZf9dJ7ySSKtdeCA=; b=zu1Y8Q/BvngBH50Io3VqYvvoki2oU/7RCIqldxtmnxOZqmDYyh6IDBKmV2iPkFvRcM jI+TG0etejyuQrpC+PhbjvP52Sw6tWBMJQtbvdeuU4OnD50arNg71C/2GMDfJLIYWtQu gKSdxj7JM4LIlK+J1z5LA4VpgiiJntcQvl31TbZoWdJjpaeAIC/cCF980zcT14Tf67My GI7+JB3K+KnPBq9t4FL4p+jxFOGGDkKEDjH7DykIlFYb4K+TVyOamUiRpIy96hM8KOW0 NpZ0QOCc9+3wQAVHU/FUwgUWGMX5XrZJ1/S4WITX25IzuNO2pRxfytDK7FFy1KlzcDDP R4bg== X-Gm-Message-State: AJIora8ViSGbXHLeIle3xoXDVEeMfwjJY8Ow/J7R+Kf4ycbWsCZ1uFzO 0RzuSoX1wWEpH23tKyY+XeM= X-Google-Smtp-Source: AGRyM1t/Tl3yBqohsHVid7RqgatTN6A+HAwa8/ji+k2PkO1wAkhEh7gVnmyDDD9g+ZPJlubguBjwSg== X-Received: by 2002:a05:620a:410e:b0:6b2:809f:2f62 with SMTP id j14-20020a05620a410e00b006b2809f2f62mr10673806qko.14.1657039302018; Tue, 05 Jul 2022 09:41:42 -0700 (PDT) Received: from dev0025.ash9.facebook.com (fwdproxy-ash-022.fbsv.net. [2a03:2880:20ff:16::face:b00c]) by smtp.gmail.com with ESMTPSA id x9-20020a05620a448900b006a708baa069sm22441724qkp.101.2022.07.05.09.41.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Jul 2022 09:41:41 -0700 (PDT) Date: Tue, 5 Jul 2022 09:41:39 -0700 From: David Vernet To: Adam Sindelar Cc: Andrew Morton , linux-mm@kvack.org, Adam Sindelar , kernel-team@fb.com, surenb@google.com Subject: Re: [PATCH v2] selftests/vm: fix errno handling in mrelease_test Message-ID: <20220705150015.o3omwkc7c23dbtkh@dev0025.ash9.facebook.com> References: <20220704173351.19595-1-adam@wowsignal.io> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220704173351.19595-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=1657039303; 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=tYpa972OxK+53nH2hieZ8THCXyBQZf9dJ7ySSKtdeCA=; b=0lSux4XIWMMJotMQP1loOsQ/kOLX4NwiFTHeyZ4afbXbW8lyk3ecBtg9goMh2q3xmb9J41 ifyzQhjIgVf3V5SwbmdMxFIrfw746CuUOmEWJ6SXaItzsonUDyLgkcpW2ro7yEB3iVxhlb cGFssnt8oOnei9w0v6/et0L1yqP1qyo= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=none; spf=pass (imf03.hostedemail.com: domain of dcvernet@gmail.com designates 209.85.222.174 as permitted sender) smtp.mailfrom=dcvernet@gmail.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1657039303; a=rsa-sha256; cv=none; b=7MO+AEqMIFkptRTATHKIne27aS0mEk+mECGkpE+7XzUhMuN7JkMy09Wy+SFAA+nXfi8Em8 6FbciavpaAe3UJLZkbbqtjVMn9LW7M1aJDQyeESL6DYt4MuvYfMTOXvdUE61VwQRYEoMKG tQ4SshweA9qWOuCC8Vp9M1VNiwcc3bg= X-Stat-Signature: c5h8bt3ri6u9ypkzb5chzx948yrkideg X-Rspamd-Queue-Id: DCA6720010 Authentication-Results: imf03.hostedemail.com; dkim=none; spf=pass (imf03.hostedemail.com: domain of dcvernet@gmail.com designates 209.85.222.174 as permitted sender) smtp.mailfrom=dcvernet@gmail.com; dmarc=none X-Rspam-User: X-Rspamd-Server: rspam02 X-HE-Tag: 1657039302-464029 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 Mon, Jul 04, 2022 at 07:33:51PM +0200, Adam Sindelar wrote: Thanks for fixing this, Adam. > 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 code before calling perror. > We should probably also include a "Fixes" line here (see [0]): Fixes: 33776141b812 ("selftests: vm: add process_mrelease tests") [0]: https://www.kernel.org/doc/html/latest/process/submitting-patches.html#describe-your-changes > Signed-off-by: Adam Sindelar > --- > v1->v2: Fixed second instance in the same file > > tools/testing/selftests/vm/mrelease_test.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/tools/testing/selftests/vm/mrelease_test.c b/tools/testing/selftests/vm/mrelease_test.c > index 96671c2f7d48..e8b17258579b 100644 > --- a/tools/testing/selftests/vm/mrelease_test.c > +++ b/tools/testing/selftests/vm/mrelease_test.c > @@ -100,8 +100,10 @@ int main(void) > > /* Test a wrong pidfd */ > if (!syscall(__NR_process_mrelease, -1, 0) || errno != EBADF) { > + /* perror overwrites errno, so this line must be first */ > + 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 +158,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); > -- > 2.35.1 > This looks good to me, but it looks like there are a couple of other places where we're doing the wrong thing, i.e. in run_negative_tests() and after calling waitpid(). Could you please fix those as well? Also adding Suren to cc. - David