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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id ACD99C433EF for ; Thu, 9 Jun 2022 21:13:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345421AbiFIVNC (ORCPT ); Thu, 9 Jun 2022 17:13:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44712 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345585AbiFIVMz (ORCPT ); Thu, 9 Jun 2022 17:12:55 -0400 Received: from mail-ot1-x32c.google.com (mail-ot1-x32c.google.com [IPv6:2607:f8b0:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A29926D900 for ; Thu, 9 Jun 2022 14:12:54 -0700 (PDT) Received: by mail-ot1-x32c.google.com with SMTP id c24-20020a9d4818000000b0060c2372addeso2432876otf.11 for ; Thu, 09 Jun 2022 14:12:54 -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=GwIpyy8Sp70Rbt6/kCL3Fq0U1K+6n63VQ2SoCbtJcoJaa6sT2/lUxNuFoaePCHJrrV BzU0zGBTdZu1xBpj01CvdaWoY+7K1bifRL8QQjMUhPRPoBzcLUTWSLnxi4YqNfxjiFF2 0q/uoDeJR4W6zIgDXM1q4rXbn/7zHHJGbaCNCmP7F8AWpmynyh2k22Al3+yYdD1PoO68 niV5ZcQ4Wb8jhITcawudyyrVq4yJomuojPyXaPj6og1gygVfEO3Hi83NE2s5/ERsYhdJ lyLLtQmHxWqcxbTMF9FsPEQAwUs0711+S+t+LQ8e117IbDq4+NeJDpfwxHPOnBjuKk8B 9DKQ== X-Gm-Message-State: AOAM533jwAJBC26wMPH5rwCqur/pGPM7px2Y7Sp6ymWBsZFX8fiKgjBk 9zQI5Ghq+z4E8yHYYORWOM6Png== 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 Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org 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