fpga: add platform drivers to the FPGA KUnit test suites
v2 cover fpga: add platform drivers to the FPGA KUnit test suites
Add and register minimal platform drivers associated with parent platform devices used for testing to prevent a null-ptr-deref when try_module_get() is called.
v2:
- Renamed include guard symbol in fpga-test-helpers.h
Marco Pagani (4):
fpga: add helpers for the FPGA KUnit test suites.
fpga: add a platform driver to the FPGA Manager test suite
fpga: add a platform driver to the FPGA Bridge test suite
fpga: add a platform driver to the FPGA Region test suite
drivers/fpga/tests/fpga-bridge-test.c | 18 +++++++++++++++- drivers/fpga/tests/fpga-mgr-test.c | 18 +++++++++++++++- drivers/fpga/tests/fpga-region-test.c | 26 ++++++++++++++++++----- drivers/fpga/tests/fpga-test-helpers.h | 29 ++++++++++++++++++++++++++ 4 files changed, 84 insertions(+), 7 deletions(-) create mode 100644 drivers/fpga/tests/fpga-test-helpers.h
base-commit: 6465e260f48790807eef06b583b38ca9789b6072
Signature · 1 line
2.41.0
PATCH v2 1/4 fpga: add helpers for the FPGA KUnit test suites.
Add helpers to facilitate the registration of minimal platform drivers to support parent platform devices used for testing.
--- drivers/fpga/tests/fpga-test-helpers.h | 29 ++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 drivers/fpga/tests/fpga-test-helpers.h
drivers/fpga/tests/fpga-test-helpers.h new file +29 -0
@@ -0,0 +1,29 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* KUnit test for the FPGA Manager +* +* Copyright (C) 2023 Red Hat, Inc. +* +* Author: Marco Pagani <[email protected]> +*/ + +#ifndef _FPGA_KUNIT_HELPERS_H +#define _FPGA_KUNIT_HELPERS_H + +#define TEST_PDEV_NAME "fpga-test-pdev" + +#define TEST_PLATFORM_DRIVER (__drv_name) \ + __TEST_PLATFORM_DRIVER(__drv_name, TEST_PDEV_NAME) +/* +* Helper macro for defining a minimal platform driver that can +* be registered to support the parent platform devices used for +* testing. +*/ +#define __TEST_PLATFORM_DRIVER (__drv_name, __dev_name) \ +static struct platform_driver __drv_name = { \ + .driver = { \ + .name = __dev_name, \ + }, \ +} + +#endif /* _FPGA_KUNIT_HELPERS_H */
Signature · 1 line
2.41.0
PATCH v2 2/4 fpga: add a platform driver to the FPGA Manager test suite
In reply to Marco PaganiRegister a minimal platform driver associated with the parent platform device used for testing to prevent a null-ptr-deref when try_module_get() is called by fpga_mgr_get().
--- drivers/fpga/tests/fpga-mgr-test.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
drivers/fpga/tests/fpga-mgr-test.c +17 -1
@@ -14,6 +14,8 @@#include <linux/scatterlist.h> #include <linux/types.h> +#include "fpga-test-helpers.h" +#define HEADER_FILL 'H'#define IMAGE_FILL 'P'#define IMAGE_BLOCK 1024
@@ -277,6 +279,18 @@ static void fpga_mgr_test_img_load_sgt(struct kunit *test)sg_free_table (ctx->img_info->sgt); } +TEST_PLATFORM_DRIVER (test_platform_driver); + +static int fpga_mgr_test_suite_init (struct kunit_suite *suite) +{ +return platform_driver_register (&test_platform_driver); +} + +static void fpga_mgr_test_suite_exit (struct kunit_suite *suite) +{ +platform_driver_unregister (&test_platform_driver); +} +static int fpga_mgr_test_init (struct kunit *test) {struct mgr_ctx *ctx;
@@ -284,7 +298,7 @@ static int fpga_mgr_test_init(struct kunit *test) ctx =kunit_kzalloc (test,sizeof (*ctx),GFP_KERNEL );KUNIT_ASSERT_NOT_ERR_OR_NULL (test, ctx); - ctx->pdev =platform_device_register_simple ("mgr_pdev" ,PLATFORM_DEVID_AUTO ,NULL ,0 ); + ctx->pdev =platform_device_register_simple (TEST_PDEV_NAME ,PLATFORM_DEVID_AUTO ,NULL ,0 );KUNIT_ASSERT_NOT_ERR_OR_NULL (test, ctx->pdev); ctx->mgr = devm_fpga_mgr_register(&ctx->pdev->dev, "Fake FPGA Manager", &fake_mgr_ops,
@@ -317,6 +331,8 @@ static struct kunit_case fpga_mgr_test_cases[] = {static struct kunit_suite fpga_mgr_suite = { .name ="fpga_mgr" , + .suite_init = fpga_mgr_test_suite_init, + .suite_exit = fpga_mgr_test_suite_exit, .init = fpga_mgr_test_init, .exit = fpga_mgr_test_exit, .test_cases = fpga_mgr_test_cases,
Signature · 1 line
2.41.0
PATCH v2 3/4 fpga: add a platform driver to the FPGA Bridge test suite
In reply to Marco PaganiRegister a minimal platform driver associated with the parent platform device used for testing to prevent a null-ptr-deref when try_module_get() is called by __fpga_bridge_get().
--- drivers/fpga/tests/fpga-bridge-test.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
drivers/fpga/tests/fpga-bridge-test.c +17 -1
@@ -13,6 +13,8 @@#include <linux/module.h> #include <linux/types.h> +#include "fpga-test-helpers.h" +struct bridge_stats {bool enable; };
@@ -53,7 +55,7 @@ static struct bridge_ctx *register_test_bridge(struct kunit *test) ctx =kunit_kzalloc (test,sizeof (*ctx),GFP_KERNEL );KUNIT_ASSERT_NOT_ERR_OR_NULL (test, ctx); - ctx->pdev =platform_device_register_simple ("bridge_pdev" ,PLATFORM_DEVID_AUTO ,NULL ,0 ); + ctx->pdev =platform_device_register_simple (TEST_PDEV_NAME ,PLATFORM_DEVID_AUTO ,NULL ,0 );KUNIT_ASSERT_NOT_ERR_OR_NULL (test, ctx->pdev); ctx->bridge = fpga_bridge_register(&ctx->pdev->dev, "Fake FPGA bridge", &fake_bridge_ops,
@@ -144,6 +146,18 @@ static void fpga_bridge_test_get_put_list(struct kunit *test)unregister_test_bridge (ctx_1); } +TEST_PLATFORM_DRIVER (test_platform_driver); + +static int fpga_bridge_test_suite_init (struct kunit_suite *suite) +{ +return platform_driver_register (&test_platform_driver); +} + +static void fpga_bridge_test_suite_exit (struct kunit_suite *suite) +{ +platform_driver_unregister (&test_platform_driver); +} +static int fpga_bridge_test_init (struct kunit *test) { test->priv =register_test_bridge (test);
@@ -165,6 +179,8 @@ static struct kunit_case fpga_bridge_test_cases[] = {static struct kunit_suite fpga_bridge_suite = { .name ="fpga_bridge" , + .suite_init = fpga_bridge_test_suite_init, + .suite_exit = fpga_bridge_test_suite_exit, .init = fpga_bridge_test_init, .exit = fpga_bridge_test_exit, .test_cases = fpga_bridge_test_cases,
Signature · 1 line
2.41.0
PATCH v2 4/4 fpga: add a platform driver to the FPGA Region test suite
In reply to Marco PaganiRegister a minimal platform driver associated with the parent platform device used for testing to prevent a null-ptr-deref when try_module_get() is called by fpga_region_get(). Also, fix a typo in the suite's name.
--- drivers/fpga/tests/fpga-region-test.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-)
drivers/fpga/tests/fpga-region-test.c +21 -5
@@ -15,6 +15,8 @@#include <linux/platform_device.h> #include <linux/types.h> +#include "fpga-test-helpers.h" +struct mgr_stats {u32 write_count; };
@@ -132,6 +134,18 @@ static void fpga_region_test_program_fpga(struct kunit *test)fpga_image_info_free (img_info); } +TEST_PLATFORM_DRIVER (test_platform_driver); + +static int fpga_region_test_suite_init (struct kunit_suite *suite) +{ +return platform_driver_register (&test_platform_driver); +} + +static void fpga_region_test_suite_exit (struct kunit_suite *suite) +{ +platform_driver_unregister (&test_platform_driver); +} +/* * The configuration used in this test suite uses a single bridge to * limit the code under test to a single unit. The functions used by the
@@ -146,14 +160,15 @@ static int fpga_region_test_init(struct kunit *test) ctx =kunit_kzalloc (test,sizeof (*ctx),GFP_KERNEL );KUNIT_ASSERT_NOT_ERR_OR_NULL (test, ctx); - ctx->mgr_pdev =platform_device_register_simple ("mgr_pdev" ,PLATFORM_DEVID_AUTO ,NULL ,0 ); + ctx->mgr_pdev =platform_device_register_simple (TEST_PDEV_NAME ,PLATFORM_DEVID_AUTO , +NULL ,0 );KUNIT_ASSERT_NOT_ERR_OR_NULL (test, ctx->mgr_pdev); ctx->mgr =devm_fpga_mgr_register (&ctx->mgr_pdev->dev,"Fake FPGA Manager" , &fake_mgr_ops, &ctx->mgr_stats);KUNIT_ASSERT_FALSE (test,IS_ERR_OR_NULL (ctx->mgr)); - ctx->bridge_pdev =platform_device_register_simple ("bridge_pdev" ,PLATFORM_DEVID_AUTO , + ctx->bridge_pdev =platform_device_register_simple (TEST_PDEV_NAME ,PLATFORM_DEVID_AUTO ,NULL ,0 );KUNIT_ASSERT_NOT_ERR_OR_NULL (test, ctx->bridge_pdev);
@@ -163,7 +178,7 @@ static int fpga_region_test_init(struct kunit *test) ctx->bridge_stats.enable = true; - ctx->region_pdev =platform_device_register_simple ("region_pdev" ,PLATFORM_DEVID_AUTO , + ctx->region_pdev =platform_device_register_simple (TEST_PDEV_NAME ,PLATFORM_DEVID_AUTO ,NULL ,0 );KUNIT_ASSERT_NOT_ERR_OR_NULL (test, ctx->region_pdev);
@@ -195,12 +210,13 @@ static void fpga_region_test_exit(struct kunit *test)static struct kunit_case fpga_region_test_cases[] = {KUNIT_CASE (fpga_region_test_class_find),KUNIT_CASE (fpga_region_test_program_fpga), - {} };static struct kunit_suite fpga_region_suite = { - .name ="fpga_mgr" , + .name ="fpga_region" , + .suite_init = fpga_region_test_suite_init, + .suite_exit = fpga_region_test_suite_exit, .init = fpga_region_test_init, .exit = fpga_region_test_exit, .test_cases = fpga_region_test_cases,
Signature · 1 line
2.41.0
Quoted 10 lines · Marco Pagani
Add and register minimal platform drivers associated with parent platform devices used for testing to prevent a null-ptr-deref when
try_module_get()is called.v2:
- Renamed include guard symbol infpga-test-helpers.hMarco Pagani (4):
fpga: add helpers for the FPGA KUnit test suites.
fpga: add a platform driver to the FPGA Manager test suite
I added the Closes tag and applied the series.
Thanks,
Yilun
Quoted 15 lines
fpga: add a platform driver to the FPGA Bridge test suite
fpga: add a platform driver to the FPGA Region test suitedrivers/fpga/tests/fpga-bridge-test.c | 18 +++++++++++++++- drivers/fpga/tests/fpga-mgr-test.c | 18 +++++++++++++++- drivers/fpga/tests/fpga-region-test.c | 26 ++++++++++++++++++----- drivers/fpga/tests/fpga-test-helpers.h | 29 ++++++++++++++++++++++++++ 4 files changed, 84 insertions(+), 7 deletions(-) create mode 100644 drivers/fpga/tests/fpga-test-helpers.hbase-commit:
6465e260f48790807eef06b583b38ca9789b6072Signature · 1 line
2.41.0