Add GVE Features
Subsystems (3)
v3 cover Add GVE Features
Changes from v2:
Patch 3: Removed white space changes.
Patch 4: Removed 24-bit dma mask, clearer commit message.
Patch 5: Removed pointless loops (only one priv flag exists currently),
Removed unused function (gve_set_report_stats),
Removed report-stats log statement, use ethtool stat instead (stats_report_trigger_cnt).
Catherine Sullivan (2):
gve: Use dev_info/err instead of netif_info/err.
gve: Add support for dma_mask register
David Awogbemila (2):
gve: NIC stats for report-stats and for ethtool
gve: Enable Link Speed Reporting in the driver.
Kuo Zhao (3):
gve: Get and set Rx copybreak via ethtool
gve: Add stats for gve.
gve: Add Gvnic stats AQ command and ethtool show/set-priv-flags.
Patricio Noyola (1):
gve: Use link status register to report link status
Sagi Shahar (1):
gve: Batch AQ commands for creating and destroying queues.
drivers/net/ethernet/google/gve/gve.h | 107 +++++- drivers/net/ethernet/google/gve/gve_adminq.c | 316 +++++++++++++-- drivers/net/ethernet/google/gve/gve_adminq.h | 62 ++- drivers/net/ethernet/google/gve/gve_ethtool.c | 361 ++++++++++++++++-- drivers/net/ethernet/google/gve/gve_main.c | 331 ++++++++++++---- .../net/ethernet/google/gve/gve_register.h | 4 +- drivers/net/ethernet/google/gve/gve_rx.c | 37 +- 7 files changed, 1039 insertions(+), 179 deletions(-)
Signature · 1 line
2.28.0.526.ge36021eeef-goog
PATCH v3 1/9 gve: Get and set Rx copybreak via ethtool
From: Kuo Zhao <[email protected]>
This adds support for getting and setting the RX copybreak value via ethtool.
--- drivers/net/ethernet/google/gve/gve_ethtool.c | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+)
drivers/net/ethernet/google/gve/gve_ethtool.c +34 -0
@@ -230,6 +230,38 @@ static int gve_user_reset(struct net_device *netdev, u32 *flags)return -EOPNOTSUPP ; } +static int gve_get_tunable (struct net_device *netdev, +const struct ethtool_tunable *etuna,void *value) +{ +struct gve_priv *priv =netdev_priv (netdev); + +switch (etuna->id) { +case ETHTOOL_RX_COPYBREAK : + *(u32 *)value = priv->rx_copybreak; +return 0 ; +default : +return -EOPNOTSUPP ; + } +} + +static int gve_set_tunable (struct net_device *netdev, +const struct ethtool_tunable *etuna,const void *value) +{ +struct gve_priv *priv =netdev_priv (netdev); +u32 len; + +switch (etuna->id) { +case ETHTOOL_RX_COPYBREAK : + len = *(u32 *)value; +if (len >PAGE_SIZE /2 ) +return -EINVAL ; + priv->rx_copybreak = len; +return 0 ; +default : +return -EOPNOTSUPP ; + } +} +const struct ethtool_ops gve_ethtool_ops = { .get_drvinfo = gve_get_drvinfo, .get_strings = gve_get_strings,
@@ -242,4 +274,6 @@ const struct ethtool_ops gve_ethtool_ops = { .get_link = ethtool_op_get_link, .get_ringparam = gve_get_ringparam, .reset = gve_user_reset, + .get_tunable = gve_get_tunable, + .set_tunable = gve_set_tunable, };
Signature · 1 line
2.28.0.526.ge36021eeef-goog
PATCH v3 2/9 gve: Add stats for gve.
In reply to David AwogbemilaFrom: Kuo Zhao <[email protected]>
Sample output of "ethtool -S <interface-name>" with 1 RX queue and 1 TX queue:
NIC statistics:
rx_packets: 1039
tx_packets: 37
rx_bytes: 822071
tx_bytes: 4100
rx_dropped: 0
tx_dropped: 0
tx_timeouts: 0
rx_skb_alloc_fail: 0
rx_buf_alloc_fail: 0
rx_desc_err_dropped_pkt: 0
interface_up_cnt: 1
interface_down_cnt: 0
reset_cnt: 0
page_alloc_fail: 0
dma_mapping_error: 0
rx_posted_desc[0]: 1365
rx_completed_desc[0]: 341
rx_bytes[0]: 215094
rx_dropped_pkt[0]: 0
rx_copybreak_pkt[0]: 3
rx_copied_pkt[0]: 3
tx_posted_desc[0]: 6
tx_completed_desc[0]: 6
tx_bytes[0]: 420
tx_wake[0]: 0
tx_stop[0]: 0
tx_event_counter[0]: 6
adminq_prod_cnt: 34
adminq_cmd_fail: 0
adminq_timeouts: 0
adminq_describe_device_cnt: 1
adminq_cfg_device_resources_cnt: 1
adminq_register_page_list_cnt: 16
adminq_unregister_page_list_cnt: 0
adminq_create_tx_queue_cnt: 8
adminq_create_rx_queue_cnt: 8
adminq_destroy_tx_queue_cnt: 0
adminq_destroy_rx_queue_cnt: 0
adminq_dcfg_device_resources_cnt: 0
adminq_set_driver_parameter_cnt: 0--- drivers/net/ethernet/google/gve/gve.h | 28 +++- drivers/net/ethernet/google/gve/gve_adminq.c | 65 +++++++- drivers/net/ethernet/google/gve/gve_ethtool.c | 149 ++++++++++++++---- drivers/net/ethernet/google/gve/gve_main.c | 15 +- drivers/net/ethernet/google/gve/gve_rx.c | 37 ++++- 5 files changed, 246 insertions(+), 48 deletions(-)
drivers/net/ethernet/google/gve/gve.h +27 -1
@@ -71,6 +71,11 @@ struct gve_rx_ring {u32 cnt;/* free-running total number of completed packets */ u32 fill_cnt;/* free-running total number of descs and buffs posted */ u32 mask;/* masks the cnt and fill_cnt to the size of the ring */ +u64 rx_copybreak_pkt;/* free-running count of copybreak packets */ +u64 rx_copied_pkt;/* free-running total number of copied packets */ +u64 rx_skb_alloc_fail;/* free-running count of skb alloc fails */ +u64 rx_buf_alloc_fail;/* free-running count of buffer alloc fails */ +u64 rx_desc_err_dropped_pkt;/* free-running count of packets dropped by descriptor error */ u32 q_num;/* queue index */ u32 ntfy_id;/* notification block index */ struct gve_queue_resources *q_resources;/* head and tail pointer idx */
@@ -202,6 +207,26 @@ struct gve_priv {dma_addr_t adminq_bus_addr;u32 adminq_mask;/* masks prod_cnt to adminq size */ u32 adminq_prod_cnt;/* free-running count of AQ cmds executed */ +u32 adminq_cmd_fail;/* free-running count of AQ cmds failed */ +u32 adminq_timeouts;/* free-running count of AQ cmds timeouts */ +/* free-running count of per AQ cmd executed */ +u32 adminq_describe_device_cnt; +u32 adminq_cfg_device_resources_cnt; +u32 adminq_register_page_list_cnt; +u32 adminq_unregister_page_list_cnt; +u32 adminq_create_tx_queue_cnt; +u32 adminq_create_rx_queue_cnt; +u32 adminq_destroy_tx_queue_cnt; +u32 adminq_destroy_rx_queue_cnt; +u32 adminq_dcfg_device_resources_cnt; +u32 adminq_set_driver_parameter_cnt; + +/* Global stats */ +u32 interface_up_cnt;/* count of times interface turned up since last reset */ +u32 interface_down_cnt;/* count of times interface turned down since last reset */ +u32 reset_cnt;/* count of reset */ +u32 page_alloc_fail;/* count of page alloc fails */ +u32 dma_mapping_error;/* count of dma mapping errors */ struct workqueue_struct *gve_wq;struct work_struct service_task;
@@ -426,7 +451,8 @@ static inline bool gve_can_recycle_pages(struct net_device *dev) }/* buffers */ -int gve_alloc_page (struct device *dev,struct page **page,dma_addr_t *dma, +int gve_alloc_page (struct gve_priv *priv,struct device *dev, +struct page **page,dma_addr_t *dma,enum dma_data_direction );void gve_free_page (struct device *dev,struct page *page,dma_addr_t dma,enum dma_data_direction );
drivers/net/ethernet/google/gve/gve_adminq.c +58 -7
110 lines not on this page · raw message
drivers/net/ethernet/google/gve/gve_ethtool.c +120 -29
238 lines not on this page · raw message
drivers/net/ethernet/google/gve/gve_main.c +12 -3
@@ -514,14 +514,18 @@ static void gve_free_rings(struct gve_priv *priv) } } -int gve_alloc_page (struct device *dev,struct page **page,dma_addr_t *dma, +int gve_alloc_page (struct gve_priv *priv,struct device *dev, +struct page **page,dma_addr_t *dma,enum dma_data_direction dir) { *page =alloc_page (GFP_KERNEL ); -if (!*page) +if (!*page) { + priv->page_alloc_fail++;return -ENOMEM ; + } *dma =dma_map_page (dev, *page,0 ,PAGE_SIZE , dir);if (dma_mapping_error (dev, *dma)) { + priv->dma_mapping_error++;put_page (*page);return -ENOMEM ; }
@@ -556,7 +560,7 @@ static int gve_alloc_queue_page_list(struct gve_priv *priv, u32 id,return -ENOMEM ;for (i =0 ; i < pages; i++) { - err =gve_alloc_page (&priv->pdev->dev, &qpl->pages[i], + err =gve_alloc_page (priv, &priv->pdev->dev, &qpl->pages[i], &qpl->page_buses[i],gve_qpl_dma_dir (priv, id));/* caller handles clean up */
@@ -697,6 +701,7 @@ static int gve_open(struct net_device *dev)gve_turnup (priv);netif_carrier_on (dev); + priv->interface_up_cnt++;return 0 ; free_rings:
@@ -738,6 +743,7 @@ static int gve_close(struct net_device *dev)gve_free_rings (priv);gve_free_qpls (priv); + priv->interface_down_cnt++;return 0 ; err:
@@ -1047,6 +1053,9 @@ int gve_reset(struct gve_priv *priv, bool attempt_teardown)/* Set it all back up */ err =gve_reset_recovery (priv, was_up);gve_clear_reset_in_progress (priv); + priv->reset_cnt++; + priv->interface_up_cnt =0 ; + priv->interface_down_cnt =0 ;return err; }
drivers/net/ethernet/google/gve/gve_rx.c +29 -8
@@ -225,7 +225,8 @@ static enum pkt_hash_types gve_rss_type(__be16 pkt_flags)return PKT_HASH_TYPE_L2 ; } -static struct sk_buff *gve_rx_copy (struct net_device *dev, +static struct sk_buff *gve_rx_copy (struct gve_rx_ring *rx, +struct net_device *dev,struct napi_struct *napi,struct gve_rx_slot_page_info *page_info,u16 len)
@@ -242,6 +243,11 @@ static struct sk_buff *gve_rx_copy(struct net_device *dev,skb_copy_to_linear_data (skb, va, len); skb->protocol =eth_type_trans (skb, dev); + +u64_stats_update_begin (&rx->statss); + rx->rx_copied_pkt++; +u64_stats_update_end (&rx->statss); +return skb; }
@@ -284,8 +290,12 @@ static bool gve_rx(struct gve_rx_ring *rx, struct gve_rx_desc *rx_desc,u16 len;/* drop this packet */ -if (unlikely (rx_desc->flags_seq &GVE_RXF_ERR )) +if (unlikely (rx_desc->flags_seq &GVE_RXF_ERR )) { +u64_stats_update_begin (&rx->statss); + rx->rx_desc_err_dropped_pkt++; +u64_stats_update_end (&rx->statss);return true; + } len =be16_to_cpu (rx_desc->len) -GVE_RX_PAD ; page_info = &rx->data.page_info[idx];
@@ -300,11 +310,14 @@ static bool gve_rx(struct gve_rx_ring *rx, struct gve_rx_desc *rx_desc,if (PAGE_SIZE ==4096 ) {if (len <= priv->rx_copybreak) {/* Just copy small packets */ - skb =gve_rx_copy (dev, napi, page_info, len); + skb =gve_rx_copy (rx, dev, napi, page_info, len); +u64_stats_update_begin (&rx->statss); + rx->rx_copybreak_pkt++; +u64_stats_update_end (&rx->statss); goto have_skb; }if (unlikely (!gve_can_recycle_pages (dev))) { - skb =gve_rx_copy (dev, napi, page_info, len); + skb =gve_rx_copy (rx, dev, napi, page_info, len); goto have_skb; } pagecount =page_count (page_info->page);
@@ -314,8 +327,12 @@ static bool gve_rx(struct gve_rx_ring *rx, struct gve_rx_desc *rx_desc,* stack. */ skb =gve_rx_add_frags (dev, napi, page_info, len); -if (!skb) +if (!skb) { +u64_stats_update_begin (&rx->statss); + rx->rx_skb_alloc_fail++; +u64_stats_update_end (&rx->statss);return true; + }/* Make sure the kernel stack can't release the page */ get_page (page_info->page);/* "flip" to other packet buffer on this page */
@@ -324,21 +341,25 @@ static bool gve_rx(struct gve_rx_ring *rx, struct gve_rx_desc *rx_desc,/* We have previously passed the other half of this * page up the stack, but it has not yet been freed. */ - skb =gve_rx_copy (dev, napi, page_info, len); + skb =gve_rx_copy (rx, dev, napi, page_info, len); }else {WARN (pagecount <1 ,"Pagecount should never be < 1" );return false; } }else { - skb =gve_rx_copy (dev, napi, page_info, len); + skb =gve_rx_copy (rx, dev, napi, page_info, len); } have_skb:/* We didn't manage to allocate an skb but we haven't had any * reset worthy failures. */ -if (!skb) +if (!skb) { +u64_stats_update_begin (&rx->statss); + rx->rx_skb_alloc_fail++; +u64_stats_update_end (&rx->statss);return true; + }if (likely (feat &NETIF_F_RXCSUM )) {/* NIC passes up the partial sum */
Signature · 1 line
2.28.0.526.ge36021eeef-goog
PATCH v3 3/9 gve: Use dev_info/err instead of netif_info/err.
In reply to David AwogbemilaFrom: Catherine Sullivan <[email protected]>
Update the driver to use dev_info/err instead of netif_info/err.
--- drivers/net/ethernet/google/gve/gve_adminq.c | 15 ++++++--------- drivers/net/ethernet/google/gve/gve_main.c | 10 +++++----- 2 files changed, 11 insertions(+), 14 deletions(-)
drivers/net/ethernet/google/gve/gve_adminq.c +6 -9
@@ -334,8 +334,7 @@ int gve_adminq_describe_device(struct gve_priv *priv) priv->tx_desc_cnt =be16_to_cpu (descriptor->tx_queue_entries);if (priv->tx_desc_cnt *sizeof (priv->tx->desc[0 ]) <PAGE_SIZE ) { -netif_err (priv, drv, priv->dev,"Tx desc count %d too low\n" , - priv->tx_desc_cnt); +dev_err (&priv->pdev->dev,"Tx desc count %d too low\n" , priv->tx_desc_cnt); err = -EINVAL ; goto free_device_descriptor; }
@@ -344,8 +343,7 @@ int gve_adminq_describe_device(struct gve_priv *priv) < PAGE_SIZE || priv->rx_desc_cnt * sizeof(priv->rx->data.data_ring[0]) < PAGE_SIZE) { -netif_err (priv, drv, priv->dev,"Rx desc count %d too low\n" , - priv->rx_desc_cnt); +dev_err (&priv->pdev->dev,"Rx desc count %d too low\n" , priv->rx_desc_cnt); err = -EINVAL ; goto free_device_descriptor; }
@@ -353,8 +351,7 @@ int gve_adminq_describe_device(struct gve_priv *priv)be64_to_cpu (descriptor->max_registered_pages); mtu =be16_to_cpu (descriptor->mtu);if (mtu <ETH_MIN_MTU ) { -netif_err (priv, drv, priv->dev,"MTU %d below minimum MTU\n" , - mtu); +dev_err (&priv->pdev->dev,"MTU %d below minimum MTU\n" , mtu); err = -EINVAL ; goto free_device_descriptor; }
@@ -362,12 +359,12 @@ int gve_adminq_describe_device(struct gve_priv *priv) priv->num_event_counters =be16_to_cpu (descriptor->counters);ether_addr_copy (priv->dev->dev_addr, descriptor->mac); mac = descriptor->mac; -netif_info (priv, drv, priv->dev,"MAC addr: %pM\n" , mac); +dev_info (&priv->pdev->dev,"MAC addr: %pM\n" , mac); priv->tx_pages_per_qpl =be16_to_cpu (descriptor->tx_pages_per_qpl); priv->rx_pages_per_qpl =be16_to_cpu (descriptor->rx_pages_per_qpl);if (priv->rx_pages_per_qpl < priv->rx_desc_cnt) { -netif_err (priv, drv, priv->dev,"rx_pages_per_qpl cannot be smaller than rx_desc_cnt, setting rx_desc_cnt down to %d.\n" , - priv->rx_pages_per_qpl); +dev_err (&priv->pdev->dev,"rx_pages_per_qpl cannot be smaller than rx_desc_cnt, setting rx_desc_cnt down to %d.\n" , + priv->rx_pages_per_qpl); priv->rx_desc_cnt = priv->rx_pages_per_qpl; } priv->default_num_queues =be16_to_cpu (descriptor->default_num_queues);
drivers/net/ethernet/google/gve/gve_main.c +5 -5
@@ -930,7 +930,7 @@ static int gve_init_priv(struct gve_priv *priv, bool skip_describe_device) priv->dev->max_mtu =PAGE_SIZE ; err =gve_adminq_set_mtu (priv, priv->dev->mtu);if (err) { -netif_err (priv, drv, priv->dev,"Could not set mtu" ); +dev_err (&priv->pdev->dev,"Could not set mtu" ); goto err; } }
@@ -970,10 +970,10 @@ static int gve_init_priv(struct gve_priv *priv, bool skip_describe_device) priv->rx_cfg.num_queues); } -netif_info (priv, drv, priv->dev,"TX queues %d, RX queues %d\n" , - priv->tx_cfg.num_queues, priv->rx_cfg.num_queues); -netif_info (priv, drv, priv->dev,"Max TX queues %d, Max RX queues %d\n" , - priv->tx_cfg.max_queues, priv->rx_cfg.max_queues); +dev_info (&priv->pdev->dev,"TX queues %d, RX queues %d\n" , + priv->tx_cfg.num_queues, priv->rx_cfg.num_queues); +dev_info (&priv->pdev->dev,"Max TX queues %d, Max RX queues %d\n" , + priv->tx_cfg.max_queues, priv->rx_cfg.max_queues); setup_device: err =gve_setup_device_resources (priv);
Signature · 1 line
2.28.0.526.ge36021eeef-goog
PATCH v3 4/9 gve: Add support for dma_mask register
In reply to David AwogbemilaFrom: Catherine Sullivan <[email protected]>
Add the dma_mask register and read it to set the dma_masks.
gve_alloc_page will alloc_page with:
GFP_DMA32 if priv->dma_mask is 32.
This helps in 32-bit device address cases where the guest would run out of SWIOTLB space. Since its buffers would be allocated GFP_DMA32, there would be less pressure on SWIOTLB.
--- drivers/net/ethernet/google/gve/gve.h | 6 ++- drivers/net/ethernet/google/gve/gve_main.c | 40 ++++++++++++------- .../net/ethernet/google/gve/gve_register.h | 3 +- 3 files changed, 32 insertions(+), 17 deletions(-)
drivers/net/ethernet/google/gve/gve.h +4 -2
@@ -232,6 +232,9 @@ struct gve_priv {struct work_struct service_task;unsigned long service_task_flags;unsigned long state_flags; + +/* Gvnic device's dma mask, set during probe. */ +u8 dma_mask; };enum gve_service_task_flags {
@@ -451,8 +454,7 @@ static inline bool gve_can_recycle_pages(struct net_device *dev) }/* buffers */ -int gve_alloc_page (struct gve_priv *priv,struct device *dev, -struct page **page,dma_addr_t *dma, +int gve_alloc_page (struct gve_priv *priv,struct device *dev,struct page **page,dma_addr_t *dma,enum dma_data_direction );void gve_free_page (struct device *dev,struct page *page,dma_addr_t dma,enum dma_data_direction );
drivers/net/ethernet/google/gve/gve_main.c +26 -14
@@ -518,7 +518,12 @@ int gve_alloc_page(struct gve_priv *priv, struct device *dev, struct page **page, dma_addr_t *dma, enum dma_data_direction dir) { - *page =alloc_page (GFP_KERNEL ); + gfp_t gfp_flags = GFP_KERNEL; + +if (priv->dma_mask ==32 ) + gfp_flags |=GFP_DMA32 ; + + *page =alloc_page (gfp_flags);if (!*page) { priv->page_alloc_fail++;return -ENOMEM ;
@@ -1083,6 +1088,7 @@ static int gve_probe(struct pci_dev *pdev, const struct pci_device_id *ent)__be32 __iomem *db_bar;struct gve_registers __iomem *reg_bar;struct gve_priv *priv; +u8 dma_mask;int err; err =pci_enable_device (pdev);
@@ -1095,19 +1101,6 @@ static int gve_probe(struct pci_dev *pdev, const struct pci_device_id *ent)pci_set_master (pdev); - err =pci_set_dma_mask (pdev,DMA_BIT_MASK (64 )); -if (err) { -dev_err (&pdev->dev,"Failed to set dma mask: err=%d\n" , err); - goto abort_with_pci_region; - } - - err =pci_set_consistent_dma_mask (pdev,DMA_BIT_MASK (64 )); -if (err) { -dev_err (&pdev->dev, -"Failed to set consistent dma mask: err=%d\n" , err); - goto abort_with_pci_region; - } - reg_bar =pci_iomap (pdev,GVE_REGISTER_BAR ,0 );if (!reg_bar) {dev_err (&pdev->dev,"Failed to map pci bar!\n" );
@@ -1122,10 +1115,28 @@ static int gve_probe(struct pci_dev *pdev, const struct pci_device_id *ent) goto abort_with_reg_bar; } + dma_mask =readb (®_bar->dma_mask); +// Default to 64 if the register isn't set +if (!dma_mask) + dma_mask =64 ;gve_write_version (®_bar->driver_version);/* Get max queues to alloc etherdev */ max_rx_queues =ioread32be (®_bar->max_tx_queues); max_tx_queues =ioread32be (®_bar->max_rx_queues); + + err =pci_set_dma_mask (pdev,DMA_BIT_MASK (64 )); +if (err) { +dev_err (&pdev->dev,"Failed to set dma mask: err=%d\n" , err); + goto abort_with_reg_bar; + } + + err =pci_set_consistent_dma_mask (pdev,DMA_BIT_MASK (64 )); +if (err) { +dev_err (&pdev->dev, +"Failed to set consistent dma mask: err=%d\n" , err); + goto abort_with_reg_bar; + } +/* Alloc and setup the netdev and priv */ dev =alloc_etherdev_mqs (sizeof (*priv), max_tx_queues, max_rx_queues);if (!dev) {
@@ -1158,6 +1169,7 @@ static int gve_probe(struct pci_dev *pdev, const struct pci_device_id *ent) priv->db_bar2 = db_bar; priv->service_task_flags =0x0 ; priv->state_flags =0x0 ; + priv->dma_mask = dma_mask;gve_set_probe_in_progress (priv); priv->gve_wq =alloc_ordered_workqueue ("gve" ,0 );
drivers/net/ethernet/google/gve/gve_register.h +2 -1
@@ -16,7 +16,8 @@ struct gve_registers {__be32 adminq_pfn;__be32 adminq_doorbell;__be32 adminq_event_counter; -u8 reserved[3 ]; +u8 reserved[2 ]; +u8 dma_mask;u8 driver_version; };
Signature · 1 line
2.28.0.526.ge36021eeef-goog
Jakub Kicinski
maintainerRe: [PATCH net-next v3 4/9] gve: Add support for dma_mask register
drivers/net/ethernet/google/gve/gve_main.c static int gve_probe(struct pci_dev *pdev, const struct pci_device_id *ent) · line 1127
Quoted 10 lines · On Tue, 8 Sep 2020 11:39:04 -0700 David Awogbemila wrote:
drivers/net/ethernet/google/gve/gve_main.c +6
-0+ dma_mask =readb (®_bar->dma_mask); +// Default to 64 if the register isn't set +if (!dma_mask) + dma_mask =64 ;gve_write_version (®_bar->driver_version);/* Get max queues to alloc etherdev */ max_rx_queues =ioread32be (®_bar->max_tx_queues); max_tx_queues =ioread32be (®_bar->max_rx_queues); + + err =pci_set_dma_mask (pdev,DMA_BIT_MASK (64 ));
You use the constant 64, not dma_mask?
You jump through hoops to get GFP_DMA allocations yet you don't set the right DMA mask. Why would swiotlb become an issue to you if there never was any reasonable mask set?
drivers/net/ethernet/google/gve/gve_main.c static int gve_probe(struct pci_dev *pdev, const struct pci_device_id *ent) · line 1133
Quoted 6 lines
drivers/net/ethernet/google/gve/gve_main.c +6
-0+if (err) { +dev_err (&pdev->dev,"Failed to set dma mask: err=%d\n" , err); + goto abort_with_reg_bar; + } + + err =pci_set_consistent_dma_mask (pdev,DMA_BIT_MASK (64 ));
dma_set_mask_and_coherent()
Quoted 5 lines
drivers/net/ethernet/google/gve/gve_main.c +5
-0+if (err) { +dev_err (&pdev->dev, +"Failed to set consistent dma mask: err=%d\n" , err); + goto abort_with_reg_bar; + }
Re: [PATCH net-next v3 4/9] gve: Add support for dma_mask register
Quoted 19 lines · Jakub Kicinski
drivers/net/ethernet/google/gve/gve_main.c static int gve_probe(struct pci_dev *pdev, const struct pci_device_id *ent) · line 1127
Quoted 10 lines · On Tue, 8 Sep 2020 11:39:04 -0700 David Awogbemila wrote:
drivers/net/ethernet/google/gve/gve_main.c +6
-0+ dma_mask =readb (®_bar->dma_mask); +// Default to 64 if the register isn't set +if (!dma_mask) + dma_mask =64 ;gve_write_version (®_bar->driver_version);/* Get max queues to alloc etherdev */ max_rx_queues =ioread32be (®_bar->max_tx_queues); max_tx_queues =ioread32be (®_bar->max_rx_queues); + + err =pci_set_dma_mask (pdev,DMA_BIT_MASK (64 ));You use the constant 64, not
dma_mask?You jump through hoops to get
GFP_DMAallocations yet you don't set the right DMA mask. Why would swiotlb become an issue to you if there never was any reasonable mask set?
Quoted 14 lines
drivers/net/ethernet/google/gve/gve_main.c static int gve_probe(struct pci_dev *pdev, const struct pci_device_id *ent) · line 1133
Quoted 6 lines
drivers/net/ethernet/google/gve/gve_main.c +6
-0+if (err) { +dev_err (&pdev->dev,"Failed to set dma mask: err=%d\n" , err); + goto abort_with_reg_bar; + } + + err =pci_set_consistent_dma_mask (pdev,DMA_BIT_MASK (64 ));
dma_set_mask_and_coherent()Quoted 5 lines
drivers/net/ethernet/google/gve/gve_main.c +5
-0+if (err) { +dev_err (&pdev->dev, +"Failed to set consistent dma mask: err=%d\n" , err); + goto abort_with_reg_bar; + }
I think you're right. Setting dma_set_mask_and_coherent(dev, 64) should mean we no longer have the swiotlb issue. I will drop this patch altogether.
PATCH v3 5/9 gve: Add Gvnic stats AQ command and ethtool show/set-priv-flags.
In reply to David AwogbemilaFrom: Kuo Zhao <[email protected]>
This adds functionality to report driver stats to Hypervisor. (Users may want to turn this feature off as a matter of privacy so a "report-stats" flag is added as an ethtool priv option. It is also disabled by default.)
The hypervisor would trigger a stats report in case "too many" packets dropped; the stats would be useful in debugging stuck queues.
A "stats_report_trigger_cnt" stat is added to count the number of times the hypervisor attempts to trigger stats report.
A timer is also added so that when report-stats is enabled, stat are updated once every 20 seconds.
--- drivers/net/ethernet/google/gve/gve.h | 69 ++++++-- drivers/net/ethernet/google/gve/gve_adminq.c | 21 +++ drivers/net/ethernet/google/gve/gve_adminq.h | 38 +++++ drivers/net/ethernet/google/gve/gve_ethtool.c | 111 ++++++++++--- drivers/net/ethernet/google/gve/gve_main.c | 148 +++++++++++++++++- .../net/ethernet/google/gve/gve_register.h | 1 + 6 files changed, 355 insertions(+), 33 deletions(-)
drivers/net/ethernet/google/gve/gve.h +59 -10
@@ -27,6 +27,13 @@/* 1 for management, 1 for rx, 1 for tx */ #define GVE_MIN_MSIX 3 +/* Numbers of gve tx/rx stats in stats report. */ +#define GVE_TX_STATS_REPORT_NUM 5 +#define GVE_RX_STATS_REPORT_NUM 2 + +/* Interval to schedule a service task, 20000ms. */ +#define GVE_SERVICE_TIMER_PERIOD 20000 +/* Each slot in the desc ring has a 1:1 mapping to a slot in the data ring */ struct gve_rx_desc_queue {struct gve_rx_desc *desc_ring;/* the descriptor ring */
@@ -220,6 +227,7 @@ struct gve_priv {u32 adminq_destroy_rx_queue_cnt;u32 adminq_dcfg_device_resources_cnt;u32 adminq_set_driver_parameter_cnt; +u32 adminq_report_stats_cnt;/* Global stats */ u32 interface_up_cnt;/* count of times interface turned up since last reset */
@@ -227,27 +235,40 @@ struct gve_priv {u32 reset_cnt;/* count of reset */ u32 page_alloc_fail;/* count of page alloc fails */ u32 dma_mapping_error;/* count of dma mapping errors */ - +u32 stats_report_trigger_cnt;/* count of device-requested stats-reports since last reset */ struct workqueue_struct *gve_wq;struct work_struct service_task;unsigned long service_task_flags;unsigned long state_flags; +struct gve_stats_report *stats_report; +u64 stats_report_len; +dma_addr_t stats_report_bus;/* dma address for the stats report */ +unsigned long ethtool_flags; + +unsigned long service_timer_period; +struct timer_list service_timer; +/* Gvnic device's dma mask, set during probe. */ u8 dma_mask; }; -enum gve_service_task_flags { -GVE_PRIV_FLAGS_DO_RESET =BIT (1 ), -GVE_PRIV_FLAGS_RESET_IN_PROGRESS =BIT (2 ), -GVE_PRIV_FLAGS_PROBE_IN_PROGRESS =BIT (3 ), +enum gve_service_task_flags_bit { +GVE_PRIV_FLAGS_DO_RESET =1 , +GVE_PRIV_FLAGS_RESET_IN_PROGRESS =2 , +GVE_PRIV_FLAGS_PROBE_IN_PROGRESS =3 , +GVE_PRIV_FLAGS_DO_REPORT_STATS =4 , +}; + +enum gve_state_flags_bit { +GVE_PRIV_FLAGS_ADMIN_QUEUE_OK =1 , +GVE_PRIV_FLAGS_DEVICE_RESOURCES_OK =2 , +GVE_PRIV_FLAGS_DEVICE_RINGS_OK =3 , +GVE_PRIV_FLAGS_NAPI_ENABLED =4 , }; -enum gve_state_flags { -GVE_PRIV_FLAGS_ADMIN_QUEUE_OK =BIT (1 ), -GVE_PRIV_FLAGS_DEVICE_RESOURCES_OK =BIT (2 ), -GVE_PRIV_FLAGS_DEVICE_RINGS_OK =BIT (3 ), -GVE_PRIV_FLAGS_NAPI_ENABLED =BIT (4 ), +enum gve_ethtool_flags_bit { +GVE_PRIV_FLAGS_REPORT_STATS =0 , };static inline bool gve_get_do_reset (struct gve_priv *priv)
@@ -297,6 +318,22 @@ static inline void gve_clear_probe_in_progress(struct gve_priv *priv)clear_bit (GVE_PRIV_FLAGS_PROBE_IN_PROGRESS , &priv->service_task_flags); } +static inline bool gve_get_do_report_stats (struct gve_priv *priv) +{ +return test_bit (GVE_PRIV_FLAGS_DO_REPORT_STATS , + &priv->service_task_flags); +} + +static inline void gve_set_do_report_stats (struct gve_priv *priv) +{ +set_bit (GVE_PRIV_FLAGS_DO_REPORT_STATS , &priv->service_task_flags); +} + +static inline void gve_clear_do_report_stats (struct gve_priv *priv) +{ +clear_bit (GVE_PRIV_FLAGS_DO_REPORT_STATS , &priv->service_task_flags); +} +static inline bool gve_get_admin_queue_ok (struct gve_priv *priv) {return test_bit (GVE_PRIV_FLAGS_ADMIN_QUEUE_OK , &priv->state_flags);
@@ -357,6 +394,16 @@ static inline void gve_clear_napi_enabled(struct gve_priv *priv)clear_bit (GVE_PRIV_FLAGS_NAPI_ENABLED , &priv->state_flags); } +static inline bool gve_get_report_stats (struct gve_priv *priv) +{ +return test_bit (GVE_PRIV_FLAGS_REPORT_STATS , &priv->ethtool_flags); +} + +static inline void gve_clear_report_stats (struct gve_priv *priv) +{ +clear_bit (GVE_PRIV_FLAGS_REPORT_STATS , &priv->ethtool_flags); +} +/* Returns the address of the ntfy_blocks irq doorbell */ static inline __be32 __iomem *gve_irq_doorbell(struct gve_priv *priv,
@@ -478,6 +525,8 @@ int gve_reset(struct gve_priv *priv, bool attempt_teardown);int gve_adjust_queues (struct gve_priv *priv,struct gve_queue_config new_rx_config,struct gve_queue_config new_tx_config); +/* report stats handling */ +void gve_handle_report_stats (struct gve_priv *priv);/* exported by ethtool.c */ extern const struct ethtool_ops gve_ethtool_ops;/* needed by ethtool */
drivers/net/ethernet/google/gve/gve_adminq.c +21 -0
@@ -35,6 +35,7 @@ int gve_adminq_alloc(struct device *dev, struct gve_priv *priv) priv->adminq_destroy_rx_queue_cnt =0 ; priv->adminq_dcfg_device_resources_cnt =0 ; priv->adminq_set_driver_parameter_cnt =0 ; + priv->adminq_report_stats_cnt =0 ;/* Setup Admin queue with the device */ iowrite32be(priv->adminq_bus_addr / PAGE_SIZE,
@@ -183,6 +184,9 @@ int gve_adminq_execute_cmd(struct gve_priv *priv,case GVE_ADMINQ_SET_DRIVER_PARAMETER : priv->adminq_set_driver_parameter_cnt++;break ; +case GVE_ADMINQ_REPORT_STATS : + priv->adminq_report_stats_cnt++; +break ;default :dev_err (&priv->pdev->dev,"unknown AQ command opcode %d\n" , opcode); }
@@ -433,3 +437,20 @@ int gve_adminq_set_mtu(struct gve_priv *priv, u64 mtu)return gve_adminq_execute_cmd (priv, &cmd); } + +int gve_adminq_report_stats (struct gve_priv *priv,u64 stats_report_len, +dma_addr_t stats_report_addr,u64 interval) +{ +union gve_adminq_command cmd; + +memset (&cmd,0 ,sizeof (cmd)); + cmd.opcode =cpu_to_be32 (GVE_ADMINQ_REPORT_STATS ); + cmd.report_stats = (struct gve_adminq_report_stats ) { + .stats_report_len =cpu_to_be64 (stats_report_len), + .stats_report_addr =cpu_to_be64 (stats_report_addr), + .interval =cpu_to_be64 (interval), + }; + +return gve_adminq_execute_cmd (priv, &cmd); +} +
drivers/net/ethernet/google/gve/gve_adminq.h +38 -0
@@ -21,6 +21,7 @@ enum gve_adminq_opcodes {GVE_ADMINQ_DESTROY_RX_QUEUE =0x8 ,GVE_ADMINQ_DECONFIGURE_DEVICE_RESOURCES =0x9 ,GVE_ADMINQ_SET_DRIVER_PARAMETER =0xB , + GVE_ADMINQ_REPORT_STATS = 0xC, };/* Admin queue status codes */
@@ -172,6 +173,40 @@ struct gve_adminq_set_driver_parameter {static_assert (sizeof (struct gve_adminq_set_driver_parameter ) ==16 ); +struct gve_adminq_report_stats { +__be64 stats_report_len; +__be64 stats_report_addr; +__be64 interval; +}; + +static_assert (sizeof (struct gve_adminq_report_stats ) ==24 ); + +struct stats { +__be32 stat_name; +__be32 queue_id; +__be64 value; +}; + +static_assert (sizeof (struct stats ) ==16 ); + +struct gve_stats_report { +__be64 written_count; +struct stats stats[0 ]; +}; + +static_assert (sizeof (struct gve_stats_report ) ==8 ); + +enum gve_stat_names { +// stats from gve +TX_WAKE_CNT =1 , +TX_STOP_CNT =2 , +TX_FRAMES_SENT =3 , +TX_BYTES_SENT =4 , +TX_LAST_COMPLETION_PROCESSED =5 , +RX_NEXT_EXPECTED_SEQUENCE =6 , +RX_BUFFERS_POSTED =7 , +}; + union gve_adminq_command { struct { __be32 opcode;
@@ -187,6 +222,7 @@ union gve_adminq_command {struct gve_adminq_register_page_list reg_page_list;struct gve_adminq_unregister_page_list unreg_page_list;struct gve_adminq_set_driver_parameter set_driver_param; +struct gve_adminq_report_stats report_stats; }; };u8 reserved[64 ];
@@ -214,4 +250,6 @@ int gve_adminq_register_page_list(struct gve_priv *priv, struct gve_queue_page_list *qpl);int gve_adminq_unregister_page_list (struct gve_priv *priv,u32 page_list_id);int gve_adminq_set_mtu (struct gve_priv *priv,u64 mtu); +int gve_adminq_report_stats (struct gve_priv *priv,u64 stats_report_len, +dma_addr_t stats_report_addr,u64 interval);#endif /* _GVE_ADMINQ_H */
drivers/net/ethernet/google/gve/gve_ethtool.c +90 -21
185 lines not on this page · raw message
drivers/net/ethernet/google/gve/gve_main.c +146 -2
217 lines not on this page · raw message
drivers/net/ethernet/google/gve/gve_register.h +1 -0
@@ -24,5 +24,6 @@ struct gve_registers {enum gve_device_status_flags {GVE_DEVICE_STATUS_RESET_MASK =BIT (1 ),GVE_DEVICE_STATUS_LINK_STATUS_MASK =BIT (2 ), +GVE_DEVICE_STATUS_REPORT_STATS_MASK =BIT (3 ), };#endif /* _GVE_REGISTER_H_ */
Signature · 1 line
2.28.0.526.ge36021eeef-goog
Jakub Kicinski
maintainerRe: [PATCH net-next v3 5/9] gve: Add Gvnic stats AQ command and ethtool show/set-priv-flags.
drivers/net/ethernet/google/gve/gve_ethtool.c gve_get_ethtool_stats(struct net_device *netdev, · line 261
Quoted 13 lines · On Tue, 8 Sep 2020 11:39:05 -0700 David Awogbemila wrote:
drivers/net/ethernet/google/gve/gve_ethtool.c +2
-0@@ -213,6 +235,7 @@ gve_get_ethtool_stats(struct net_device *netdev, }else { i += priv->rx_cfg.num_queues *NUM_GVE_RX_CNTS ; } +/* walk TX rings */ if (priv->tx) {for (ring =0 ; ring < priv->tx_cfg.num_queues; ring++) {@@ -235,6 +258,7 @@ gve_get_ethtool_stats(struct net_device *netdev, }else { i += priv->tx_cfg.num_queues *NUM_GVE_TX_CNTS ; } +
Again, these white space changes don't belong in this patch.
Jakub Kicinski
maintainerRe: [PATCH net-next v3 5/9] gve: Add Gvnic stats AQ command and ethtool show/set-priv-flags.
In reply to David AwogbemilaQuoted 9 lines · On Tue, 8 Sep 2020 11:39:05 -0700 David Awogbemila wrote:
drivers/net/ethernet/google/gve/gve_ethtool.c +9
-0+/* Only one priv flag exists: report-stats (BIT(0))*/ +if (flags &BIT (0 )) + new_flags |=BIT (0 ); +else + new_flags &= ~(BIT (0 )); + priv->ethtool_flags = new_flags; +/* update the stats when user turns report-stats on */ +if (flags &BIT (0 )) +gve_handle_report_stats (priv);
drivers/net/ethernet/google/gve/gve_ethtool.c static int gve_set_tunable(struct net_device *netdev, · line 418
Quoted 10 lines
drivers/net/ethernet/google/gve/gve_ethtool.c +10
-0+/* zero off gve stats when report-stats turned off */ +if (!(flags &BIT (0 )) && (ori_flags &BIT (0 ))) { +int tx_stats_num =GVE_TX_STATS_REPORT_NUM * + priv->tx_cfg.num_queues; +int rx_stats_num =GVE_RX_STATS_REPORT_NUM * + priv->rx_cfg.num_queues; + +memset (priv->stats_report->stats,0 , (tx_stats_num + rx_stats_num) * +sizeof (struct stats )); + }
I don't understand why you don't cancel/start the timer when this flag is changed. Why waste the CPU cycles on handling a useless timer?
Re: [PATCH net-next v3 5/9] gve: Add Gvnic stats AQ command and ethtool show/set-priv-flags.
Quoted 22 lines · Jakub Kicinski
Quoted 9 lines · On Tue, 8 Sep 2020 11:39:05 -0700 David Awogbemila wrote:
drivers/net/ethernet/google/gve/gve_ethtool.c +9
-0+/* Only one priv flag exists: report-stats (BIT(0))*/ +if (flags &BIT (0 )) + new_flags |=BIT (0 ); +else + new_flags &= ~(BIT (0 )); + priv->ethtool_flags = new_flags; +/* update the stats when user turns report-stats on */ +if (flags &BIT (0 )) +gve_handle_report_stats (priv);drivers/net/ethernet/google/gve/gve_ethtool.c static int gve_set_tunable(struct net_device *netdev, · line 418
Quoted 10 lines
drivers/net/ethernet/google/gve/gve_ethtool.c +10
-0+/* zero off gve stats when report-stats turned off */ +if (!(flags &BIT (0 )) && (ori_flags &BIT (0 ))) { +int tx_stats_num =GVE_TX_STATS_REPORT_NUM * + priv->tx_cfg.num_queues; +int rx_stats_num =GVE_RX_STATS_REPORT_NUM * + priv->rx_cfg.num_queues; + +memset (priv->stats_report->stats,0 , (tx_stats_num + rx_stats_num) * +sizeof (struct stats )); + }
Quoted 2 lines
I don't understand why you don't cancel/start the timer when this flag is changed. Why waste the CPU cycles on handling a useless timer?
Thanks, I'll adjust this to turn the timer on/off when the flag is turned on/off.
PATCH v3 6/9 gve: NIC stats for report-stats and for ethtool
In reply to David AwogbemilaThis adds per queue NIC stats to ethtool stats and to report-stats. These stats are always exposed to guest whether or not the report-stats flag is turned on.
--- drivers/net/ethernet/google/gve/gve.h | 4 + drivers/net/ethernet/google/gve/gve_adminq.h | 5 ++ drivers/net/ethernet/google/gve/gve_ethtool.c | 83 ++++++++++++++++++- drivers/net/ethernet/google/gve/gve_main.c | 4 +- 4 files changed, 93 insertions(+), 3 deletions(-)
drivers/net/ethernet/google/gve/gve.h +4 -0
@@ -31,6 +31,10 @@#define GVE_TX_STATS_REPORT_NUM 5#define GVE_RX_STATS_REPORT_NUM 2 +/* Numbers of NIC tx/rx stats in stats report. */ +#define NIC_TX_STATS_REPORT_NUM 0 +#define NIC_RX_STATS_REPORT_NUM 4 +/* Interval to schedule a service task, 20000ms. */ #define GVE_SERVICE_TIMER_PERIOD 20000
drivers/net/ethernet/google/gve/gve_adminq.h +5 -0
@@ -205,6 +205,11 @@ enum gve_stat_names {TX_LAST_COMPLETION_PROCESSED =5 ,RX_NEXT_EXPECTED_SEQUENCE =6 ,RX_BUFFERS_POSTED =7 , +// stats from NIC +RX_QUEUE_DROP_CNT =65 , +RX_NO_BUFFERS_POSTED =66 , +RX_DROPS_PACKET_OVER_MRU =67 , + RX_DROPS_INVALID_CHECKSUM = 68, }; union gve_adminq_command {
drivers/net/ethernet/google/gve/gve_ethtool.c +82 -1
130 lines not on this page · raw message
drivers/net/ethernet/google/gve/gve_main.c +2 -2
@@ -101,9 +101,9 @@ static int gve_alloc_stats_report(struct gve_priv *priv) {int tx_stats_num, rx_stats_num; - tx_stats_num = (GVE_TX_STATS_REPORT_NUM ) * + tx_stats_num = (GVE_TX_STATS_REPORT_NUM +NIC_TX_STATS_REPORT_NUM ) * priv->tx_cfg.num_queues; - rx_stats_num = (GVE_RX_STATS_REPORT_NUM ) * + rx_stats_num = (GVE_RX_STATS_REPORT_NUM +NIC_RX_STATS_REPORT_NUM ) * priv->rx_cfg.num_queues; priv->stats_report_len =sizeof (struct gve_stats_report ) + (tx_stats_num + rx_stats_num) *
Signature · 1 line
2.28.0.526.ge36021eeef-goog
PATCH v3 7/9 gve: Batch AQ commands for creating and destroying queues.
In reply to David AwogbemilaFrom: Sagi Shahar <[email protected]>
Adds support for batching AQ commands and uses it for creating and destroying queues.
--- drivers/net/ethernet/google/gve/gve_adminq.c | 188 ++++++++++++++++--- drivers/net/ethernet/google/gve/gve_adminq.h | 10 +- drivers/net/ethernet/google/gve/gve_main.c | 94 +++++----- 3 files changed, 211 insertions(+), 81 deletions(-)
drivers/net/ethernet/google/gve/gve_adminq.c +165 -23
@@ -135,20 +135,71 @@ static int gve_adminq_parse_err(struct gve_priv *priv, u32 status) } } +/* Flushes all AQ commands currently queued and waits for them to complete. +* If there are failures, it will return the first error. +*/ +static int gve_adminq_kick_and_wait (struct gve_priv *priv) +{ +u32 tail, head; +int i; + + tail =ioread32be (&priv->reg_bar0->adminq_event_counter); + head = priv->adminq_prod_cnt; + +gve_adminq_kick_cmd (priv, head); +if (!gve_adminq_wait_for_cmd (priv, head)) { +dev_err (&priv->pdev->dev,"AQ commands timed out, need to reset AQ\n" ); + priv->adminq_timeouts++; +return -ENOTRECOVERABLE ; + } + +for (i = tail; i < head; i++) { +union gve_adminq_command *cmd; +u32 status, err; + + cmd = &priv->adminq[i & priv->adminq_mask]; + status =be32_to_cpu (READ_ONCE (cmd->status)); + err =gve_adminq_parse_err (priv, status); +if (err) +// Return the first error if we failed. +return err; + } + +return 0 ; +} +/* This function is not threadsafe - the caller is responsible for any * necessary locks. */ -int gve_adminq_execute_cmd (struct gve_priv *priv, -union gve_adminq_command *cmd_orig) +static int gve_adminq_issue_cmd (struct gve_priv *priv, +union gve_adminq_command *cmd_orig) {union gve_adminq_command *cmd; -u32 status =0 ; -u32 prod_cnt;u32 opcode; +u32 tail; + + tail =ioread32be (&priv->reg_bar0->adminq_event_counter); + +// Check if next command will overflow the buffer. +if (((priv->adminq_prod_cnt +1 ) & priv->adminq_mask) == tail) { +int err; + +// Flush existing commands to make room. + err =gve_adminq_kick_and_wait (priv); +if (err) +return err; + +// Retry. + tail =ioread32be (&priv->reg_bar0->adminq_event_counter); +if (((priv->adminq_prod_cnt +1 ) & priv->adminq_mask) == tail) { +// This should never happen. We just flushed the +// command queue so there should be enough space. +return -ENOMEM ; + } + } cmd = &priv->adminq[priv->adminq_prod_cnt & priv->adminq_mask]; priv->adminq_prod_cnt++; - prod_cnt = priv->adminq_prod_cnt;memcpy (cmd, cmd_orig,sizeof (*cmd_orig)); opcode =be32_to_cpu (READ_ONCE (cmd->opcode));
@@ -191,16 +242,30 @@ int gve_adminq_execute_cmd(struct gve_priv *priv,dev_err (&priv->pdev->dev,"unknown AQ command opcode %d\n" , opcode); } -gve_adminq_kick_cmd (priv, prod_cnt); -if (!gve_adminq_wait_for_cmd (priv, prod_cnt)) { -dev_err (&priv->pdev->dev,"AQ command timed out, need to reset AQ\n" ); - priv->adminq_timeouts++; -return -ENOTRECOVERABLE ; - } +return 0 ; +} -memcpy (cmd_orig, cmd,sizeof (*cmd)); - status =be32_to_cpu (READ_ONCE (cmd->status)); -return gve_adminq_parse_err (priv, status); +/* This function is not threadsafe - the caller is responsible for any +* necessary locks. +* The caller is also responsible for making sure there are no commands +* waiting to be executed. +*/ +static int gve_adminq_execute_cmd (struct gve_priv *priv,union gve_adminq_command *cmd_orig) +{ +u32 tail, head; +int err; + + tail =ioread32be (&priv->reg_bar0->adminq_event_counter); + head = priv->adminq_prod_cnt; +if (tail != head) +// This is not a valid path +return -EINVAL ; + + err =gve_adminq_issue_cmd (priv, cmd_orig); +if (err) +return err; + +return gve_adminq_kick_and_wait (priv); }/* The device specifies that the management vector can either be the first irq
@@ -245,29 +310,50 @@ int gve_adminq_deconfigure_device_resources(struct gve_priv *priv)return gve_adminq_execute_cmd (priv, &cmd); } -int gve_adminq_create_tx_queue (struct gve_priv *priv,u32 queue_index) +static int gve_adminq_create_tx_queue (struct gve_priv *priv,u32 queue_index) {struct gve_tx_ring *tx = &priv->tx[queue_index];union gve_adminq_command cmd; +int err;memset (&cmd,0 ,sizeof (cmd)); cmd.opcode =cpu_to_be32 (GVE_ADMINQ_CREATE_TX_QUEUE ); cmd.create_tx_queue = (struct gve_adminq_create_tx_queue ) { .queue_id =cpu_to_be32 (queue_index), .reserved =0 , - .queue_resources_addr =cpu_to_be64 (tx->q_resources_bus), + .queue_resources_addr = +cpu_to_be64 (tx->q_resources_bus), .tx_ring_addr =cpu_to_be64 (tx->bus), .queue_page_list_id =cpu_to_be32 (tx->tx_fifo.qpl->id), .ntfy_id =cpu_to_be32 (tx->ntfy_id), }; -return gve_adminq_execute_cmd (priv, &cmd); + err =gve_adminq_issue_cmd (priv, &cmd); +if (err) +return err; + +return 0 ; } -int gve_adminq_create_rx_queue (struct gve_priv *priv,u32 queue_index) +int gve_adminq_create_tx_queues (struct gve_priv *priv,u32 num_queues) +{ +int err; +int i; + +for (i =0 ; i < num_queues; i++) { + err =gve_adminq_create_tx_queue (priv, i); +if (err) +return err; + } + +return gve_adminq_kick_and_wait (priv); +} + +static int gve_adminq_create_rx_queue (struct gve_priv *priv,u32 queue_index) {struct gve_rx_ring *rx = &priv->rx[queue_index];union gve_adminq_command cmd; +int err;memset (&cmd,0 ,sizeof (cmd)); cmd.opcode =cpu_to_be32 (GVE_ADMINQ_CREATE_RX_QUEUE );
@@ -282,12 +368,31 @@ int gve_adminq_create_rx_queue(struct gve_priv *priv, u32 queue_index) .queue_page_list_id = cpu_to_be32(rx->data.qpl->id), }; -return gve_adminq_execute_cmd (priv, &cmd); + err =gve_adminq_issue_cmd (priv, &cmd); +if (err) +return err; + +return 0 ; } -int gve_adminq_destroy_tx_queue (struct gve_priv *priv,u32 queue_index) +int gve_adminq_create_rx_queues (struct gve_priv *priv,u32 num_queues) +{ +int err; +int i; + +for (i =0 ; i < num_queues; i++) { + err =gve_adminq_create_rx_queue (priv, i); +if (err) +return err; + } + +return gve_adminq_kick_and_wait (priv); +} + +static int gve_adminq_destroy_tx_queue (struct gve_priv *priv,u32 queue_index) {union gve_adminq_command cmd; +int err;memset (&cmd,0 ,sizeof (cmd)); cmd.opcode =cpu_to_be32 (GVE_ADMINQ_DESTROY_TX_QUEUE );
@@ -295,12 +400,31 @@ int gve_adminq_destroy_tx_queue(struct gve_priv *priv, u32 queue_index) .queue_id = cpu_to_be32(queue_index), }; -return gve_adminq_execute_cmd (priv, &cmd); + err =gve_adminq_issue_cmd (priv, &cmd); +if (err) +return err; + +return 0 ; } -int gve_adminq_destroy_rx_queue (struct gve_priv *priv,u32 queue_index) +int gve_adminq_destroy_tx_queues (struct gve_priv *priv,u32 num_queues) +{ +int err; +int i; + +for (i =0 ; i < num_queues; i++) { + err =gve_adminq_destroy_tx_queue (priv, i); +if (err) +return err; + } + +return gve_adminq_kick_and_wait (priv); +} + +static int gve_adminq_destroy_rx_queue (struct gve_priv *priv,u32 queue_index) {union gve_adminq_command cmd; +int err;memset (&cmd,0 ,sizeof (cmd)); cmd.opcode =cpu_to_be32 (GVE_ADMINQ_DESTROY_RX_QUEUE );
@@ -308,7 +432,25 @@ int gve_adminq_destroy_rx_queue(struct gve_priv *priv, u32 queue_index) .queue_id = cpu_to_be32(queue_index), }; -return gve_adminq_execute_cmd (priv, &cmd); + err =gve_adminq_issue_cmd (priv, &cmd); +if (err) +return err; + +return 0 ; +} + +int gve_adminq_destroy_rx_queues (struct gve_priv *priv,u32 num_queues) +{ +int err; +int i; + +for (i =0 ; i < num_queues; i++) { + err =gve_adminq_destroy_rx_queue (priv, i); +if (err) +return err; + } + +return gve_adminq_kick_and_wait (priv); }int gve_adminq_describe_device (struct gve_priv *priv)
drivers/net/ethernet/google/gve/gve_adminq.h +4 -6
@@ -238,8 +238,6 @@ static_assert(sizeof(union gve_adminq_command) == 64);int gve_adminq_alloc (struct device *dev,struct gve_priv *priv);void gve_adminq_free (struct device *dev,struct gve_priv *priv);void gve_adminq_release (struct gve_priv *priv); -int gve_adminq_execute_cmd (struct gve_priv *priv, -union gve_adminq_command *cmd_orig);int gve_adminq_describe_device (struct gve_priv *priv); int gve_adminq_configure_device_resources(struct gve_priv *priv, dma_addr_t counter_array_bus_addr,
@@ -247,10 +245,10 @@ int gve_adminq_configure_device_resources(struct gve_priv *priv,dma_addr_t db_array_bus_addr, u32 num_ntfy_blks);int gve_adminq_deconfigure_device_resources (struct gve_priv *priv); -int gve_adminq_create_tx_queue (struct gve_priv *priv,u32 queue_id); -int gve_adminq_destroy_tx_queue (struct gve_priv *priv,u32 queue_id); -int gve_adminq_create_rx_queue (struct gve_priv *priv,u32 queue_id); -int gve_adminq_destroy_rx_queue (struct gve_priv *priv,u32 queue_id); +int gve_adminq_create_tx_queues (struct gve_priv *priv,u32 num_queues); +int gve_adminq_destroy_tx_queues (struct gve_priv *priv,u32 queue_id); +int gve_adminq_create_rx_queues (struct gve_priv *priv,u32 num_queues); +int gve_adminq_destroy_rx_queues (struct gve_priv *priv,u32 queue_id);int gve_adminq_register_page_list (struct gve_priv *priv,struct gve_queue_page_list *qpl);int gve_adminq_unregister_page_list (struct gve_priv *priv,u32 page_list_id);
drivers/net/ethernet/google/gve/gve_main.c +42 -52
112 lines not on this page · raw message
Signature · 1 line
2.28.0.526.ge36021eeef-goog
PATCH v3 8/9 gve: Use link status register to report link status
In reply to David AwogbemilaFrom: Patricio Noyola <[email protected]>
This makes the driver better aware of the connectivity status of the device. Based on the device's status register, the driver can call netif_carrier_{on,off}.
--- drivers/net/ethernet/google/gve/gve_main.c | 24 +++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)
drivers/net/ethernet/google/gve/gve_main.c +21 -3
@@ -767,7 +767,7 @@ static int gve_open(struct net_device *dev)gve_set_device_rings_ok (priv);gve_turnup (priv); -netif_carrier_on (dev); +queue_work (priv->gve_wq, &priv->service_task); priv->interface_up_cnt++;return 0 ;
@@ -1024,16 +1024,34 @@ void gve_handle_report_stats(struct gve_priv *priv) } } +static void gve_handle_link_status (struct gve_priv *priv,bool link_status) +{ +if (!gve_get_napi_enabled (priv)) +return ; + +if (link_status ==netif_carrier_ok (priv->dev)) +return ; + +if (link_status) { +dev_info (&priv->pdev->dev,"Device link is up.\n" ); +netif_carrier_on (priv->dev); + }else { +dev_info (&priv->pdev->dev,"Device link is down.\n" ); +netif_carrier_off (priv->dev); + } +} +/* Handle NIC status register changes, reset requests and report stats */ static void gve_service_task (struct work_struct *work) { struct gve_priv *priv = container_of(work, struct gve_priv, service_task); +u32 status =ioread32be (&priv->reg_bar0->device_status); -gve_handle_status (priv, -ioread32be (&priv->reg_bar0->device_status)); +gve_handle_status (priv, status);gve_handle_reset (priv); +gve_handle_link_status (priv,GVE_DEVICE_STATUS_LINK_STATUS_MASK & status);if (gve_get_do_report_stats (priv)) {gve_handle_report_stats (priv);gve_clear_do_report_stats (priv);
Signature · 1 line
2.28.0.526.ge36021eeef-goog
Jakub Kicinski
maintainerRe: [PATCH net-next v3 8/9] gve: Use link status register to report link status
drivers/net/ethernet/google/gve/gve_main.c void gve_handle_report_stats(struct gve_priv *priv) · line 1040
Quoted 5 lines · On Tue, 8 Sep 2020 11:39:08 -0700 David Awogbemila wrote:
drivers/net/ethernet/google/gve/gve_main.c +5
-0+dev_info (&priv->pdev->dev,"Device link is up.\n" ); +netif_carrier_on (priv->dev); + }else { +dev_info (&priv->pdev->dev,"Device link is down.\n" ); +netif_carrier_off (priv->dev);
These should be netdev_info()
Re: [PATCH net-next v3 8/9] gve: Use link status register to report link status
Quoted 9 lines · Jakub Kicinski
drivers/net/ethernet/google/gve/gve_main.c void gve_handle_report_stats(struct gve_priv *priv) · line 1040
Quoted 5 lines · On Tue, 8 Sep 2020 11:39:08 -0700 David Awogbemila wrote:
drivers/net/ethernet/google/gve/gve_main.c +5
-0+dev_info (&priv->pdev->dev,"Device link is up.\n" ); +netif_carrier_on (priv->dev); + }else { +dev_info (&priv->pdev->dev,"Device link is down.\n" ); +netif_carrier_off (priv->dev);These should be
netdev_info()
Thanks. I'll adjust these.
PATCH v3 9/9 gve: Enable Link Speed Reporting in the driver.
In reply to David AwogbemilaThis change allows the driver to report the device link speed when the ethtool command:
ethtool <nic name>
is run.
Getting the link speed is done via a new admin queue command:
ReportLinkSpeed.
--- drivers/net/ethernet/google/gve/gve.h | 4 +++ drivers/net/ethernet/google/gve/gve_adminq.c | 31 +++++++++++++++++++ drivers/net/ethernet/google/gve/gve_adminq.h | 9 ++++++ drivers/net/ethernet/google/gve/gve_ethtool.c | 14 ++++++++- 4 files changed, 57 insertions(+), 1 deletion(-)
drivers/net/ethernet/google/gve/gve.h +4 -0
@@ -232,6 +232,7 @@ struct gve_priv {u32 adminq_dcfg_device_resources_cnt;u32 adminq_set_driver_parameter_cnt;u32 adminq_report_stats_cnt; +u32 adminq_report_link_speed_cnt;/* Global stats */ u32 interface_up_cnt;/* count of times interface turned up since last reset */
@@ -253,6 +254,9 @@ struct gve_priv {unsigned long service_timer_period;struct timer_list service_timer; +/* Gvnic device link speed from hypervisor. */ +u64 link_speed; +/* Gvnic device's dma mask, set during probe. */ u8 dma_mask; };
drivers/net/ethernet/google/gve/gve_adminq.c +31 -0
@@ -36,6 +36,7 @@ int gve_adminq_alloc(struct device *dev, struct gve_priv *priv) priv->adminq_dcfg_device_resources_cnt =0 ; priv->adminq_set_driver_parameter_cnt =0 ; priv->adminq_report_stats_cnt =0 ; + priv->adminq_report_link_speed_cnt =0 ;/* Setup Admin queue with the device */ iowrite32be(priv->adminq_bus_addr / PAGE_SIZE,
@@ -238,6 +239,9 @@ static int gve_adminq_issue_cmd(struct gve_priv *priv,case GVE_ADMINQ_REPORT_STATS : priv->adminq_report_stats_cnt++;break ; +case GVE_ADMINQ_REPORT_LINK_SPEED : + priv->adminq_report_link_speed_cnt++; +break ;default :dev_err (&priv->pdev->dev,"unknown AQ command opcode %d\n" , opcode); }
@@ -596,3 +600,30 @@ int gve_adminq_report_stats(struct gve_priv *priv, u64 stats_report_len,return gve_adminq_execute_cmd (priv, &cmd); } +int gve_adminq_report_link_speed (struct gve_priv *priv) +{ +union gve_adminq_command gvnic_cmd; +dma_addr_t link_speed_region_bus; +__be64 *link_speed_region; +int err; + + link_speed_region = +dma_alloc_coherent (&priv->pdev->dev,sizeof (*link_speed_region), + &link_speed_region_bus,GFP_KERNEL ); + +if (!link_speed_region) +return -ENOMEM ; + +memset (&gvnic_cmd,0 ,sizeof (gvnic_cmd)); + gvnic_cmd.opcode =cpu_to_be32 (GVE_ADMINQ_REPORT_LINK_SPEED ); + gvnic_cmd.report_link_speed.link_speed_address = +cpu_to_be64 (link_speed_region_bus); + + err =gve_adminq_execute_cmd (priv, &gvnic_cmd); + + priv->link_speed =be64_to_cpu (*link_speed_region); +dma_free_coherent (&priv->pdev->dev,sizeof (*link_speed_region), link_speed_region, + link_speed_region_bus); +return err; +} +
drivers/net/ethernet/google/gve/gve_adminq.h +9 -0
@@ -22,6 +22,7 @@ enum gve_adminq_opcodes {GVE_ADMINQ_DECONFIGURE_DEVICE_RESOURCES =0x9 ,GVE_ADMINQ_SET_DRIVER_PARAMETER =0xB ,GVE_ADMINQ_REPORT_STATS =0xC , + GVE_ADMINQ_REPORT_LINK_SPEED = 0xD };/* Admin queue status codes */
@@ -181,6 +182,12 @@ struct gve_adminq_report_stats {static_assert (sizeof (struct gve_adminq_report_stats ) ==24 ); +struct gve_adminq_report_link_speed { +__be64 link_speed_address; +}; + +static_assert (sizeof (struct gve_adminq_report_link_speed ) ==8 ); +struct stats {__be32 stat_name;__be32 queue_id;
@@ -228,6 +235,7 @@ union gve_adminq_command {struct gve_adminq_unregister_page_list unreg_page_list;struct gve_adminq_set_driver_parameter set_driver_param;struct gve_adminq_report_stats report_stats; +struct gve_adminq_report_link_speed report_link_speed; }; };u8 reserved[64 ];
@@ -255,4 +263,5 @@ int gve_adminq_unregister_page_list(struct gve_priv *priv, u32 page_list_id);int gve_adminq_set_mtu (struct gve_priv *priv,u64 mtu);int gve_adminq_report_stats (struct gve_priv *priv,u64 stats_report_len,dma_addr_t stats_report_addr,u64 interval); +int gve_adminq_report_link_speed (struct gve_priv *priv);#endif /* _GVE_ADMINQ_H */
drivers/net/ethernet/google/gve/gve_ethtool.c +13 -1
@@ -59,7 +59,7 @@ static const char gve_gstrings_adminq_stats[][ETH_GSTRING_LEN] = {"adminq_create_tx_queue_cnt" ,"adminq_create_rx_queue_cnt" ,"adminq_destroy_tx_queue_cnt" ,"adminq_destroy_rx_queue_cnt" ,"adminq_dcfg_device_resources_cnt" ,"adminq_set_driver_parameter_cnt" , - "adminq_report_stats_cnt", +"adminq_report_stats_cnt" ,"adminq_report_link_speed_cnt" }; static const char gve_gstrings_priv_flags[][ETH_GSTRING_LEN] = {
@@ -355,6 +355,7 @@ gve_get_ethtool_stats(struct net_device *netdev, data[i++] = priv->adminq_dcfg_device_resources_cnt; data[i++] = priv->adminq_set_driver_parameter_cnt; data[i++] = priv->adminq_report_stats_cnt; + data[i++] = priv->adminq_report_link_speed_cnt; } static void gve_get_channels(struct net_device *netdev,
@@ -501,6 +502,16 @@ static int gve_set_priv_flags(struct net_device *netdev, u32 flags)return 0 ; } +static int gve_get_link_ksettings (struct net_device *netdev, +struct ethtool_link_ksettings *cmd) +{ +struct gve_priv *priv =netdev_priv (netdev); +int err =gve_adminq_report_link_speed (priv); + + cmd->base.speed = priv->link_speed; +return err; +} +const struct ethtool_ops gve_ethtool_ops = { .get_drvinfo = gve_get_drvinfo, .get_strings = gve_get_strings,
@@ -517,4 +528,5 @@ const struct ethtool_ops gve_ethtool_ops = { .set_tunable = gve_set_tunable, .get_priv_flags = gve_get_priv_flags, .set_priv_flags = gve_set_priv_flags, + .get_link_ksettings = gve_get_link_ksettings };
Signature · 1 line
2.28.0.526.ge36021eeef-goog