Re: [qemu-s390x] [Qemu-devel] [PATCH v4 1/6] vfio-ccw: make it safe to access channel programs

Halil Pasic
2019-04-11T15:58:31Z

On Wed, 10 Apr 2019 22:59:41 -0400
Eric Farman <farman@linux.ibm.com> wrote:

> r the next release :) It would be one thing less on my plate...
> >>
> >
> > Sorry I was not able to spend any significant amount of time on this
> > lately.
> >
> > Gave the combined set (this + Farhans fio-ccw fixes for kernel
> > stacktraces v2) it a bit of smoke testing after some minor adjustments
> > to make it compile:
> >
> > --- a/drivers/s390/cio/vfio_ccw_ops.c
> > +++ b/drivers/s390/cio/vfio_ccw_ops.c
> > @@ -13,6 +13,7 @@
> > #include <linux/vfio.h>
> > #include <linux/mdev.h>
> > #include <linux/nospec.h>
> > +#include <linux/slab.h>
> >
> > #include "vfio_ccw_private.h"
> >
> >
>
> Hrm... Taking today's master, and the two series you mention (slight
> adjustment to apply patch 3 of Connie's series, because part of it was
> split out a few weeks ago), and I don't encounter this. Tried switching
> between SLUB/SLAB, but still compiles fine.

Let me guess: you have CONFIG_PCI in our .config, right?

In arch/s390/include/asm/pci_io.h we have

#ifndef _ASM_S390_PCI_IO_H
#define _ASM_S390_PCI_IO_H

#ifdef CONFIG_PCI

#include <linux/kernel.h>
#include <linux/slab.h>

and pci_io.h comes in via

include/linux/vfio.h
include/linux/iommu.h
include/linux/scatterlist.h
arch/s390/include/asm/io.h
arch/s390/include/asm/pci_io.h

Figured it out with help from Farhan. Took me quite some time.

Regards,
Halil