net: mana: Add PF and XDP_REDIRECT support
Haiyang Zhang
maintainerv2 cover net: mana: Add PF and XDP_REDIRECT support
The patch set adds PF and XDP_REDIRECT support.
Dexuan Cui (1):
net: mana: Add the Linux MANA PF driver
Haiyang Zhang (1):
net: mana: Add support of XDP_REDIRECT action
drivers/net/ethernet/microsoft/mana/gdma.h | 10 ++ .../net/ethernet/microsoft/mana/gdma_main.c | 39 ++++- .../net/ethernet/microsoft/mana/hw_channel.c | 18 ++- .../net/ethernet/microsoft/mana/hw_channel.h | 5 + drivers/net/ethernet/microsoft/mana/mana.h | 70 +++++++++ .../net/ethernet/microsoft/mana/mana_bpf.c | 64 ++++++++ drivers/net/ethernet/microsoft/mana/mana_en.c | 148 +++++++++++++++++- .../ethernet/microsoft/mana/mana_ethtool.c | 12 +- 8 files changed, 360 insertions(+), 6 deletions(-)
Signature · 1 line
2.25.1
Haiyang Zhang
maintainerPATCH v2 1/2 net: mana: Add the Linux MANA PF driver
From: Dexuan Cui <[email protected]>
This minimal PF driver runs on bare metal.
Currently Ethernet TX/RX works. SR-IOV management is not supported yet.
--- drivers/net/ethernet/microsoft/mana/gdma.h | 10 ++ .../net/ethernet/microsoft/mana/gdma_main.c | 39 ++++- .../net/ethernet/microsoft/mana/hw_channel.c | 18 ++- .../net/ethernet/microsoft/mana/hw_channel.h | 5 + drivers/net/ethernet/microsoft/mana/mana.h | 64 +++++++++ drivers/net/ethernet/microsoft/mana/mana_en.c | 135 ++++++++++++++++++ 6 files changed, 267 insertions(+), 4 deletions(-)
drivers/net/ethernet/microsoft/mana/gdma.h +10 -0
@@ -348,6 +348,7 @@ struct gdma_context {struct completion eq_test_event;u32 test_event_eq_id; +bool is_pf;void __iomem *bar0_va;void __iomem *shm_base;void __iomem *db_page_base;
@@ -469,6 +470,15 @@ struct gdma_eqe {#define GDMA_REG_DB_PAGE_SIZE 0x10#define GDMA_REG_SHM_OFFSET 0x18 +#define GDMA_PF_REG_DB_PAGE_SIZE 0xD0 +#define GDMA_PF_REG_DB_PAGE_OFF 0xC8 +#define GDMA_PF_REG_SHM_OFF 0x70 + +#define GDMA_SRIOV_REG_CFG_BASE_OFF 0x108 + +#define MANA_PF_DEVICE_ID 0x00B9 +#define MANA_VF_DEVICE_ID 0x00BA +struct gdma_posted_wqe_info {u32 wqe_size_in_bu; };
drivers/net/ethernet/microsoft/mana/gdma_main.c +36 -3
@@ -18,7 +18,24 @@ static u64 mana_gd_r64(struct gdma_context *g, u64 offset)return readq (g->bar0_va + offset); } -static void mana_gd_init_registers (struct pci_dev *pdev) +static void mana_gd_init_pf_regs (struct pci_dev *pdev) +{ +struct gdma_context *gc =pci_get_drvdata (pdev); +void __iomem *sriov_base_va; +u64 sriov_base_off; + + gc->db_page_size =mana_gd_r32 (gc,GDMA_PF_REG_DB_PAGE_SIZE ) &0xFFFF ; + gc->db_page_base = gc->bar0_va + +mana_gd_r64 (gc,GDMA_PF_REG_DB_PAGE_OFF ); + + sriov_base_off =mana_gd_r64 (gc,GDMA_SRIOV_REG_CFG_BASE_OFF ); + + sriov_base_va = gc->bar0_va + sriov_base_off; + gc->shm_base = sriov_base_va + +mana_gd_r64 (gc, sriov_base_off +GDMA_PF_REG_SHM_OFF ); +} + +static void mana_gd_init_vf_regs (struct pci_dev *pdev) {struct gdma_context *gc =pci_get_drvdata (pdev);
@@ -30,6 +47,16 @@ static void mana_gd_init_registers(struct pci_dev *pdev) gc->shm_base = gc->bar0_va +mana_gd_r64 (gc,GDMA_REG_SHM_OFFSET ); } +static void mana_gd_init_registers (struct pci_dev *pdev) +{ +struct gdma_context *gc =pci_get_drvdata (pdev); + +if (gc->is_pf) +mana_gd_init_pf_regs (pdev); +else +mana_gd_init_vf_regs (pdev); +} +static int mana_gd_query_max_resources (struct pci_dev *pdev) {struct gdma_context *gc =pci_get_drvdata (pdev);
@@ -1304,6 +1331,11 @@ static void mana_gd_cleanup(struct pci_dev *pdev)mana_gd_remove_irqs (pdev); } +static bool mana_is_pf (unsigned short dev_id) +{ +return dev_id ==MANA_PF_DEVICE_ID ; +} +static int mana_gd_probe (struct pci_dev *pdev,const struct pci_device_id *ent) {struct gdma_context *gc;
@@ -1340,10 +1372,10 @@ static int mana_gd_probe(struct pci_dev *pdev, const struct pci_device_id *ent)if (!bar0_va) goto free_gc; + gc->is_pf =mana_is_pf (pdev->device); gc->bar0_va = bar0_va; gc->dev = &pdev->dev; - err =mana_gd_setup (pdev);if (err) goto unmap_bar;
@@ -1438,7 +1470,8 @@ static void mana_gd_shutdown(struct pci_dev *pdev)#endif static const struct pci_device_id mana_id_table[] = { - {PCI_DEVICE (PCI_VENDOR_ID_MICROSOFT ,0x00BA ) }, + {PCI_DEVICE (PCI_VENDOR_ID_MICROSOFT ,MANA_PF_DEVICE_ID ) }, + {PCI_DEVICE (PCI_VENDOR_ID_MICROSOFT ,MANA_VF_DEVICE_ID ) }, { } };
drivers/net/ethernet/microsoft/mana/hw_channel.c +17 -1
@@ -158,6 +158,14 @@ static void mana_hwc_init_event_handler(void *ctx, struct gdma_queue *q_self, hwc->rxq->msg_buf->gpa_mkey = val; hwc->txq->msg_buf->gpa_mkey = val;break ; + +case HWC_INIT_DATA_PF_DEST_RQ_ID : + hwc->pf_dest_vrq_id = val; +break ; + +case HWC_INIT_DATA_PF_DEST_CQ_ID : + hwc->pf_dest_vrcq_id = val; +break ; }break ;
@@ -773,10 +781,13 @@ void mana_hwc_destroy_channel(struct gdma_context *gc)int mana_hwc_send_request (struct hw_channel_context *hwc,u32 req_len,const void *req,u32 resp_len,void *resp) { +struct gdma_context *gc = hwc->gdma_dev->gdma_context;struct hwc_work_request *tx_wr;struct hwc_wq *txq = hwc->txq;struct gdma_req_hdr *req_msg;struct hwc_caller_ctx *ctx; +u32 dest_vrcq =0 ; +u32 dest_vrq =0 ;u16 msg_id;int err;
@@ -803,7 +814,12 @@ int mana_hwc_send_request(struct hw_channel_context *hwc, u32 req_len, tx_wr->msg_size = req_len; - err =mana_hwc_post_tx_wqe (txq, tx_wr,0 ,0 , false); +if (gc->is_pf) { + dest_vrq = hwc->pf_dest_vrq_id; + dest_vrcq = hwc->pf_dest_vrcq_id; + } + + err =mana_hwc_post_tx_wqe (txq, tx_wr, dest_vrq, dest_vrcq, false);if (err) {dev_err (hwc->dev,"HWC: Failed to post send WQE: %d\n" , err); goto out;
drivers/net/ethernet/microsoft/mana/hw_channel.h +5 -0
@@ -20,6 +20,8 @@#define HWC_INIT_DATA_MAX_NUM_CQS 7#define HWC_INIT_DATA_PDID 8#define HWC_INIT_DATA_GPA_MKEY 9 +#define HWC_INIT_DATA_PF_DEST_RQ_ID 10 +#define HWC_INIT_DATA_PF_DEST_CQ_ID 11/* Structures labeled with "HW DATA" are exchanged with the hardware. All of * them are naturally aligned and hence don't need __packed.
@@ -178,6 +180,9 @@ struct hw_channel_context {struct semaphore sema;struct gdma_resource inflight_msg_res; +u32 pf_dest_vrq_id; +u32 pf_dest_vrcq_id; +struct hwc_caller_ctx *caller_ctx; };
drivers/net/ethernet/microsoft/mana/mana.h +64 -0
82 lines not on this page · raw message
drivers/net/ethernet/microsoft/mana/mana_en.c +135 -0
189 lines not on this page · raw message
Signature · 1 line
2.25.1
Haiyang Zhang
maintainerPATCH v2 2/2 net: mana: Add support of XDP_REDIRECT action
In reply to Haiyang ZhangAdd a handler of the XDP_REDIRECT return code from a XDP program. The packets will be flushed at the end of each RX/CQ NAPI poll cycle. ndo_xdp_xmit() is implemented by sharing the code in mana_xdp_tx(). Ethtool per queue counters are added for XDP redirect and xmit operations.
--- drivers/net/ethernet/microsoft/mana/mana.h | 6 ++ .../net/ethernet/microsoft/mana/mana_bpf.c | 64 +++++++++++++++++++ drivers/net/ethernet/microsoft/mana/mana_en.c | 13 +++- .../ethernet/microsoft/mana/mana_ethtool.c | 12 +++- 4 files changed, 93 insertions(+), 2 deletions(-)
drivers/net/ethernet/microsoft/mana/mana.h +6 -0
@@ -53,12 +53,14 @@ struct mana_stats_rx {u64 bytes;u64 xdp_drop;u64 xdp_tx; +u64 xdp_redirect;struct u64_stats_sync syncp; };struct mana_stats_tx {u64 packets;u64 bytes; +u64 xdp_xmit;struct u64_stats_sync syncp; };
@@ -311,6 +313,8 @@ struct mana_rxq {struct bpf_prog __rcu *bpf_prog;struct xdp_rxq_info xdp_rxq;struct page *xdp_save_page; +bool xdp_flush; +int xdp_rc;/* XDP redirect return code */ /* MUST BE THE LAST MEMBER: * Each receive buffer has an associated mana_recv_buf_oob.
@@ -396,6 +400,8 @@ int mana_probe(struct gdma_dev *gd, bool resuming);void mana_remove (struct gdma_dev *gd,bool suspending);void mana_xdp_tx (struct sk_buff *skb,struct net_device *ndev); +int mana_xdp_xmit (struct net_device *ndev,int n,struct xdp_frame **frames, +u32 flags);u32 mana_run_xdp (struct net_device *ndev,struct mana_rxq *rxq,struct xdp_buff *xdp,void *buf_va,uint pkt_len);struct bpf_prog *mana_xdp_get (struct mana_port_context *apc);
drivers/net/ethernet/microsoft/mana/mana_bpf.c +64 -0
85 lines not on this page · raw message
drivers/net/ethernet/microsoft/mana/mana_en.c +12 -1
@@ -6,6 +6,7 @@#include <linux/inetdevice.h> #include <linux/etherdevice.h> #include <linux/ethtool.h> +#include <linux/filter.h> #include <linux/mm.h> #include <net/checksum.h>
@@ -382,6 +383,7 @@ static const struct net_device_ops mana_devops = { .ndo_validate_addr = eth_validate_addr, .ndo_get_stats64 = mana_get_stats64, .ndo_bpf = mana_bpf, + .ndo_xdp_xmit = mana_xdp_xmit, };static void mana_cleanup_port_context (struct mana_port_context *apc)
@@ -1120,6 +1122,9 @@ static void mana_rx_skb(void *buf_va, struct mana_rxcomp_oob *cqe, act =mana_run_xdp (ndev, rxq, &xdp, buf_va, pkt_len); +if (act ==XDP_REDIRECT && !rxq->xdp_rc) +return ; +if (act !=XDP_PASS && act !=XDP_TX ) goto drop_xdp;
@@ -1275,11 +1280,14 @@ static void mana_process_rx_cqe(struct mana_rxq *rxq, struct mana_cq *cq,static void mana_poll_rx_cq (struct mana_cq *cq) {struct gdma_comp *comp = cq->gdma_comp_buf; +struct mana_rxq *rxq = cq->rxq;int comp_read, i; comp_read =mana_gd_poll_cq (cq->gdma_cq, comp,CQE_POLLING_BUFFER );WARN_ON_ONCE (comp_read >CQE_POLLING_BUFFER ); + rxq->xdp_flush = false; +for (i =0 ; i < comp_read; i++) {if (WARN_ON_ONCE (comp[i].is_sq))return ;
@@ -1288,8 +1296,11 @@ static void mana_poll_rx_cq(struct mana_cq *cq)if (WARN_ON_ONCE (comp[i].wq_num != cq->rxq->gdma_id))return ; -mana_process_rx_cqe (cq->rxq, cq, &comp[i]); +mana_process_rx_cqe (rxq, cq, &comp[i]); } + +if (rxq->xdp_flush) +xdp_do_flush (); }static void mana_cq_handler (void *context,struct gdma_queue *gdma_queue)
drivers/net/ethernet/microsoft/mana/mana_ethtool.c +11 -1
@@ -23,7 +23,7 @@ static int mana_get_sset_count(struct net_device *ndev, int stringset)if (stringset !=ETH_SS_STATS )return -EINVAL ; -return ARRAY_SIZE (mana_eth_stats) + num_queues *6 ; +return ARRAY_SIZE (mana_eth_stats) + num_queues *8 ; }static void mana_get_strings (struct net_device *ndev,u32 stringset,u8 *data)
@@ -50,6 +50,8 @@ static void mana_get_strings(struct net_device *ndev, u32 stringset, u8 *data) p +=ETH_GSTRING_LEN ;sprintf (p,"rx_%d_xdp_tx" , i); p +=ETH_GSTRING_LEN ; +sprintf (p,"rx_%d_xdp_redirect" , i); + p +=ETH_GSTRING_LEN ; }for (i =0 ; i < num_queues; i++) {
@@ -57,6 +59,8 @@ static void mana_get_strings(struct net_device *ndev, u32 stringset, u8 *data) p +=ETH_GSTRING_LEN ;sprintf (p,"tx_%d_bytes" , i); p +=ETH_GSTRING_LEN ; +sprintf (p,"tx_%d_xdp_xmit" , i); + p +=ETH_GSTRING_LEN ; } }
@@ -70,6 +74,8 @@ static void mana_get_ethtool_stats(struct net_device *ndev,struct mana_stats_tx *tx_stats;unsigned int start;u64 packets, bytes; +u64 xdp_redirect; +u64 xdp_xmit;u64 xdp_drop;u64 xdp_tx;int q, i =0 ;
@@ -89,12 +95,14 @@ static void mana_get_ethtool_stats(struct net_device *ndev, bytes = rx_stats->bytes; xdp_drop = rx_stats->xdp_drop; xdp_tx = rx_stats->xdp_tx; + xdp_redirect = rx_stats->xdp_redirect; }while (u64_stats_fetch_retry_irq (&rx_stats->syncp, start)); data[i++] = packets; data[i++] = bytes; data[i++] = xdp_drop; data[i++] = xdp_tx; + data[i++] = xdp_redirect; }for (q =0 ; q < num_queues; q++) {
@@ -104,10 +112,12 @@ static void mana_get_ethtool_stats(struct net_device *ndev, start =u64_stats_fetch_begin_irq (&tx_stats->syncp); packets = tx_stats->packets; bytes = tx_stats->bytes; + xdp_xmit = tx_stats->xdp_xmit; }while (u64_stats_fetch_retry_irq (&tx_stats->syncp, start)); data[i++] = packets; data[i++] = bytes; + data[i++] = xdp_xmit; } }
Signature · 1 line
2.25.1
This series was applied to netdev/net-next.git (master) by Paolo Abeni <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (master) by Paolo Abeni <[email protected]>:
Quoted 9 lines · On Tue, 14 Jun 2022 13:28:53 -0700 you wrote:
The patch set adds PF and
XDP_REDIRECTsupport.Dexuan Cui (1):
net: mana: Add the Linux MANA PF driverHaiyang Zhang (1):
net: mana: Add support ofXDP_REDIRECTaction[...]
Here is the summary with links:
- [net-next,v2,1/2] net: mana: Add the Linux MANA PF driver
https://git.kernel.org/netdev/net-next/c/1566e7d6206f - [net-next,v2,2/2] net: mana: Add support of XDP_REDIRECT action https://git.kernel.org/netdev/net-next/c/7a8938cd024d
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html