Commit d0f89c4c authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf 

Daniel Borkmann says:

====================
pull-request: bpf 2023-04-13

We've added 6 non-merge commits during the last 1 day(s) which contain
a total of 14 files changed, 205 insertions(+), 38 deletions(-).

The main changes are:

1) One late straggler fix on the XDP hints side which fixes
   bpf_xdp_metadata_rx_hash kfunc API before the release goes out
   in order to provide information on the RSS hash type,
   from Jesper Dangaard Brouer.

* tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf:
  selftests/bpf: Adjust bpf_xdp_metadata_rx_hash for new arg
  mlx4: bpf_xdp_metadata_rx_hash add xdp rss hash type
  veth: bpf_xdp_metadata_rx_hash add xdp rss hash type
  mlx5: bpf_xdp_metadata_rx_hash add xdp rss hash type
  xdp: rss hash types representation
  selftests/bpf: xdp_hw_metadata remove bpf_printk and add counters
====================

Link: https://lore.kernel.org/r/20230413192939.10202-1-daniel@iogearbox.net


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 0646dc31 b65ef48c

drivers/net/ethernet/mellanox/mlx4/en_rx.c

+20 −2
Original line number Diff line number Diff line
@@ -681,14 +681,32 @@ int mlx4_en_xdp_rx_timestamp(const struct xdp_md *ctx, u64 *timestamp) 
	return 0;

}



int mlx4_en_xdp_rx_hash(const struct xdp_md *ctx, u32 *hash)

int mlx4_en_xdp_rx_hash(const struct xdp_md *ctx, u32 *hash,

			enum xdp_rss_hash_type *rss_type)

{

	struct mlx4_en_xdp_buff *_ctx = (void *)ctx;

	struct mlx4_cqe *cqe = _ctx->cqe;

	enum xdp_rss_hash_type xht = 0;

	__be16 status;



	if (unlikely(!(_ctx->dev->features & NETIF_F_RXHASH)))

		return -ENODATA;



	*hash = be32_to_cpu(_ctx->cqe->immed_rss_invalid);

	*hash = be32_to_cpu(cqe->immed_rss_invalid);

	status = cqe->status;

	if (status & cpu_to_be16(MLX4_CQE_STATUS_TCP))

		xht = XDP_RSS_L4_TCP;

	if (status & cpu_to_be16(MLX4_CQE_STATUS_UDP))

		xht = XDP_RSS_L4_UDP;

	if (status & cpu_to_be16(MLX4_CQE_STATUS_IPV4 | MLX4_CQE_STATUS_IPV4F))

		xht |= XDP_RSS_L3_IPV4;

	if (status & cpu_to_be16(MLX4_CQE_STATUS_IPV6)) {

		xht |= XDP_RSS_L3_IPV6;

		if (cqe->ipv6_ext_mask)

			xht |= XDP_RSS_L3_DYNHDR;

	}

	*rss_type = xht;



	return 0;

}

drivers/net/ethernet/mellanox/mlx4/mlx4_en.h

+2 −1
Original line number Diff line number Diff line
@@ -798,7 +798,8 @@ int mlx4_en_netdev_event(struct notifier_block *this, 


struct xdp_md;

int mlx4_en_xdp_rx_timestamp(const struct xdp_md *ctx, u64 *timestamp);

int mlx4_en_xdp_rx_hash(const struct xdp_md *ctx, u32 *hash);

int mlx4_en_xdp_rx_hash(const struct xdp_md *ctx, u32 *hash,

			enum xdp_rss_hash_type *rss_type);



/*

 * Functions for time stamping

drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c

+61 −2
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <net/xdp_sock_drv.h>

#include "en/xdp.h"

#include "en/params.h"

#include <linux/bitfield.h>



int mlx5e_xdp_max_mtu(struct mlx5e_params *params, struct mlx5e_xsk_param *xsk)

{
@@ -169,14 +170,72 @@ static int mlx5e_xdp_rx_timestamp(const struct xdp_md *ctx, u64 *timestamp) 
	return 0;

}



static int mlx5e_xdp_rx_hash(const struct xdp_md *ctx, u32 *hash)

/* Mapping HW RSS Type bits CQE_RSS_HTYPE_IP + CQE_RSS_HTYPE_L4 into 4-bits*/

#define RSS_TYPE_MAX_TABLE	16 /* 4-bits max 16 entries */

#define RSS_L4		GENMASK(1, 0)

#define RSS_L3		GENMASK(3, 2) /* Same as CQE_RSS_HTYPE_IP */



/* Valid combinations of CQE_RSS_HTYPE_IP + CQE_RSS_HTYPE_L4 sorted numerical */

enum mlx5_rss_hash_type {

	RSS_TYPE_NO_HASH	= (FIELD_PREP_CONST(RSS_L3, CQE_RSS_IP_NONE) |

				   FIELD_PREP_CONST(RSS_L4, CQE_RSS_L4_NONE)),

	RSS_TYPE_L3_IPV4	= (FIELD_PREP_CONST(RSS_L3, CQE_RSS_IPV4) |

				   FIELD_PREP_CONST(RSS_L4, CQE_RSS_L4_NONE)),

	RSS_TYPE_L4_IPV4_TCP	= (FIELD_PREP_CONST(RSS_L3, CQE_RSS_IPV4) |

				   FIELD_PREP_CONST(RSS_L4, CQE_RSS_L4_TCP)),

	RSS_TYPE_L4_IPV4_UDP	= (FIELD_PREP_CONST(RSS_L3, CQE_RSS_IPV4) |

				   FIELD_PREP_CONST(RSS_L4, CQE_RSS_L4_UDP)),

	RSS_TYPE_L4_IPV4_IPSEC	= (FIELD_PREP_CONST(RSS_L3, CQE_RSS_IPV4) |

				   FIELD_PREP_CONST(RSS_L4, CQE_RSS_L4_IPSEC)),

	RSS_TYPE_L3_IPV6	= (FIELD_PREP_CONST(RSS_L3, CQE_RSS_IPV6) |

				   FIELD_PREP_CONST(RSS_L4, CQE_RSS_L4_NONE)),

	RSS_TYPE_L4_IPV6_TCP	= (FIELD_PREP_CONST(RSS_L3, CQE_RSS_IPV6) |

				   FIELD_PREP_CONST(RSS_L4, CQE_RSS_L4_TCP)),

	RSS_TYPE_L4_IPV6_UDP	= (FIELD_PREP_CONST(RSS_L3, CQE_RSS_IPV6) |

				   FIELD_PREP_CONST(RSS_L4, CQE_RSS_L4_UDP)),

	RSS_TYPE_L4_IPV6_IPSEC	= (FIELD_PREP_CONST(RSS_L3, CQE_RSS_IPV6) |

				   FIELD_PREP_CONST(RSS_L4, CQE_RSS_L4_IPSEC)),

};



/* Invalid combinations will simply return zero, allows no boundary checks */

static const enum xdp_rss_hash_type mlx5_xdp_rss_type[RSS_TYPE_MAX_TABLE] = {

	[RSS_TYPE_NO_HASH]	 = XDP_RSS_TYPE_NONE,

	[1]			 = XDP_RSS_TYPE_NONE, /* Implicit zero */

	[2]			 = XDP_RSS_TYPE_NONE, /* Implicit zero */

	[3]			 = XDP_RSS_TYPE_NONE, /* Implicit zero */

	[RSS_TYPE_L3_IPV4]	 = XDP_RSS_TYPE_L3_IPV4,

	[RSS_TYPE_L4_IPV4_TCP]	 = XDP_RSS_TYPE_L4_IPV4_TCP,

	[RSS_TYPE_L4_IPV4_UDP]	 = XDP_RSS_TYPE_L4_IPV4_UDP,

	[RSS_TYPE_L4_IPV4_IPSEC] = XDP_RSS_TYPE_L4_IPV4_IPSEC,

	[RSS_TYPE_L3_IPV6]	 = XDP_RSS_TYPE_L3_IPV6,

	[RSS_TYPE_L4_IPV6_TCP]	 = XDP_RSS_TYPE_L4_IPV6_TCP,

	[RSS_TYPE_L4_IPV6_UDP]   = XDP_RSS_TYPE_L4_IPV6_UDP,

	[RSS_TYPE_L4_IPV6_IPSEC] = XDP_RSS_TYPE_L4_IPV6_IPSEC,

	[12]			 = XDP_RSS_TYPE_NONE, /* Implicit zero */

	[13]			 = XDP_RSS_TYPE_NONE, /* Implicit zero */

	[14]			 = XDP_RSS_TYPE_NONE, /* Implicit zero */

	[15]			 = XDP_RSS_TYPE_NONE, /* Implicit zero */

};



static int mlx5e_xdp_rx_hash(const struct xdp_md *ctx, u32 *hash,

			     enum xdp_rss_hash_type *rss_type)

{

	const struct mlx5e_xdp_buff *_ctx = (void *)ctx;

	const struct mlx5_cqe64 *cqe = _ctx->cqe;

	u32 hash_type, l4_type, ip_type, lookup;



	if (unlikely(!(_ctx->xdp.rxq->dev->features & NETIF_F_RXHASH)))

		return -ENODATA;



	*hash = be32_to_cpu(_ctx->cqe->rss_hash_result);

	*hash = be32_to_cpu(cqe->rss_hash_result);



	hash_type = cqe->rss_hash_type;

	BUILD_BUG_ON(CQE_RSS_HTYPE_IP != RSS_L3); /* same mask */

	ip_type = hash_type & CQE_RSS_HTYPE_IP;

	l4_type = FIELD_GET(CQE_RSS_HTYPE_L4, hash_type);

	lookup = ip_type | l4_type;

	*rss_type = mlx5_xdp_rss_type[lookup];



	return 0;

}

drivers/net/veth.c

+7 −3
Original line number Diff line number Diff line
@@ -1648,14 +1648,18 @@ static int veth_xdp_rx_timestamp(const struct xdp_md *ctx, u64 *timestamp) 
	return 0;

}



static int veth_xdp_rx_hash(const struct xdp_md *ctx, u32 *hash)

static int veth_xdp_rx_hash(const struct xdp_md *ctx, u32 *hash,

			    enum xdp_rss_hash_type *rss_type)

{

	struct veth_xdp_buff *_ctx = (void *)ctx;

	struct sk_buff *skb = _ctx->skb;



	if (!_ctx->skb)

	if (!skb)

		return -ENODATA;



	*hash = skb_get_hash(_ctx->skb);

	*hash = skb_get_hash(skb);

	*rss_type = skb->l4_hash ? XDP_RSS_TYPE_L4_ANY : XDP_RSS_TYPE_NONE;



	return 0;

}

include/linux/mlx5/device.h

+12 −2
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <linux/types.h>

#include <rdma/ib_verbs.h>

#include <linux/mlx5/mlx5_ifc.h>

#include <linux/bitfield.h>



#if defined(__LITTLE_ENDIAN)

#define MLX5_SET_HOST_ENDIANNESS	0
@@ -980,14 +981,23 @@ enum { 
};



enum {

	CQE_RSS_HTYPE_IP	= 0x3 << 2,

	CQE_RSS_HTYPE_IP	= GENMASK(3, 2),

	/* cqe->rss_hash_type[3:2] - IP destination selected for hash

	 * (00 = none,  01 = IPv4, 10 = IPv6, 11 = Reserved)

	 */

	CQE_RSS_HTYPE_L4	= 0x3 << 6,

	CQE_RSS_IP_NONE		= 0x0,

	CQE_RSS_IPV4		= 0x1,

	CQE_RSS_IPV6		= 0x2,

	CQE_RSS_RESERVED	= 0x3,



	CQE_RSS_HTYPE_L4	= GENMASK(7, 6),

	/* cqe->rss_hash_type[7:6] - L4 destination selected for hash

	 * (00 = none, 01 = TCP. 10 = UDP, 11 = IPSEC.SPI

	 */

	CQE_RSS_L4_NONE		= 0x0,

	CQE_RSS_L4_TCP		= 0x1,

	CQE_RSS_L4_UDP		= 0x2,

	CQE_RSS_L4_IPSEC	= 0x3,

};



enum {