[net-next] net: mscc: ocelot: avoid type promotion when calling ocelot_ifh_set_dest

Commit Message

Vladimir Oltean Feb. 15, 2021, 1:31 p.m. UTC

From: Vladimir Oltean <[e-mail]>

Smatch is confused by the fact that a 32-bit BIT(port) macro is passed
as argument to the ocelot_ifh_set_dest function and warns:

ocelot_xmit() warn: should '(((1))) << (dp->index)' be a 64 bit type?
seville_xmit() warn: should '(((1))) << (dp->index)' be a 64 bit type?

The destination port mask is copied into a 12-bit field of the packet,
starting at bit offset 67 and ending at 56.

So this DSA tagging protocol supports at most 12 bits, which is clearly
less than 32. Attempting to send to a port number > 12 will cause the
packing() call to truncate way before there will be 32-bit truncation
due to type promotion of the BIT(port) argument towards u64.

Therefore, smatch's fears that BIT(port) will do the wrong thing and
cause unexpected truncation for "port" values >= 32 are unfounded.
Nonetheless, let's silence the warning by explicitly passing an u64
value to ocelot_ifh_set_dest, such that the compiler does not need to do
a questionable type promotion.

Reported-by: kernel test robot <[e-mail]>
Reported-by: Dan Carpenter <[e-mail]>
Signed-off-by: Vladimir Oltean <[e-mail]>
---
 drivers/net/ethernet/mscc/ocelot.c | 2 +-
 net/dsa/tag_ocelot.c               | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Comments

[e-mail] Feb. 15, 2021, 8:50 p.m. UTC | #1

Hello:

This patch was applied to netdev/net-next.git (refs/heads/master):

On Mon, 15 Feb 2021 15:31:43 +0200 you wrote:
> From: Vladimir Oltean <[e-mail]>
> 
> Smatch is confused by the fact that a 32-bit BIT(port) macro is passed
> as argument to the ocelot_ifh_set_dest function and warns:
> 
> ocelot_xmit() warn: should '(((1))) << (dp->index)' be a 64 bit type?
> seville_xmit() warn: should '(((1))) << (dp->index)' be a 64 bit type?
> 
> [...]

Here is the summary with links:
  - [net-next] net: mscc: ocelot: avoid type promotion when calling ocelot_ifh_set_dest
    https://git.kernel.org/netdev/net-next/c/1f778d500df3

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html

Patch

diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c
index 8d97c731e953..5d13087c85d6 100644
--- a/drivers/net/ethernet/mscc/ocelot.c
+++ b/drivers/net/ethernet/mscc/ocelot.c
@@ -803,7 +803,7 @@  void ocelot_port_inject_frame(struct ocelot *ocelot, int port, int grp,
 			 QS_INJ_CTRL_SOF, QS_INJ_CTRL, grp);
 
 	ocelot_ifh_set_bypass(ifh, 1);
-	ocelot_ifh_set_dest(ifh, BIT(port));
+	ocelot_ifh_set_dest(ifh, BIT_ULL(port));
 	ocelot_ifh_set_tag_type(ifh, IFH_TAG_TYPE_C);
 	ocelot_ifh_set_vid(ifh, skb_vlan_tag_get(skb));
 	ocelot_ifh_set_rew_op(ifh, rew_op);
diff --git a/net/dsa/tag_ocelot.c b/net/dsa/tag_ocelot.c
index a7dd61c8e005..f9df9cac81c5 100644
--- a/net/dsa/tag_ocelot.c
+++ b/net/dsa/tag_ocelot.c
@@ -56,7 +56,7 @@  static struct sk_buff *ocelot_xmit(struct sk_buff *skb,
 	void *injection;
 
 	ocelot_xmit_common(skb, netdev, cpu_to_be32(0x8880000a), &injection);
-	ocelot_ifh_set_dest(injection, BIT(dp->index));
+	ocelot_ifh_set_dest(injection, BIT_ULL(dp->index));
 
 	return skb;
 }
@@ -68,7 +68,7 @@  static struct sk_buff *seville_xmit(struct sk_buff *skb,
 	void *injection;
 
 	ocelot_xmit_common(skb, netdev, cpu_to_be32(0x88800005), &injection);
-	seville_ifh_set_dest(injection, BIT(dp->index));
+	seville_ifh_set_dest(injection, BIT_ULL(dp->index));
 
 	return skb;
 }