Use new ipv6_addr_cpu_to_be32 and ipv6_addr_be32_to_cpu helper,
and IPV6_ADDR_WORDS. This is arguably slightly nicer.
No functional change intended.
Compile tested only.
Suggested-by: Andrew Lunn <andrew@lunn.ch>
Link: https://lore.kernel.org/netdev/c7684349-535c-45a4-9a74-d47479a50020@lunn.ch/
Signed-off-by: Simon Horman <horms@kernel.org>
---
.../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 79 +++++++++++-----------
.../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 8 ++-
2 files changed, 44 insertions(+), 43 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index 82574ce0194f..ce629cbc5d01 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -13,8 +13,9 @@
#include <linux/platform_device.h>
#include <linux/if_vlan.h>
#include <linux/crash_dump.h>
-#include <net/ipv6.h>
+
#include <net/rtnetlink.h>
+
#include "hclge_cmd.h"
#include "hclge_dcb.h"
#include "hclge_main.h"
@@ -6278,15 +6279,15 @@ static void hclge_fd_get_ip4_tuple(struct ethtool_rx_flow_spec *fs,
static void hclge_fd_get_tcpip6_tuple(struct ethtool_rx_flow_spec *fs,
struct hclge_fd_rule *rule, u8 ip_proto)
{
- be32_to_cpu_array(rule->tuples.src_ip, fs->h_u.tcp_ip6_spec.ip6src,
- IPV6_SIZE);
- be32_to_cpu_array(rule->tuples_mask.src_ip, fs->m_u.tcp_ip6_spec.ip6src,
- IPV6_SIZE);
+ ipv6_addr_be32_to_cpu(rule->tuples.src_ip,
+ fs->h_u.tcp_ip6_spec.ip6src);
+ ipv6_addr_be32_to_cpu(rule->tuples_mask.src_ip,
+ fs->m_u.tcp_ip6_spec.ip6src);
- be32_to_cpu_array(rule->tuples.dst_ip, fs->h_u.tcp_ip6_spec.ip6dst,
- IPV6_SIZE);
- be32_to_cpu_array(rule->tuples_mask.dst_ip, fs->m_u.tcp_ip6_spec.ip6dst,
- IPV6_SIZE);
+ ipv6_addr_be32_to_cpu(rule->tuples.dst_ip,
+ fs->h_u.tcp_ip6_spec.ip6dst);
+ ipv6_addr_be32_to_cpu(rule->tuples_mask.dst_ip,
+ fs->m_u.tcp_ip6_spec.ip6dst);
rule->tuples.src_port = be16_to_cpu(fs->h_u.tcp_ip6_spec.psrc);
rule->tuples_mask.src_port = be16_to_cpu(fs->m_u.tcp_ip6_spec.psrc);
@@ -6307,15 +6308,15 @@ static void hclge_fd_get_tcpip6_tuple(struct ethtool_rx_flow_spec *fs,
static void hclge_fd_get_ip6_tuple(struct ethtool_rx_flow_spec *fs,
struct hclge_fd_rule *rule)
{
- be32_to_cpu_array(rule->tuples.src_ip, fs->h_u.usr_ip6_spec.ip6src,
- IPV6_SIZE);
- be32_to_cpu_array(rule->tuples_mask.src_ip, fs->m_u.usr_ip6_spec.ip6src,
- IPV6_SIZE);
+ ipv6_addr_be32_to_cpu(rule->tuples.src_ip,
+ fs->h_u.usr_ip6_spec.ip6src);
+ ipv6_addr_be32_to_cpu(rule->tuples_mask.src_ip,
+ fs->m_u.usr_ip6_spec.ip6src);
- be32_to_cpu_array(rule->tuples.dst_ip, fs->h_u.usr_ip6_spec.ip6dst,
- IPV6_SIZE);
- be32_to_cpu_array(rule->tuples_mask.dst_ip, fs->m_u.usr_ip6_spec.ip6dst,
- IPV6_SIZE);
+ ipv6_addr_be32_to_cpu(rule->tuples.dst_ip,
+ fs->h_u.usr_ip6_spec.ip6dst);
+ ipv6_addr_be32_to_cpu(rule->tuples_mask.dst_ip,
+ fs->m_u.usr_ip6_spec.ip6dst);
rule->tuples.ip_proto = fs->h_u.usr_ip6_spec.l4_proto;
rule->tuples_mask.ip_proto = fs->m_u.usr_ip6_spec.l4_proto;
@@ -6744,21 +6745,19 @@ static void hclge_fd_get_tcpip6_info(struct hclge_fd_rule *rule,
struct ethtool_tcpip6_spec *spec,
struct ethtool_tcpip6_spec *spec_mask)
{
- cpu_to_be32_array(spec->ip6src,
- rule->tuples.src_ip, IPV6_SIZE);
- cpu_to_be32_array(spec->ip6dst,
- rule->tuples.dst_ip, IPV6_SIZE);
+ ipv6_addr_cpu_to_be32(spec->ip6src, rule->tuples.src_ip);
+ ipv6_addr_cpu_to_be32(spec->ip6dst, rule->tuples.dst_ip);
if (rule->unused_tuple & BIT(INNER_SRC_IP))
memset(spec_mask->ip6src, 0, sizeof(spec_mask->ip6src));
else
- cpu_to_be32_array(spec_mask->ip6src, rule->tuples_mask.src_ip,
- IPV6_SIZE);
+ ipv6_addr_cpu_to_be32(spec_mask->ip6src,
+ rule->tuples_mask.src_ip);
if (rule->unused_tuple & BIT(INNER_DST_IP))
memset(spec_mask->ip6dst, 0, sizeof(spec_mask->ip6dst));
else
- cpu_to_be32_array(spec_mask->ip6dst, rule->tuples_mask.dst_ip,
- IPV6_SIZE);
+ ipv6_addr_cpu_to_be32(spec_mask->ip6dst,
+ rule->tuples_mask.dst_ip);
spec->tclass = rule->tuples.ip_tos;
spec_mask->tclass = rule->unused_tuple & BIT(INNER_IP_TOS) ?
@@ -6777,19 +6776,19 @@ static void hclge_fd_get_ip6_info(struct hclge_fd_rule *rule,
struct ethtool_usrip6_spec *spec,
struct ethtool_usrip6_spec *spec_mask)
{
- cpu_to_be32_array(spec->ip6src, rule->tuples.src_ip, IPV6_SIZE);
- cpu_to_be32_array(spec->ip6dst, rule->tuples.dst_ip, IPV6_SIZE);
+ ipv6_addr_cpu_to_be32(spec->ip6src, rule->tuples.src_ip);
+ ipv6_addr_cpu_to_be32(spec->ip6dst, rule->tuples.dst_ip);
if (rule->unused_tuple & BIT(INNER_SRC_IP))
memset(spec_mask->ip6src, 0, sizeof(spec_mask->ip6src));
else
- cpu_to_be32_array(spec_mask->ip6src,
- rule->tuples_mask.src_ip, IPV6_SIZE);
+ ipv6_addr_cpu_to_be32(spec_mask->ip6src,
+ rule->tuples_mask.src_ip);
if (rule->unused_tuple & BIT(INNER_DST_IP))
memset(spec_mask->ip6dst, 0, sizeof(spec_mask->ip6dst));
else
- cpu_to_be32_array(spec_mask->ip6dst,
- rule->tuples_mask.dst_ip, IPV6_SIZE);
+ ipv6_addr_cpu_to_be32(spec_mask->ip6dst,
+ rule->tuples_mask.dst_ip);
spec->tclass = rule->tuples.ip_tos;
spec_mask->tclass = rule->unused_tuple & BIT(INNER_IP_TOS) ?
@@ -7007,7 +7006,7 @@ static void hclge_fd_get_flow_tuples(const struct flow_keys *fkeys,
} else {
int i;
- for (i = 0; i < IPV6_SIZE; i++) {
+ for (i = 0; i < IPV6_ADDR_WORDS; i++) {
tuples->src_ip[i] = be32_to_cpu(flow_ip6_src[i]);
tuples->dst_ip[i] = be32_to_cpu(flow_ip6_dst[i]);
}
@@ -7262,14 +7261,14 @@ static int hclge_get_cls_key_ip(const struct flow_rule *flow,
struct flow_match_ipv6_addrs match;
flow_rule_match_ipv6_addrs(flow, &match);
- be32_to_cpu_array(rule->tuples.src_ip, match.key->src.s6_addr32,
- IPV6_SIZE);
- be32_to_cpu_array(rule->tuples_mask.src_ip,
- match.mask->src.s6_addr32, IPV6_SIZE);
- be32_to_cpu_array(rule->tuples.dst_ip, match.key->dst.s6_addr32,
- IPV6_SIZE);
- be32_to_cpu_array(rule->tuples_mask.dst_ip,
- match.mask->dst.s6_addr32, IPV6_SIZE);
+ ipv6_addr_be32_to_cpu(rule->tuples.src_ip,
+ match.key->src.s6_addr32);
+ ipv6_addr_be32_to_cpu(rule->tuples_mask.src_ip,
+ match.mask->src.s6_addr32);
+ ipv6_addr_be32_to_cpu(rule->tuples.dst_ip,
+ match.key->dst.s6_addr32);
+ ipv6_addr_be32_to_cpu(rule->tuples_mask.dst_ip,
+ match.mask->dst.s6_addr32);
} else {
rule->unused_tuple |= BIT(INNER_SRC_IP);
rule->unused_tuple |= BIT(INNER_DST_IP);
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
index b5178b0f88b3..b9fc719880bb 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
@@ -8,7 +8,9 @@
#include <linux/phy.h>
#include <linux/if_vlan.h>
#include <linux/kfifo.h>
+
#include <net/devlink.h>
+#include <net/ipv6.h>
#include "hclge_cmd.h"
#include "hclge_ptp.h"
@@ -718,15 +720,15 @@ struct hclge_fd_cfg {
};
#define IPV4_INDEX 3
-#define IPV6_SIZE 4
+
struct hclge_fd_rule_tuples {
u8 src_mac[ETH_ALEN];
u8 dst_mac[ETH_ALEN];
/* Be compatible for ip address of both ipv4 and ipv6.
* For ipv4 address, we store it in src/dst_ip[3].
*/
- u32 src_ip[IPV6_SIZE];
- u32 dst_ip[IPV6_SIZE];
+ u32 src_ip[IPV6_ADDR_WORDS];
+ u32 dst_ip[IPV6_ADDR_WORDS];
u16 src_port;
u16 dst_port;
u16 vlan_tag1;
--
2.43.0Reviewed-by: Jijie Shao <shaojijie@huawei.com>
on 2024/8/12 20:11, Simon Horman wrote:
> Use new ipv6_addr_cpu_to_be32 and ipv6_addr_be32_to_cpu helper,
> and IPV6_ADDR_WORDS. This is arguably slightly nicer.
>
> No functional change intended.
> Compile tested only.
>
> Suggested-by: Andrew Lunn <andrew@lunn.ch>
> Link: https://lore.kernel.org/netdev/c7684349-535c-45a4-9a74-d47479a50020@lunn.ch/
> Signed-off-by: Simon Horman <horms@kernel.org>
> ---
> .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 79 +++++++++++-----------
> .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 8 ++-
> 2 files changed, 44 insertions(+), 43 deletions(-)
>
> diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
> index 82574ce0194f..ce629cbc5d01 100644
> --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
> +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
> @@ -13,8 +13,9 @@
> #include <linux/platform_device.h>
> #include <linux/if_vlan.h>
> #include <linux/crash_dump.h>
> -#include <net/ipv6.h>
> +
> #include <net/rtnetlink.h>
> +
> #include "hclge_cmd.h"
> #include "hclge_dcb.h"
> #include "hclge_main.h"
> @@ -6278,15 +6279,15 @@ static void hclge_fd_get_ip4_tuple(struct ethtool_rx_flow_spec *fs,
> static void hclge_fd_get_tcpip6_tuple(struct ethtool_rx_flow_spec *fs,
> struct hclge_fd_rule *rule, u8 ip_proto)
> {
> - be32_to_cpu_array(rule->tuples.src_ip, fs->h_u.tcp_ip6_spec.ip6src,
> - IPV6_SIZE);
> - be32_to_cpu_array(rule->tuples_mask.src_ip, fs->m_u.tcp_ip6_spec.ip6src,
> - IPV6_SIZE);
> + ipv6_addr_be32_to_cpu(rule->tuples.src_ip,
> + fs->h_u.tcp_ip6_spec.ip6src);
> + ipv6_addr_be32_to_cpu(rule->tuples_mask.src_ip,
> + fs->m_u.tcp_ip6_spec.ip6src);
>
> - be32_to_cpu_array(rule->tuples.dst_ip, fs->h_u.tcp_ip6_spec.ip6dst,
> - IPV6_SIZE);
> - be32_to_cpu_array(rule->tuples_mask.dst_ip, fs->m_u.tcp_ip6_spec.ip6dst,
> - IPV6_SIZE);
> + ipv6_addr_be32_to_cpu(rule->tuples.dst_ip,
> + fs->h_u.tcp_ip6_spec.ip6dst);
> + ipv6_addr_be32_to_cpu(rule->tuples_mask.dst_ip,
> + fs->m_u.tcp_ip6_spec.ip6dst);
>
> rule->tuples.src_port = be16_to_cpu(fs->h_u.tcp_ip6_spec.psrc);
> rule->tuples_mask.src_port = be16_to_cpu(fs->m_u.tcp_ip6_spec.psrc);
> @@ -6307,15 +6308,15 @@ static void hclge_fd_get_tcpip6_tuple(struct ethtool_rx_flow_spec *fs,
> static void hclge_fd_get_ip6_tuple(struct ethtool_rx_flow_spec *fs,
> struct hclge_fd_rule *rule)
> {
> - be32_to_cpu_array(rule->tuples.src_ip, fs->h_u.usr_ip6_spec.ip6src,
> - IPV6_SIZE);
> - be32_to_cpu_array(rule->tuples_mask.src_ip, fs->m_u.usr_ip6_spec.ip6src,
> - IPV6_SIZE);
> + ipv6_addr_be32_to_cpu(rule->tuples.src_ip,
> + fs->h_u.usr_ip6_spec.ip6src);
> + ipv6_addr_be32_to_cpu(rule->tuples_mask.src_ip,
> + fs->m_u.usr_ip6_spec.ip6src);
>
> - be32_to_cpu_array(rule->tuples.dst_ip, fs->h_u.usr_ip6_spec.ip6dst,
> - IPV6_SIZE);
> - be32_to_cpu_array(rule->tuples_mask.dst_ip, fs->m_u.usr_ip6_spec.ip6dst,
> - IPV6_SIZE);
> + ipv6_addr_be32_to_cpu(rule->tuples.dst_ip,
> + fs->h_u.usr_ip6_spec.ip6dst);
> + ipv6_addr_be32_to_cpu(rule->tuples_mask.dst_ip,
> + fs->m_u.usr_ip6_spec.ip6dst);
>
> rule->tuples.ip_proto = fs->h_u.usr_ip6_spec.l4_proto;
> rule->tuples_mask.ip_proto = fs->m_u.usr_ip6_spec.l4_proto;
> @@ -6744,21 +6745,19 @@ static void hclge_fd_get_tcpip6_info(struct hclge_fd_rule *rule,
> struct ethtool_tcpip6_spec *spec,
> struct ethtool_tcpip6_spec *spec_mask)
> {
> - cpu_to_be32_array(spec->ip6src,
> - rule->tuples.src_ip, IPV6_SIZE);
> - cpu_to_be32_array(spec->ip6dst,
> - rule->tuples.dst_ip, IPV6_SIZE);
> + ipv6_addr_cpu_to_be32(spec->ip6src, rule->tuples.src_ip);
> + ipv6_addr_cpu_to_be32(spec->ip6dst, rule->tuples.dst_ip);
> if (rule->unused_tuple & BIT(INNER_SRC_IP))
> memset(spec_mask->ip6src, 0, sizeof(spec_mask->ip6src));
> else
> - cpu_to_be32_array(spec_mask->ip6src, rule->tuples_mask.src_ip,
> - IPV6_SIZE);
> + ipv6_addr_cpu_to_be32(spec_mask->ip6src,
> + rule->tuples_mask.src_ip);
>
> if (rule->unused_tuple & BIT(INNER_DST_IP))
> memset(spec_mask->ip6dst, 0, sizeof(spec_mask->ip6dst));
> else
> - cpu_to_be32_array(spec_mask->ip6dst, rule->tuples_mask.dst_ip,
> - IPV6_SIZE);
> + ipv6_addr_cpu_to_be32(spec_mask->ip6dst,
> + rule->tuples_mask.dst_ip);
>
> spec->tclass = rule->tuples.ip_tos;
> spec_mask->tclass = rule->unused_tuple & BIT(INNER_IP_TOS) ?
> @@ -6777,19 +6776,19 @@ static void hclge_fd_get_ip6_info(struct hclge_fd_rule *rule,
> struct ethtool_usrip6_spec *spec,
> struct ethtool_usrip6_spec *spec_mask)
> {
> - cpu_to_be32_array(spec->ip6src, rule->tuples.src_ip, IPV6_SIZE);
> - cpu_to_be32_array(spec->ip6dst, rule->tuples.dst_ip, IPV6_SIZE);
> + ipv6_addr_cpu_to_be32(spec->ip6src, rule->tuples.src_ip);
> + ipv6_addr_cpu_to_be32(spec->ip6dst, rule->tuples.dst_ip);
> if (rule->unused_tuple & BIT(INNER_SRC_IP))
> memset(spec_mask->ip6src, 0, sizeof(spec_mask->ip6src));
> else
> - cpu_to_be32_array(spec_mask->ip6src,
> - rule->tuples_mask.src_ip, IPV6_SIZE);
> + ipv6_addr_cpu_to_be32(spec_mask->ip6src,
> + rule->tuples_mask.src_ip);
>
> if (rule->unused_tuple & BIT(INNER_DST_IP))
> memset(spec_mask->ip6dst, 0, sizeof(spec_mask->ip6dst));
> else
> - cpu_to_be32_array(spec_mask->ip6dst,
> - rule->tuples_mask.dst_ip, IPV6_SIZE);
> + ipv6_addr_cpu_to_be32(spec_mask->ip6dst,
> + rule->tuples_mask.dst_ip);
>
> spec->tclass = rule->tuples.ip_tos;
> spec_mask->tclass = rule->unused_tuple & BIT(INNER_IP_TOS) ?
> @@ -7007,7 +7006,7 @@ static void hclge_fd_get_flow_tuples(const struct flow_keys *fkeys,
> } else {
> int i;
>
> - for (i = 0; i < IPV6_SIZE; i++) {
> + for (i = 0; i < IPV6_ADDR_WORDS; i++) {
> tuples->src_ip[i] = be32_to_cpu(flow_ip6_src[i]);
> tuples->dst_ip[i] = be32_to_cpu(flow_ip6_dst[i]);
> }
> @@ -7262,14 +7261,14 @@ static int hclge_get_cls_key_ip(const struct flow_rule *flow,
> struct flow_match_ipv6_addrs match;
>
> flow_rule_match_ipv6_addrs(flow, &match);
> - be32_to_cpu_array(rule->tuples.src_ip, match.key->src.s6_addr32,
> - IPV6_SIZE);
> - be32_to_cpu_array(rule->tuples_mask.src_ip,
> - match.mask->src.s6_addr32, IPV6_SIZE);
> - be32_to_cpu_array(rule->tuples.dst_ip, match.key->dst.s6_addr32,
> - IPV6_SIZE);
> - be32_to_cpu_array(rule->tuples_mask.dst_ip,
> - match.mask->dst.s6_addr32, IPV6_SIZE);
> + ipv6_addr_be32_to_cpu(rule->tuples.src_ip,
> + match.key->src.s6_addr32);
> + ipv6_addr_be32_to_cpu(rule->tuples_mask.src_ip,
> + match.mask->src.s6_addr32);
> + ipv6_addr_be32_to_cpu(rule->tuples.dst_ip,
> + match.key->dst.s6_addr32);
> + ipv6_addr_be32_to_cpu(rule->tuples_mask.dst_ip,
> + match.mask->dst.s6_addr32);
> } else {
> rule->unused_tuple |= BIT(INNER_SRC_IP);
> rule->unused_tuple |= BIT(INNER_DST_IP);
> diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
> index b5178b0f88b3..b9fc719880bb 100644
> --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
> +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
> @@ -8,7 +8,9 @@
> #include <linux/phy.h>
> #include <linux/if_vlan.h>
> #include <linux/kfifo.h>
> +
> #include <net/devlink.h>
> +#include <net/ipv6.h>
>
> #include "hclge_cmd.h"
> #include "hclge_ptp.h"
> @@ -718,15 +720,15 @@ struct hclge_fd_cfg {
> };
>
> #define IPV4_INDEX 3
> -#define IPV6_SIZE 4
> +
> struct hclge_fd_rule_tuples {
> u8 src_mac[ETH_ALEN];
> u8 dst_mac[ETH_ALEN];
> /* Be compatible for ip address of both ipv4 and ipv6.
> * For ipv4 address, we store it in src/dst_ip[3].
> */
> - u32 src_ip[IPV6_SIZE];
> - u32 dst_ip[IPV6_SIZE];
> + u32 src_ip[IPV6_ADDR_WORDS];
> + u32 dst_ip[IPV6_ADDR_WORDS];
> u16 src_port;
> u16 dst_port;
> u16 vlan_tag1;
>
On Mon, Aug 12, 2024 at 01:11:57PM +0100, Simon Horman wrote:
> Use new ipv6_addr_cpu_to_be32 and ipv6_addr_be32_to_cpu helper,
> and IPV6_ADDR_WORDS. This is arguably slightly nicer.
>
> No functional change intended.
> Compile tested only.
>
> Suggested-by: Andrew Lunn <andrew@lunn.ch>
> Link: https://lore.kernel.org/netdev/c7684349-535c-45a4-9a74-d47479a50020@lunn.ch/
> Signed-off-by: Simon Horman <horms@kernel.org>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Andrew
© 2016 - 2024 Red Hat, Inc.