The patch titled Subject: proc: add selftest for last field of /proc/loadavg has been added to the -mm tree. Its filename is proc-test-last-field-of-proc-loadavg.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/proc-test-last-field-of-proc-loadavg.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/proc-test-last-field-of-proc-loadavg.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Alexey Dobriyan <adobriyan@xxxxxxxxx> Subject: proc: add selftest for last field of /proc/loadavg Test fork counter formerly known as ->last_pid, the only part of /proc/loadavg which can be tested. Testing in init pid namespace is not reliable because of background activity. Link: http://lkml.kernel.org/r/20180311152241.GA26247@avx2 Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx> Cc: Shuah Khan <shuah@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- tools/testing/selftests/proc/.gitignore | 1 tools/testing/selftests/proc/Makefile | 1 tools/testing/selftests/proc/proc-loadavg-001.c | 83 ++++++++++++++ 3 files changed, 85 insertions(+) diff -puN tools/testing/selftests/proc/.gitignore~proc-test-last-field-of-proc-loadavg tools/testing/selftests/proc/.gitignore --- a/tools/testing/selftests/proc/.gitignore~proc-test-last-field-of-proc-loadavg +++ a/tools/testing/selftests/proc/.gitignore @@ -1,3 +1,4 @@ +/proc-loadavg-001 /proc-self-map-files-001 /proc-self-map-files-002 /proc-self-syscall diff -puN tools/testing/selftests/proc/Makefile~proc-test-last-field-of-proc-loadavg tools/testing/selftests/proc/Makefile --- a/tools/testing/selftests/proc/Makefile~proc-test-last-field-of-proc-loadavg +++ a/tools/testing/selftests/proc/Makefile @@ -1,6 +1,7 @@ CFLAGS += -Wall -O2 TEST_GEN_PROGS := +TEST_GEN_PROGS += proc-loadavg-001 TEST_GEN_PROGS += proc-self-map-files-001 TEST_GEN_PROGS += proc-self-map-files-002 TEST_GEN_PROGS += proc-self-syscall diff -puN /dev/null tools/testing/selftests/proc/proc-loadavg-001.c --- /dev/null +++ a/tools/testing/selftests/proc/proc-loadavg-001.c @@ -0,0 +1,83 @@ +/* + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ +/* Test that /proc/loadavg correctly reports last pid in pid namespace. */ +#define _GNU_SOURCE +#include <errno.h> +#include <sched.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <unistd.h> +#include <sys/wait.h> + +int main(void) +{ + pid_t pid; + int wstatus; + + if (unshare(CLONE_NEWPID) == -1) { + if (errno == ENOSYS || errno == EPERM) + return 2; + return 1; + } + + pid = fork(); + if (pid == -1) + return 1; + if (pid == 0) { + char buf[128], *p; + int fd; + ssize_t rv; + + fd = open("/proc/loadavg" , O_RDONLY); + if (fd == -1) + return 1; + rv = read(fd, buf, sizeof(buf)); + if (rv < 3) + return 1; + p = buf + rv; + + /* pid 1 */ + if (!(p[-3] == ' ' && p[-2] == '1' && p[-1] == '\n')) + return 1; + + pid = fork(); + if (pid == -1) + return 1; + if (pid == 0) + return 0; + if (waitpid(pid, NULL, 0) == -1) + return 1; + + lseek(fd, 0, SEEK_SET); + rv = read(fd, buf, sizeof(buf)); + if (rv < 3) + return 1; + p = buf + rv; + + /* pid 2 */ + if (!(p[-3] == ' ' && p[-2] == '2' && p[-1] == '\n')) + return 1; + + return 0; + } + + if (waitpid(pid, &wstatus, 0) == -1) + return 1; + if (WIFEXITED(wstatus) && WEXITSTATUS(wstatus) == 0) + return 0; + return 1; +} _ Binary file patches/proc-test-last-field-of-proc-loadavg.patch matches Patches currently in -mm which might be from adobriyan@xxxxxxxxx are slab-mark-kmalloc-machinery-as-__ro_after_init.patch slab-fixup-calculate_alignment-argument-type.patch slab-make-kmalloc_index-return-unsigned-int.patch slab-make-kmalloc_size-return-unsigned-int.patch slab-make-create_kmalloc_cache-work-with-32-bit-sizes.patch slab-make-create_boot_cache-work-with-32-bit-sizes.patch slab-make-kmem_cache_create-work-with-32-bit-sizes.patch slab-make-size_index-array-u8.patch slab-make-size_index_elem-unsigned-int.patch slub-make-remote_node_defrag_ratio-unsigned-int.patch slub-make-max_attr_size-unsigned-int.patch slub-make-red_left_pad-unsigned-int.patch slub-make-reserved-unsigned-int.patch slub-make-align-unsigned-int.patch slub-make-inuse-unsigned-int.patch slub-make-cpu_partial-unsigned-int.patch slub-make-offset-unsigned-int.patch slub-make-object_size-unsigned-int.patch slub-make-size-unsigned-int.patch slab-make-kmem_cache_flags-accept-32-bit-object-size.patch kasan-make-kasan_cache_create-work-with-32-bit-slab-cache-sizes.patch slab-make-usercopy-region-32-bit.patch slub-make-slab_index-return-unsigned-int.patch slub-make-struct-kmem_cache_order_objects-x-unsigned-int.patch slub-make-size_from_object-return-unsigned-int.patch slab-use-32-bit-arithmetic-in-freelist_randomize.patch proc-do-less-stuff-under-pde_unload_lock.patch proc-move-proc-sysvipc-creation-to-where-it-belongs.patch proc-faster-open-close-of-files-without-release-hook.patch proc-randomize-struct-pde_opener.patch proc-move-struct-pde_opener-to-kmem-cache.patch proc-account-struct-pde_opener.patch proc-check-permissions-earlier-for-proc-wchan.patch proc-use-set_puts-at-proc-wchan.patch proc-test-proc-self-wchan.patch proc-test-proc-self-syscall.patch proc-move-struct-proc_dir_entry-into-kmem-cache.patch proc-fix-proc-map_files-lookup-some-more.patch proc-register-filesystem-last.patch proc-faster-proc-cmdline.patch proc-do-mmput-asap-for-proc-map_files.patch proc-revalidate-misc-dentries.patch proc-test-last-field-of-proc-loadavg.patch uts-create-struct-uts_namespace-from-kmem_cache.patch seq_file-delete-small-value-optimization.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html