xen-blkback: default to X86_32 ABI on x86
Subsystems (2)
PATCH 1/1 xen-blkback: default to X86_32 ABI on x86
Prior to the existance of 64-bit backends using the X86_64 ABI, frontends used the X86_32 ABI. These old frontends do not specify the ABI and when used with a 64-bit backend do not work.
On x86, default to the X86_32 ABI if one is not specified. Backends on ARM continue to default to their NATIVE ABI.
--- drivers/block/xen-blkback/common.h | 9 +++++++++ drivers/block/xen-blkback/xenbus.c | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-)
drivers/block/xen-blkback/common.h +9 -0
@@ -214,6 +214,15 @@ enum blkif_protocol { BLKIF_PROTOCOL_X86_64 = 3, }; +/* +* Default protocol if the frontend doesn't specify one. +*/ +#ifdef CONFIG_X86 +# define BLKIF_PROTOCOL_DEFAULT BLKIF_PROTOCOL_X86_32 +#else +# define BLKIF_PROTOCOL_DEFAULT BLKIF_PROTOCOL_NATIVE +#endif +struct xen_vbd {/* What the domain refers to this vbd as. */ blkif_vdev_t handle;
drivers/block/xen-blkback/xenbus.c +2 -2
@@ -868,11 +868,11 @@ static int connect_ring(struct backend_info *be)return err; } - be->blkif->blk_protocol =BLKIF_PROTOCOL_NATIVE ; + be->blkif->blk_protocol =BLKIF_PROTOCOL_DEFAULT ; err =xenbus_gather (XBT_NIL , dev->otherend,"protocol" ,"%63s" , protocol,NULL );if (err) -strcpy (protocol,"unspecified, assuming native" ); +strcpy (protocol,"unspecified, assuming default" );else if (0 ==strcmp (protocol,XEN_IO_PROTO_ABI_NATIVE )) be->blkif->blk_protocol =BLKIF_PROTOCOL_NATIVE ;else if (0 ==strcmp (protocol,XEN_IO_PROTO_ABI_X86_32 ))
Signature · 1 line
1.7.10.4
Quoted 3 lines · David Vrabel
Prior to the existance of 64-bit backends using the
X86_64ABI, frontends used theX86_32ABI. These old frontends do not specify the ABI and when used with a 64-bit backend do not work.
Whoa. How old are we talking? I had been using RHEL5 guests and those work OK (64bit dom0, 32-bit domU).
Quoted 51 lines
On x86, default to the
X86_32ABI if one is not specified. Backends on ARM continue to default to their NATIVE ABI.Signed-off-by David Vrabel <[email protected]>--- drivers/block/xen-blkback/common.h | 9 +++++++++ drivers/block/xen-blkback/xenbus.c | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-)drivers/block/xen-blkback/common.h +9
-0@@ -214,6 +214,15 @@ enum blkif_protocol { BLKIF_PROTOCOL_X86_64 = 3, }; +/* +* Default protocol if the frontend doesn't specify one. +*/ +#ifdef CONFIG_X86 +# define BLKIF_PROTOCOL_DEFAULT BLKIF_PROTOCOL_X86_32 +#else +# define BLKIF_PROTOCOL_DEFAULT BLKIF_PROTOCOL_NATIVE +#endif +struct xen_vbd {/* What the domain refers to this vbd as. */ blkif_vdev_t handle;drivers/block/xen-blkback/xenbus.c +2
-2@@ -868,11 +868,11 @@ static int connect_ring(struct backend_info *be)return err; } - be->blkif->blk_protocol =BLKIF_PROTOCOL_NATIVE ; + be->blkif->blk_protocol =BLKIF_PROTOCOL_DEFAULT ; err =xenbus_gather (XBT_NIL , dev->otherend,"protocol" ,"%63s" , protocol,NULL );if (err) -strcpy (protocol,"unspecified, assuming native" ); +strcpy (protocol,"unspecified, assuming default" );else if (0 ==strcmp (protocol,XEN_IO_PROTO_ABI_NATIVE )) be->blkif->blk_protocol =BLKIF_PROTOCOL_NATIVE ;else if (0 ==strcmp (protocol,XEN_IO_PROTO_ABI_X86_32 ))Signature · 1 line
1.7.10.4
Quoted 7 lines · Konrad Rzeszutek Wilk
Quoted 3 lines · David Vrabel
Prior to the existance of 64-bit backends using the
X86_64ABI, frontends used theX86_32ABI. These old frontends do not specify the ABI and when used with a 64-bit backend do not work.Whoa. How old are we talking? I had been using RHEL5 guests and those work OK (64bit dom0, 32-bit domU).
Unfortunately I can't remember and the internal commit is tagged with the wrong bug number. I think it was either sles 9 or rhel 4.
David
El 05/02/15 a les 18.09, David Vrabel ha escrit:
Quoted 8 lines
Prior to the existance of 64-bit backends using the
X86_64ABI, frontends used theX86_32ABI. These old frontends do not specify the ABI and when used with a 64-bit backend do not work.On x86, default to the
X86_32ABI if one is not specified. Backends on ARM continue to default to their NATIVE ABI.Signed-off-by David Vrabel <[email protected]>
I don't see anything wrong with changing the default protocol from native to the 32bit variant.
Roger.