[PATCH] drm: Simplify testing on UML with kunit.py

[PATCH] drm: Simplify testing on UML with kunit.py

[Michał Winiarski]

DRM depends on IOMEM and DMA, introduce an additional Kconfig to pull in
IOMEM and DMA emulation on UML.
Since --kconfig_add usage is no longer needed, remove it from
documentation.

Signed-off-by: Michał Winiarski <michal.winiarski@intel.com>
---
 Documentation/gpu/drm-internals.rst | 7 +------
 drivers/video/Kconfig               | 4 ++++
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Documentation/gpu/drm-internals.rst b/Documentation/gpu/drm-internals.rst
index 5fd20a306718..c264a9587d21 100644
--- a/Documentation/gpu/drm-internals.rst
+++ b/Documentation/gpu/drm-internals.rst
@@ -228,16 +228,11 @@ follows:
 
 .. code-block:: bash
 
-	$ ./tools/testing/kunit/kunit.py run --kunitconfig=drivers/gpu/drm/tests \
-		--kconfig_add CONFIG_VIRTIO_UML=y \
-		--kconfig_add CONFIG_UML_PCI_OVER_VIRTIO=y
+	$ ./tools/testing/kunit/kunit.py run --kunitconfig=drivers/gpu/drm/tests
 
 .. note::
 	The configuration included in ``.kunitconfig`` should be as generic as
 	possible.
-	``CONFIG_VIRTIO_UML`` and ``CONFIG_UML_PCI_OVER_VIRTIO`` are not
-	included in it because they are only required for User Mode Linux.
-
 
 Legacy Support Code
 ===================
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 0587e21abad9..f3266c9fa8a6 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -52,5 +52,9 @@ if FB || SGI_NEWPORT_CONSOLE
 
 endif
 
+config DRM_UML_IO_EMULATION
+	def_bool y if UML && KUNIT
+	select UML_DMA_EMULATION
+	select UML_IOMEM_EMULATION
 
 endmenu
-- 
2.37.3

Re: [PATCH] drm: Simplify testing on UML with kunit.py

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 1469 bytes --]

Hi,

On Thu, Sep 01, 2022 at 03:36:21PM +0200, Michał Winiarski wrote:
> DRM depends on IOMEM and DMA, introduce an additional Kconfig to pull in
> IOMEM and DMA emulation on UML.
> Since --kconfig_add usage is no longer needed, remove it from
> documentation.
> 
> Signed-off-by: Michał Winiarski <michal.winiarski@intel.com>
> ---
>  Documentation/gpu/drm-internals.rst | 7 +------
>  drivers/video/Kconfig               | 4 ++++
>  2 files changed, 5 insertions(+), 6 deletions(-)
> 
> diff --git a/Documentation/gpu/drm-internals.rst b/Documentation/gpu/drm-internals.rst
> index 5fd20a306718..c264a9587d21 100644
> --- a/Documentation/gpu/drm-internals.rst
> +++ b/Documentation/gpu/drm-internals.rst
> @@ -228,16 +228,11 @@ follows:
>  
>  .. code-block:: bash
>  
> -	$ ./tools/testing/kunit/kunit.py run --kunitconfig=drivers/gpu/drm/tests \
> -		--kconfig_add CONFIG_VIRTIO_UML=y \
> -		--kconfig_add CONFIG_UML_PCI_OVER_VIRTIO=y
> +	$ ./tools/testing/kunit/kunit.py run --kunitconfig=drivers/gpu/drm/tests
>  
>  .. note::
>  	The configuration included in ``.kunitconfig`` should be as generic as
>  	possible.
> -	``CONFIG_VIRTIO_UML`` and ``CONFIG_UML_PCI_OVER_VIRTIO`` are not
> -	included in it because they are only required for User Mode Linux.
> -

I'm all for removing that part of the documentation, but because
6fc3a8636a7b, in 6.0 should address this entirely? Why would we need
that other symbol?

Maxime

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

Re: [PATCH] drm: Simplify testing on UML with kunit.py

[Michał Winiarski]

On Thu, Sep 01, 2022 at 04:02:53PM +0200, Maxime Ripard wrote:
> Hi,
> 
> On Thu, Sep 01, 2022 at 03:36:21PM +0200, Michał Winiarski wrote:
> > DRM depends on IOMEM and DMA, introduce an additional Kconfig to pull in
> > IOMEM and DMA emulation on UML.
> > Since --kconfig_add usage is no longer needed, remove it from
> > documentation.
> > 
> > Signed-off-by: Michał Winiarski <michal.winiarski@intel.com>
> > ---
> >  Documentation/gpu/drm-internals.rst | 7 +------
> >  drivers/video/Kconfig               | 4 ++++
> >  2 files changed, 5 insertions(+), 6 deletions(-)
> > 
> > diff --git a/Documentation/gpu/drm-internals.rst b/Documentation/gpu/drm-internals.rst
> > index 5fd20a306718..c264a9587d21 100644
> > --- a/Documentation/gpu/drm-internals.rst
> > +++ b/Documentation/gpu/drm-internals.rst
> > @@ -228,16 +228,11 @@ follows:
> >  
> >  .. code-block:: bash
> >  
> > -	$ ./tools/testing/kunit/kunit.py run --kunitconfig=drivers/gpu/drm/tests \
> > -		--kconfig_add CONFIG_VIRTIO_UML=y \
> > -		--kconfig_add CONFIG_UML_PCI_OVER_VIRTIO=y
> > +	$ ./tools/testing/kunit/kunit.py run --kunitconfig=drivers/gpu/drm/tests
> >  
> >  .. note::
> >  	The configuration included in ``.kunitconfig`` should be as generic as
> >  	possible.
> > -	``CONFIG_VIRTIO_UML`` and ``CONFIG_UML_PCI_OVER_VIRTIO`` are not
> > -	included in it because they are only required for User Mode Linux.
> > -
> 
> I'm all for removing that part of the documentation, but because
> 6fc3a8636a7b, in 6.0 should address this entirely? Why would we need
> that other symbol?

We don't. I wasn't aware that 6fc3a8636a7b exists and had this one in my tree
prior to 6.0.
(well... technically we do need those other symbols and don't need VIRTIO, but
since CONFIG_UML_PCI_OVER_VIRTIO pull in those two, it also works).
Since docs were not updated, I didn't see any conflicts when rebasing.

Sorry for the noise, please ignore this patch.

-Michał

> 
> Maxime

Re: [PATCH] drm: Simplify testing on UML with kunit.py

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 2219 bytes --]

On Thu, Sep 01, 2022 at 04:49:09PM +0200, Michał Winiarski wrote:
> On Thu, Sep 01, 2022 at 04:02:53PM +0200, Maxime Ripard wrote:
> > Hi,
> > 
> > On Thu, Sep 01, 2022 at 03:36:21PM +0200, Michał Winiarski wrote:
> > > DRM depends on IOMEM and DMA, introduce an additional Kconfig to pull in
> > > IOMEM and DMA emulation on UML.
> > > Since --kconfig_add usage is no longer needed, remove it from
> > > documentation.
> > > 
> > > Signed-off-by: Michał Winiarski <michal.winiarski@intel.com>
> > > ---
> > >  Documentation/gpu/drm-internals.rst | 7 +------
> > >  drivers/video/Kconfig               | 4 ++++
> > >  2 files changed, 5 insertions(+), 6 deletions(-)
> > > 
> > > diff --git a/Documentation/gpu/drm-internals.rst b/Documentation/gpu/drm-internals.rst
> > > index 5fd20a306718..c264a9587d21 100644
> > > --- a/Documentation/gpu/drm-internals.rst
> > > +++ b/Documentation/gpu/drm-internals.rst
> > > @@ -228,16 +228,11 @@ follows:
> > >  
> > >  .. code-block:: bash
> > >  
> > > -	$ ./tools/testing/kunit/kunit.py run --kunitconfig=drivers/gpu/drm/tests \
> > > -		--kconfig_add CONFIG_VIRTIO_UML=y \
> > > -		--kconfig_add CONFIG_UML_PCI_OVER_VIRTIO=y
> > > +	$ ./tools/testing/kunit/kunit.py run --kunitconfig=drivers/gpu/drm/tests
> > >  
> > >  .. note::
> > >  	The configuration included in ``.kunitconfig`` should be as generic as
> > >  	possible.
> > > -	``CONFIG_VIRTIO_UML`` and ``CONFIG_UML_PCI_OVER_VIRTIO`` are not
> > > -	included in it because they are only required for User Mode Linux.
> > > -
> > 
> > I'm all for removing that part of the documentation, but because
> > 6fc3a8636a7b, in 6.0 should address this entirely? Why would we need
> > that other symbol?
> 
> We don't. I wasn't aware that 6fc3a8636a7b exists and had this one in my tree
> prior to 6.0.
> (well... technically we do need those other symbols and don't need VIRTIO, but
> since CONFIG_UML_PCI_OVER_VIRTIO pull in those two, it also works).
> Since docs were not updated, I didn't see any conflicts when rebasing.
> 
> Sorry for the noise, please ignore this patch.

I mean, the doc still isn't up to date, so please send that part of the
patch :)

Maxime

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]