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 <[email protected]>
---
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
LGTM! Good catch :)
Acked-by: Nico Pache <[email protected]>
On Thu, Jun 9, 2022 at 4:37 PM Joel Savitz <[email protected]> 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 <[email protected]>
> ---
> 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
>
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 <[email protected]>
> ---
> 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 <[email protected]>
thanks,
-- Shuah
On 6/9/22 3:50 PM, Nico Pache wrote:
> LGTM! Good catch :)
>
> Acked-by: Nico Pache <[email protected]>
>
> On Thu, Jun 9, 2022 at 4:37 PM Joel Savitz <[email protected]> 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 <[email protected]>
>> ---
Applied to linux-kselftest fixes for next rc
thanks,
-- Shuah