Signed-off-by: Jesper Dangaard Brouer <brouer@xxxxxxxxxx>
---
drivers/net/ethernet/intel/i40e/i40e_main.c | 34 ++++++
drivers/net/ethernet/intel/i40e/i40e_txrx.c | 156 ++++++++++++++++++++++++---
2 files changed, 173 insertions(+), 17 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 83e0cf475ebd..2ef5b3e49ba4 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -5,6 +5,7 @@
#include <linux/of_net.h>
#include <linux/pci.h>
#include <linux/bpf.h>
+#include <linux/btf.h>
#include <generated/utsrelease.h>
#include <linux/crash_dump.h>
@@ -27,6 +28,10 @@ static const char i40e_driver_string[] =
static const char i40e_copyright[] = "Copyright (c) 2013 - 2019 Intel Corporation.";
+static struct btf *this_module_btf;
+extern s32 btf_id_xdp_hints_i40e;
+extern s32 btf_id_xdp_hints_i40e_timestamp;
+
/* a bit of forward declarations */
static void i40e_vsi_reinit_locked(struct i40e_vsi *vsi);
static void i40e_handle_reset_warning(struct i40e_pf *pf, bool lock_acquired);
@@ -13589,6 +13594,7 @@ static int i40e_config_netdev(struct i40e_vsi *vsi)
NETIF_F_SCTP_CRC |
NETIF_F_RXHASH |
NETIF_F_RXCSUM |
+ NETIF_F_XDP_HINTS |
0;
if (!(pf->hw_features & I40E_HW_OUTER_UDP_CSUM_CAPABLE))
@@ -13633,6 +13639,7 @@ static int i40e_config_netdev(struct i40e_vsi *vsi)
netdev->hw_features |= hw_features;
netdev->features |= hw_features | NETIF_F_HW_VLAN_CTAG_FILTER;
+ netdev->features |= NETIF_F_XDP_HINTS;
netdev->hw_enc_features |= NETIF_F_TSO_MANGLEID;
netdev->features &= ~NETIF_F_HW_TC;
@@ -16545,6 +16552,28 @@ static struct pci_driver i40e_driver = {
.sriov_configure = i40e_pci_sriov_configure,
};
+static s32 find_btf_id(struct btf *btf, const char *name)
+{
+ s32 btf_id;
+
+ if (!btf)
+ return -EFAULT;
+
+ btf_id = btf_find_by_name_kind(btf, name, BTF_KIND_STRUCT);
+ if (btf_id < 0) {
+ pr_warn("%s: BTF cannot find struct %s", i40e_driver_name, name);
+ return 0;
+ }
+ pr_info("%s: BTF id %d for struct %s", i40e_driver_name, btf_id, name);
+ return btf_id;
+}
+
+static void i40e_this_module_btf_lookups(struct btf *btf)
+{
+ btf_id_xdp_hints_i40e = find_btf_id(btf, "xdp_hints_i40e");
+ btf_id_xdp_hints_i40e_timestamp = find_btf_id(btf, "xdp_hints_i40e_timestamp");
+}
+
/**
* i40e_init_module - Driver registration routine
*
@@ -16553,6 +16582,10 @@ static struct pci_driver i40e_driver = {
**/
static int __init i40e_init_module(void)
{
+ this_module_btf = btf_get_module_btf(THIS_MODULE);
+ if (this_module_btf)
+ i40e_this_module_btf_lookups(this_module_btf);
+
pr_info("%s: %s\n", i40e_driver_name, i40e_driver_string);
pr_info("%s: %s\n", i40e_driver_name, i40e_copyright);
@@ -16586,5 +16619,6 @@ static void __exit i40e_exit_module(void)
destroy_workqueue(i40e_wq);
ida_destroy(&i40e_client_ida);
i40e_dbg_exit();
+ btf_put_module_btf(this_module_btf);
}
module_exit(i40e_exit_module);
diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
index 26459d7f68cc..d19331d034ee 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
@@ -1822,15 +1822,10 @@ _i40e_rx_checksum(struct i40e_vsi *vsi,
ret.csum_level = 1;
/* Only report checksum unnecessary for TCP, UDP, or SCTP */
- switch (decoded.inner_prot) {
- case I40E_RX_PTYPE_INNER_PROT_TCP:
- case I40E_RX_PTYPE_INNER_PROT_UDP:
- case I40E_RX_PTYPE_INNER_PROT_SCTP:
+ if (likely((decoded.inner_prot == I40E_RX_PTYPE_INNER_PROT_TCP) ||
+ (decoded.inner_prot == I40E_RX_PTYPE_INNER_PROT_UDP) ||
+ (decoded.inner_prot == I40E_RX_PTYPE_INNER_PROT_SCTP)))
ret.ip_summed = CHECKSUM_UNNECESSARY;
- fallthrough;
- default:
- break;
- }
return ret;
@@ -1861,19 +1856,17 @@ static inline void i40e_rx_checksum(struct i40e_vsi *vsi,
/**
* i40e_ptype_to_htype - get a hash type
- * @ptype: the ptype value from the descriptor
+ * @ptype: the decoded ptype value from the descriptor
*
* Returns a hash type to be used by skb_set_hash
**/
-static inline int i40e_ptype_to_htype(u8 ptype)
+static inline int i40e_ptype_to_htype(struct i40e_rx_ptype_decoded decoded)
{
- struct i40e_rx_ptype_decoded decoded = decode_rx_desc_ptype(ptype);
-
- if (!decoded.known)
+ if (unlikely(!decoded.known))
return PKT_HASH_TYPE_NONE;
- if (decoded.outer_ip == I40E_RX_PTYPE_OUTER_IP &&
- decoded.payload_layer == I40E_RX_PTYPE_PAYLOAD_LAYER_PAY4)
+ if (likely(decoded.outer_ip == I40E_RX_PTYPE_OUTER_IP &&
+ decoded.payload_layer == I40E_RX_PTYPE_PAYLOAD_LAYER_PAY4))
return PKT_HASH_TYPE_L4;
else if (decoded.outer_ip == I40E_RX_PTYPE_OUTER_IP &&
decoded.payload_layer == I40E_RX_PTYPE_PAYLOAD_LAYER_PAY3)
@@ -1903,8 +1896,11 @@ static inline void i40e_rx_hash(struct i40e_ring *ring,
return;
if ((rx_desc->wb.qword1.status_error_len & rss_mask) == rss_mask) {
+ struct i40e_rx_ptype_decoded ptype;
+
+ ptype = decode_rx_desc_ptype(rx_ptype);
hash = le32_to_cpu(rx_desc->wb.qword0.hi_dword.rss);
- skb_set_hash(skb, hash, i40e_ptype_to_htype(rx_ptype));
+ skb_set_hash(skb, hash, i40e_ptype_to_htype(ptype));
}
}
@@ -1950,6 +1946,130 @@ void i40e_process_skb_fields(struct i40e_ring *rx_ring,
skb->protocol = eth_type_trans(skb, rx_ring->netdev);
}
+struct xdp_hints_i40e {
+ struct i40e_rx_ptype_decoded i40e_hash_ptype;
+ struct xdp_hints_common common;
+};
+
+struct xdp_hints_i40e_timestamp {
+ u64 rx_timestamp;
+ struct xdp_hints_i40e base;
+};
+
+/* Extending xdp_hints_flags */
+enum xdp_hints_flags_driver {
+ HINT_FLAG_RX_TIMESTAMP = BIT(16),
+};
+
+/* BTF IDs gets looked up on driver i40e_init_module */
+s32 btf_id_xdp_hints_i40e;
+s32 btf_id_xdp_hints_i40e_timestamp;
+
+static inline u32 i40e_rx_checksum_xdp(struct i40e_vsi *vsi, u64 qword1,
+ struct xdp_hints_i40e *xdp_hints,
+ struct i40e_rx_ptype_decoded ptype)
+{
+ struct i40e_rx_checksum_ret ret;
+
+ ret = _i40e_rx_checksum(vsi, qword1, ptype);
+ return xdp_hints_set_rx_csum(&xdp_hints->common, ret.ip_summed, ret.csum_level);
+}
+
+static inline u32 i40e_rx_hash_xdp(struct i40e_ring *ring,
+ union i40e_rx_desc *rx_desc,
+ struct xdp_buff *xdp,
+ u64 rx_desc_qword1,
+ struct xdp_hints_i40e *xdp_hints,
+ struct i40e_rx_ptype_decoded ptype
+ )
+{
+ const u64 rss_mask = (u64)I40E_RX_DESC_FLTSTAT_RSS_HASH <<
+ I40E_RX_DESC_STATUS_FLTSTAT_SHIFT;
+ u32 flags = 0;
+
+ if (unlikely(!(ring->netdev->features & NETIF_F_RXHASH))) {
+ struct i40e_rx_ptype_decoded zero = {};
+ xdp_hints->i40e_hash_ptype = zero;
+ return 0;
+ }
+
+ if (likely((rx_desc_qword1 & rss_mask) == rss_mask)) {
+ u32 hash = le32_to_cpu(rx_desc->wb.qword0.hi_dword.rss);
+ u32 htype;
+
+ /* i40e provide extra information about protocol type */
+ xdp_hints->i40e_hash_ptype = ptype;
+ htype = i40e_ptype_to_htype(ptype);
+ flags = xdp_hints_set_rx_hash(&xdp_hints->common, hash, htype);
+
+ }
+ return flags;
+}
+
+static inline void i40e_process_xdp_hints(struct i40e_ring *rx_ring,
+ union i40e_rx_desc *rx_desc,
+ struct xdp_buff *xdp,
+ u64 qword)
+{
+ u32 rx_status = (qword & I40E_RXD_QW1_STATUS_MASK) >>
+ I40E_RXD_QW1_STATUS_SHIFT;
+ u32 tsynvalid = rx_status & I40E_RXD_QW1_STATUS_TSYNVALID_MASK;
+ u32 tsyn = (rx_status & I40E_RXD_QW1_STATUS_TSYNINDX_MASK) >>
+ I40E_RXD_QW1_STATUS_TSYNINDX_SHIFT;
+ u64 tsyn_ts;
+
+ struct i40e_rx_ptype_decoded ptype;
+ struct xdp_hints_i40e *xdp_hints;
+ struct xdp_hints_common *common;
+ u32 btf_id = btf_id_xdp_hints_i40e;
+ u32 btf_sz = sizeof(*xdp_hints);
+ u32 f1 = 0, f2, f3, f4, f5 = 0;
+ u8 rx_ptype;
+
+ if (!(rx_ring->netdev->features & NETIF_F_XDP_HINTS))
+ return;
+
+ /* Driver have xdp headroom when using build_skb */
+ if (unlikely(!ring_uses_build_skb(rx_ring)))
+ return;
+
+ xdp_hints = xdp->data - btf_sz;
+ common = &xdp_hints->common;
+
+ if (unlikely(tsynvalid)) {
+ struct xdp_hints_i40e_timestamp *hints;
+
+ tsyn_ts = i40e_ptp_rx_hwtstamp_raw(rx_ring->vsi->back, tsyn);
+ btf_id = btf_id_xdp_hints_i40e_timestamp;
+ btf_sz = sizeof(*hints);
+ hints = xdp->data - btf_sz;
+ hints->rx_timestamp = ns_to_ktime(tsyn_ts);
+ f1 = HINT_FLAG_RX_TIMESTAMP;
+ }
+
+ /* ptype needed by both hash and checksum code */
+ rx_ptype = (qword & I40E_RXD_QW1_PTYPE_MASK) >> I40E_RXD_QW1_PTYPE_SHIFT;
+ ptype = decode_rx_desc_ptype(rx_ptype);
+
+ f2 = i40e_rx_hash_xdp(rx_ring, rx_desc, xdp, qword, xdp_hints, ptype);
+ f3 = i40e_rx_checksum_xdp(rx_ring->vsi, qword, xdp_hints, ptype);
+ f4 = xdp_hints_set_rxq(common, rx_ring->queue_index);
+
+ if (unlikely(qword & BIT(I40E_RX_DESC_STATUS_L2TAG1P_SHIFT))) {
+ __le16 vlan_tag = rx_desc->wb.qword0.lo_dword.l2tag1;
+
+ f5 = xdp_hints_set_vlan(common, le16_to_cpu(vlan_tag),
+ htons(ETH_P_8021Q));
+ }
+
+ xdp_hints_set_flags(common, (f1 | f2 | f3 | f4 | f5));
+ common->btf_id = btf_id;
+ xdp->data_meta = xdp->data - btf_sz;
+
+ xdp_buff_set_hints(xdp, BTF_ORIGIN_MODULE, true);
+}
+
+
/**
* i40e_cleanup_headers - Correct empty headers
* @rx_ring: rx descriptor ring packet is being transacted on
@@ -2497,7 +2617,7 @@ static int i40e_clean_rx_irq(struct i40e_ring *rx_ring, int budget)
*/
dma_rmb();
- if (i40e_rx_is_programming_status(qword)) {
+ if (unlikely(i40e_rx_is_programming_status(qword))) {
i40e_clean_programming_status(rx_ring,
rx_desc->raw.qword[0],
qword);
@@ -2524,6 +2644,8 @@ static int i40e_clean_rx_irq(struct i40e_ring *rx_ring, int budget)
rx_buffer->page_offset - offset;
xdp_prepare_buff(&xdp, hard_start, offset, size, true);
xdp_buff_clear_frags_flag(&xdp);
+ prefetchw(xdp.data - 8); /* xdp.data_meta cacheline */
+ i40e_process_xdp_hints(rx_ring, rx_desc, &xdp, qword);
#if (PAGE_SIZE > 4096)
/* At larger PAGE_SIZE, frame_sz depend on len size */
xdp.frame_sz = i40e_rx_frame_truesize(rx_ring, size);
