| Message ID | 1500652244-31881-11-git-send-email-joserz@linux.vnet.ibm.com |
|---|---|
| State | New |
| Headers | show |
Hi Ziviani, On 07/21/17 17:50, Jose Ricardo Ziviani wrote: > From: Alexey Kardashevskiy <aik@ozlabs.ru> > > BugLink: http://bugs.launchpad.net/bugs/1686019 > > Small change on file include/uapi/linux/kvm.h due to conflics with > DEFINES included by MIPS and S390 patches. > > This adds a capability number for in-kernel support for VFIO on > SPAPR platform. > > The capability will tell the user space whether in-kernel handlers of > H_PUT_TCE can handle VFIO-targeted requests or not. If not, the user space > must not attempt allocating a TCE table in the host kernel via > the KVM_CREATE_SPAPR_TCE KVM ioctl because in that case TCE requests > will not be passed to the user space which is desired action in > the situation like that. > > Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> > Reviewed-by: David Gibson <david@gibson.dropbear.id.au> > Signed-off-by: Paul Mackerras <paulus@ozlabs.org> > (cherry picked from commit 4898d3f49b5b156c33f0ae0f49ede417ab86195e) In the cover letter you mentioned that you needed to resolve a conflict in order to apply this patch. So in this case, you need to use "backported from commit <sha1>" instead of "cherry picked from ...". > Signed-off-by: Jose Ricardo Ziviani <joserz@linux.vnet.ibm.com> > --- > include/uapi/linux/kvm.h | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h > index 1f50f21..655c845 100644 > --- a/include/uapi/linux/kvm.h > +++ b/include/uapi/linux/kvm.h > @@ -873,6 +873,7 @@ struct kvm_ppc_smmu_info { > #define KVM_CAP_PPC_HTM 132 > #define KVM_CAP_PPC_MMU_RADIX 134 > #define KVM_CAP_PPC_MMU_HASH_V3 135 > +#define KVM_CAP_SPAPR_TCE_VFIO 142 > > #ifdef KVM_CAP_IRQ_ROUTING > >
On Fri, Jul 21, 2017 at 06:19:41PM +0200, Kleber Souza wrote: > Hi Ziviani, > > On 07/21/17 17:50, Jose Ricardo Ziviani wrote: > > From: Alexey Kardashevskiy <aik@ozlabs.ru> > > > > BugLink: http://bugs.launchpad.net/bugs/1686019 > > > > Small change on file include/uapi/linux/kvm.h due to conflics with > > DEFINES included by MIPS and S390 patches. > > > > This adds a capability number for in-kernel support for VFIO on > > SPAPR platform. > > > > The capability will tell the user space whether in-kernel handlers of > > H_PUT_TCE can handle VFIO-targeted requests or not. If not, the user space > > must not attempt allocating a TCE table in the host kernel via > > the KVM_CREATE_SPAPR_TCE KVM ioctl because in that case TCE requests > > will not be passed to the user space which is desired action in > > the situation like that. > > > > Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> > > Reviewed-by: David Gibson <david@gibson.dropbear.id.au> > > Signed-off-by: Paul Mackerras <paulus@ozlabs.org> > > (cherry picked from commit 4898d3f49b5b156c33f0ae0f49ede417ab86195e) > > In the cover letter you mentioned that you needed to resolve a conflict > in order to apply this patch. So in this case, you need to use > "backported from commit <sha1>" instead of "cherry picked from ...". If this is the only patch that you need to change, no need to send the entire series again, just send the v3 patch in response to the v2 one, using git send-email --in-reply-to and the Message-ID of the v2 patch. Thanks. Cascardo. > > > Signed-off-by: Jose Ricardo Ziviani <joserz@linux.vnet.ibm.com> > > --- > > include/uapi/linux/kvm.h | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h > > index 1f50f21..655c845 100644 > > --- a/include/uapi/linux/kvm.h > > +++ b/include/uapi/linux/kvm.h > > @@ -873,6 +873,7 @@ struct kvm_ppc_smmu_info { > > #define KVM_CAP_PPC_HTM 132 > > #define KVM_CAP_PPC_MMU_RADIX 134 > > #define KVM_CAP_PPC_MMU_HASH_V3 135 > > +#define KVM_CAP_SPAPR_TCE_VFIO 142 > > > > #ifdef KVM_CAP_IRQ_ROUTING > > > >
diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index 1f50f21..655c845 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -873,6 +873,7 @@ struct kvm_ppc_smmu_info { #define KVM_CAP_PPC_HTM 132 #define KVM_CAP_PPC_MMU_RADIX 134 #define KVM_CAP_PPC_MMU_HASH_V3 135 +#define KVM_CAP_SPAPR_TCE_VFIO 142 #ifdef KVM_CAP_IRQ_ROUTING