Commit 19cf492c authored by David Matlack's avatar David Matlack Committed by Alex Williamson
Browse files

vfio: selftests: Move vfio_selftests_*() helpers into libvfio.c 



Move the vfio_selftests_*() helpers into their own file libvfio.c. These
helpers have nothing to do with struct vfio_pci_device, so they don't
make sense in vfio_pci_device.c.

No functional change intended.

Reviewed-by: default avatarAlex Mastro <amastro@fb.com>
Tested-by: default avatarAlex Mastro <amastro@fb.com>
Reviewed-by: default avatarRaghavendra Rao Ananta <rananta@google.com>
Signed-off-by: default avatarDavid Matlack <dmatlack@google.com>
Link: https://lore.kernel.org/r/20251126231733.3302983-16-dmatlack@google.com


Signed-off-by: default avatarAlex Williamson <alex@shazbot.org>
parent 657d241e

tools/testing/selftests/vfio/lib/libvfio.c

0 → 100644
+78 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only



#include <stdio.h>

#include <stdlib.h>



#include "../../../kselftest.h"

#include <libvfio.h>



static bool is_bdf(const char *str)

{

	unsigned int s, b, d, f;

	int length, count;



	count = sscanf(str, "%4x:%2x:%2x.%2x%n", &s, &b, &d, &f, &length);

	return count == 4 && length == strlen(str);

}



static char **get_bdfs_cmdline(int *argc, char *argv[], int *nr_bdfs)

{

	int i;



	for (i = *argc - 1; i > 0 && is_bdf(argv[i]); i--)

		continue;



	i++;

	*nr_bdfs = *argc - i;

	*argc -= *nr_bdfs;



	return *nr_bdfs ? &argv[i] : NULL;

}



static char *get_bdf_env(void)

{

	char *bdf;



	bdf = getenv("VFIO_SELFTESTS_BDF");

	if (!bdf)

		return NULL;



	VFIO_ASSERT_TRUE(is_bdf(bdf), "Invalid BDF: %s\n", bdf);

	return bdf;

}



char **vfio_selftests_get_bdfs(int *argc, char *argv[], int *nr_bdfs)

{

	static char *env_bdf;

	char **bdfs;



	bdfs = get_bdfs_cmdline(argc, argv, nr_bdfs);

	if (bdfs)

		return bdfs;



	env_bdf = get_bdf_env();

	if (env_bdf) {

		*nr_bdfs = 1;

		return &env_bdf;

	}



	fprintf(stderr, "Unable to determine which device(s) to use, skipping test.\n");

	fprintf(stderr, "\n");

	fprintf(stderr, "To pass the device address via environment variable:\n");

	fprintf(stderr, "\n");

	fprintf(stderr, "    export VFIO_SELFTESTS_BDF=\"segment:bus:device.function\"\n");

	fprintf(stderr, "    %s [options]\n", argv[0]);

	fprintf(stderr, "\n");

	fprintf(stderr, "To pass the device address(es) via argv:\n");

	fprintf(stderr, "\n");

	fprintf(stderr, "    %s [options] segment:bus:device.function ...\n", argv[0]);

	fprintf(stderr, "\n");

	exit(KSFT_SKIP);

}



const char *vfio_selftests_get_bdf(int *argc, char *argv[])

{

	int nr_bdfs;



	return vfio_selftests_get_bdfs(argc, argv, &nr_bdfs)[0];

}

tools/testing/selftests/vfio/lib/libvfio.mk

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ LIBVFIO_SRCDIR := $(selfdir)/vfio/lib 


LIBVFIO_C := iommu.c

LIBVFIO_C += iova_allocator.c

LIBVFIO_C += libvfio.c

LIBVFIO_C += vfio_pci_device.c

LIBVFIO_C += vfio_pci_driver.c

tools/testing/selftests/vfio/lib/vfio_pci_device.c

+0 −71
Original line number Diff line number Diff line
@@ -376,74 +376,3 @@ void vfio_pci_device_cleanup(struct vfio_pci_device *device) 


	free(device);

}
 


static bool is_bdf(const char *str)

{

	unsigned int s, b, d, f;

	int length, count;



	count = sscanf(str, "%4x:%2x:%2x.%2x%n", &s, &b, &d, &f, &length);

	return count == 4 && length == strlen(str);

}



static char **get_bdfs_cmdline(int *argc, char *argv[], int *nr_bdfs)

{

	int i;



	for (i = *argc - 1; i > 0 && is_bdf(argv[i]); i--)

		continue;



	i++;

	*nr_bdfs = *argc - i;

	*argc -= *nr_bdfs;



	return *nr_bdfs ? &argv[i] : NULL;

}



static char *get_bdf_env(void)

{

	char *bdf;



	bdf = getenv("VFIO_SELFTESTS_BDF");

	if (!bdf)

		return NULL;



	VFIO_ASSERT_TRUE(is_bdf(bdf), "Invalid BDF: %s\n", bdf);

	return bdf;

}



char **vfio_selftests_get_bdfs(int *argc, char *argv[], int *nr_bdfs)

{

	static char *env_bdf;

	char **bdfs;



	bdfs = get_bdfs_cmdline(argc, argv, nr_bdfs);

	if (bdfs)

		return bdfs;



	env_bdf = get_bdf_env();

	if (env_bdf) {

		*nr_bdfs = 1;

		return &env_bdf;

	}



	fprintf(stderr, "Unable to determine which device(s) to use, skipping test.\n");

	fprintf(stderr, "\n");

	fprintf(stderr, "To pass the device address via environment variable:\n");

	fprintf(stderr, "\n");

	fprintf(stderr, "    export VFIO_SELFTESTS_BDF=\"segment:bus:device.function\"\n");

	fprintf(stderr, "    %s [options]\n", argv[0]);

	fprintf(stderr, "\n");

	fprintf(stderr, "To pass the device address(es) via argv:\n");

	fprintf(stderr, "\n");

	fprintf(stderr, "    %s [options] segment:bus:device.function ...\n", argv[0]);

	fprintf(stderr, "\n");

	exit(KSFT_SKIP);

}



const char *vfio_selftests_get_bdf(int *argc, char *argv[])

{

	int nr_bdfs;



	return vfio_selftests_get_bdfs(argc, argv, &nr_bdfs)[0];

}