RDMA/qedr: Explicitly cast pkt->tx_dest to qed_ll2_tx_dest
Subsystems (3)
PATCH 1/1 RDMA/qedr: Explicitly cast pkt->tx_dest to qed_ll2_tx_dest
Clang warns when one enumerated type is explicitly converted to another.
drivers/infiniband/hw/qedr/qedr_roce_cm.c:198:28: warning: implicit conversion from enumeration type 'enum qed_roce_ll2_tx_dest' to different enumeration type 'enum qed_ll2_tx_dest' [-Wenum-conversion]
ll2_tx_pkt.tx_dest = pkt->tx_dest;
~ ~~~~~^~~~~~~1 warning generated.
Avoid this warning by explicitly casting pkt->tx_dest to qed_112_tx_dest, which has the expected values from the type qed_roce_ll2_tx_dest.
--- drivers/infiniband/hw/qedr/qedr_roce_cm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/qedr/qedr_roce_cm.c +1 -1
@@ -195,7 +195,7 @@ static int qedr_ll2_post_tx(struct qedr_dev *dev, ll2_tx_pkt.num_of_bds =1 /* hdr */ + pkt->n_seg; ll2_tx_pkt.vlan =0 ; - ll2_tx_pkt.tx_dest = pkt->tx_dest; + ll2_tx_pkt.tx_dest = (enum qed_ll2_tx_dest )pkt->tx_dest; ll2_tx_pkt.qed_roce_flavor = roce_flavor; ll2_tx_pkt.first_frag = pkt->header.baddr; ll2_tx_pkt.first_frag_len = pkt->header.len;
Signature · 1 line
2.19.0
Quoted 6 lines · Nathan Chancellor
Clang warns when one enumerated type is explicitly converted to another.
drivers/infiniband/hw/qedr/qedr_roce_cm.c:198:28: warning: implicit conversion from enumeration type 'enumqed_roce_ll2_tx_dest' to different enumeration type 'enumqed_ll2_tx_dest' [-Wenum-conversion]
Quoted 7 lines
ll2_tx_pkt.tx_dest = pkt->tx_dest; ~ ~~~~~^~~~~~~1 warning generated.
Avoid this warning by explicitly casting
pkt->tx_desttoqed_112_tx_dest, which has the expected values from the typeqed_roce_ll2_tx_dest.
But these enums are different lengths, which is problematic for this patch. Is this code broken, or that it's ok for ll2_tx_pkt.tx_dest to have a value that's not a valid enumeration value for enum qed_ll2_tx_dest? (QED_LL2_TX_DEST_MAX 's value (3) is outside the enumeration values of enum qed_roce_ll2_tx_dest).
include/linux/qed/qed_rdma_if.h:
42 enum qed_roce_ll2_tx_dest {
43 /* Light L2 TX Destination to the Network */
44 QED_ROCE_LL2_TX_DEST_NW,
45
46 /* Light L2 TX Destination to the Loopback */ 47 QED_ROCE_LL2_TX_DEST_LB, 48 QED_ROCE_LL2_TX_DEST_MAX
49 };
include/linux/qed/qed_ll2_if.h:
64 enum qed_ll2_tx_dest {
65 QED_LL2_TX_DEST_NW, /* Light L2 TX Destination to the
Network */
66 QED_LL2_TX_DEST_LB, /* Light L2 TX Destination to the
Loopback */
67 QED_LL2_TX_DEST_DROP, /* Light L2 Drop the TX packet */
68 QED_LL2_TX_DEST_MAX
69 };
Maybe the maintainers can clarify?
Quoted 23 lines
Reported-by Nick Desaulniers <[email protected]>Signed-off-by Nathan Chancellor <[email protected]>--- drivers/infiniband/hw/qedr/qedr_roce_cm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/infiniband/hw/qedr/qedr_roce_cm.c +1
-2@@ -195,7 +195,7 @@ static int qedr_ll2_post_tx(struct qedr_dev *dev, ll2_tx_pkt.num_of_bds =1 /* hdr */ + pkt->n_seg; ll2_tx_pkt.vlan =0 ; - ll2_tx_pkt.tx_dest = pkt->tx_dest; + ll2_tx_pkt.tx_dest = (enum qed_ll2_tx_dest )pkt->tx_dest; ll2_tx_pkt.qed_roce_flavor = roce_flavor; ll2_tx_pkt.first_frag = pkt->header.baddr; ll2_tx_pkt.first_frag_len = pkt->header.len; --2.19.0
Signature · 2 lines
Thanks, ~Nick Desaulniers
Quoted 42 lines · Nick Desaulniers
Quoted 6 lines · Nathan Chancellor
Clang warns when one enumerated type is explicitly converted to another.
drivers/infiniband/hw/qedr/qedr_roce_cm.c:198:28: warning: implicit conversion from enumeration type 'enumqed_roce_ll2_tx_dest' to different enumeration type 'enumqed_ll2_tx_dest' [-Wenum-conversion]Quoted 7 lines
ll2_tx_pkt.tx_dest = pkt->tx_dest; ~ ~~~~~^~~~~~~1 warning generated.
Avoid this warning by explicitly casting
pkt->tx_desttoqed_112_tx_dest, which has the expected values from the typeqed_roce_ll2_tx_dest.But these enums are different lengths, which is problematic for this patch. Is this code broken, or that it's ok for ll2_tx_pkt.tx_dest to have a value that's not a valid enumeration value for enum
qed_ll2_tx_dest? (QED_LL2_TX_DEST_MAX's value (3) is outside the enumeration values of enumqed_roce_ll2_tx_dest).
include/linux/qed/qed_rdma_if.h:
42 enumqed_roce_ll2_tx_dest{
43 /* Light L2 TX Destination to the Network */
44QED_ROCE_LL2_TX_DEST_NW,
4546 /* Light L2 TX Destination to the Loopback */ 47 QED_ROCE_LL2_TX_DEST_LB, 48 QED_ROCE_LL2_TX_DEST_MAX49 };
include/linux/qed/qed_ll2_if.h:
64 enumqed_ll2_tx_dest{
65QED_LL2_TX_DEST_NW, /* Light L2 TX Destination to the
Network */
66QED_LL2_TX_DEST_LB, /* Light L2 TX Destination to the
Loopback */
67QED_LL2_TX_DEST_DROP, /* Light L2 Drop the TX packet */
68QED_LL2_TX_DEST_MAX
69 };
Quoted 2 lines
Maybe the maintainers can clarify?
My assumption was that if QED_ROCE_LL2_TX_DEST_MAX was used that the packet would be dropped.
Turns out that QED_ROCE_LL2_TX_DEST_MAX isn't actually used anywhere in the tree. I suppose that qed_roce_ll2_tx_dest could just be removed and all other instances of those values could be converted to qed_ll2_tx_dest like the rxe patch. I'll test this now and send a patch along if it works out.
Nathan
Quoted 28 lines
Quoted 23 lines
Reported-by Nick Desaulniers <[email protected]>Signed-off-by Nathan Chancellor <[email protected]>--- drivers/infiniband/hw/qedr/qedr_roce_cm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/infiniband/hw/qedr/qedr_roce_cm.c +1
-2@@ -195,7 +195,7 @@ static int qedr_ll2_post_tx(struct qedr_dev *dev, ll2_tx_pkt.num_of_bds =1 /* hdr */ + pkt->n_seg; ll2_tx_pkt.vlan =0 ; - ll2_tx_pkt.tx_dest = pkt->tx_dest; + ll2_tx_pkt.tx_dest = (enum qed_ll2_tx_dest )pkt->tx_dest; ll2_tx_pkt.qed_roce_flavor = roce_flavor; ll2_tx_pkt.first_frag = pkt->header.baddr; ll2_tx_pkt.first_frag_len = pkt->header.len; --2.19.0
Signature · 2 lines
Thanks, ~Nick Desaulniers
Quoted 47 lines · Nathan Chancellor
Quoted 42 lines · Nick Desaulniers
Quoted 6 lines · Nathan Chancellor
Clang warns when one enumerated type is explicitly converted to another.
drivers/infiniband/hw/qedr/qedr_roce_cm.c:198:28: warning: implicit conversion from enumeration type 'enumqed_roce_ll2_tx_dest' to different enumeration type 'enumqed_ll2_tx_dest' [-Wenum-conversion]Quoted 7 lines
ll2_tx_pkt.tx_dest = pkt->tx_dest; ~ ~~~~~^~~~~~~1 warning generated.
Avoid this warning by explicitly casting
pkt->tx_desttoqed_112_tx_dest, which has the expected values from the typeqed_roce_ll2_tx_dest.But these enums are different lengths, which is problematic for this patch. Is this code broken, or that it's ok for ll2_tx_pkt.tx_dest to have a value that's not a valid enumeration value for enum
qed_ll2_tx_dest? (QED_LL2_TX_DEST_MAX's value (3) is outside the enumeration values of enumqed_roce_ll2_tx_dest).
include/linux/qed/qed_rdma_if.h:
42 enumqed_roce_ll2_tx_dest{
43 /* Light L2 TX Destination to the Network */
44QED_ROCE_LL2_TX_DEST_NW,
4546 /* Light L2 TX Destination to the Loopback */ 47 QED_ROCE_LL2_TX_DEST_LB, 48 QED_ROCE_LL2_TX_DEST_MAX49 };
include/linux/qed/qed_ll2_if.h:
64 enumqed_ll2_tx_dest{
65QED_LL2_TX_DEST_NW, /* Light L2 TX Destination to the
Network */
66QED_LL2_TX_DEST_LB, /* Light L2 TX Destination to the
Loopback */
67QED_LL2_TX_DEST_DROP, /* Light L2 Drop the TX packet */
68QED_LL2_TX_DEST_MAX
69 };Quoted 2 lines
Maybe the maintainers can clarify?
Quoted 8 lines
My assumption was that if
QED_ROCE_LL2_TX_DEST_MAXwas used that the packet would be dropped.Turns out that
QED_ROCE_LL2_TX_DEST_MAXisn't actually used anywhere in the tree. I suppose thatqed_roce_ll2_tx_destcould just be removed and all other instances of those values could be converted toqed_ll2_tx_destlike the rxe patch. I'll test this now and send a patch along if it works out.
Even better. Sometimes removing code is the correct solution. Number of lines of code and number of bugs are positively correlated, so the less code sometimes the better.
Quoted 31 lines
Nathan
Quoted 28 lines
Quoted 21 lines
Reported-by Nick Desaulniers <[email protected]>Signed-off-by Nathan Chancellor <[email protected]>--- drivers/infiniband/hw/qedr/qedr_roce_cm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/infiniband/hw/qedr/qedr_roce_cm.c +1
-2@@ -195,7 +195,7 @@ static int qedr_ll2_post_tx(struct qedr_dev *dev, ll2_tx_pkt.num_of_bds =1 /* hdr */ + pkt->n_seg; ll2_tx_pkt.vlan =0 ; - ll2_tx_pkt.tx_dest = pkt->tx_dest; + ll2_tx_pkt.tx_dest = (enum qed_ll2_tx_dest )pkt->tx_dest; ll2_tx_pkt.qed_roce_flavor = roce_flavor; ll2_tx_pkt.first_frag = pkt->header.baddr; ll2_tx_pkt.first_frag_len = pkt->header.len; --Quoted 2 lines
2.19.0
--
Thanks,
~Nick Desaulniers
Signature · 2 lines
Thanks, ~Nick Desaulniers
PATCH v2 1/1 RDMA/qedr: Remove enumerated type qed_roce_ll2_tx_dest
In reply to Nathan ChancellorClang warns when one enumerated type is explicitly converted to another.
drivers/infiniband/hw/qedr/qedr_roce_cm.c:198:28: warning: implicit conversion from enumeration type 'enum qed_roce_ll2_tx_dest' to different enumeration type 'enum qed_ll2_tx_dest' [-Wenum-conversion]
ll2_tx_pkt.tx_dest = pkt->tx_dest;
~ ~~~~~^~~~~~~1 warning generated.
Turns out that QED_ROCE_LL2_TX_DEST_NW and QED_ROCE_LL2_TX_DEST_LB are only used once in the whole tree and QED_ROCE_LL2_TX_DEST_MAX is used nowhere. Remove them and use the equivalent values from qed_ll2_tx_dest in their place.
---
v1 -> v2:
* Rather than using an explicit cast, just convert the uses to the appropriate values and delete the duplicated enum.
drivers/infiniband/hw/qedr/qedr_roce_cm.c | 4 ++-- include/linux/qed/qed_rdma_if.h | 11 +---------- 2 files changed, 3 insertions(+), 12 deletions(-)
drivers/infiniband/hw/qedr/qedr_roce_cm.c +2 -2
@@ -519,9 +519,9 @@ static inline int qedr_gsi_build_packet(struct qedr_dev *dev, }if (ether_addr_equal (udh.eth.smac_h, udh.eth.dmac_h)) - packet->tx_dest =QED_ROCE_LL2_TX_DEST_LB ; + packet->tx_dest =QED_LL2_TX_DEST_LB ;else - packet->tx_dest =QED_ROCE_LL2_TX_DEST_NW ; + packet->tx_dest =QED_LL2_TX_DEST_NW ; packet->roce_mode = roce_mode;memcpy (packet->header.vaddr, ud_header_buffer, header_size);
include/linux/qed/qed_rdma_if.h +1 -10
@@ -39,15 +39,6 @@#include <linux/qed/qed_ll2_if.h> #include <linux/qed/rdma_common.h> -enum qed_roce_ll2_tx_dest { -/* Light L2 TX Destination to the Network */ -QED_ROCE_LL2_TX_DEST_NW , - -/* Light L2 TX Destination to the Loopback */ -QED_ROCE_LL2_TX_DEST_LB , -QED_ROCE_LL2_TX_DEST_MAX -}; -#define QED_RDMA_MAX_CNQ_SIZE (0xFFFF)/* rdma interface */
@@ -581,7 +572,7 @@ struct qed_roce_ll2_packet {int n_seg;struct qed_roce_ll2_buffer payload[RDMA_MAX_SGE_PER_SQ_WQE ];int roce_mode; -enum qed_roce_ll2_tx_dest tx_dest; +enum qed_ll2_tx_dest tx_dest; };enum qed_rdma_type {
Signature · 1 line
2.19.0
Re: [PATCH v2] RDMA/qedr: Remove enumerated type qed_roce_ll2_tx_dest
Quoted 33 lines · Nathan Chancellor
Clang warns when one enumerated type is explicitly converted to another.
drivers/infiniband/hw/qedr/qedr_roce_cm.c:198:28: warning: implicit conversion from enumeration type 'enumqed_roce_ll2_tx_dest' to different enumeration type 'enumqed_ll2_tx_dest' [-Wenum-conversion]ll2_tx_pkt.tx_dest = pkt->tx_dest; ~ ~~~~~^~~~~~~1 warning generated.
Turns out that
QED_ROCE_LL2_TX_DEST_NWandQED_ROCE_LL2_TX_DEST_LBare only used once in the whole tree andQED_ROCE_LL2_TX_DEST_MAXis used nowhere. Remove them and use the equivalent values fromqed_ll2_tx_destin their place.Reported-by Nick Desaulniers <[email protected]>Signed-off-by Nathan Chancellor <[email protected]>---
v1 -> v2:
* Rather than using an explicit cast, just convert the uses to the appropriate values and delete the duplicated enum.
drivers/infiniband/hw/qedr/qedr_roce_cm.c | 4 ++-- include/linux/qed/qed_rdma_if.h | 11 +---------- 2 files changed, 3 insertions(+), 12 deletions(-)drivers/infiniband/hw/qedr/qedr_roce_cm.c +0
-0
drivers/infiniband/hw/qedr/qedr_roce_cm.c static inline int qedr_gsi_build_packet(struct qedr_dev *dev, · line 524
Quoted 8 lines
drivers/infiniband/hw/qedr/qedr_roce_cm.c +2
-2@@ -519,9 +519,9 @@ static inline int qedr_gsi_build_packet(struct qedr_dev *dev, }if (ether_addr_equal (udh.eth.smac_h, udh.eth.dmac_h)) - packet->tx_dest =QED_ROCE_LL2_TX_DEST_LB ; + packet->tx_dest =QED_LL2_TX_DEST_LB ;else - packet->tx_dest =QED_ROCE_LL2_TX_DEST_NW ; + packet->tx_dest =QED_LL2_TX_DEST_NW ;
Yep, looks like these were the only two sites using enum qed_roce_ll2_tx_dest in the whole kernel. The new enum values match the previous enum values, so this is no functional change while simplifying the code (one less enum to get wrong).
Quoted 35 lines
drivers/infiniband/hw/qedr/qedr_roce_cm.c +0
-0packet->roce_mode = roce_mode;memcpy (packet->header.vaddr, ud_header_buffer, header_size);include/linux/qed/qed_rdma_if.h +1
-11@@ -39,15 +39,6 @@#include <linux/qed/qed_ll2_if.h> #include <linux/qed/rdma_common.h> -enum qed_roce_ll2_tx_dest { -/* Light L2 TX Destination to the Network */ -QED_ROCE_LL2_TX_DEST_NW , - -/* Light L2 TX Destination to the Loopback */ -QED_ROCE_LL2_TX_DEST_LB , -QED_ROCE_LL2_TX_DEST_MAX -}; -#define QED_RDMA_MAX_CNQ_SIZE (0xFFFF)/* rdma interface */ @@ -581,7 +572,7 @@ struct qed_roce_ll2_packet {int n_seg;struct qed_roce_ll2_buffer payload[RDMA_MAX_SGE_PER_SQ_WQE ];int roce_mode; -enum qed_roce_ll2_tx_dest tx_dest; +enum qed_ll2_tx_dest tx_dest; };enum qed_rdma_type { --2.19.0
Signature · 2 lines
Thanks, ~Nick Desaulniers
Kalderon, Michal
Acked-byRE: [PATCH v2] RDMA/qedr: Remove enumerated type qed_roce_ll2_tx_dest
Quoted 91 lines
From: Nick Desaulniers <[email protected]>
Sent: Friday, September 28, 2018 1:30 AMExternal Email
Quoted 11 lines · Nathan Chancellor
Clang warns when one enumerated type is explicitly converted to another.
drivers/infiniband/hw/qedr/qedr_roce_cm.c:198:28: warning: implicit conversion from enumeration type 'enumqed_roce_ll2_tx_dest' to different enumeration type 'enumqed_ll2_tx_dest' [-Wenum-conversion]ll2_tx_pkt.tx_dest = pkt->tx_dest; ~ ~~~~~^~~~~~~1 warning generated.
Turns out that
QED_ROCE_LL2_TX_DEST_NWand
QED_ROCE_LL2_TX_DEST_LBareQuoted 1 line
only used once in the whole tree and
QED_ROCE_LL2_TX_DEST_MAXisused
drivers/infiniband/hw/qedr/qedr_roce_cm.c static inline int qedr_gsi_build_packet(struct
Quoted 22 lines
nowhere. Remove them and use the equivalent values from
qed_ll2_tx_destin their place.Reported-by Nick Desaulniers <[email protected]>Signed-off-by Nathan Chancellor <[email protected]>---
v1 -> v2:
* Rather than using an explicit cast, just convert the uses to the appropriate values and delete the duplicated enum.
drivers/infiniband/hw/qedr/qedr_roce_cm.c | 4 ++-- include/linux/qed/qed_rdma_if.h | 11 +---------- 2 files changed, 3 insertions(+), 12 deletions(-)drivers/infiniband/hw/qedr/qedr_roce_cm.c +0
-0@@ -519,9 +519,9 @@ static inline int qedr_gsi_build_packet(struct
qedr_dev*dev,drivers/infiniband/hw/qedr/qedr_roce_cm.c static inline int qedr_gsi_build_packet(struct qedr_dev *dev, · line 524
Quoted 8 lines
drivers/infiniband/hw/qedr/qedr_roce_cm.c +2
-2}if (ether_addr_equal (udh.eth.smac_h, udh.eth.dmac_h)) - packet->tx_dest =QED_ROCE_LL2_TX_DEST_LB ; + packet->tx_dest =QED_LL2_TX_DEST_LB ;else - packet->tx_dest =QED_ROCE_LL2_TX_DEST_NW ; + packet->tx_dest =QED_LL2_TX_DEST_NW ;Yep, looks like these were the only two sites using enum
qed_roce_ll2_tx_destin the whole kernel. The new enum values match the previous enum values, so this is no functional change while simplifying the code (one less enum to get wrong).Reviewed-by Nick Desaulniers <[email protected]>Quoted 32 lines
drivers/infiniband/hw/qedr/qedr_roce_cm.c +0
-0packet->roce_mode = roce_mode;memcpy (packet->header.vaddr, ud_header_buffer, header_size);(quoted diff) +0
-0
b/include/linux/qed/qed_rdma_if.hindexdf4d13f7e191..d15f8e4815e3100644include/linux/qed/qed_rdma_if.h +1
-10@@ -39,15 +39,6 @@#include <linux/qed/qed_ll2_if.h> #include <linux/qed/rdma_common.h> -enum qed_roce_ll2_tx_dest { -/* Light L2 TX Destination to the Network */ -QED_ROCE_LL2_TX_DEST_NW , - -/* Light L2 TX Destination to the Loopback */ -QED_ROCE_LL2_TX_DEST_LB , -QED_ROCE_LL2_TX_DEST_MAX -}; -#define QED_RDMA_MAX_CNQ_SIZE (0xFFFF)/* rdma interface */ @@ -581,7 +572,7 @@ struct qed_roce_ll2_packet {int n_seg;struct qed_roce_ll2_buffer payload[RDMA_MAX_SGE_PER_SQ_WQE ];int roce_mode; -enum qed_roce_ll2_tx_dest tx_dest; +enum qed_ll2_tx_dest tx_dest; };
Quoted 9 lines
Quoted 4 lines
include/linux/qed/qed_rdma_if.h +0
-1enum qed_rdma_type { --2.19.0
--
Thanks,
~Nick Desaulniers
Thanks, definitely looks cleaner.
Jason Gunthorpe
AppliedRe: [PATCH v2] RDMA/qedr: Remove enumerated type qed_roce_ll2_tx_dest
In reply to Nathan ChancellorQuoted 18 lines · Nathan Chancellor
Clang warns when one enumerated type is explicitly converted to another.
drivers/infiniband/hw/qedr/qedr_roce_cm.c:198:28: warning: implicit conversion from enumeration type 'enumqed_roce_ll2_tx_dest' to different enumeration type 'enumqed_ll2_tx_dest' [-Wenum-conversion]ll2_tx_pkt.tx_dest = pkt->tx_dest; ~ ~~~~~^~~~~~~1 warning generated.
Turns out that
QED_ROCE_LL2_TX_DEST_NWandQED_ROCE_LL2_TX_DEST_LBare only used once in the whole tree andQED_ROCE_LL2_TX_DEST_MAXis used nowhere. Remove them and use the equivalent values fromqed_ll2_tx_destin their place.Reported-by Nick Desaulniers <[email protected]>Signed-off-by Nathan Chancellor <[email protected]>Reviewed-by Nick Desaulniers <[email protected]>Acked-by Michal Kalderon <[email protected]>
Quoted 6 lines
---
v1 -> v2:
* Rather than using an explicit cast, just convert the uses to the appropriate values and delete the duplicated enum.
Applied to for-next, thanks
Jason