Sinclair Yeh
2016-Jan-19 21:46 UTC
[PATCH 6/6] VMware balloon: Update vmw_balloon.c to use the VMW_PORT macro
Updated VMWARE_BALLOON_CMD to use the common VMW_PORT macro. Doing this rather than replacing all instances of VMWARE_BALLOON_CMD to minimize code change. Signed-off-by: Sinclair Yeh <syeh at vmware.com> Reviewed-by: Thomas Hellstrom <thellstrom at vmware.com> Reviewed-by: Alok N Kataria <akataria at vmware.com> Acked-by: Xavier Deguillard <xdeguillard at vmware.com> Cc: pv-drivers at vmware.com Cc: Xavier Deguillard <xdeguillard at vmware.com> Cc: linux-kernel at vger.kernel.org Cc: virtualization at lists.linux-foundation.org Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org> --- v1 Swapped parameters 1 and 2 to VMW_PORT because the macro has been updated v2 Updated VMW_PORT() usage because the macro and vmw_balloon.c's usage have changed. --- drivers/misc/vmw_balloon.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/drivers/misc/vmw_balloon.c b/drivers/misc/vmw_balloon.c index 1e688bf..6476b74 100644 --- a/drivers/misc/vmw_balloon.c +++ b/drivers/misc/vmw_balloon.c @@ -46,6 +46,7 @@ #include <linux/vmw_vmci_defs.h> #include <linux/vmw_vmci_api.h> #include <asm/hypervisor.h> +#include <asm/vmware.h> MODULE_AUTHOR("VMware, Inc."); MODULE_DESCRIPTION("VMware Memory Control (Balloon) Driver"); @@ -197,25 +198,17 @@ static void vmballoon_batch_set_pa(struct vmballoon_batch_page *batch, int idx, } -#define VMWARE_BALLOON_CMD(cmd, arg1, arg2, result) \ -({ \ - unsigned long __status, __dummy1, __dummy2, __dummy3; \ - __asm__ __volatile__ ("inl %%dx" : \ - "=a"(__status), \ - "=c"(__dummy1), \ - "=d"(__dummy2), \ - "=b"(result), \ - "=S" (__dummy3) : \ - "0"(VMW_BALLOON_HV_MAGIC), \ - "1"(VMW_BALLOON_CMD_##cmd), \ - "2"(VMW_BALLOON_HV_PORT), \ - "3"(arg1), \ - "4" (arg2) : \ - "memory"); \ - if (VMW_BALLOON_CMD_##cmd == VMW_BALLOON_CMD_START) \ - result = __dummy1; \ - result &= -1UL; \ - __status & -1UL; \ +#define VMWARE_BALLOON_CMD(cmd, arg1, arg2, result) \ +({ \ + unsigned long __status, __dummy1, __dummy2; \ + unsigned long __si, __di; \ + VMW_PORT(VMW_BALLOON_CMD_##cmd, arg1, arg2, 0, \ + VMW_BALLOON_HV_PORT, VMW_BALLOON_HV_MAGIC, \ + __status, result, __dummy1, __dummy2, __si, __di); \ + if (VMW_BALLOON_CMD_##cmd == VMW_BALLOON_CMD_START) \ + result = __dummy1; \ + result &= -1UL; \ + __status & -1UL; \ }) #ifdef CONFIG_DEBUG_FS -- 1.9.1
Greg KH
2016-Feb-08 19:41 UTC
[PATCH 6/6] VMware balloon: Update vmw_balloon.c to use the VMW_PORT macro
On Tue, Jan 19, 2016 at 01:46:05PM -0800, Sinclair Yeh wrote:> Updated VMWARE_BALLOON_CMD to use the common VMW_PORT macro. > Doing this rather than replacing all instances of VMWARE_BALLOON_CMD > to minimize code change. > > Signed-off-by: Sinclair Yeh <syeh at vmware.com> > Reviewed-by: Thomas Hellstrom <thellstrom at vmware.com> > Reviewed-by: Alok N Kataria <akataria at vmware.com> > Acked-by: Xavier Deguillard <xdeguillard at vmware.com> > Cc: pv-drivers at vmware.com > Cc: Xavier Deguillard <xdeguillard at vmware.com> > Cc: linux-kernel at vger.kernel.org > Cc: virtualization at lists.linux-foundation.org > Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>Acked-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>> -#define VMWARE_BALLOON_CMD(cmd, arg1, arg2, result) \ > -({ \ > - unsigned long __status, __dummy1, __dummy2, __dummy3; \ > - __asm__ __volatile__ ("inl %%dx" : \ > - "=a"(__status), \ > - "=c"(__dummy1), \ > - "=d"(__dummy2), \ > - "=b"(result), \ > - "=S" (__dummy3) : \ > - "0"(VMW_BALLOON_HV_MAGIC), \ > - "1"(VMW_BALLOON_CMD_##cmd), \ > - "2"(VMW_BALLOON_HV_PORT), \ > - "3"(arg1), \ > - "4" (arg2) : \ > - "memory"); \ > - if (VMW_BALLOON_CMD_##cmd == VMW_BALLOON_CMD_START) \ > - result = __dummy1; \ > - result &= -1UL; \ > - __status & -1UL; \ > +#define VMWARE_BALLOON_CMD(cmd, arg1, arg2, result) \ > +({ \ > + unsigned long __status, __dummy1, __dummy2; \ > + unsigned long __si, __di; \ > + VMW_PORT(VMW_BALLOON_CMD_##cmd, arg1, arg2, 0, \ > + VMW_BALLOON_HV_PORT, VMW_BALLOON_HV_MAGIC, \ > + __status, result, __dummy1, __dummy2, __si, __di); \ > + if (VMW_BALLOON_CMD_##cmd == VMW_BALLOON_CMD_START) \ > + result = __dummy1; \ > + result &= -1UL; \ > + __status & -1UL; \ > })Honestly, it doesn't look anymore "readable" to me, but it's your code to maintain, not mine... :)
Sinclair Yeh
2016-Mar-31 14:39 UTC
[PATCH 6/6] VMware balloon: Update vmw_balloon.c to use the VMW_PORT macro
Hi, Does any one know when this series will be applied? Sinclair On Mon, Feb 08, 2016 at 11:41:57AM -0800, Greg KH wrote:> On Tue, Jan 19, 2016 at 01:46:05PM -0800, Sinclair Yeh wrote: > > Updated VMWARE_BALLOON_CMD to use the common VMW_PORT macro. > > Doing this rather than replacing all instances of VMWARE_BALLOON_CMD > > to minimize code change. > > > > Signed-off-by: Sinclair Yeh <syeh at vmware.com> > > Reviewed-by: Thomas Hellstrom <thellstrom at vmware.com> > > Reviewed-by: Alok N Kataria <akataria at vmware.com> > > Acked-by: Xavier Deguillard <xdeguillard at vmware.com> > > Cc: pv-drivers at vmware.com > > Cc: Xavier Deguillard <xdeguillard at vmware.com> > > Cc: linux-kernel at vger.kernel.org > > Cc: virtualization at lists.linux-foundation.org > > Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org> > > > Acked-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org> > > > -#define VMWARE_BALLOON_CMD(cmd, arg1, arg2, result) \ > > -({ \ > > - unsigned long __status, __dummy1, __dummy2, __dummy3; \ > > - __asm__ __volatile__ ("inl %%dx" : \ > > - "=a"(__status), \ > > - "=c"(__dummy1), \ > > - "=d"(__dummy2), \ > > - "=b"(result), \ > > - "=S" (__dummy3) : \ > > - "0"(VMW_BALLOON_HV_MAGIC), \ > > - "1"(VMW_BALLOON_CMD_##cmd), \ > > - "2"(VMW_BALLOON_HV_PORT), \ > > - "3"(arg1), \ > > - "4" (arg2) : \ > > - "memory"); \ > > - if (VMW_BALLOON_CMD_##cmd == VMW_BALLOON_CMD_START) \ > > - result = __dummy1; \ > > - result &= -1UL; \ > > - __status & -1UL; \ > > +#define VMWARE_BALLOON_CMD(cmd, arg1, arg2, result) \ > > +({ \ > > + unsigned long __status, __dummy1, __dummy2; \ > > + unsigned long __si, __di; \ > > + VMW_PORT(VMW_BALLOON_CMD_##cmd, arg1, arg2, 0, \ > > + VMW_BALLOON_HV_PORT, VMW_BALLOON_HV_MAGIC, \ > > + __status, result, __dummy1, __dummy2, __si, __di); \ > > + if (VMW_BALLOON_CMD_##cmd == VMW_BALLOON_CMD_START) \ > > + result = __dummy1; \ > > + result &= -1UL; \ > > + __status & -1UL; \ > > }) > > Honestly, it doesn't look anymore "readable" to me, but it's your code > to maintain, not mine... :) >
Maybe Matching Threads
- [PATCH 6/6] VMware balloon: Update vmw_balloon.c to use the VMW_PORT macro
- [PATCH 6/6] VMware balloon: Update vmw_balloon.c to use the VMW_PORT macro
- [PATCH 6/6] VMware balloon: Update vmw_balloon.c to use the VMW_PORT macro
- [PATCH 6/6] VMware balloon: Update vmw_balloon.c to use the VMW_PORT macro
- [PATCH 6/6] VMware balloon: Update vmw_balloon.c to use the VMW_PORT macro