Re: [net PATCH 2/2] net: dsa: qca8k: fix ethtool autocast mib for big-endian systems

From: Andrew Lunn
Date: Wed Oct 12 2022 - 08:37:56 EST


> struct qca8k_priv *priv = ds->priv;
> const struct qca8k_mib_desc *mib;
> struct mib_ethhdr *mib_ethhdr;
> - int i, mib_len, offset = 0;
> - u64 *data;
> + __le32 *data2;
> u8 port;
> + int i;
>
> mib_ethhdr = (struct mib_ethhdr *)skb_mac_header(skb);
> mib_eth_data = &priv->mib_eth_data;
> @@ -1532,28 +1532,24 @@ static void qca8k_mib_autocast_handler(struct dsa_switch *ds, struct sk_buff *sk
> if (port != mib_eth_data->req_port)
> goto exit;
>
> - data = mib_eth_data->data;
> + data2 = (__le32 *)skb->data;
>
> for (i = 0; i < priv->info->mib_count; i++) {
> mib = &ar8327_mib[i];
>
> /* First 3 mib are present in the skb head */
> if (i < 3) {
> - data[i] = mib_ethhdr->data[i];
> + mib_eth_data->data[i] = le32_to_cpu(mib_ethhdr->data[i]);
> continue;
> }
>
> - mib_len = sizeof(uint32_t);
> -
> /* Some mib are 64 bit wide */
> if (mib->size == 2)
> - mib_len = sizeof(uint64_t);
> -
> - /* Copy the mib value from packet to the */
> - memcpy(data + i, skb->data + offset, mib_len);
> + mib_eth_data->data[i] = le64_to_cpu(*(__le64 *)data2);
> + else
> + mib_eth_data->data[i] = le32_to_cpu(*data2);

Are there any alignment guarantees? The old memcpy did not care if the
source has oddly alignment. But when you start dereferencing a pointed,
you need to be sure those pointers are aligned. You might want to use
get_unaligned_le32 and get_unaligned_le64.

Andrew