From: Lucas De Marchi <lucas.demarchi@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: Lucas De Marchi <lucas.demarchi@intel.com>, maarten.lankhorst@intel.com
Subject: [Intel-xe] [PATCH 4/7] drm/xe: Use XE_KUNIT for symbol namespace
Date: Tue, 21 Mar 2023 15:05:24 -0700 [thread overview]
Message-ID: <20230321220527.595462-5-lucas.demarchi@intel.com> (raw)
In-Reply-To: <20230321220527.595462-1-lucas.demarchi@intel.com>
Instead of simply using EXPORT_SYMBOL() so the functions can be called
across modules, use EXPORT_SYMBOL_NS_GPL() with a private XE_KUNIT
namespace. This avoids accidentally "leaking" these functions and letting
them be called from outside the kunit tests. Use the _GPL() variant
since it's the license declared for the test modules. If these
functiosn are accidentally called from another module, they would
receive a modpost error like below:
ERROR: modpost: module XXXXXXX uses symbol
xe_ccs_migrate_kunit from namespace XE_KUNIT, but does not
import it.
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
drivers/gpu/drm/xe/tests/xe_bo.c | 4 ++--
drivers/gpu/drm/xe/tests/xe_bo_test.c | 1 +
drivers/gpu/drm/xe/tests/xe_dma_buf.c | 2 +-
drivers/gpu/drm/xe/tests/xe_dma_buf_test.c | 1 +
drivers/gpu/drm/xe/tests/xe_migrate.c | 2 +-
drivers/gpu/drm/xe/tests/xe_migrate_test.c | 1 +
drivers/gpu/drm/xe/tests/xe_rtp.c | 6 +++---
drivers/gpu/drm/xe/tests/xe_rtp_test.c | 1 +
8 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/xe/tests/xe_bo.c b/drivers/gpu/drm/xe/tests/xe_bo.c
index aa433a7b59b7..345956b43e8d 100644
--- a/drivers/gpu/drm/xe/tests/xe_bo.c
+++ b/drivers/gpu/drm/xe/tests/xe_bo.c
@@ -166,7 +166,7 @@ void xe_ccs_migrate_kunit(struct kunit *test)
{
xe_call_for_each_device(ccs_test_run_device);
}
-EXPORT_SYMBOL(xe_ccs_migrate_kunit);
+EXPORT_SYMBOL_NS_GPL(xe_ccs_migrate_kunit, XE_KUNIT);
static int evict_test_run_gt(struct xe_device *xe, struct xe_gt *gt, struct kunit *test)
{
@@ -304,4 +304,4 @@ void xe_bo_evict_kunit(struct kunit *test)
{
xe_call_for_each_device(evict_test_run_device);
}
-EXPORT_SYMBOL(xe_bo_evict_kunit);
+EXPORT_SYMBOL_NS_GPL(xe_bo_evict_kunit, XE_KUNIT);
diff --git a/drivers/gpu/drm/xe/tests/xe_bo_test.c b/drivers/gpu/drm/xe/tests/xe_bo_test.c
index 92dda4fca21b..f51835cd461f 100644
--- a/drivers/gpu/drm/xe/tests/xe_bo_test.c
+++ b/drivers/gpu/drm/xe/tests/xe_bo_test.c
@@ -22,3 +22,4 @@ kunit_test_suite(xe_bo_test_suite);
MODULE_AUTHOR("Intel Corporation");
MODULE_LICENSE("GPL");
+MODULE_IMPORT_NS(XE_KUNIT);
diff --git a/drivers/gpu/drm/xe/tests/xe_dma_buf.c b/drivers/gpu/drm/xe/tests/xe_dma_buf.c
index cf9dddf1a8d7..39a2b8d5755f 100644
--- a/drivers/gpu/drm/xe/tests/xe_dma_buf.c
+++ b/drivers/gpu/drm/xe/tests/xe_dma_buf.c
@@ -259,4 +259,4 @@ void xe_dma_buf_kunit(struct kunit *test)
{
xe_call_for_each_device(dma_buf_run_device);
}
-EXPORT_SYMBOL(xe_dma_buf_kunit);
+EXPORT_SYMBOL_NS_GPL(xe_dma_buf_kunit, XE_KUNIT);
diff --git a/drivers/gpu/drm/xe/tests/xe_dma_buf_test.c b/drivers/gpu/drm/xe/tests/xe_dma_buf_test.c
index a1adfd1e1605..9430ec58ecfb 100644
--- a/drivers/gpu/drm/xe/tests/xe_dma_buf_test.c
+++ b/drivers/gpu/drm/xe/tests/xe_dma_buf_test.c
@@ -21,3 +21,4 @@ kunit_test_suite(xe_dma_buf_test_suite);
MODULE_AUTHOR("Intel Corporation");
MODULE_LICENSE("GPL");
+MODULE_IMPORT_NS(XE_KUNIT);
diff --git a/drivers/gpu/drm/xe/tests/xe_migrate.c b/drivers/gpu/drm/xe/tests/xe_migrate.c
index d410305c9b59..d6d815f419af 100644
--- a/drivers/gpu/drm/xe/tests/xe_migrate.c
+++ b/drivers/gpu/drm/xe/tests/xe_migrate.c
@@ -407,4 +407,4 @@ void xe_migrate_sanity_kunit(struct kunit *test)
{
xe_call_for_each_device(migrate_test_run_device);
}
-EXPORT_SYMBOL(xe_migrate_sanity_kunit);
+EXPORT_SYMBOL_NS_GPL(xe_migrate_sanity_kunit, XE_KUNIT);
diff --git a/drivers/gpu/drm/xe/tests/xe_migrate_test.c b/drivers/gpu/drm/xe/tests/xe_migrate_test.c
index d6be360c3b6d..5f704be2ad33 100644
--- a/drivers/gpu/drm/xe/tests/xe_migrate_test.c
+++ b/drivers/gpu/drm/xe/tests/xe_migrate_test.c
@@ -21,3 +21,4 @@ kunit_test_suite(xe_migrate_test_suite);
MODULE_AUTHOR("Intel Corporation");
MODULE_LICENSE("GPL");
+MODULE_IMPORT_NS(XE_KUNIT);
diff --git a/drivers/gpu/drm/xe/tests/xe_rtp.c b/drivers/gpu/drm/xe/tests/xe_rtp.c
index 92e2c2b8b44d..3076f17d6497 100644
--- a/drivers/gpu/drm/xe/tests/xe_rtp.c
+++ b/drivers/gpu/drm/xe/tests/xe_rtp.c
@@ -102,7 +102,7 @@ void xe_rtp_process_basic(struct kunit *test)
KUNIT_EXPECT_EQ(test, clr_bits, sr_entry->clr_bits);
KUNIT_EXPECT_EQ(test, set_bits, sr_entry->set_bits);
}
-EXPORT_SYMBOL(xe_rtp_process_basic);
+EXPORT_SYMBOL_NS_GPL(xe_rtp_process_basic, XE_KUNIT);
/*
* Duplicate entries - same register register, only one action,
@@ -148,7 +148,7 @@ void xe_rtp_process_dup(struct kunit *test)
KUNIT_EXPECT_EQ(test, count, 1);
KUNIT_EXPECT_EQ(test, sr_entry->set_bits, REG_BIT(0));
}
-EXPORT_SYMBOL(xe_rtp_process_dup);
+EXPORT_SYMBOL_NS_GPL(xe_rtp_process_dup, XE_KUNIT);
/*
* Incompatible types: same register register, but entries trying to set the
@@ -198,4 +198,4 @@ void xe_rtp_process_incompat_types(struct kunit *test)
KUNIT_EXPECT_EQ(test, count, 1);
KUNIT_EXPECT_EQ(test, sr_entry->set_bits, REG_BIT(0));
}
-EXPORT_SYMBOL(xe_rtp_process_incompat_types);
+EXPORT_SYMBOL_NS_GPL(xe_rtp_process_incompat_types, XE_KUNIT);
diff --git a/drivers/gpu/drm/xe/tests/xe_rtp_test.c b/drivers/gpu/drm/xe/tests/xe_rtp_test.c
index 4a12aad3f759..bb633dd09a76 100644
--- a/drivers/gpu/drm/xe/tests/xe_rtp_test.c
+++ b/drivers/gpu/drm/xe/tests/xe_rtp_test.c
@@ -62,3 +62,4 @@ kunit_test_suite(xe_rtp_test_suite);
MODULE_AUTHOR("Intel Corporation");
MODULE_LICENSE("GPL");
+MODULE_IMPORT_NS(XE_KUNIT);
--
2.39.0
next prev parent reply other threads:[~2023-03-21 22:06 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-21 22:05 [Intel-xe] [PATCH 0/7] Unit tests for rtp and GT wa/tuning Lucas De Marchi
2023-03-21 22:05 ` [Intel-xe] [PATCH 1/7] drm/xe: Add basic unit tests for rtp Lucas De Marchi
2023-03-27 17:56 ` Michał Winiarski
2023-03-31 13:43 ` Lucas De Marchi
2023-04-01 8:59 ` Lucas De Marchi
2023-04-01 18:54 ` Michał Winiarski
2023-04-02 1:24 ` Lucas De Marchi
2023-04-02 10:51 ` Michal Wajdeczko
2023-03-31 14:34 ` Lucas De Marchi
2023-04-01 8:54 ` Lucas De Marchi
2023-04-01 18:26 ` Michał Winiarski
2023-04-02 1:34 ` Lucas De Marchi
2023-04-02 11:17 ` Michal Wajdeczko
2023-04-02 21:54 ` Lucas De Marchi
2023-04-03 7:38 ` Michal Wajdeczko
2023-04-03 13:02 ` Lucas De Marchi
2023-03-21 22:05 ` [Intel-xe] [PATCH 2/7] drm/xe: Extract function to initialize xe->info Lucas De Marchi
2023-03-21 22:05 ` [Intel-xe] [PATCH 3/7] drm/xe: Move test infra out of xe_pci.[ch] Lucas De Marchi
2023-03-21 22:05 ` Lucas De Marchi [this message]
2023-03-21 22:05 ` [Intel-xe] [PATCH 5/7] drm/xe: Generalize fake device creation Lucas De Marchi
2023-03-21 22:05 ` [Intel-xe] [PATCH 6/7] drm/xe/reg_sr: Save errors for kunit integration Lucas De Marchi
2023-03-27 18:29 ` Michał Winiarski
2023-03-31 14:43 ` Lucas De Marchi
2023-03-21 22:05 ` [Intel-xe] [PATCH 7/7] drm/xe: Add test for GT workarounds and tunings Lucas De Marchi
2023-03-21 22:08 ` [Intel-xe] ✓ CI.Patch_applied: success for Unit tests for rtp and GT wa/tuning Patchwork
2023-03-31 15:14 ` Lucas De Marchi
2023-04-03 6:08 ` Mauro Carvalho Chehab
2023-03-21 22:09 ` [Intel-xe] ✓ CI.KUnit: " Patchwork
2023-03-21 22:13 ` [Intel-xe] ✓ CI.Build: " Patchwork
2023-03-21 22:25 ` [Intel-xe] ○ CI.BAT: info " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230321220527.595462-5-lucas.demarchi@intel.com \
--to=lucas.demarchi@intel.com \
--cc=intel-xe@lists.freedesktop.org \
--cc=maarten.lankhorst@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox