Received: by 2002:a5d:925a:0:0:0:0:0 with SMTP id e26csp825924iol; Thu, 9 Jun 2022 15:07:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyMlCGZt2DWg+ybhjzEadhuFTOgq5R+GGJrrjyq5AdB6zcM0pXSlUDJ4TmQOmcvypNk7hBq X-Received: by 2002:a17:906:519b:b0:711:fb34:16f4 with SMTP id y27-20020a170906519b00b00711fb3416f4mr8669405ejk.275.1654812424487; Thu, 09 Jun 2022 15:07:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654812424; cv=none; d=google.com; s=arc-20160816; b=sIeDOVCZk8M0349kcZ6xoK01DJwOhgxHX/phjVNlQnJn8nEAuumkJCNNgIo/HC2KAi TVa5ZJC54V1n+YZcVXZySjH1APEvXU8mXIwGKqgVWOowxlzh17zCbkGpFZye7h/H4/c5 mcIMtUIFVOa+4VU8kLFz2aT46R6o/K5ae5DxyaBuVeO9ixpHQsF+oTbi//k2Y8KwIi2l UJgie7kfnytazXQlA7o8F1fdrR5uD82RuKK2K9m0Jf17lAeoq6GRnZcnb2Cvz3GOH7gz rtRGZXlPXFSVA/kzUhETjB5uzDOunHVjNAgoJzor1zsONZKsu/ltJStI5E5/qqK60lMI kggg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:subject:message-id:date:from:in-reply-to :references:mime-version:dkim-signature; bh=GmYtaQLv1m6AJWe/7StrNTTypt8bklBHRRA6RHL2h34=; b=jdgIG5yhKI6+9PMCmb9/FmbLH9XVpuo2LR7qReHLuRMYgpgW/dbr3C+BpaTe+xKe41 w1YGxSZzjvF58XfoCN3QbuozcRyaDfT8QzgnpSwRsUNW5f5vHRb5kjJGgtw4v168RA8B WwfGRtEjhNO8iOYPog/LW4LTVPwmX/j4bhocal/RYfSayvVbfA1AUiI6PM/0wf0ChC81 oVo3dKly3ZX0m2ZgyV8sXBIVqC7UovZ3fl5illHSlo/Pl7dxbjt05p6wJgbhlsQPO7i4 ipPqcnl8pV/hsTxML9zoptyiaigZ00HChz9bxvJAooPW+xw3gX6lfryXN+PQNfuE93x/ 7xMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=g8mTo9g4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bn7-20020a170906c0c700b006fdeef08e53si5551754ejb.380.2022.06.09.15.06.32; Thu, 09 Jun 2022 15:07:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=g8mTo9g4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245760AbiFIVvR (ORCPT + 99 others); Thu, 9 Jun 2022 17:51:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230371AbiFIVvQ (ORCPT ); Thu, 9 Jun 2022 17:51:16 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id ED43331928 for ; Thu, 9 Jun 2022 14:51:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654811473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=GmYtaQLv1m6AJWe/7StrNTTypt8bklBHRRA6RHL2h34=; b=g8mTo9g46m7K/0/1UmQBKez2SQ7NNJ5JqWgmgxRHgIsmV9vtnY+PwSuY0PZU0zxvPXvptr 0VKnQXG3a7Xg56a2+IxMCb1zo+6XUy3MJ5NsYvulVhYOs5HubAk9dgp3yWz3EVZw7fOAT6 FPK/pbh7cu6KZi/wicKW3laahetO+5s= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-659-hSAJfF4BOjqVFD40r5aE1Q-1; Thu, 09 Jun 2022 17:51:12 -0400 X-MC-Unique: hSAJfF4BOjqVFD40r5aE1Q-1 Received: by mail-ed1-f70.google.com with SMTP id z20-20020a05640235d400b0042dfc1c0e80so17450374edc.21 for ; Thu, 09 Jun 2022 14:51:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=GmYtaQLv1m6AJWe/7StrNTTypt8bklBHRRA6RHL2h34=; b=WgAzxaQr0c5dv/XMyv0ssgHEjDeogKxVvovyK0cVnEFhnugHgOu/QPvxyc0iDQcbSv khfuhVJndsVXD0c6/YRuwxGsfTc1U5bT/hIYAR4R/Xu0Lvp3svCcnfH2D1Oq3Fii2EmG O8nkzL+GBoPXy4cqiLN+eTTc3rafF4hKm87Qqm6qtGcX4+TRbAfwr9o0wGN4DcBc2XWu V+LXNHr5KcFyKJCorwjzoveFIoq9mYS8T8mXEmioLJELcQMP6T4G+tIpXoCzdHBYRaNa 5uSDMUJKRc+oBfd6REavk/tJ5Xgr/iQGwWVL+TXSh31L4xBm1jw4JP2GbVVuCAsifSGx iJzw== X-Gm-Message-State: AOAM533ACDlfv+Wdiys51AcYlUvBOeg0gnqMpAbm5GidRzNidicQyjZ7 ner5qiU+QN9cZdsf6Xtp/8+ov8XqRhRgH5SNMrGTGKbAl3wNii1XMSITZtOqViw4emp/Qz+oAjq Jb3gH1H+iwX+jXGIYkyeeEW7gG26e/p6ZzseCoTPz X-Received: by 2002:a05:6402:4252:b0:42e:13d4:4f4c with SMTP id g18-20020a056402425200b0042e13d44f4cmr45220211edb.92.1654811470644; Thu, 09 Jun 2022 14:51:10 -0700 (PDT) X-Received: by 2002:a05:6402:4252:b0:42e:13d4:4f4c with SMTP id g18-20020a056402425200b0042e13d44f4cmr45220193edb.92.1654811470494; Thu, 09 Jun 2022 14:51:10 -0700 (PDT) MIME-Version: 1.0 References: <20220609203217.3206247-1-jsavitz@redhat.com> In-Reply-To: <20220609203217.3206247-1-jsavitz@redhat.com> From: Nico Pache Date: Thu, 9 Jun 2022 17:50:44 -0400 Message-ID: Subject: Re: [PATCH] selftests: make use of GUP_TEST_FILE macro To: Joel Savitz Cc: LKML , Andrew Morton , Shuah Khan , Linux MM , linux-kselftest@vger.kernel.org Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-3.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org LGTM! Good catch :) Acked-by: Nico Pache On Thu, Jun 9, 2022 at 4:37 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); > -- > 2.31.1 >