[PATCH net-next 0/5] net: dsa: Fix C=1 W=1 warnings

[PATCH net-next 0/5] net: dsa: Fix C=1 W=1 warnings

[Andrew Lunn]

Mostly not using __be16 when decoding packet contents.

Andrew Lunn (5):
  net: dsa: Add __precpu property to prevent warnings
  net: dsa: tag_ksz: Fix __be16 warnings
  net: dsa: tag_lan9303: Fix __be16 warnings
  net: dsa: tag_mtk: Fix warnings for __be16
  net: dsa: tag_qca.c: Fix warning for __be16 vs u16

 net/dsa/dsa_priv.h    |  2 +-
 net/dsa/tag_ksz.c     |  9 +++++----
 net/dsa/tag_lan9303.c | 17 +++++++++--------
 net/dsa/tag_mtk.c     |  3 ++-
 net/dsa/tag_qca.c     |  8 +++++---
 5 files changed, 22 insertions(+), 17 deletions(-)

-- 
2.27.0.rc2

[PATCH net-next 1/5] net: dsa: Add __precpu property to prevent warnings

[Andrew Lunn]

net/dsa/slave.c:505:13: warning: incorrect type in initializer (different address spaces)
net/dsa/slave.c:505:13:    expected void const [noderef] <asn:3> *__vpp_verify
net/dsa/slave.c:505:13:    got struct pcpu_sw_netstats *

Add the needed _percpu property to prevent this warning.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
 net/dsa/dsa_priv.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h
index adecf73bd608..1653e3377cb3 100644
--- a/net/dsa/dsa_priv.h
+++ b/net/dsa/dsa_priv.h
@@ -77,7 +77,7 @@ struct dsa_slave_priv {
 	struct sk_buff *	(*xmit)(struct sk_buff *skb,
 					struct net_device *dev);
 
-	struct pcpu_sw_netstats	*stats64;
+	struct pcpu_sw_netstats	__percpu *stats64;
 
 	struct gro_cells	gcells;
 
-- 
2.27.0.rc2

Re: [PATCH net-next 1/5] net: dsa: Add __precpu property to prevent warnings

[Florian Fainelli]

On 7/5/2020 12:30 PM, Andrew Lunn wrote:
> net/dsa/slave.c:505:13: warning: incorrect type in initializer (different address spaces)
> net/dsa/slave.c:505:13:    expected void const [noderef] <asn:3> *__vpp_verify
> net/dsa/slave.c:505:13:    got struct pcpu_sw_netstats *
> 
> Add the needed _percpu property to prevent this warning.
> 
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>

Subject should be s/__precpu/__percpu/, with that fixed:

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
-- 
Florian

[PATCH net-next 2/5] net: dsa: tag_ksz: Fix __be16 warnings

[Andrew Lunn]

cpu_to_be16 returns a __be16 value. So what it is assigned to needs to
have the same type to avoid warnings.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
 net/dsa/tag_ksz.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/net/dsa/tag_ksz.c b/net/dsa/tag_ksz.c
index 90d055c4df9e..bd1a3158d79a 100644
--- a/net/dsa/tag_ksz.c
+++ b/net/dsa/tag_ksz.c
@@ -156,8 +156,9 @@ static struct sk_buff *ksz9477_xmit(struct sk_buff *skb,
 {
 	struct dsa_port *dp = dsa_slave_to_port(dev);
 	struct sk_buff *nskb;
-	u16 *tag;
+	__be16 *tag;
 	u8 *addr;
+	u16 val;
 
 	nskb = ksz_common_xmit(skb, dev, KSZ9477_INGRESS_TAG_LEN);
 	if (!nskb)
@@ -167,12 +168,12 @@ static struct sk_buff *ksz9477_xmit(struct sk_buff *skb,
 	tag = skb_put(nskb, KSZ9477_INGRESS_TAG_LEN);
 	addr = skb_mac_header(nskb);
 
-	*tag = BIT(dp->index);
+	val = BIT(dp->index);
 
 	if (is_link_local_ether_addr(addr))
-		*tag |= KSZ9477_TAIL_TAG_OVERRIDE;
+		val |= KSZ9477_TAIL_TAG_OVERRIDE;
 
-	*tag = cpu_to_be16(*tag);
+	*tag = cpu_to_be16(val);
 
 	return nskb;
 }
-- 
2.27.0.rc2

Re: [PATCH net-next 2/5] net: dsa: tag_ksz: Fix __be16 warnings

[Florian Fainelli]

On 7/5/2020 12:30 PM, Andrew Lunn wrote:
> cpu_to_be16 returns a __be16 value. So what it is assigned to needs to
> have the same type to avoid warnings.
> 
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
-- 
Florian

[PATCH net-next 3/5] net: dsa: tag_lan9303: Fix __be16 warnings

[Andrew Lunn]

net/dsa/tag_lan9303.c:76:24: warning: incorrect type in assignment (different base types)
net/dsa/tag_lan9303.c:76:24:    expected unsigned short [usertype]
net/dsa/tag_lan9303.c:76:24:    got restricted __be16 [usertype]
net/dsa/tag_lan9303.c:80:24: warning: incorrect type in assignment (different base types)
net/dsa/tag_lan9303.c:80:24:    expected unsigned short [usertype]
net/dsa/tag_lan9303.c:80:24:    got restricted __be16 [usertype]
net/dsa/tag_lan9303.c:106:31: warning: restricted __be16 degrades to integer
net/dsa/tag_lan9303.c:111:24: warning: cast to restricted __be16
net/dsa/tag_lan9303.c:111:24: warning: cast to restricted __be16
net/dsa/tag_lan9303.c:111:24: warning: cast to restricted __be16
net/dsa/tag_lan9303.c:111:24: warning: cast to restricted __be16

Make use of __be16 where appropriate to fix these warnings.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
 net/dsa/tag_lan9303.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/net/dsa/tag_lan9303.c b/net/dsa/tag_lan9303.c
index eb0e7a32e53d..ccfb6f641bbf 100644
--- a/net/dsa/tag_lan9303.c
+++ b/net/dsa/tag_lan9303.c
@@ -55,7 +55,8 @@ static int lan9303_xmit_use_arl(struct dsa_port *dp, u8 *dest_addr)
 static struct sk_buff *lan9303_xmit(struct sk_buff *skb, struct net_device *dev)
 {
 	struct dsa_port *dp = dsa_slave_to_port(dev);
-	u16 *lan9303_tag;
+	__be16 *lan9303_tag;
+	u16 tag;
 
 	/* insert a special VLAN tag between the MAC addresses
 	 * and the current ethertype field.
@@ -72,12 +73,12 @@ static struct sk_buff *lan9303_xmit(struct sk_buff *skb, struct net_device *dev)
 	/* make room between MACs and Ether-Type */
 	memmove(skb->data, skb->data + LAN9303_TAG_LEN, 2 * ETH_ALEN);
 
-	lan9303_tag = (u16 *)(skb->data + 2 * ETH_ALEN);
+	lan9303_tag = (__be16 *)(skb->data + 2 * ETH_ALEN);
+	tag = lan9303_xmit_use_arl(dp, skb->data) ?
+		LAN9303_TAG_TX_USE_ALR :
+		dp->index | LAN9303_TAG_TX_STP_OVERRIDE;
 	lan9303_tag[0] = htons(ETH_P_8021Q);
-	lan9303_tag[1] = lan9303_xmit_use_arl(dp, skb->data) ?
-				LAN9303_TAG_TX_USE_ALR :
-				dp->index | LAN9303_TAG_TX_STP_OVERRIDE;
-	lan9303_tag[1] = htons(lan9303_tag[1]);
+	lan9303_tag[1] = htons(tag);
 
 	return skb;
 }
@@ -85,7 +86,7 @@ static struct sk_buff *lan9303_xmit(struct sk_buff *skb, struct net_device *dev)
 static struct sk_buff *lan9303_rcv(struct sk_buff *skb, struct net_device *dev,
 				   struct packet_type *pt)
 {
-	u16 *lan9303_tag;
+	__be16 *lan9303_tag;
 	u16 lan9303_tag1;
 	unsigned int source_port;
 
@@ -101,7 +102,7 @@ static struct sk_buff *lan9303_rcv(struct sk_buff *skb, struct net_device *dev,
 	 *                           ^
 	 *                        ->data
 	 */
-	lan9303_tag = (u16 *)(skb->data - 2);
+	lan9303_tag = (__be16 *)(skb->data - 2);
 
 	if (lan9303_tag[0] != htons(ETH_P_8021Q)) {
 		dev_warn_ratelimited(&dev->dev, "Dropping packet due to invalid VLAN marker\n");
-- 
2.27.0.rc2

Re: [PATCH net-next 3/5] net: dsa: tag_lan9303: Fix __be16 warnings

[Florian Fainelli]

On 7/5/2020 12:30 PM, Andrew Lunn wrote:
> net/dsa/tag_lan9303.c:76:24: warning: incorrect type in assignment (different base types)
> net/dsa/tag_lan9303.c:76:24:    expected unsigned short [usertype]
> net/dsa/tag_lan9303.c:76:24:    got restricted __be16 [usertype]
> net/dsa/tag_lan9303.c:80:24: warning: incorrect type in assignment (different base types)
> net/dsa/tag_lan9303.c:80:24:    expected unsigned short [usertype]
> net/dsa/tag_lan9303.c:80:24:    got restricted __be16 [usertype]
> net/dsa/tag_lan9303.c:106:31: warning: restricted __be16 degrades to integer
> net/dsa/tag_lan9303.c:111:24: warning: cast to restricted __be16
> net/dsa/tag_lan9303.c:111:24: warning: cast to restricted __be16
> net/dsa/tag_lan9303.c:111:24: warning: cast to restricted __be16
> net/dsa/tag_lan9303.c:111:24: warning: cast to restricted __be16
> 
> Make use of __be16 where appropriate to fix these warnings.
> 
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
-- 
Florian

[PATCH net-next 4/5] net: dsa: tag_mtk: Fix warnings for __be16

[Andrew Lunn]

net/dsa/tag_mtk.c:84:13: warning: incorrect type in assignment (different base types)
net/dsa/tag_mtk.c:84:13:    expected restricted __be16 [usertype] hdr
net/dsa/tag_mtk.c:84:13:    got int
net/dsa/tag_mtk.c:94:17: warning: restricted __be16 degrades to integer

The result of a ntohs() is not __be16, but u16.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
 net/dsa/tag_mtk.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/dsa/tag_mtk.c b/net/dsa/tag_mtk.c
index d6619edd53e5..f602fc758d68 100644
--- a/net/dsa/tag_mtk.c
+++ b/net/dsa/tag_mtk.c
@@ -67,8 +67,9 @@ static struct sk_buff *mtk_tag_xmit(struct sk_buff *skb,
 static struct sk_buff *mtk_tag_rcv(struct sk_buff *skb, struct net_device *dev,
 				   struct packet_type *pt)
 {
+	u16 hdr;
 	int port;
-	__be16 *phdr, hdr;
+	__be16 *phdr;
 	unsigned char *dest = eth_hdr(skb)->h_dest;
 	bool is_multicast_skb = is_multicast_ether_addr(dest) &&
 				!is_broadcast_ether_addr(dest);
-- 
2.27.0.rc2

Re: [PATCH net-next 4/5] net: dsa: tag_mtk: Fix warnings for __be16

[Florian Fainelli]

On 7/5/2020 12:30 PM, Andrew Lunn wrote:
> net/dsa/tag_mtk.c:84:13: warning: incorrect type in assignment (different base types)
> net/dsa/tag_mtk.c:84:13:    expected restricted __be16 [usertype] hdr
> net/dsa/tag_mtk.c:84:13:    got int
> net/dsa/tag_mtk.c:94:17: warning: restricted __be16 degrades to integer
> 
> The result of a ntohs() is not __be16, but u16.
> 
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
-- 
Florian

[PATCH net-next 5/5] net: dsa: tag_qca.c: Fix warning for __be16 vs u16

[Andrew Lunn]

net/dsa/tag_qca.c:48:15: warning: incorrect type in assignment (different base types)
net/dsa/tag_qca.c:48:15:    expected unsigned short [usertype]
net/dsa/tag_qca.c:48:15:    got restricted __be16 [usertype]
net/dsa/tag_qca.c:68:13: warning: incorrect type in assignment (different base types)
net/dsa/tag_qca.c:68:13:    expected restricted __be16 [usertype] hdr
net/dsa/tag_qca.c:68:13:    got int
net/dsa/tag_qca.c:71:16: warning: restricted __be16 degrades to integer
net/dsa/tag_qca.c:81:17: warning: restricted __be16 degrades to integer

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
 net/dsa/tag_qca.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/net/dsa/tag_qca.c b/net/dsa/tag_qca.c
index 70db7c909f74..7066f5e697d7 100644
--- a/net/dsa/tag_qca.c
+++ b/net/dsa/tag_qca.c
@@ -31,7 +31,8 @@
 static struct sk_buff *qca_tag_xmit(struct sk_buff *skb, struct net_device *dev)
 {
 	struct dsa_port *dp = dsa_slave_to_port(dev);
-	u16 *phdr, hdr;
+	__be16 *phdr;
+	u16 hdr;
 
 	if (skb_cow_head(skb, QCA_HDR_LEN) < 0)
 		return NULL;
@@ -39,7 +40,7 @@ static struct sk_buff *qca_tag_xmit(struct sk_buff *skb, struct net_device *dev)
 	skb_push(skb, QCA_HDR_LEN);
 
 	memmove(skb->data, skb->data + QCA_HDR_LEN, 2 * ETH_ALEN);
-	phdr = (u16 *)(skb->data + 2 * ETH_ALEN);
+	phdr = (__be16 *)(skb->data + 2 * ETH_ALEN);
 
 	/* Set the version field, and set destination port information */
 	hdr = QCA_HDR_VERSION << QCA_HDR_XMIT_VERSION_S |
@@ -54,8 +55,9 @@ static struct sk_buff *qca_tag_rcv(struct sk_buff *skb, struct net_device *dev,
 				   struct packet_type *pt)
 {
 	u8 ver;
+	u16  hdr;
 	int port;
-	__be16 *phdr, hdr;
+	__be16 *phdr;
 
 	if (unlikely(!pskb_may_pull(skb, QCA_HDR_LEN)))
 		return NULL;
-- 
2.27.0.rc2

Re: [PATCH net-next 5/5] net: dsa: tag_qca.c: Fix warning for __be16 vs u16

[Florian Fainelli]

On 7/5/2020 12:30 PM, Andrew Lunn wrote:
> net/dsa/tag_qca.c:48:15: warning: incorrect type in assignment (different base types)
> net/dsa/tag_qca.c:48:15:    expected unsigned short [usertype]
> net/dsa/tag_qca.c:48:15:    got restricted __be16 [usertype]
> net/dsa/tag_qca.c:68:13: warning: incorrect type in assignment (different base types)
> net/dsa/tag_qca.c:68:13:    expected restricted __be16 [usertype] hdr
> net/dsa/tag_qca.c:68:13:    got int
> net/dsa/tag_qca.c:71:16: warning: restricted __be16 degrades to integer
> net/dsa/tag_qca.c:81:17: warning: restricted __be16 degrades to integer
> 
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
-- 
Florian

Re: [PATCH net-next 0/5] net: dsa: Fix C=1 W=1 warnings

[David Miller]

From: Andrew Lunn <andrew@lunn.ch>
Date: Sun,  5 Jul 2020 21:30:03 +0200

> Mostly not using __be16 when decoding packet contents.

Series applied with patch #1's subject fixed.