Received-SPF: pass (google.com: domain of linux-kernel+bounces-81001-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Date: Mon, 26 Feb 2024 10:04:15 +0100
From: Maxime Ripard <mripard@kernel.org>
To: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Arnd Bergmann <arnd@kernel.org>, Oded Gabbay <ogabbay@kernel.org>, 
	Thomas =?utf-8?Q?Hellstr=C3=B6m?= <thomas.hellstrom@linux.intel.com>, Arnd Bergmann <arnd@arndb.de>, 
	Maarten Lankhorst <maarten.lankhorst@linux.intel.com>, Thomas Zimmermann <tzimmermann@suse.de>, 
	David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>, 
	Rodrigo Vivi <rodrigo.vivi@intel.com>, Matthew Brost <matthew.brost@intel.com>, 
	Francois Dugast <francois.dugast@intel.com>, Jani Nikula <jani.nikula@intel.com>, 
	Tejas Upadhyay <tejas.upadhyay@intel.com>, Matthew Auld <matthew.auld@intel.com>, 
	Mauro Carvalho Chehab <mchehab@kernel.org>, Michal Wajdeczko <michal.wajdeczko@intel.com>, 
	Matt Roper <matthew.d.roper@intel.com>, Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>, 
	intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/3] drm/xe/kunit: fix link failure with built-in xe
Message-ID: <e5vndkeqsxozognnsn4snuhbvpvmxvz5foj44nrwpsucajwrkr@kvlqsijrehll>
References: <20240224121528.1972719-1-arnd@kernel.org>
 <7hfobmmgs6ntnusobalqxslcyv3kqdlnhxjoxbaful4ameavj2@niodl55l7b7g>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="mzwthjftv6ebzjkj"
Content-Disposition: inline
In-Reply-To: <7hfobmmgs6ntnusobalqxslcyv3kqdlnhxjoxbaful4ameavj2@niodl55l7b7g>


--mzwthjftv6ebzjkj
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Sun, Feb 25, 2024 at 09:42:06PM -0600, Lucas De Marchi wrote:
> On Sat, Feb 24, 2024 at 01:14:59PM +0100, Arnd Bergmann wrote:
> > From: Arnd Bergmann <arnd@arndb.de>
> >=20
> > When the driver is built-in but the tests are in loadable modules,
> > the helpers don't actually get put into the driver:
> >=20
> > ERROR: modpost: "xe_kunit_helper_alloc_xe_device" [drivers/gpu/drm/xe/t=
ests/xe_test.ko] undefined!
> >=20
> > Change the Makefile to ensure they are always part of the driver
> > even when the rest of the kunit tests are in loadable modules.
> >=20
> > The tests/xe_kunit_helpers.c file depends on DRM_KUNIT_TEST_HELPERS,
> > so this has to always be selected by the main XE module now, rather
> > than the actual tests. In turn, the "depends on (m || (y && KUNIT=3Dy))"
> > doesn't really do what it tried and can just be removed.
>=20
> it actually did, which was to workaround issues prior to the commit you
> are pointing out.  What it did  was to make sure xe.ko is m, or if it's
> built-in, kunit is also built-in. Apparently the problem here is that
> the xe_test.ko is missing the symbols.
>=20
> See commit 08987a8b6820 ("drm/xe: Fix build with KUNIT=3Dm").
>=20
> I'm happy to remove it though if it's indeed not needed anymore.

I think the main issue with that original patch is that it keeps the
direct include of the test files.

I assume it was done to allow kunit tests of static functions, but now
that VISIBLE_IF_KUNIT and EXPORT_SYMBOL_IF_KUNIT are a thing, you don't
have the need for that include, and you can build your tests in a module
while the code is builtin.

And the conversion should be pretty minimal.

Maxime

--mzwthjftv6ebzjkj
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iHUEABYKAB0WIQRcEzekXsqa64kGDp7j7w1vZxhRxQUCZdxUCgAKCRDj7w1vZxhR
xbo0AQCXLjOUMPlHPDRJQNooVy21X6D9u5gkUwNThw78/qfJIAEAkWn/qdsZFs/j
xH9z/KXXCorD31m1Jpr4RqDpaELZMwg=
=mYq4
-----END PGP SIGNATURE-----

--mzwthjftv6ebzjkj--