Re: [PATCH v2 06/22] selftests/coredump: add a separate helper header

[R Nageswara Sastry <rnsastry@linux.ibm.com>]

On 20.08.2026 4:39 AM, Christian Brauner wrote:
> Right now we have coredump_test.h which pulls in the test harness.
> So it can't be included in coredump_test_helpers.c and it hand-rolls a
> bunch of stuff that is not needed.
>
> Instead of this mess, split everything out into a separate
> coredump_test_helpers.h header and make both coredump_test.h and
> coredump_test_helpers.c include it.
>
> Signed-off-by: Christian Brauner (Amutable) <brauner@kernel.org>
Tested-by: R Nageswara Sastry <rnsastry@linux.ibm.com>

System: ppc64le LPAR (IBM POWER), Linux 7.3-rc2
> ---
>   tools/testing/selftests/coredump/coredump_test.h   | 30 +-----------------
>   .../selftests/coredump/coredump_test_helpers.c     | 17 +---------
>   .../selftests/coredump/coredump_test_helpers.h     | 37 ++++++++++++++++++++++
>   3 files changed, 39 insertions(+), 45 deletions(-)
>
> diff --git a/tools/testing/selftests/coredump/coredump_test.h b/tools/testing/selftests/coredump/coredump_test.h
> index a02809145e2d..8d99b5cb2f12 100644
> --- a/tools/testing/selftests/coredump/coredump_test.h
> +++ b/tools/testing/selftests/coredump/coredump_test.h
> @@ -3,18 +3,9 @@
>   #ifndef __COREDUMP_TEST_H
>   #define __COREDUMP_TEST_H
>   
> -#include <stdbool.h>
> -#include <sys/types.h>
> -#include <linux/coredump.h>
> -
>   #include "../kselftest_harness.h"
> -#include "../pidfd/pidfd.h"
> -
> -#ifndef PAGE_SIZE
> -#define PAGE_SIZE 4096
> -#endif
>   
> -#define NUM_THREAD_SPAWN 128
> +#include "coredump_test_helpers.h"
>   
>   /* Coredump fixture */
>   FIXTURE(coredump)
> @@ -24,15 +15,6 @@ FIXTURE(coredump)
>   	int fd_tmpfs_detached;
>   };
>   
> -/* Shared helper function declarations */
> -void *do_nothing(void *arg);
> -void crashing_child(void);
> -int create_detached_tmpfs(void);
> -int create_and_listen_unix_socket(const char *path);
> -bool set_core_pattern(const char *pattern);
> -int get_peer_pidfd(int fd);
> -bool get_pidfd_info(int fd_peer_pidfd, struct pidfd_info *info);
> -
>   /* Inline helper that uses harness types */
>   static inline void wait_and_check_coredump_server(pid_t pid_coredump_server,
>   						   struct __test_metadata *const _metadata,
> @@ -45,14 +27,4 @@ static inline void wait_and_check_coredump_server(pid_t pid_coredump_server,
>   	ASSERT_EQ(WEXITSTATUS(status), 0);
>   }
>   
> -/* Protocol helper function declarations */
> -ssize_t recv_marker(int fd);
> -bool read_marker(int fd, enum coredump_mark mark);
> -bool read_coredump_req(int fd, struct coredump_req *req);
> -bool send_coredump_ack(int fd, const struct coredump_req *req,
> -		       __u64 mask, size_t size_ack);
> -bool check_coredump_req(const struct coredump_req *req);
> -int open_coredump_tmpfile(int fd_tmpfs_detached);
> -void process_coredump_worker(int fd_coredump, int fd_peer_pidfd, int fd_core_file);
> -
>   #endif /* __COREDUMP_TEST_H */
> diff --git a/tools/testing/selftests/coredump/coredump_test_helpers.c b/tools/testing/selftests/coredump/coredump_test_helpers.c
> index 306711e1b24d..570fc2e005c2 100644
> --- a/tools/testing/selftests/coredump/coredump_test_helpers.c
> +++ b/tools/testing/selftests/coredump/coredump_test_helpers.c
> @@ -20,23 +20,8 @@
>   #include <unistd.h>
>   
>   #include "../filesystems/wrappers.h"
> -#include "../pidfd/pidfd.h"
>   
> -/* Forward declarations to avoid including harness header */
> -struct __test_metadata;
> -
> -/* Match the fixture definition from coredump_test.h */
> -struct _fixture_coredump_data {
> -	char original_core_pattern[256];
> -	pid_t pid_coredump_server;
> -	int fd_tmpfs_detached;
> -};
> -
> -#ifndef PAGE_SIZE
> -#define PAGE_SIZE 4096
> -#endif
> -
> -#define NUM_THREAD_SPAWN 128
> +#include "coredump_test_helpers.h"
>   
>   void *do_nothing(void *arg)
>   {
> diff --git a/tools/testing/selftests/coredump/coredump_test_helpers.h b/tools/testing/selftests/coredump/coredump_test_helpers.h
> new file mode 100644
> index 000000000000..45904bd177b8
> --- /dev/null
> +++ b/tools/testing/selftests/coredump/coredump_test_helpers.h
> @@ -0,0 +1,37 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> +
> +#ifndef __COREDUMP_TEST_HELPERS_H
> +#define __COREDUMP_TEST_HELPERS_H
> +
> +#include <stdbool.h>
> +#include <sys/types.h>
> +#include <linux/coredump.h>
> +
> +#include "../pidfd/pidfd.h"
> +
> +#ifndef PAGE_SIZE
> +#define PAGE_SIZE 4096
> +#endif
> +
> +#define NUM_THREAD_SPAWN 128
> +
> +/* Shared helper function declarations */
> +void *do_nothing(void *arg);
> +void crashing_child(void);
> +int create_detached_tmpfs(void);
> +int create_and_listen_unix_socket(const char *path);
> +bool set_core_pattern(const char *pattern);
> +int get_peer_pidfd(int fd);
> +bool get_pidfd_info(int fd_peer_pidfd, struct pidfd_info *info);
> +
> +/* Protocol helper function declarations */
> +ssize_t recv_marker(int fd);
> +bool read_marker(int fd, enum coredump_mark mark);
> +bool read_coredump_req(int fd, struct coredump_req *req);
> +bool send_coredump_ack(int fd, const struct coredump_req *req,
> +		       __u64 mask, size_t size_ack);
> +bool check_coredump_req(const struct coredump_req *req);
> +int open_coredump_tmpfile(int fd_tmpfs_detached);
> +void process_coredump_worker(int fd_coredump, int fd_peer_pidfd, int fd_core_file);
> +
> +#endif /* __COREDUMP_TEST_HELPERS_H */
>
-- 
Thanks and Regards
R.Nageswara Sastry