RDMA/vmw_pvrdma: Fix the active_speed and phys_state value
Subsystems (2)
PATCH 1/1 RDMA/vmw_pvrdma: Fix the active_speed and phys_state value
The PVRDMA device still reports the active_speed in u8. Lets use the ib_eth_get_speed to report the speed and width. Unfortunately, phys_state gets stored as msb of the new u16 active_speed.
--- drivers/infiniband/hw/vmw_pvrdma/pvrdma.h | 18 ------------------ .../infiniband/hw/vmw_pvrdma/pvrdma_verbs.c | 8 ++++---- .../infiniband/hw/vmw_pvrdma/pvrdma_verbs.h | 2 +- 3 files changed, 5 insertions(+), 23 deletions(-)
drivers/infiniband/hw/vmw_pvrdma/pvrdma.h +0 -18
@@ -360,24 +360,6 @@ static inline enum pvrdma_port_width ib_port_width_to_pvrdma(return (enum pvrdma_port_width )width; } -static inline enum ib_port_width pvrdma_port_width_to_ib ( -enum pvrdma_port_width width) -{ -return (enum ib_port_width )width; -} - -static inline enum pvrdma_port_speed ib_port_speed_to_pvrdma ( -enum ib_port_speed speed) -{ -return (enum pvrdma_port_speed )speed; -} - -static inline enum ib_port_speed pvrdma_port_speed_to_ib ( -enum pvrdma_port_speed speed) -{ -return (enum ib_port_speed )speed; -} -static inline int ib_qp_attr_mask_to_pvrdma (int attr_mask) {return attr_mask &PVRDMA_MASK (PVRDMA_QP_ATTR_MASK_MAX );
drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c +4 -4
@@ -167,11 +167,11 @@ int pvrdma_query_port(struct ib_device *ibdev, u8 port, props->sm_sl = resp->attrs.sm_sl; props->subnet_timeout = resp->attrs.subnet_timeout; props->init_type_reply = resp->attrs.init_type_reply; - props->active_width =pvrdma_port_width_to_ib (resp->attrs.active_width); - props->active_speed =pvrdma_port_speed_to_ib (resp->attrs.active_speed); - props->phys_state = resp->attrs.phys_state; + err =ib_get_eth_speed (ibdev,1 , &props->active_speed, + &props->active_width); + props->phys_state = resp->attrs.active_speed >>8 ; -return 0 ; +return err; }/**
drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h +1 -1
@@ -178,7 +178,7 @@ struct pvrdma_port_attr {u8 active_width;u16 active_speed;u8 phys_state; -u8 reserved[2 ]; +u8 reserved; };struct pvrdma_global_route {
Signature · 1 line
2.18.1
Jason Gunthorpe
maintainerQuoted 4 lines · Adit Ranadive
The PVRDMA device still reports the
active_speedin u8. Lets use theib_eth_get_speedto report the speed and width. Unfortunately,phys_stategets stored as msb of the new u16active_speed.
This explanation is not clear, I have no idea what this is fixing
Jason
Quoted 7 lines · Jason Gunthorpe
Quoted 4 lines · Adit Ranadive
The PVRDMA device still reports the
active_speedin u8. Lets use theib_eth_get_speedto report the speed and width. Unfortunately,phys_stategets stored as msb of the new u16active_speed.This explanation is not clear, I have no idea what this is fixing
It seemed more clear to me in my head, I guess :).
After commit 376ceb31ff87 changed the active_speed attribute to u16, both the active_speed and phys_state attributes in the pvrdma_port_attr struct are getting stored in this u16. As a result, these show up as invalid values in ibv_devinfo.
Our device still gives us back a u8 active_speed so both these are getting stored in the u16. This fix I proposed simply gets the active_speed from the netdev while the phys_state still needs to come from the pvrdma device, i.e. the msb the of the u16. I also removed some unused functions as a result.
Alternatively, I could change the u8 active_width and u16 active_speed to reserved now that we're getting the active_speed and active_width from the ib_get_eth_speed function.
Quoted 3 lines
Jason
Quoted 22 lines · Adit Ranadive
Quoted 7 lines · Jason Gunthorpe
Quoted 4 lines · Adit Ranadive
The PVRDMA device still reports the
active_speedin u8. Lets use theib_eth_get_speedto report the speed and width. Unfortunately,phys_stategets stored as msb of the new u16active_speed.This explanation is not clear, I have no idea what this is fixing
It seemed more clear to me in my head, I guess :).
After commit
376ceb31ff87changed theactive_speedattribute to u16, both theactive_speedandphys_stateattributes in thepvrdma_port_attrstruct are getting stored in this u16. As a result, these show up as invalid values inibv_devinfo.Our device still gives us back a u8
active_speedso both these are getting stored in the u16. This fix I proposed simply gets theactive_speedfrom the netdev while thephys_statestill needs to come from the pvrdma device, i.e. the msb the of the u16. I also removed some unused functions as a result.
Quoted 4 lines
Alternatively, I could change the u8
active_widthand u16active_speedto reserved now that we're getting theactive_speedandactive_widthfrom theib_get_eth_speedfunction.
Jason, did you have any comments on this or did you want me to just send v1 with an updated description?
Quoted 3 lines
Quoted 3 lines
Jason
Jason Gunthorpe
maintainerQuoted 23 lines · Adit Ranadive
Quoted 22 lines · Adit Ranadive
Quoted 7 lines · Jason Gunthorpe
Quoted 4 lines · Adit Ranadive
The PVRDMA device still reports the
active_speedin u8. Lets use theib_eth_get_speedto report the speed and width. Unfortunately,phys_stategets stored as msb of the new u16active_speed.This explanation is not clear, I have no idea what this is fixing
It seemed more clear to me in my head, I guess :).
After commit
376ceb31ff87changed theactive_speedattribute to u16, both theactive_speedandphys_stateattributes in thepvrdma_port_attrstruct are getting stored in this u16. As a result, these show up as invalid values inibv_devinfo.Our device still gives us back a u8
active_speedso both these are getting stored in the u16. This fix I proposed simply gets theactive_speedfrom the netdev while thephys_statestill needs to come from the pvrdma device, i.e. the msb the of the u16. I also removed some unused functions as a result.
Quoted 6 lines
Quoted 3 lines
Alternatively, I could change the u8
active_widthand u16active_speedto reserved now that we're getting theactive_speedandactive_widthfrom theib_get_eth_speedfunction.Jason, did you have any comments on this or did you want me to just send v1 with an updated description?
I still haven't figured out what this is fixing.
Is 'struct pvrdma_port_attr' some kind of ABI? If so why isn't the fix to revert the type?
Jason
Quoted 28 lines · Jason Gunthorpe
Quoted 27 lines · Adit Ranadive
Quoted 25 lines · Adit Ranadive
Quoted 7 lines · Jason Gunthorpe
Quoted 4 lines · Adit Ranadive
The PVRDMA device still reports the
active_speedin u8. Lets use theib_eth_get_speedto report the speed and width. Unfortunately,phys_stategets stored as msb of the new u16active_speed.This explanation is not clear, I have no idea what this is fixing
It seemed more clear to me in my head, I guess :).
After commit
376ceb31ff87changed theactive_speedattribute to u16, both theactive_speedandphys_stateattributes in thepvrdma_port_attrstruct are getting stored in this u16. As a result, these show up as invalid values inibv_devinfo.Our device still gives us back a u8
active_speedso both these are getting stored in the u16. This fix I proposed simply gets theactive_speedfrom the netdev while thephys_statestill needs to come from the pvrdma device, i.e. the msb the of the u16. I also removed some unused functions as a result.Alternatively, I could change the u8
active_widthand u16active_speedto reserved now that we're getting theactive_speedandactive_widthfrom theib_get_eth_speedfunction.
Quoted 7 lines
Quoted 2 lines
Jason, did you have any comments on this or did you want me to just send v1 with an updated description?
I still haven't figured out what this is fixing.
Is 'struct
pvrdma_port_attr' some kind of ABI? If so why isn't the fix to revert the type?
I can revert it but I thought that it had to a u16 based on the IBTA, no? Or does that not apply to device-level stuff?
Also, instead of reverting it seemed better to use the ib_get_eth_speed function to get the active_speed based on the netdev.
Jason Gunthorpe
maintainerQuoted 32 lines · Adit Ranadive
Quoted 31 lines · Jason Gunthorpe
Quoted 29 lines · Adit Ranadive
Quoted 22 lines · Adit Ranadive
Quoted 7 lines · Jason Gunthorpe
Quoted 4 lines · Adit Ranadive
The PVRDMA device still reports the
active_speedin u8. Lets use theib_eth_get_speedto report the speed and width. Unfortunately,phys_stategets stored as msb of the new u16active_speed.This explanation is not clear, I have no idea what this is fixing
It seemed more clear to me in my head, I guess :).
After commit
376ceb31ff87changed theactive_speedattribute to u16, both theactive_speedandphys_stateattributes in thepvrdma_port_attrstruct are getting stored in this u16. As a result, these show up as invalid values inibv_devinfo.Our device still gives us back a u8
active_speedso both these are getting stored in the u16. This fix I proposed simply gets theactive_speedfrom the netdev while thephys_statestill needs to come from the pvrdma device, i.e. the msb the of the u16. I also removed some unused functions as a result.Quoted 3 lines
Alternatively, I could change the u8
active_widthand u16active_speedto reserved now that we're getting theactive_speedandactive_widthfrom theib_get_eth_speedfunction.Jason, did you have any comments on this or did you want me to just send v1 with an updated description?
Quoted 7 lines
Quoted 4 lines
I still haven't figured out what this is fixing.
Is 'struct
pvrdma_port_attr' some kind of ABI? If so why isn't the fix to revert the type?I can revert it but I thought that it had to a u16 based on the IBTA, no? Or does that not apply to device-level stuff?
You didn't answer the question, it it ABI to some kind of FW interface or something?
*HOW* did two fields get overlapped onto a single u16?? The compiler won't do this..
Jason
Quoted 38 lines · Jason Gunthorpe
Quoted 37 lines · Adit Ranadive
Quoted 35 lines · Jason Gunthorpe
Quoted 23 lines · Adit Ranadive
Quoted 22 lines · Adit Ranadive
Quoted 7 lines · Jason Gunthorpe
Quoted 4 lines · Adit Ranadive
The PVRDMA device still reports the
active_speedin u8. Lets use theib_eth_get_speedto report the speed and width. Unfortunately,phys_stategets stored as msb of the new u16active_speed.This explanation is not clear, I have no idea what this is fixing
It seemed more clear to me in my head, I guess :).
After commit
376ceb31ff87changed theactive_speedattribute to u16, both theactive_speedandphys_stateattributes in thepvrdma_port_attrstruct are getting stored in this u16. As a result, these show up as invalid values inibv_devinfo.Our device still gives us back a u8
active_speedso both these are getting stored in the u16. This fix I proposed simply gets theactive_speedfrom the netdev while thephys_statestill needs to come from the pvrdma device, i.e. the msb the of the u16. I also removed some unused functions as a result.Quoted 6 lines
Quoted 3 lines
Alternatively, I could change the u8
active_widthand u16active_speedto reserved now that we're getting theactive_speedandactive_widthfrom theib_get_eth_speedfunction.Jason, did you have any comments on this or did you want me to just send v1 with an updated description?
I still haven't figured out what this is fixing.
Is 'struct
pvrdma_port_attr' some kind of ABI? If so why isn't the fix to revert the type?
Quoted 9 lines
Quoted 2 lines
I can revert it but I thought that it had to a u16 based on the IBTA, no? Or does that not apply to device-level stuff?
You didn't answer the question, it it ABI to some kind of FW interface or something?
*HOW* did two fields get overlapped onto a single u16?? The compiler won't do this..
It is an ABI to the device for port attributes. The device gives us back this structure for query port verb. The response from the device is memcopied into this pvrdma_port_attr structure. So both the bytes representing active_speed and phys_state from the device are copied into the single u16 in this structure.
Jason Gunthorpe
maintainerQuoted 49 lines · Adit Ranadive
Quoted 38 lines · Jason Gunthorpe
Quoted 37 lines · Adit Ranadive
Quoted 35 lines · Jason Gunthorpe
Quoted 23 lines · Adit Ranadive
Quoted 22 lines · Adit Ranadive
Quoted 7 lines · Jason Gunthorpe
Quoted 4 lines · Adit Ranadive
The PVRDMA device still reports the
active_speedin u8. Lets use theib_eth_get_speedto report the speed and width. Unfortunately,phys_stategets stored as msb of the new u16active_speed.This explanation is not clear, I have no idea what this is fixing
It seemed more clear to me in my head, I guess :).
After commit
376ceb31ff87changed theactive_speedattribute to u16, both theactive_speedandphys_stateattributes in thepvrdma_port_attrstruct are getting stored in this u16. As a result, these show up as invalid values inibv_devinfo.Our device still gives us back a u8
active_speedso both these are getting stored in the u16. This fix I proposed simply gets theactive_speedfrom the netdev while thephys_statestill needs to come from the pvrdma device, i.e. the msb the of the u16. I also removed some unused functions as a result.Quoted 6 lines
Quoted 3 lines
Alternatively, I could change the u8
active_widthand u16active_speedto reserved now that we're getting theactive_speedandactive_widthfrom theib_get_eth_speedfunction.Jason, did you have any comments on this or did you want me to just send v1 with an updated description?
I still haven't figured out what this is fixing.
Is 'struct
pvrdma_port_attr' some kind of ABI? If so why isn't the fix to revert the type?Quoted 9 lines
Quoted 2 lines
I can revert it but I thought that it had to a u16 based on the IBTA, no? Or does that not apply to device-level stuff?
You didn't answer the question, it it ABI to some kind of FW interface or something?
*HOW* did two fields get overlapped onto a single u16?? The compiler won't do this..
Quoted 5 lines
It is an ABI to the device for port attributes. The device gives us back this structure for query port verb. The response from the device is memcopied into this
pvrdma_port_attrstructure. So both the bytes representingactive_speedandphys_statefrom the device are copied into the single u16 in this structure.
So it is ABI and it shouldn't have been changed, point at the stuff that made it ABI and revert the structure layout change..
Jason
Quoted 50 lines · Jason Gunthorpe
Quoted 49 lines · Adit Ranadive
Quoted 47 lines · Jason Gunthorpe
Quoted 32 lines · Adit Ranadive
Quoted 31 lines · Jason Gunthorpe
Quoted 29 lines · Adit Ranadive
Quoted 22 lines · Adit Ranadive
Quoted 7 lines · Jason Gunthorpe
Quoted 4 lines · Adit Ranadive
The PVRDMA device still reports the
active_speedin u8. Lets use theib_eth_get_speedto report the speed and width. Unfortunately,phys_stategets stored as msb of the new u16active_speed.This explanation is not clear, I have no idea what this is fixing
It seemed more clear to me in my head, I guess :).
After commit
376ceb31ff87changed theactive_speedattribute to u16, both theactive_speedandphys_stateattributes in thepvrdma_port_attrstruct are getting stored in this u16. As a result, these show up as invalid values inibv_devinfo.Our device still gives us back a u8
active_speedso both these are getting stored in the u16. This fix I proposed simply gets theactive_speedfrom the netdev while thephys_statestill needs to come from the pvrdma device, i.e. the msb the of the u16. I also removed some unused functions as a result.Quoted 3 lines
Alternatively, I could change the u8
active_widthand u16active_speedto reserved now that we're getting theactive_speedandactive_widthfrom theib_get_eth_speedfunction.Jason, did you have any comments on this or did you want me to just send v1 with an updated description?
Quoted 7 lines
Quoted 4 lines
I still haven't figured out what this is fixing.
Is 'struct
pvrdma_port_attr' some kind of ABI? If so why isn't the fix to revert the type?I can revert it but I thought that it had to a u16 based on the IBTA, no? Or does that not apply to device-level stuff?
You didn't answer the question, it it ABI to some kind of FW interface or something?
*HOW* did two fields get overlapped onto a single u16?? The compiler won't do this..
Quoted 8 lines
Quoted 5 lines
It is an ABI to the device for port attributes. The device gives us back this structure for query port verb. The response from the device is memcopied into this
pvrdma_port_attrstructure. So both the bytes representingactive_speedandphys_statefrom the device are copied into the single u16 in this structure.So it is ABI and it shouldn't have been changed, point at the stuff that made it ABI and revert the structure layout change..
How will it work for the new IBTA speed?
Thanks
Quoted 2 lines
Jason
Quoted 57 lines · Leon Romanovsky
Quoted 56 lines · Jason Gunthorpe
Quoted 54 lines · Adit Ranadive
Quoted 38 lines · Jason Gunthorpe
Quoted 37 lines · Adit Ranadive
Quoted 35 lines · Jason Gunthorpe
Quoted 23 lines · Adit Ranadive
Quoted 22 lines · Adit Ranadive
Quoted 7 lines · Jason Gunthorpe
Quoted 4 lines · Adit Ranadive
The PVRDMA device still reports the
active_speedin u8. Lets use theib_eth_get_speedto report the speed and width. Unfortunately,phys_stategets stored as msb of the new u16active_speed.This explanation is not clear, I have no idea what this is fixing
It seemed more clear to me in my head, I guess :).
After commit
376ceb31ff87changed theactive_speedattribute to u16, both theactive_speedandphys_stateattributes in thepvrdma_port_attrstruct are getting stored in this u16. As a result, these show up as invalid values inibv_devinfo.Our device still gives us back a u8
active_speedso both these are getting stored in the u16. This fix I proposed simply gets theactive_speedfrom the netdev while thephys_statestill needs to come from the pvrdma device, i.e. the msb the of the u16. I also removed some unused functions as a result.Quoted 6 lines
Quoted 3 lines
Alternatively, I could change the u8
active_widthand u16active_speedto reserved now that we're getting theactive_speedandactive_widthfrom theib_get_eth_speedfunction.Jason, did you have any comments on this or did you want me to just send v1 with an updated description?
I still haven't figured out what this is fixing.
Is 'struct
pvrdma_port_attr' some kind of ABI? If so why isn't the fix to revert the type?Quoted 9 lines
Quoted 2 lines
I can revert it but I thought that it had to a u16 based on the IBTA, no? Or does that not apply to device-level stuff?
You didn't answer the question, it it ABI to some kind of FW interface or something?
*HOW* did two fields get overlapped onto a single u16?? The compiler won't do this..
It is an ABI to the device for port attributes. The device gives us back this structure for query port verb. The response from the device is memcopied into this
pvrdma_port_attrstructure. So both the bytes representingactive_speedandphys_statefrom the device are copied into the single u16 in this structure.
Quoted 4 lines
Quoted 2 lines
So it is ABI and it shouldn't have been changed, point at the stuff that made it ABI and revert the structure layout change..
How will it work for the new IBTA speed?
Hopefully that should be addressed in another patch I'll send out that uses the ib_get_eth_speed api?
Quoted 5 lines
Thanks
Quoted 2 lines
Jason
Quoted 58 lines · Adit Ranadive
Quoted 57 lines · Leon Romanovsky
Quoted 56 lines · Jason Gunthorpe
Quoted 54 lines · Adit Ranadive
Quoted 38 lines · Jason Gunthorpe
Quoted 37 lines · Adit Ranadive
Quoted 35 lines · Jason Gunthorpe
Quoted 23 lines · Adit Ranadive
Quoted 22 lines · Adit Ranadive
Quoted 7 lines · Jason Gunthorpe
Quoted 4 lines · Adit Ranadive
The PVRDMA device still reports the
active_speedin u8. Lets use theib_eth_get_speedto report the speed and width. Unfortunately,phys_stategets stored as msb of the new u16active_speed.This explanation is not clear, I have no idea what this is fixing
It seemed more clear to me in my head, I guess :).
After commit
376ceb31ff87changed theactive_speedattribute to u16, both theactive_speedandphys_stateattributes in thepvrdma_port_attrstruct are getting stored in this u16. As a result, these show up as invalid values inibv_devinfo.Our device still gives us back a u8
active_speedso both these are getting stored in the u16. This fix I proposed simply gets theactive_speedfrom the netdev while thephys_statestill needs to come from the pvrdma device, i.e. the msb the of the u16. I also removed some unused functions as a result.Quoted 6 lines
Quoted 3 lines
Alternatively, I could change the u8
active_widthand u16active_speedto reserved now that we're getting theactive_speedandactive_widthfrom theib_get_eth_speedfunction.Jason, did you have any comments on this or did you want me to just send v1 with an updated description?
I still haven't figured out what this is fixing.
Is 'struct
pvrdma_port_attr' some kind of ABI? If so why isn't the fix to revert the type?Quoted 9 lines
Quoted 2 lines
I can revert it but I thought that it had to a u16 based on the IBTA, no? Or does that not apply to device-level stuff?
You didn't answer the question, it it ABI to some kind of FW interface or something?
*HOW* did two fields get overlapped onto a single u16?? The compiler won't do this..
It is an ABI to the device for port attributes. The device gives us back this structure for query port verb. The response from the device is memcopied into this
pvrdma_port_attrstructure. So both the bytes representingactive_speedandphys_statefrom the device are copied into the single u16 in this structure.
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
So it is ABI and it shouldn't have been changed, point at the stuff that made it ABI and revert the structure layout change..
How will it work for the new IBTA speed?
Hopefully that should be addressed in another patch I'll send out that uses the
ib_get_eth_speedapi?
It will work for now, but any new speed above NDR will break pvrdma.
Thanks
Quoted 6 lines
Quoted 6 lines
Thanks
Quoted 2 lines
Jason