diff mbox

vfio-mdev: Fix mtty sample driver building

Message ID 20161214193859.32293.43760.stgit@gimli.home (mailing list archive)
State New, archived
Headers show

Commit Message

Alex Williamson Dec. 14, 2016, 7:39 p.m. UTC
This sample driver was originally under Documentation/ and was moved
to samples, but build support was never adjusted for the new location.

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
---
 samples/Kconfig            |    7 +++++++
 samples/Makefile           |    3 ++-
 samples/vfio-mdev/Makefile |   14 +-------------
 3 files changed, 10 insertions(+), 14 deletions(-)


--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Kirti Wankhede Dec. 15, 2016, 7:45 a.m. UTC | #1
On 12/15/2016 1:09 AM, Alex Williamson wrote:
> This sample driver was originally under Documentation/ and was moved
> to samples, but build support was never adjusted for the new location.
> 
> Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
> ---
>  samples/Kconfig            |    7 +++++++
>  samples/Makefile           |    3 ++-
>  samples/vfio-mdev/Makefile |   14 +-------------
>  3 files changed, 10 insertions(+), 14 deletions(-)
> 

This change would bring this example driver in Kernel build system if
selected. I do have verified build and tested it on x86_64 platform.
Have you verified x86 and PPC/ARM build (which I think primarily could
use VFIO)?

Thanks,
Kirti

> diff --git a/samples/Kconfig b/samples/Kconfig
> index a6d2a43..b124f62 100644
> --- a/samples/Kconfig
> +++ b/samples/Kconfig
> @@ -105,4 +105,11 @@ config SAMPLE_BLACKFIN_GPTIMERS
>  	help
>  	  Build samples of blackfin gptimers sample module.
>  
> +config SAMPLE_VFIO_MDEV_MTTY
> +	tristate "Build VFIO mtty example mediated device sample code -- loadable modules only"
> +	depends on VFIO_MDEV_DEVICE && m
> +	help
> +	  Build a virtual tty sample driver for use as a VFIO
> +	  mediated device
> +
>  endif # SAMPLES
> diff --git a/samples/Makefile b/samples/Makefile
> index e17d66d..86a137e 100644
> --- a/samples/Makefile
> +++ b/samples/Makefile
> @@ -2,4 +2,5 @@
>  
>  obj-$(CONFIG_SAMPLES)	+= kobject/ kprobes/ trace_events/ livepatch/ \
>  			   hw_breakpoint/ kfifo/ kdb/ hidraw/ rpmsg/ seccomp/ \
> -			   configfs/ connector/ v4l/ trace_printk/ blackfin/
> +			   configfs/ connector/ v4l/ trace_printk/ blackfin/ \
> +			   vfio-mdev/
> diff --git a/samples/vfio-mdev/Makefile b/samples/vfio-mdev/Makefile
> index a932edb..cbbd868 100644
> --- a/samples/vfio-mdev/Makefile
> +++ b/samples/vfio-mdev/Makefile
> @@ -1,13 +1 @@
> -#
> -# Makefile for mtty.c file
> -#
> -KERNEL_DIR:=/lib/modules/$(shell uname -r)/build
> -
> -obj-m:=mtty.o
> -
> -modules clean modules_install:
> -	$(MAKE) -C $(KERNEL_DIR) SUBDIRS=$(PWD) $@
> -
> -default: modules
> -
> -module: modules
> +obj-$(CONFIG_SAMPLE_VFIO_MDEV_MTTY) += mtty.o
> 
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Alex Williamson Dec. 15, 2016, 8:12 a.m. UTC | #2
On Thu, 15 Dec 2016 13:15:34 +0530
Kirti Wankhede <kwankhede@nvidia.com> wrote:

> On 12/15/2016 1:09 AM, Alex Williamson wrote:
> > This sample driver was originally under Documentation/ and was moved
> > to samples, but build support was never adjusted for the new location.
> > 
> > Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
> > ---
> >  samples/Kconfig            |    7 +++++++
> >  samples/Makefile           |    3 ++-
> >  samples/vfio-mdev/Makefile |   14 +-------------
> >  3 files changed, 10 insertions(+), 14 deletions(-)
> >   
> 
> This change would bring this example driver in Kernel build system if
> selected. I do have verified build and tested it on x86_64 platform.
> Have you verified x86 and PPC/ARM build (which I think primarily could
> use VFIO)?

I have not, but I'm fairly confident that CONFIG_SAMPLES is not a
typical user or distro config option, so I think we're at a low risk
of breaking anyone.  In general I test almost exclusively for x86_64 and
rely on external auto builders to identify issues on other archs. 
Thanks,

Alex

> > diff --git a/samples/Kconfig b/samples/Kconfig
> > index a6d2a43..b124f62 100644
> > --- a/samples/Kconfig
> > +++ b/samples/Kconfig
> > @@ -105,4 +105,11 @@ config SAMPLE_BLACKFIN_GPTIMERS
> >  	help
> >  	  Build samples of blackfin gptimers sample module.
> >  
> > +config SAMPLE_VFIO_MDEV_MTTY
> > +	tristate "Build VFIO mtty example mediated device sample code -- loadable modules only"
> > +	depends on VFIO_MDEV_DEVICE && m
> > +	help
> > +	  Build a virtual tty sample driver for use as a VFIO
> > +	  mediated device
> > +
> >  endif # SAMPLES
> > diff --git a/samples/Makefile b/samples/Makefile
> > index e17d66d..86a137e 100644
> > --- a/samples/Makefile
> > +++ b/samples/Makefile
> > @@ -2,4 +2,5 @@
> >  
> >  obj-$(CONFIG_SAMPLES)	+= kobject/ kprobes/ trace_events/ livepatch/ \
> >  			   hw_breakpoint/ kfifo/ kdb/ hidraw/ rpmsg/ seccomp/ \
> > -			   configfs/ connector/ v4l/ trace_printk/ blackfin/
> > +			   configfs/ connector/ v4l/ trace_printk/ blackfin/ \
> > +			   vfio-mdev/
> > diff --git a/samples/vfio-mdev/Makefile b/samples/vfio-mdev/Makefile
> > index a932edb..cbbd868 100644
> > --- a/samples/vfio-mdev/Makefile
> > +++ b/samples/vfio-mdev/Makefile
> > @@ -1,13 +1 @@
> > -#
> > -# Makefile for mtty.c file
> > -#
> > -KERNEL_DIR:=/lib/modules/$(shell uname -r)/build
> > -
> > -obj-m:=mtty.o
> > -
> > -modules clean modules_install:
> > -	$(MAKE) -C $(KERNEL_DIR) SUBDIRS=$(PWD) $@
> > -
> > -default: modules
> > -
> > -module: modules
> > +obj-$(CONFIG_SAMPLE_VFIO_MDEV_MTTY) += mtty.o
> >   

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Eric Auger Dec. 15, 2016, 9:36 a.m. UTC | #3
Hi,

On 14/12/2016 20:39, Alex Williamson wrote:
> This sample driver was originally under Documentation/ and was moved
> to samples, but build support was never adjusted for the new location.
> 
> Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
> ---
>  samples/Kconfig            |    7 +++++++
>  samples/Makefile           |    3 ++-
>  samples/vfio-mdev/Makefile |   14 +-------------
>  3 files changed, 10 insertions(+), 14 deletions(-)
> 
> diff --git a/samples/Kconfig b/samples/Kconfig
> index a6d2a43..b124f62 100644
> --- a/samples/Kconfig
> +++ b/samples/Kconfig
> @@ -105,4 +105,11 @@ config SAMPLE_BLACKFIN_GPTIMERS
>  	help
>  	  Build samples of blackfin gptimers sample module.
>  
> +config SAMPLE_VFIO_MDEV_MTTY
> +	tristate "Build VFIO mtty example mediated device sample code -- loadable modules only"
> +	depends on VFIO_MDEV_DEVICE && m
> +	help
> +	  Build a virtual tty sample driver for use as a VFIO
> +	  mediated device
> +
>  endif # SAMPLES
> diff --git a/samples/Makefile b/samples/Makefile
> index e17d66d..86a137e 100644
> --- a/samples/Makefile
> +++ b/samples/Makefile
> @@ -2,4 +2,5 @@
>  
>  obj-$(CONFIG_SAMPLES)	+= kobject/ kprobes/ trace_events/ livepatch/ \
>  			   hw_breakpoint/ kfifo/ kdb/ hidraw/ rpmsg/ seccomp/ \
> -			   configfs/ connector/ v4l/ trace_printk/ blackfin/
> +			   configfs/ connector/ v4l/ trace_printk/ blackfin/ \
> +			   vfio-mdev/
> diff --git a/samples/vfio-mdev/Makefile b/samples/vfio-mdev/Makefile
> index a932edb..cbbd868 100644
> --- a/samples/vfio-mdev/Makefile
> +++ b/samples/vfio-mdev/Makefile
> @@ -1,13 +1 @@
> -#
> -# Makefile for mtty.c file
> -#
> -KERNEL_DIR:=/lib/modules/$(shell uname -r)/build
> -
> -obj-m:=mtty.o
> -
> -modules clean modules_install:
> -	$(MAKE) -C $(KERNEL_DIR) SUBDIRS=$(PWD) $@
> -
> -default: modules
> -
> -module: modules
> +obj-$(CONFIG_SAMPLE_VFIO_MDEV_MTTY) += mtty.o

Test-compiled on ARM aarch64

Reviewed-by: Eric Auger <eric.auger@redhat.com>
Tested-by: Eric Auger <eric.auger@redhat.com>

Best Regards

Eric


> 
> --
> To unsubscribe from this list: send the line "unsubscribe kvm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Kirti Wankhede Dec. 15, 2016, 9:47 a.m. UTC | #4
On 12/15/2016 1:42 PM, Alex Williamson wrote:
> On Thu, 15 Dec 2016 13:15:34 +0530
> Kirti Wankhede <kwankhede@nvidia.com> wrote:
> 
>> On 12/15/2016 1:09 AM, Alex Williamson wrote:
>>> This sample driver was originally under Documentation/ and was moved
>>> to samples, but build support was never adjusted for the new location.
>>>
>>> Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
>>> ---
>>>  samples/Kconfig            |    7 +++++++
>>>  samples/Makefile           |    3 ++-
>>>  samples/vfio-mdev/Makefile |   14 +-------------
>>>  3 files changed, 10 insertions(+), 14 deletions(-)
>>>   
>>
>> This change would bring this example driver in Kernel build system if
>> selected. I do have verified build and tested it on x86_64 platform.
>> Have you verified x86 and PPC/ARM build (which I think primarily could
>> use VFIO)?
> 
> I have not, but I'm fairly confident that CONFIG_SAMPLES is not a
> typical user or distro config option, so I think we're at a low risk
> of breaking anyone.  In general I test almost exclusively for x86_64 and
> rely on external auto builders to identify issues on other archs. 

Ok. I'm fine with this change. Also saw Eric's confirmation on ARM
aarch64 compilations. Thanks.

Reviewed-by: Kirti Wankhede <kwankhede@nvidia.com>

Thanks,
Kirti


> Thanks,
> 
> Alex
> 
>>> diff --git a/samples/Kconfig b/samples/Kconfig
>>> index a6d2a43..b124f62 100644
>>> --- a/samples/Kconfig
>>> +++ b/samples/Kconfig
>>> @@ -105,4 +105,11 @@ config SAMPLE_BLACKFIN_GPTIMERS
>>>  	help
>>>  	  Build samples of blackfin gptimers sample module.
>>>  
>>> +config SAMPLE_VFIO_MDEV_MTTY
>>> +	tristate "Build VFIO mtty example mediated device sample code -- loadable modules only"
>>> +	depends on VFIO_MDEV_DEVICE && m
>>> +	help
>>> +	  Build a virtual tty sample driver for use as a VFIO
>>> +	  mediated device
>>> +
>>>  endif # SAMPLES
>>> diff --git a/samples/Makefile b/samples/Makefile
>>> index e17d66d..86a137e 100644
>>> --- a/samples/Makefile
>>> +++ b/samples/Makefile
>>> @@ -2,4 +2,5 @@
>>>  
>>>  obj-$(CONFIG_SAMPLES)	+= kobject/ kprobes/ trace_events/ livepatch/ \
>>>  			   hw_breakpoint/ kfifo/ kdb/ hidraw/ rpmsg/ seccomp/ \
>>> -			   configfs/ connector/ v4l/ trace_printk/ blackfin/
>>> +			   configfs/ connector/ v4l/ trace_printk/ blackfin/ \
>>> +			   vfio-mdev/
>>> diff --git a/samples/vfio-mdev/Makefile b/samples/vfio-mdev/Makefile
>>> index a932edb..cbbd868 100644
>>> --- a/samples/vfio-mdev/Makefile
>>> +++ b/samples/vfio-mdev/Makefile
>>> @@ -1,13 +1 @@
>>> -#
>>> -# Makefile for mtty.c file
>>> -#
>>> -KERNEL_DIR:=/lib/modules/$(shell uname -r)/build
>>> -
>>> -obj-m:=mtty.o
>>> -
>>> -modules clean modules_install:
>>> -	$(MAKE) -C $(KERNEL_DIR) SUBDIRS=$(PWD) $@
>>> -
>>> -default: modules
>>> -
>>> -module: modules
>>> +obj-$(CONFIG_SAMPLE_VFIO_MDEV_MTTY) += mtty.o
>>>   
> 
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Alex Williamson Dec. 15, 2016, 5:08 p.m. UTC | #5
On Thu, 15 Dec 2016 10:36:02 +0100
Auger Eric <eric.auger@redhat.com> wrote:

> Hi,
> 
> On 14/12/2016 20:39, Alex Williamson wrote:
> > This sample driver was originally under Documentation/ and was moved
> > to samples, but build support was never adjusted for the new location.
> > 
> > Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
> > ---
> >  samples/Kconfig            |    7 +++++++
> >  samples/Makefile           |    3 ++-
> >  samples/vfio-mdev/Makefile |   14 +-------------
> >  3 files changed, 10 insertions(+), 14 deletions(-)
> > 
> > diff --git a/samples/Kconfig b/samples/Kconfig
> > index a6d2a43..b124f62 100644
> > --- a/samples/Kconfig
> > +++ b/samples/Kconfig
> > @@ -105,4 +105,11 @@ config SAMPLE_BLACKFIN_GPTIMERS
> >  	help
> >  	  Build samples of blackfin gptimers sample module.
> >  
> > +config SAMPLE_VFIO_MDEV_MTTY
> > +	tristate "Build VFIO mtty example mediated device sample code -- loadable modules only"
> > +	depends on VFIO_MDEV_DEVICE && m
> > +	help
> > +	  Build a virtual tty sample driver for use as a VFIO
> > +	  mediated device
> > +
> >  endif # SAMPLES
> > diff --git a/samples/Makefile b/samples/Makefile
> > index e17d66d..86a137e 100644
> > --- a/samples/Makefile
> > +++ b/samples/Makefile
> > @@ -2,4 +2,5 @@
> >  
> >  obj-$(CONFIG_SAMPLES)	+= kobject/ kprobes/ trace_events/ livepatch/ \
> >  			   hw_breakpoint/ kfifo/ kdb/ hidraw/ rpmsg/ seccomp/ \
> > -			   configfs/ connector/ v4l/ trace_printk/ blackfin/
> > +			   configfs/ connector/ v4l/ trace_printk/ blackfin/ \
> > +			   vfio-mdev/
> > diff --git a/samples/vfio-mdev/Makefile b/samples/vfio-mdev/Makefile
> > index a932edb..cbbd868 100644
> > --- a/samples/vfio-mdev/Makefile
> > +++ b/samples/vfio-mdev/Makefile
> > @@ -1,13 +1 @@
> > -#
> > -# Makefile for mtty.c file
> > -#
> > -KERNEL_DIR:=/lib/modules/$(shell uname -r)/build
> > -
> > -obj-m:=mtty.o
> > -
> > -modules clean modules_install:
> > -	$(MAKE) -C $(KERNEL_DIR) SUBDIRS=$(PWD) $@
> > -
> > -default: modules
> > -
> > -module: modules
> > +obj-$(CONFIG_SAMPLE_VFIO_MDEV_MTTY) += mtty.o  
> 
> Test-compiled on ARM aarch64
> 
> Reviewed-by: Eric Auger <eric.auger@redhat.com>
> Tested-by: Eric Auger <eric.auger@redhat.com>

Thanks for both!

Alex
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Alex Williamson Dec. 15, 2016, 5:09 p.m. UTC | #6
On Thu, 15 Dec 2016 15:17:46 +0530
Kirti Wankhede <kwankhede@nvidia.com> wrote:

> On 12/15/2016 1:42 PM, Alex Williamson wrote:
> > On Thu, 15 Dec 2016 13:15:34 +0530
> > Kirti Wankhede <kwankhede@nvidia.com> wrote:
> >   
> >> On 12/15/2016 1:09 AM, Alex Williamson wrote:  
> >>> This sample driver was originally under Documentation/ and was moved
> >>> to samples, but build support was never adjusted for the new location.
> >>>
> >>> Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
> >>> ---
> >>>  samples/Kconfig            |    7 +++++++
> >>>  samples/Makefile           |    3 ++-
> >>>  samples/vfio-mdev/Makefile |   14 +-------------
> >>>  3 files changed, 10 insertions(+), 14 deletions(-)
> >>>     
> >>
> >> This change would bring this example driver in Kernel build system if
> >> selected. I do have verified build and tested it on x86_64 platform.
> >> Have you verified x86 and PPC/ARM build (which I think primarily could
> >> use VFIO)?  
> > 
> > I have not, but I'm fairly confident that CONFIG_SAMPLES is not a
> > typical user or distro config option, so I think we're at a low risk
> > of breaking anyone.  In general I test almost exclusively for x86_64 and
> > rely on external auto builders to identify issues on other archs.   
> 
> Ok. I'm fine with this change. Also saw Eric's confirmation on ARM
> aarch64 compilations. Thanks.
> 
> Reviewed-by: Kirti Wankhede <kwankhede@nvidia.com>

Thanks!

Alex


> >>> diff --git a/samples/Kconfig b/samples/Kconfig
> >>> index a6d2a43..b124f62 100644
> >>> --- a/samples/Kconfig
> >>> +++ b/samples/Kconfig
> >>> @@ -105,4 +105,11 @@ config SAMPLE_BLACKFIN_GPTIMERS
> >>>  	help
> >>>  	  Build samples of blackfin gptimers sample module.
> >>>  
> >>> +config SAMPLE_VFIO_MDEV_MTTY
> >>> +	tristate "Build VFIO mtty example mediated device sample code -- loadable modules only"
> >>> +	depends on VFIO_MDEV_DEVICE && m
> >>> +	help
> >>> +	  Build a virtual tty sample driver for use as a VFIO
> >>> +	  mediated device
> >>> +
> >>>  endif # SAMPLES
> >>> diff --git a/samples/Makefile b/samples/Makefile
> >>> index e17d66d..86a137e 100644
> >>> --- a/samples/Makefile
> >>> +++ b/samples/Makefile
> >>> @@ -2,4 +2,5 @@
> >>>  
> >>>  obj-$(CONFIG_SAMPLES)	+= kobject/ kprobes/ trace_events/ livepatch/ \
> >>>  			   hw_breakpoint/ kfifo/ kdb/ hidraw/ rpmsg/ seccomp/ \
> >>> -			   configfs/ connector/ v4l/ trace_printk/ blackfin/
> >>> +			   configfs/ connector/ v4l/ trace_printk/ blackfin/ \
> >>> +			   vfio-mdev/
> >>> diff --git a/samples/vfio-mdev/Makefile b/samples/vfio-mdev/Makefile
> >>> index a932edb..cbbd868 100644
> >>> --- a/samples/vfio-mdev/Makefile
> >>> +++ b/samples/vfio-mdev/Makefile
> >>> @@ -1,13 +1 @@
> >>> -#
> >>> -# Makefile for mtty.c file
> >>> -#
> >>> -KERNEL_DIR:=/lib/modules/$(shell uname -r)/build
> >>> -
> >>> -obj-m:=mtty.o
> >>> -
> >>> -modules clean modules_install:
> >>> -	$(MAKE) -C $(KERNEL_DIR) SUBDIRS=$(PWD) $@
> >>> -
> >>> -default: modules
> >>> -
> >>> -module: modules
> >>> +obj-$(CONFIG_SAMPLE_VFIO_MDEV_MTTY) += mtty.o
> >>>     
> >   

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/samples/Kconfig b/samples/Kconfig
index a6d2a43..b124f62 100644
--- a/samples/Kconfig
+++ b/samples/Kconfig
@@ -105,4 +105,11 @@  config SAMPLE_BLACKFIN_GPTIMERS
 	help
 	  Build samples of blackfin gptimers sample module.
 
+config SAMPLE_VFIO_MDEV_MTTY
+	tristate "Build VFIO mtty example mediated device sample code -- loadable modules only"
+	depends on VFIO_MDEV_DEVICE && m
+	help
+	  Build a virtual tty sample driver for use as a VFIO
+	  mediated device
+
 endif # SAMPLES
diff --git a/samples/Makefile b/samples/Makefile
index e17d66d..86a137e 100644
--- a/samples/Makefile
+++ b/samples/Makefile
@@ -2,4 +2,5 @@ 
 
 obj-$(CONFIG_SAMPLES)	+= kobject/ kprobes/ trace_events/ livepatch/ \
 			   hw_breakpoint/ kfifo/ kdb/ hidraw/ rpmsg/ seccomp/ \
-			   configfs/ connector/ v4l/ trace_printk/ blackfin/
+			   configfs/ connector/ v4l/ trace_printk/ blackfin/ \
+			   vfio-mdev/
diff --git a/samples/vfio-mdev/Makefile b/samples/vfio-mdev/Makefile
index a932edb..cbbd868 100644
--- a/samples/vfio-mdev/Makefile
+++ b/samples/vfio-mdev/Makefile
@@ -1,13 +1 @@ 
-#
-# Makefile for mtty.c file
-#
-KERNEL_DIR:=/lib/modules/$(shell uname -r)/build
-
-obj-m:=mtty.o
-
-modules clean modules_install:
-	$(MAKE) -C $(KERNEL_DIR) SUBDIRS=$(PWD) $@
-
-default: modules
-
-module: modules
+obj-$(CONFIG_SAMPLE_VFIO_MDEV_MTTY) += mtty.o