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 A67B3C43334 for ; Thu, 9 Jun 2022 21:12:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E35896B00F4; Thu, 9 Jun 2022 17:12:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DE5E86B00F7; Thu, 9 Jun 2022 17:12:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C84A98D0034; Thu, 9 Jun 2022 17:12:54 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id B5C536B00F4 for ; Thu, 9 Jun 2022 17:12:54 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay12.hostedemail.com (Postfix) with ESMTP id 833D5121461 for ; Thu, 9 Jun 2022 21:12:54 +0000 (UTC) X-FDA: 79559947068.01.61E61B7 Received: from mail-ot1-f41.google.com (mail-ot1-f41.google.com [209.85.210.41]) by imf22.hostedemail.com (Postfix) with ESMTP id 22EBDC008C for ; Thu, 9 Jun 2022 21:12:53 +0000 (UTC) Received: by mail-ot1-f41.google.com with SMTP id l24-20020a0568301d7800b0060c1ebc6438so3375985oti.9 for ; Thu, 09 Jun 2022 14:12:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=+w8VVwED6Dp8wTgVB+vZ7Un8RsUPAYrcjHRsKAD4xYo=; b=InsJbxZvLSkW6zLt3p6dpNfxY2n8892EJhnqGHT9ypiLAMtlGyFQTSMqKwKgDgDjV5 iXKFqQTPl1XJHrEeBYg0+0rGmHZiRgZK/mMTrd5PdOWXVoLP8FtsG/q8peJpbJ2BcYy1 7vOUIrm7WI+Mwr66LkywqKxeM8wRrdIToCRaw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=+w8VVwED6Dp8wTgVB+vZ7Un8RsUPAYrcjHRsKAD4xYo=; b=a62mZoYb9p3hV+bopM0Bkl5/+DpWszEZ9h7QOwjbTATyar4BsO77AC63mKRHECLdRZ HoVE/YXVDdf68WF8T0KZ52AW28RQePb+NWgMLF5emegyVZrY0AT8CVfaN7PdjQt9D1Hk L8ge2RBw3zyLr0SrwsYSShfSLUVOHsL9cIQ/WUN8sfIqPF/GptDlCqzliVVnbcJ+zVfD mm3uBteYlV2Xu/FOOPEtlaBvgdKZHOblAu1rlEsOPDxSbedN/2cFfJKEjV62Z0bcVoWD wwBn4Vh9UWbL7bVY3lKIwx+RzPl1Yk6eE3HFpUTFIVySsSEmnrOgi0OkLwItvQk3ukav eyOw== X-Gm-Message-State: AOAM533ye10lYYupwnKksbpSJL0u9H6qDFLHqSyfRf8QyIRlF/llvnHj /0rkcWEmDkiI15KD/tvNS6msRg== X-Google-Smtp-Source: ABdhPJyNQ0HXAQ4Z6PJBiKgrnpq9DxaLq1ka8Z5MjlwseLsdKqrTZSLQJ3UbUlYFLUJPgSLmW/zZDQ== X-Received: by 2002:a05:6830:1e89:b0:60c:1c6d:476b with SMTP id n9-20020a0568301e8900b0060c1c6d476bmr3975832otr.288.1654809173354; Thu, 09 Jun 2022 14:12:53 -0700 (PDT) Received: from [192.168.1.128] ([38.15.45.1]) by smtp.gmail.com with ESMTPSA id lc15-20020a056871418f00b000f5eb6b409bsm10939453oab.45.2022.06.09.14.12.52 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 09 Jun 2022 14:12:52 -0700 (PDT) Subject: Re: [PATCH] selftests: make use of GUP_TEST_FILE macro To: Joel Savitz , linux-kernel@vger.kernel.org Cc: Andrew Morton , Shuah Khan , linux-mm@kvack.org, linux-kselftest@vger.kernel.org, Nico Pache , Shuah Khan References: <20220609203217.3206247-1-jsavitz@redhat.com> From: Shuah Khan Message-ID: Date: Thu, 9 Jun 2022 15:12:51 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: <20220609203217.3206247-1-jsavitz@redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1654809174; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=+w8VVwED6Dp8wTgVB+vZ7Un8RsUPAYrcjHRsKAD4xYo=; b=aQ+vU8lEoLXHh6yo9C+wISpnxVWdUSEZnV4p6M4wZPZD0L/pqItFALDRyAnIQmFF5l+aJM QPfPMPzSCedZxTV/pxO5+nNXxLeLtpPvMPDyk1SL9A9qrhl87zyP/j400MoT1OavMXoSc5 m3VUPm1oj2esSLLElyS8iiK/c4hadoA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1654809174; a=rsa-sha256; cv=none; b=oRBYXQc3T8koUrU2uhrlopBvoqNn3iQNixQYOtqT+jvtPCOTWF3c5E1TRjLiL1Y1/qJ1Ex MUrXAEL7+2V2CLhOKzBKSG0VlTlzIbs4y14dSEUEf6+2kfNm4Shn07JCasfB0O34//NfEZ So/MLS/C/nXZdV/Yc32RjT6bLVfNwRA= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=google header.b=InsJbxZv; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf22.hostedemail.com: domain of skhan@linuxfoundation.org designates 209.85.210.41 as permitted sender) smtp.mailfrom=skhan@linuxfoundation.org Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=google header.b=InsJbxZv; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf22.hostedemail.com: domain of skhan@linuxfoundation.org designates 209.85.210.41 as permitted sender) smtp.mailfrom=skhan@linuxfoundation.org X-Rspamd-Server: rspam08 X-Rspam-User: X-Stat-Signature: tok69rqqdf5mc7eh74qxauixfufi5san X-Rspamd-Queue-Id: 22EBDC008C X-HE-Tag: 1654809173-743104 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 6/9/22 2:32 PM, Joel Savitz wrote: > Commit 17de1e559cf1 ("selftests: clarify common error when running > gup_test") had most of its hunks dropped due to a conflict with another > patch accepted into Linux around the same time that implemented the same > behavior as a subset of other changes. > > However, the remaining hunk defines the GUP_TEST_FILE macro without > making use of it. This patch makes use of the macro in the two relevant > places. > > Furthermore, the above mentioned commit's log message erroneously describes > the changes that were dropped from the patch. > > This patch corrects the record. > > Fixes: 17de1e559cf1 ("selftests: clarify common error when running gup_test") > > Signed-off-by: Joel Savitz > --- > tools/testing/selftests/vm/gup_test.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tools/testing/selftests/vm/gup_test.c b/tools/testing/selftests/vm/gup_test.c > index 6bb36ca71cb5..a309876d832f 100644 > --- a/tools/testing/selftests/vm/gup_test.c > +++ b/tools/testing/selftests/vm/gup_test.c > @@ -209,7 +209,7 @@ int main(int argc, char **argv) > if (write) > gup.gup_flags |= FOLL_WRITE; > > - gup_fd = open("/sys/kernel/debug/gup_test", O_RDWR); > + gup_fd = open(GUP_TEST_FILE, O_RDWR); > if (gup_fd == -1) { > switch (errno) { > case EACCES: > @@ -224,7 +224,7 @@ int main(int argc, char **argv) > printf("check if CONFIG_GUP_TEST is enabled in kernel config\n"); > break; > default: > - perror("failed to open /sys/kernel/debug/gup_test"); > + perror("failed to open " GUP_TEST_FILE); > break; > } > exit(KSFT_SKIP); > Thank you for finding and fixing the problem. Reviewed-by: Shuah Khan thanks, -- Shuah