virtio-net: support dynamic coalescing moderation
Subsystems (4)
cover virtio-net: support dynamic coalescing moderation
Now, virtio-net already supports per-queue moderation parameter setting. Based on this, we use the netdim library of linux to support dynamic coalescing moderation for virtio-net.
Due to hardware scheduling issues, we only tested rx dim.
@Test env
rxq0 has affinity to cpu0.
@Test cmd
client: taskset -c 0 sockperf tp -i ${IP} -t 30 --tcp -m ${msg_size}
server: taskset -c 0 sockperf sr --tcp
@Test res
The second column is the ratio of the result returned by client when rx dim is enabled to the result returned by client when rx dim is disabled.
-------------------------------------- | msg_size | rx_dim=on / rx_dim=off | -------------------------------------- | 14B | + 3% | -------------------------------------- | 100B | + 16% | -------------------------------------- | 500B | + 25% | -------------------------------------- | 1400B | + 28% | -------------------------------------- | 2048B | + 22% | -------------------------------------- | 4096B | + 5% | --------------------------------------
---
This patch set was part of the previous netdim patch set[1].
[1] was split into a merged bugfix set[2] and the current set. The previous relevant commentators have been Cced.
[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/[email protected]/
Heng Qi (5):
virtio-net: returns whether napi is complete
virtio-net: separate rx/tx coalescing moderation cmds
virtio-net: extract virtqueue coalescig cmd for reuse
virtio-net: support rx netdim
virtio-net: support tx netdim
drivers/net/virtio_net.c | 394 ++++++++++++++++++++++++++++++++------- 1 file changed, 322 insertions(+), 72 deletions(-)
Signature · 1 line
2.19.1.6.gb485710b
PATCH 1/5 virtio-net: returns whether napi is complete
rx netdim needs to count the traffic during a complete napi process, and start updating and comparing samples to make decisions after the napi ends. Let virtqueue_napi_complete() return true if napi is done, otherwise vice versa.
--- drivers/net/virtio_net.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/net/virtio_net.c +5 -1
@@ -431,7 +431,7 @@ static void virtqueue_napi_schedule(struct napi_struct *napi, } } -static void virtqueue_napi_complete (struct napi_struct *napi, +static bool virtqueue_napi_complete (struct napi_struct *napi,struct virtqueue *vq,int processed) {int opaque;
@@ -440,9 +440,13 @@ static void virtqueue_napi_complete(struct napi_struct *napi,if (napi_complete_done (napi, processed)) {if (unlikely (virtqueue_poll (vq, opaque)))virtqueue_napi_schedule (napi, vq); +else +return true; }else {virtqueue_disable_cb (vq); } + +return false; }static void skb_xmit_done (struct virtqueue *vq)
Signature · 1 line
2.19.1.6.gb485710b
PATCH 2/5 virtio-net: separate rx/tx coalescing moderation cmds
In reply to Heng QiThis patch separates the rx and tx global coalescing moderation commands to support netdim switches in subsequent patches.
--- drivers/net/virtio_net.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-)
drivers/net/virtio_net.c +27 -3
@@ -3260,10 +3260,10 @@ static int virtnet_get_link_ksettings(struct net_device *dev,return 0 ; } -static int virtnet_send_notf_coal_cmds (struct virtnet_info *vi, -struct ethtool_coalesce *ec) +static int virtnet_send_tx_notf_coal_cmds (struct virtnet_info *vi, +struct ethtool_coalesce *ec) { -struct scatterlist sgs_tx, sgs_rx; +struct scatterlist sgs_tx;int i; vi->ctrl->coal_tx.tx_usecs =cpu_to_le32 (ec->tx_coalesce_usecs);
@@ -3283,6 +3283,14 @@ static int virtnet_send_notf_coal_cmds(struct virtnet_info *vi, vi->sq[i].intr_coal.max_packets = ec->tx_max_coalesced_frames; } +return 0 ; +} + +static int virtnet_send_rx_notf_coal_cmds (struct virtnet_info *vi, +struct ethtool_coalesce *ec) +{ +struct scatterlist sgs_rx; + vi->ctrl->coal_rx.rx_usecs =cpu_to_le32 (ec->rx_coalesce_usecs); vi->ctrl->coal_rx.rx_max_packets =cpu_to_le32 (ec->rx_max_coalesced_frames);sg_init_one (&sgs_rx, &vi->ctrl->coal_rx,sizeof (vi->ctrl->coal_rx));
@@ -3303,6 +3311,22 @@ static int virtnet_send_notf_coal_cmds(struct virtnet_info *vi,return 0 ; } +static int virtnet_send_notf_coal_cmds (struct virtnet_info *vi, +struct ethtool_coalesce *ec) +{ +int err; + + err =virtnet_send_tx_notf_coal_cmds (vi, ec); +if (err) +return err; + + err =virtnet_send_rx_notf_coal_cmds (vi, ec); +if (err) +return err; + +return 0 ; +} +static int virtnet_send_ctrl_coal_vq_cmd (struct virtnet_info *vi,u16 vqn,u32 max_usecs,u32 max_packets) {
Signature · 1 line
2.19.1.6.gb485710b
PATCH 3/5 virtio-net: extract virtqueue coalescig cmd for reuse
In reply to Heng QiExtract commands to set virtqueue coalescing parameters for reuse by ethtool -Q, vq resize and netdim.
--- drivers/net/virtio_net.c | 106 +++++++++++++++++++++++---------------- 1 file changed, 64 insertions(+), 42 deletions(-)
drivers/net/virtio_net.c +64 -42
@@ -2846,6 +2846,58 @@ static void virtnet_cpu_notif_remove(struct virtnet_info *vi) &vi->node_dead); } +static int virtnet_send_ctrl_coal_vq_cmd (struct virtnet_info *vi, +u16 vqn,u32 max_usecs,u32 max_packets) +{ +struct scatterlist sgs; + + vi->ctrl->coal_vq.vqn =cpu_to_le16 (vqn); + vi->ctrl->coal_vq.coal.max_usecs =cpu_to_le32 (max_usecs); + vi->ctrl->coal_vq.coal.max_packets =cpu_to_le32 (max_packets); +sg_init_one (&sgs, &vi->ctrl->coal_vq,sizeof (vi->ctrl->coal_vq)); + +if (!virtnet_send_command (vi,VIRTIO_NET_CTRL_NOTF_COAL , +VIRTIO_NET_CTRL_NOTF_COAL_VQ_SET , + &sgs)) +return -EINVAL ; + +return 0 ; +} + +static int virtnet_send_rx_ctrl_coal_vq_cmd (struct virtnet_info *vi, +u16 queue,u32 max_usecs, +u32 max_packets) +{ +int err; + + err =virtnet_send_ctrl_coal_vq_cmd (vi,rxq2vq (queue), + max_usecs, max_packets); +if (err) +return err; + + vi->rq[queue].intr_coal.max_usecs = max_usecs; + vi->rq[queue].intr_coal.max_packets = max_packets; + +return 0 ; +} + +static int virtnet_send_tx_ctrl_coal_vq_cmd (struct virtnet_info *vi, +u16 queue,u32 max_usecs, +u32 max_packets) +{ +int err; + + err =virtnet_send_ctrl_coal_vq_cmd (vi,txq2vq (queue), + max_usecs, max_packets); +if (err) +return err; + + vi->sq[queue].intr_coal.max_usecs = max_usecs; + vi->sq[queue].intr_coal.max_packets = max_packets; + +return 0 ; +} + static void virtnet_get_ringparam(struct net_device *dev, struct ethtool_ringparam *ring, struct kernel_ethtool_ringparam *kernel_ring,
@@ -2903,14 +2955,11 @@ static int virtnet_set_ringparam(struct net_device *dev,* through the VIRTIO_NET_CTRL_NOTF_COAL_TX_SET command, or, if the driver * did not set any TX coalescing parameters, to 0. */ - err =virtnet_send_ctrl_coal_vq_cmd (vi,txq2vq (i), - vi->intr_coal_tx.max_usecs, - vi->intr_coal_tx.max_packets); + err =virtnet_send_tx_ctrl_coal_vq_cmd (vi, i, + vi->intr_coal_tx.max_usecs, + vi->intr_coal_tx.max_packets);if (err)return err; - - vi->sq[i].intr_coal.max_usecs = vi->intr_coal_tx.max_usecs; - vi->sq[i].intr_coal.max_packets = vi->intr_coal_tx.max_packets; }if (ring->rx_pending != rx_pending) {
@@ -2919,14 +2968,11 @@ static int virtnet_set_ringparam(struct net_device *dev,return err;/* The reason is same as the transmit virtqueue reset */ - err =virtnet_send_ctrl_coal_vq_cmd (vi,rxq2vq (i), - vi->intr_coal_rx.max_usecs, - vi->intr_coal_rx.max_packets); + err =virtnet_send_rx_ctrl_coal_vq_cmd (vi, i, + vi->intr_coal_rx.max_usecs, + vi->intr_coal_rx.max_packets);if (err)return err; - - vi->rq[i].intr_coal.max_usecs = vi->intr_coal_rx.max_usecs; - vi->rq[i].intr_coal.max_packets = vi->intr_coal_rx.max_packets; } }
@@ -3327,48 +3373,24 @@ static int virtnet_send_notf_coal_cmds(struct virtnet_info *vi,return 0 ; } -static int virtnet_send_ctrl_coal_vq_cmd (struct virtnet_info *vi, -u16 vqn,u32 max_usecs,u32 max_packets) -{ -struct scatterlist sgs; - - vi->ctrl->coal_vq.vqn =cpu_to_le16 (vqn); - vi->ctrl->coal_vq.coal.max_usecs =cpu_to_le32 (max_usecs); - vi->ctrl->coal_vq.coal.max_packets =cpu_to_le32 (max_packets); -sg_init_one (&sgs, &vi->ctrl->coal_vq,sizeof (vi->ctrl->coal_vq)); - -if (!virtnet_send_command (vi,VIRTIO_NET_CTRL_NOTF_COAL , -VIRTIO_NET_CTRL_NOTF_COAL_VQ_SET , - &sgs)) -return -EINVAL ; - -return 0 ; -} -static int virtnet_send_notf_coal_vq_cmds (struct virtnet_info *vi,struct ethtool_coalesce *ec,u16 queue) {int err; - err =virtnet_send_ctrl_coal_vq_cmd (vi,rxq2vq (queue), - ec->rx_coalesce_usecs, - ec->rx_max_coalesced_frames); + err =virtnet_send_rx_ctrl_coal_vq_cmd (vi, queue, + ec->rx_coalesce_usecs, + ec->rx_max_coalesced_frames);if (err)return err; - vi->rq[queue].intr_coal.max_usecs = ec->rx_coalesce_usecs; - vi->rq[queue].intr_coal.max_packets = ec->rx_max_coalesced_frames; - - err =virtnet_send_ctrl_coal_vq_cmd (vi,txq2vq (queue), - ec->tx_coalesce_usecs, - ec->tx_max_coalesced_frames); + err =virtnet_send_tx_ctrl_coal_vq_cmd (vi, queue, + ec->tx_coalesce_usecs, + ec->tx_max_coalesced_frames);if (err)return err; - vi->sq[queue].intr_coal.max_usecs = ec->tx_coalesce_usecs; - vi->sq[queue].intr_coal.max_packets = ec->tx_max_coalesced_frames; -return 0 ; }
Signature · 1 line
2.19.1.6.gb485710b
PATCH 4/5 virtio-net: support rx netdim
In reply to Heng QiBy comparing the traffic information in the complete napi processes, let the virtio-net driver automatically adjust the coalescing moderation parameters of each receive queue.
--- drivers/net/virtio_net.c | 147 +++++++++++++++++++++++++++++++++------ 1 file changed, 126 insertions(+), 21 deletions(-)
drivers/net/virtio_net.c +126 -21
@@ -19,6 +19,7 @@#include <linux/average.h> #include <linux/filter.h> #include <linux/kernel.h> +#include <linux/dim.h> #include <net/route.h> #include <net/xdp.h> #include <net/net_failover.h>
@@ -172,6 +173,17 @@ struct receive_queue {struct virtnet_rq_stats stats; +/* The number of rx notifications */ +u16 calls; + +/* Is dynamic interrupt moderation enabled? */ +bool dim_enabled; + +/* Dynamic Interrupt Moderation */ +struct dim dim; + +u32 packets_in_napi; +struct virtnet_interrupt_coalesce intr_coal;/* Chain pages by the private ptr. */
@@ -305,6 +317,9 @@ struct virtnet_info {u8 duplex;u32 speed; +/* Is rx dynamic interrupt moderation enabled? */ +bool rx_dim_enabled; +/* Interrupt coalescing settings */ struct virtnet_interrupt_coalesce intr_coal_tx;struct virtnet_interrupt_coalesce intr_coal_rx;
@@ -2001,6 +2016,7 @@ static void skb_recv_done(struct virtqueue *rvq)struct virtnet_info *vi = rvq->vdev->priv;struct receive_queue *rq = &vi->rq[vq2rxq (rvq)]; + rq->calls++;virtqueue_napi_schedule (&rq->napi, rvq); }
@@ -2138,6 +2154,25 @@ static void virtnet_poll_cleantx(struct receive_queue *rq) } } +static void virtnet_rx_dim_work (struct work_struct *work); + +static void virtnet_rx_dim_update (struct virtnet_info *vi,struct receive_queue *rq) +{ +struct virtnet_rq_stats *stats = &rq->stats; +struct dim_sample cur_sample = {}; + +if (!rq->packets_in_napi) +return ; + +u64_stats_update_begin (&rq->stats.syncp); +dim_update_sample (rq->calls, stats->packets, + stats->bytes, &cur_sample); +u64_stats_update_end (&rq->stats.syncp); + +net_dim (&rq->dim, cur_sample); + rq->packets_in_napi =0 ; +} +static int virtnet_poll (struct napi_struct *napi,int budget) { struct receive_queue *rq =
@@ -2146,17 +2181,22 @@ static int virtnet_poll(struct napi_struct *napi, int budget)struct send_queue *sq;unsigned int received;unsigned int xdp_xmit =0 ; +bool napi_complete;virtnet_poll_cleantx (rq); received =virtnet_receive (rq, budget, &xdp_xmit); + rq->packets_in_napi += received;if (xdp_xmit &VIRTIO_XDP_REDIR )xdp_do_flush ();/* Out of packets? */ -if (received < budget) -virtqueue_napi_complete (napi, rq->vq, received); +if (received < budget) { + napi_complete =virtqueue_napi_complete (napi, rq->vq, received); +if (napi_complete && rq->dim_enabled) +virtnet_rx_dim_update (vi, rq); + }if (xdp_xmit &VIRTIO_XDP_TX ) { sq =virtnet_xdp_get_sq (vi);
@@ -2176,6 +2216,7 @@ static void virtnet_disable_queue_pair(struct virtnet_info *vi, int qp_index)virtnet_napi_tx_disable (&vi->sq[qp_index].napi);napi_disable (&vi->rq[qp_index].napi);xdp_rxq_info_unreg (&vi->rq[qp_index].xdp_rxq); +cancel_work_sync (&vi->rq[qp_index].dim.work); }static int virtnet_enable_queue_pair (struct virtnet_info *vi,int qp_index)
@@ -2193,6 +2234,9 @@ static int virtnet_enable_queue_pair(struct virtnet_info *vi, int qp_index)if (err <0 ) goto err_xdp_reg_mem_model; +INIT_WORK (&vi->rq[qp_index].dim.work, virtnet_rx_dim_work); + vi->rq[qp_index].dim.mode =DIM_CQ_PERIOD_MODE_START_FROM_EQE ; +virtnet_napi_enable (vi->rq[qp_index].vq, &vi->rq[qp_index].napi);virtnet_napi_tx_enable (vi, vi->sq[qp_index].vq, &vi->sq[qp_index].napi);
@@ -3335,23 +3379,42 @@ static int virtnet_send_tx_notf_coal_cmds(struct virtnet_info *vi,static int virtnet_send_rx_notf_coal_cmds (struct virtnet_info *vi,struct ethtool_coalesce *ec) { +bool rx_ctrl_dim_on = !!ec->use_adaptive_rx_coalesce;struct scatterlist sgs_rx; +int i; - vi->ctrl->coal_rx.rx_usecs =cpu_to_le32 (ec->rx_coalesce_usecs); - vi->ctrl->coal_rx.rx_max_packets =cpu_to_le32 (ec->rx_max_coalesced_frames); -sg_init_one (&sgs_rx, &vi->ctrl->coal_rx,sizeof (vi->ctrl->coal_rx)); - -if (!virtnet_send_command (vi,VIRTIO_NET_CTRL_NOTF_COAL , -VIRTIO_NET_CTRL_NOTF_COAL_RX_SET , - &sgs_rx)) +if (rx_ctrl_dim_on && (ec->rx_coalesce_usecs != vi->intr_coal_rx.max_usecs || + ec->rx_max_coalesced_frames != vi->intr_coal_rx.max_packets))return -EINVAL ; -/* Save parameters */ - vi->intr_coal_rx.max_usecs = ec->rx_coalesce_usecs; - vi->intr_coal_rx.max_packets = ec->rx_max_coalesced_frames; -for (i =0 ; i < vi->max_queue_pairs; i++) { - vi->rq[i].intr_coal.max_usecs = ec->rx_coalesce_usecs; - vi->rq[i].intr_coal.max_packets = ec->rx_max_coalesced_frames; +if (rx_ctrl_dim_on) { +if (virtio_has_feature (vi->vdev,VIRTIO_NET_F_VQ_NOTF_COAL )) { + vi->rx_dim_enabled = true; +for (i =0 ; i < vi->max_queue_pairs; i++) + vi->rq[i].dim_enabled = true; + }else { +return -EOPNOTSUPP ; + } + }else { + vi->rx_dim_enabled = false; +for (i =0 ; i < vi->max_queue_pairs; i++) + vi->rq[i].dim_enabled = false; + + vi->ctrl->coal_rx.rx_usecs =cpu_to_le32 (ec->rx_coalesce_usecs); + vi->ctrl->coal_rx.rx_max_packets =cpu_to_le32 (ec->rx_max_coalesced_frames); +sg_init_one (&sgs_rx, &vi->ctrl->coal_rx,sizeof (vi->ctrl->coal_rx)); + +if (!virtnet_send_command (vi,VIRTIO_NET_CTRL_NOTF_COAL , +VIRTIO_NET_CTRL_NOTF_COAL_RX_SET , + &sgs_rx)) +return -EINVAL ; + + vi->intr_coal_rx.max_usecs = ec->rx_coalesce_usecs; + vi->intr_coal_rx.max_packets = ec->rx_max_coalesced_frames; +for (i =0 ; i < vi->max_queue_pairs; i++) { + vi->rq[i].intr_coal.max_usecs = ec->rx_coalesce_usecs; + vi->rq[i].intr_coal.max_packets = ec->rx_max_coalesced_frames; + } }return 0 ;
@@ -3377,13 +3440,27 @@ static int virtnet_send_notf_coal_vq_cmds(struct virtnet_info *vi,struct ethtool_coalesce *ec, u16 queue) { + bool rx_ctrl_dim_on; +u32 max_usecs, max_packets;int err; - err =virtnet_send_rx_ctrl_coal_vq_cmd (vi, queue, - ec->rx_coalesce_usecs, - ec->rx_max_coalesced_frames); -if (err) -return err; + rx_ctrl_dim_on = !!ec->use_adaptive_rx_coalesce; + max_usecs = vi->rq[queue].intr_coal.max_usecs; + max_packets = vi->rq[queue].intr_coal.max_packets; +if (rx_ctrl_dim_on && (ec->rx_coalesce_usecs != max_usecs || + ec->rx_max_coalesced_frames != max_packets)) +return -EINVAL ; + +if (rx_ctrl_dim_on) { + vi->rq[queue].dim_enabled = true; + }else { + vi->rq[queue].dim_enabled = false; + err =virtnet_send_rx_ctrl_coal_vq_cmd (vi, queue, + ec->rx_coalesce_usecs, + ec->rx_max_coalesced_frames); +if (err) +return err; + } err = virtnet_send_tx_ctrl_coal_vq_cmd(vi, queue, ec->tx_coalesce_usecs,
@@ -3394,6 +3471,32 @@ static int virtnet_send_notf_coal_vq_cmds(struct virtnet_info *vi,return 0 ; } +static void virtnet_rx_dim_work (struct work_struct *work) +{ + struct dim *dim = container_of(work, struct dim, work); +struct receive_queue *rq =container_of (dim, + struct receive_queue, dim); +struct virtnet_info *vi = rq->vq->vdev->priv; +struct net_device *dev = vi->dev; +struct dim_cq_moder update_moder; +int qnum = rq - vi->rq, err; + + update_moder =net_dim_get_rx_moderation (dim->mode, dim->profile_ix); +if (update_moder.usec != vi->rq[qnum].intr_coal.max_usecs || + update_moder.pkts != vi->rq[qnum].intr_coal.max_packets) { +rtnl_lock (); + err =virtnet_send_rx_ctrl_coal_vq_cmd (vi, qnum, + update_moder.usec, + update_moder.pkts); +if (err) +pr_debug ("%s: Failed to send dim parameters on rxq%d\n" , + dev->name, (int )(rq - vi->rq)); +rtnl_unlock (); + } + + dim->state =DIM_START_MEASURE ; +} +static int virtnet_coal_params_supported (struct ethtool_coalesce *ec) {/* usecs coalescing is supported only if VIRTIO_NET_F_NOTF_COAL
@@ -3475,6 +3578,7 @@ static int virtnet_get_coalesce(struct net_device *dev, ec->tx_coalesce_usecs = vi->intr_coal_tx.max_usecs; ec->tx_max_coalesced_frames = vi->intr_coal_tx.max_packets; ec->rx_max_coalesced_frames = vi->intr_coal_rx.max_packets; + ec->use_adaptive_rx_coalesce = vi->rx_dim_enabled; }else { ec->rx_max_coalesced_frames =1 ;
@@ -3532,6 +3636,7 @@ static int virtnet_get_per_queue_coalesce(struct net_device *dev, ec->tx_coalesce_usecs = vi->sq[queue].intr_coal.max_usecs; ec->tx_max_coalesced_frames = vi->sq[queue].intr_coal.max_packets; ec->rx_max_coalesced_frames = vi->rq[queue].intr_coal.max_packets; + ec->use_adaptive_rx_coalesce = vi->rq[queue].dim_enabled; }else { ec->rx_max_coalesced_frames =1 ;
@@ -3657,7 +3762,7 @@ static int virtnet_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info)static const struct ethtool_ops virtnet_ethtool_ops = { .supported_coalesce_params =ETHTOOL_COALESCE_MAX_FRAMES | -ETHTOOL_COALESCE_USECS , +ETHTOOL_COALESCE_USECS |ETHTOOL_COALESCE_USE_ADAPTIVE_RX , .get_drvinfo = virtnet_get_drvinfo, .get_link = ethtool_op_get_link, .get_ringparam = virtnet_get_ringparam,
Signature · 1 line
2.19.1.6.gb485710b
PATCH 5/5 virtio-net: support tx netdim
In reply to Heng QiSimilar to rx netdim, this patch supports adaptive tx coalescing moderation for the virtio-net.
--- drivers/net/virtio_net.c | 143 ++++++++++++++++++++++++++++++++------- 1 file changed, 119 insertions(+), 24 deletions(-)
drivers/net/virtio_net.c +119 -24
@@ -154,6 +154,15 @@ struct send_queue {struct virtnet_sq_stats stats; +/* The number of tx notifications */ +u16 calls; + +/* Is dynamic interrupt moderation enabled? */ +bool dim_enabled; + +/* Dynamic Interrupt Moderation */ +struct dim dim; +struct virtnet_interrupt_coalesce intr_coal;struct napi_struct napi;
@@ -317,8 +326,9 @@ struct virtnet_info {u8 duplex;u32 speed; -/* Is rx dynamic interrupt moderation enabled? */ +/* Is dynamic interrupt moderation enabled? */ bool rx_dim_enabled; +bool tx_dim_enabled;/* Interrupt coalescing settings */ struct virtnet_interrupt_coalesce intr_coal_tx;
@@ -464,19 +474,40 @@ static bool virtqueue_napi_complete(struct napi_struct *napi,return false; } +static void virtnet_tx_dim_work (struct work_struct *work); + +static void virtnet_tx_dim_update (struct virtnet_info *vi,struct send_queue *sq) +{ +struct virtnet_sq_stats *stats = &sq->stats; +struct dim_sample cur_sample = {}; + +u64_stats_update_begin (&sq->stats.syncp); +dim_update_sample (sq->calls, stats->packets, + stats->bytes, &cur_sample); +u64_stats_update_end (&sq->stats.syncp); + +net_dim (&sq->dim, cur_sample); +} +static void skb_xmit_done (struct virtqueue *vq) {struct virtnet_info *vi = vq->vdev->priv; -struct napi_struct *napi = &vi->sq[vq2txq (vq)].napi; +struct send_queue *sq = &vi->sq[vq2txq (vq)]; +struct napi_struct *napi = &sq->napi; + + sq->calls++;/* Suppress further interrupts. */ virtqueue_disable_cb (vq); -if (napi->weight) +if (napi->weight) {virtqueue_napi_schedule (napi, vq); -else + }else { +if (sq->dim_enabled) +virtnet_tx_dim_update (vi, sq);/* We were probably waiting for more output buffers. */ netif_wake_subqueue (vi->dev,vq2txq (vq)); + } }#define MRG_CTX_HEADER_SHIFT 22
@@ -2217,6 +2248,7 @@ static void virtnet_disable_queue_pair(struct virtnet_info *vi, int qp_index)napi_disable (&vi->rq[qp_index].napi);xdp_rxq_info_unreg (&vi->rq[qp_index].xdp_rxq);cancel_work_sync (&vi->rq[qp_index].dim.work); +cancel_work_sync (&vi->sq[qp_index].dim.work); }static int virtnet_enable_queue_pair (struct virtnet_info *vi,int qp_index)
@@ -2236,6 +2268,8 @@ static int virtnet_enable_queue_pair(struct virtnet_info *vi, int qp_index)INIT_WORK (&vi->rq[qp_index].dim.work, virtnet_rx_dim_work); vi->rq[qp_index].dim.mode =DIM_CQ_PERIOD_MODE_START_FROM_EQE ; +INIT_WORK (&vi->sq[qp_index].dim.work, virtnet_tx_dim_work); + vi->sq[qp_index].dim.mode =DIM_CQ_PERIOD_MODE_START_FROM_EQE ;virtnet_napi_enable (vi->rq[qp_index].vq, &vi->rq[qp_index].napi);virtnet_napi_tx_enable (vi, vi->sq[qp_index].vq, &vi->sq[qp_index].napi);
@@ -2316,6 +2350,9 @@ static int virtnet_poll_tx(struct napi_struct *napi, int budget)__netif_tx_unlock (txq);__napi_schedule (napi); } + }else { +if (sq->dim_enabled) +virtnet_tx_dim_update (vi, sq); } }
@@ -3353,24 +3390,42 @@ static int virtnet_get_link_ksettings(struct net_device *dev,static int virtnet_send_tx_notf_coal_cmds (struct virtnet_info *vi,struct ethtool_coalesce *ec) { +bool tx_ctrl_dim_on = !!ec->use_adaptive_tx_coalesce;struct scatterlist sgs_tx;int i; - vi->ctrl->coal_tx.tx_usecs =cpu_to_le32 (ec->tx_coalesce_usecs); - vi->ctrl->coal_tx.tx_max_packets =cpu_to_le32 (ec->tx_max_coalesced_frames); -sg_init_one (&sgs_tx, &vi->ctrl->coal_tx,sizeof (vi->ctrl->coal_tx)); - -if (!virtnet_send_command (vi,VIRTIO_NET_CTRL_NOTF_COAL , -VIRTIO_NET_CTRL_NOTF_COAL_TX_SET , - &sgs_tx)) +if (tx_ctrl_dim_on && (ec->tx_coalesce_usecs != vi->intr_coal_tx.max_usecs || + ec->tx_max_coalesced_frames != vi->intr_coal_tx.max_packets))return -EINVAL ; -/* Save parameters */ - vi->intr_coal_tx.max_usecs = ec->tx_coalesce_usecs; - vi->intr_coal_tx.max_packets = ec->tx_max_coalesced_frames; -for (i =0 ; i < vi->max_queue_pairs; i++) { - vi->sq[i].intr_coal.max_usecs = ec->tx_coalesce_usecs; - vi->sq[i].intr_coal.max_packets = ec->tx_max_coalesced_frames; +if (tx_ctrl_dim_on) { +if (virtio_has_feature (vi->vdev,VIRTIO_NET_F_VQ_NOTF_COAL )) { + vi->tx_dim_enabled = true; +for (i =0 ; i < vi->max_queue_pairs; i++) + vi->sq[i].dim_enabled = true; + }else { +return -EOPNOTSUPP ; + } + }else { + vi->tx_dim_enabled = false; +for (i =0 ; i < vi->max_queue_pairs; i++) + vi->sq[i].dim_enabled = false; + + vi->ctrl->coal_tx.tx_usecs =cpu_to_le32 (ec->tx_coalesce_usecs); + vi->ctrl->coal_tx.tx_max_packets =cpu_to_le32 (ec->tx_max_coalesced_frames); +sg_init_one (&sgs_tx, &vi->ctrl->coal_tx,sizeof (vi->ctrl->coal_tx)); + +if (!virtnet_send_command (vi,VIRTIO_NET_CTRL_NOTF_COAL , +VIRTIO_NET_CTRL_NOTF_COAL_TX_SET , + &sgs_tx)) +return -EINVAL ; + + vi->intr_coal_tx.max_usecs = ec->tx_coalesce_usecs; + vi->intr_coal_tx.max_packets = ec->tx_max_coalesced_frames; +for (i =0 ; i < vi->max_queue_pairs; i++) { + vi->sq[i].intr_coal.max_usecs = ec->tx_coalesce_usecs; + vi->sq[i].intr_coal.max_packets = ec->tx_max_coalesced_frames; + } }return 0 ;
@@ -3436,11 +3491,37 @@ static int virtnet_send_notf_coal_cmds(struct virtnet_info *vi,return 0 ; } +static void virtnet_tx_dim_work (struct work_struct *work) +{ + struct dim *dim = container_of(work, struct dim, work); +struct send_queue *sq =container_of (dim, + struct send_queue, dim); +struct virtnet_info *vi = sq->vq->vdev->priv; +struct net_device *dev = vi->dev; +struct dim_cq_moder update_moder; +int qnum = sq - vi->sq, err; + + update_moder =net_dim_get_tx_moderation (dim->mode, dim->profile_ix); +if (update_moder.usec != vi->sq[qnum].intr_coal.max_usecs || + update_moder.pkts != vi->sq[qnum].intr_coal.max_packets) { +rtnl_lock (); + err =virtnet_send_tx_ctrl_coal_vq_cmd (vi, qnum, + update_moder.usec, + update_moder.pkts); +if (err) +pr_debug ("%s: Failed to send dim parameters on txq%d\n" , + dev->name, (int )(sq - vi->sq)); +rtnl_unlock (); + } + + dim->state =DIM_START_MEASURE ; +} +static int virtnet_send_notf_coal_vq_cmds (struct virtnet_info *vi,struct ethtool_coalesce *ec,u16 queue) { -bool rx_ctrl_dim_on; +bool rx_ctrl_dim_on, tx_ctrl_dim_on;u32 max_usecs, max_packets;int err;
@@ -3462,11 +3543,23 @@ static int virtnet_send_notf_coal_vq_cmds(struct virtnet_info *vi,return err; } - err =virtnet_send_tx_ctrl_coal_vq_cmd (vi, queue, - ec->tx_coalesce_usecs, - ec->tx_max_coalesced_frames); -if (err) -return err; + tx_ctrl_dim_on = !!ec->use_adaptive_tx_coalesce; + max_usecs = vi->sq[queue].intr_coal.max_usecs; + max_packets = vi->sq[queue].intr_coal.max_packets; +if (tx_ctrl_dim_on && (ec->tx_coalesce_usecs != max_usecs || + ec->tx_max_coalesced_frames != max_packets)) +return -EINVAL ; + +if (tx_ctrl_dim_on) { + vi->sq[queue].dim_enabled = true; + }else { + vi->sq[queue].dim_enabled = false; + err =virtnet_send_tx_ctrl_coal_vq_cmd (vi, queue, + ec->tx_coalesce_usecs, + ec->tx_max_coalesced_frames); +if (err) +return err; + }return 0 ; }
@@ -3579,6 +3672,7 @@ static int virtnet_get_coalesce(struct net_device *dev, ec->tx_max_coalesced_frames = vi->intr_coal_tx.max_packets; ec->rx_max_coalesced_frames = vi->intr_coal_rx.max_packets; ec->use_adaptive_rx_coalesce = vi->rx_dim_enabled; + ec->use_adaptive_tx_coalesce = vi->tx_dim_enabled; }else { ec->rx_max_coalesced_frames =1 ;
@@ -3637,6 +3731,7 @@ static int virtnet_get_per_queue_coalesce(struct net_device *dev, ec->tx_max_coalesced_frames = vi->sq[queue].intr_coal.max_packets; ec->rx_max_coalesced_frames = vi->rq[queue].intr_coal.max_packets; ec->use_adaptive_rx_coalesce = vi->rq[queue].dim_enabled; + ec->use_adaptive_tx_coalesce = vi->sq[queue].dim_enabled; }else { ec->rx_max_coalesced_frames =1 ;
@@ -3762,7 +3857,7 @@ static int virtnet_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info)static const struct ethtool_ops virtnet_ethtool_ops = { .supported_coalesce_params =ETHTOOL_COALESCE_MAX_FRAMES | -ETHTOOL_COALESCE_USECS |ETHTOOL_COALESCE_USE_ADAPTIVE_RX , +ETHTOOL_COALESCE_USECS |ETHTOOL_COALESCE_USE_ADAPTIVE , .get_drvinfo = virtnet_get_drvinfo, .get_link = ethtool_op_get_link, .get_ringparam = virtnet_get_ringparam,
Signature · 1 line
2.19.1.6.gb485710b
Quoted 6 lines · Heng Qi
Now, virtio-net already supports per-queue moderation parameter setting. Based on this, we use the netdim library of linux to support dynamic coalescing moderation for virtio-net.
Due to hardware scheduling issues, we only tested rx dim.
Do you have PPS numbers? And TX numbers are also important as the throughput could be misleading due to various reasons.
Thanks
Quoted 50 lines
@Test env
rxq0 has affinity to cpu0.@Test cmd
client: taskset -c 0 sockperf tp -i ${IP} -t 30 --tcp -m ${msg_size}
server: taskset -c 0 sockperf sr --tcp@Test res
The second column is the ratio of the result returned by client when rx dim is enabled to the result returned by client when rx dim is disabled.-------------------------------------- | msg_size | rx_dim=on / rx_dim=off | -------------------------------------- | 14B | + 3% | -------------------------------------- | 100B | + 16% | -------------------------------------- | 500B | + 25% | -------------------------------------- | 1400B | + 28% | -------------------------------------- | 2048B | + 22% | -------------------------------------- | 4096B | + 5% | -----------------------------------------
This patch set was part of the previous netdim patch set[1].
[1] was split into a merged bugfix set[2] and the current set. The previous relevant commentators have been Cced.[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/[email protected]/Heng Qi (5):
virtio-net: returns whether napi is complete
virtio-net: separate rx/tx coalescing moderation cmds
virtio-net: extract virtqueue coalescig cmd for reuse
virtio-net: support rx netdim
virtio-net: support tx netdimdrivers/net/virtio_net.c | 394 ++++++++++++++++++++++++++++++++------- 1 file changed, 322 insertions(+), 72 deletions(-)--
2.19.1.6.gb485710b
Quoted 11 lines · Jason Wang
Quoted 6 lines · Heng Qi
Now, virtio-net already supports per-queue moderation parameter setting. Based on this, we use the netdim library of linux to support dynamic coalescing moderation for virtio-net.
Due to hardware scheduling issues, we only tested rx dim.
Do you have PPS numbers? And TX numbers are also important as the throughput could be misleading due to various reasons.
Another consideration:
We currently have two TX mode, NAPI by default, and orphan. Simple pktgen test shows NAPI can only achieve 30% of orphan. So we need to make sure:
1) dim helps for NAPI, and if NAPI can compete with orphan, we can drop the orphan code completely which is a great release and simplification of the codes. And it means we can have BQL, and other good stuff on top easily.
2) dim doesn't cause regression for orphan
Thanks
Quoted 53 lines
Thanks
Quoted 50 lines
@Test env
rxq0 has affinity to cpu0.@Test cmd
client: taskset -c 0 sockperf tp -i ${IP} -t 30 --tcp -m ${msg_size}
server: taskset -c 0 sockperf sr --tcp@Test res
The second column is the ratio of the result returned by client when rx dim is enabled to the result returned by client when rx dim is disabled.-------------------------------------- | msg_size | rx_dim=on / rx_dim=off | -------------------------------------- | 14B | + 3% | -------------------------------------- | 100B | + 16% | -------------------------------------- | 500B | + 25% | -------------------------------------- | 1400B | + 28% | -------------------------------------- | 2048B | + 22% | -------------------------------------- | 4096B | + 5% | -----------------------------------------
This patch set was part of the previous netdim patch set[1].
[1] was split into a merged bugfix set[2] and the current set. The previous relevant commentators have been Cced.[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/[email protected]/Heng Qi (5):
virtio-net: returns whether napi is complete
virtio-net: separate rx/tx coalescing moderation cmds
virtio-net: extract virtqueue coalescig cmd for reuse
virtio-net: support rx netdim
virtio-net: support tx netdimdrivers/net/virtio_net.c | 394 ++++++++++++++++++++++++++++++++------- 1 file changed, 322 insertions(+), 72 deletions(-)--
2.19.1.6.gb485710b
Jakub Kicinski
maintainerRe: [PATCH net-next 2/5] virtio-net: separate rx/tx coalescing moderation cmds
In reply to Heng Qidrivers/net/virtio_net.c static int virtnet_send_notf_coal_cmds(struct virtnet_info *vi, · line 3293
Quoted 6 lines · On Thu, 12 Oct 2023 15:44:06 +0800 Heng Qi wrote:
drivers/net/virtio_net.c +6
-0+ +static int virtnet_send_rx_notf_coal_cmds (struct virtnet_info *vi, +struct ethtool_coalesce *ec) +{ +struct scatterlist sgs_rx; +
../drivers/net/virtio_net.c: In function ‘virtnet_send_rx_notf_coal_cmds’:../drivers/net/virtio_net.c:3306:14: error: ‘i’ undeclared (first use in this function); did you mean ‘vi’?
3306 | for (i = 0; i < vi->max_queue_pairs; i++) {
| ^
| viQuoted 8 lines · Jason Wang
Quoted 5 lines · Heng Qi
Now, virtio-net already supports per-queue moderation parameter setting. Based on this, we use the netdim library of linux to support dynamic coalescing moderation for virtio-net.
Due to hardware scheduling issues, we only tested rx dim.
Do you have PPS numbers? And TX numbers are also important as the throughput could be misleading due to various reasons.
OK, will reply until the test environment is ready (the test machine is currently locked by someone else).
Thanks!
Quoted 52 lines
Thanks
Quoted 49 lines
@Test env
rxq0 has affinity to cpu0.@Test cmd
client: taskset -c 0 sockperf tp -i ${IP} -t 30 --tcp -m ${msg_size}
server: taskset -c 0 sockperf sr --tcp@Test res
The second column is the ratio of the result returned by client when rx dim is enabled to the result returned by client when rx dim is disabled.-------------------------------------- | msg_size | rx_dim=on / rx_dim=off | -------------------------------------- | 14B | + 3% | -------------------------------------- | 100B | + 16% | -------------------------------------- | 500B | + 25% | -------------------------------------- | 1400B | + 28% | -------------------------------------- | 2048B | + 22% | -------------------------------------- | 4096B | + 5% | -----------------------------------------
This patch set was part of the previous netdim patch set[1].
[1] was split into a merged bugfix set[2] and the current set. The previous relevant commentators have been Cced.[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/[email protected]/Heng Qi (5):
virtio-net: returns whether napi is complete
virtio-net: separate rx/tx coalescing moderation cmds
virtio-net: extract virtqueue coalescig cmd for reuse
virtio-net: support rx netdim
virtio-net: support tx netdimdrivers/net/virtio_net.c | 394 ++++++++++++++++++++++++++++++++------- 1 file changed, 322 insertions(+), 72 deletions(-)--
2.19.1.6.gb485710b
Re: [PATCH net-next 2/5] virtio-net: separate rx/tx coalescing moderation cmds
In reply to Jakub KicinskiQuoted 9 lines · Jakub Kicinski
drivers/net/virtio_net.c static int virtnet_send_notf_coal_cmds(struct virtnet_info *vi, · line 3293
Quoted 6 lines · On Thu, 12 Oct 2023 15:44:06 +0800 Heng Qi wrote:
drivers/net/virtio_net.c +6
-0+ +static int virtnet_send_rx_notf_coal_cmds (struct virtnet_info *vi, +struct ethtool_coalesce *ec) +{ +struct scatterlist sgs_rx; +
../drivers/net/virtio_net.c: In function ‘virtnet_send_rx_notf_coal_cmds’:../drivers/net/virtio_net.c:3306:14: error: ‘i’ undeclared (first use in this function); did you mean ‘vi’?
Quoted 3 lines
3306 | for (i = 0; i < vi->max_queue_pairs; i++) {
| ^
| viWill fix in the next version.
Thanks!
Michael S. Tsirkin
maintainerRe: [PATCH net-next 2/5] virtio-net: separate rx/tx coalescing moderation cmds
Quoted 16 lines · Heng Qi
Quoted 9 lines · Jakub Kicinski
drivers/net/virtio_net.c static int virtnet_send_notf_coal_cmds(struct virtnet_info *vi, · line 3293
Quoted 6 lines · On Thu, 12 Oct 2023 15:44:06 +0800 Heng Qi wrote:
drivers/net/virtio_net.c +6
-0+ +static int virtnet_send_rx_notf_coal_cmds (struct virtnet_info *vi, +struct ethtool_coalesce *ec) +{ +struct scatterlist sgs_rx; +
../drivers/net/virtio_net.c: In function ‘virtnet_send_rx_notf_coal_cmds’:../drivers/net/virtio_net.c:3306:14: error: ‘i’ undeclared (first use in this function); did you mean ‘vi’?Quoted 3 lines
3306 | for (i = 0; i < vi->max_queue_pairs; i++) { | ^ | vi
Quoted 3 lines
Will fix in the next version.
Thanks!
OK, however pls do test individual patches as well as the whole patchset.
Signature · 6 lines
MST _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Quoted 8 lines · Jason Wang
Quoted 5 lines · Heng Qi
Now, virtio-net already supports per-queue moderation parameter setting. Based on this, we use the netdim library of linux to support dynamic coalescing moderation for virtio-net.
Due to hardware scheduling issues, we only tested rx dim.
Do you have PPS numbers? And TX numbers are also important as the throughput could be misleading due to various reasons.
Hi Jason!
The comparison of rx netdim performance is as follows:
(the backend supporting tx dim is not yet ready)
I. Sockperf UDP
=================================================
1. Envrxq_0 is affinity to cpu_0
2. Cmd
client: taskset -c 0 sockperf tp -p 8989 -i $IP -t 10 -m 16B
server: taskset -c 0 sockperf sr -p 8989
3. Result
dim off: 1143277.00 rxpps, throughput 17.844 MBps, cpu is 100%. dim on: 1124161.00 rxpps, throughput 17.610 MBps, cpu is 83.5%.
=================================================
II. Redis
=================================================
1. Env
There are 8 rxqs and rxq_i is affinity to cpu_i.
2. Result
When all cpus are 100%, ops/sec of memtier_benchmark client is dim off: 978437.23
dim on: 1143638.28
=================================================
III. Nginx
=================================================
1. Env
There are 8 rxqs and rxq_i is affinity to cpu_i.
2. Result
When all cpus are 100%, requests/sec of wrk client is dim off: 877931.67
dim on: 1019160.31
=================================================
Thanks!
Quoted 52 lines
Thanks
Quoted 49 lines
@Test env
rxq0 has affinity to cpu0.@Test cmd
client: taskset -c 0 sockperf tp -i ${IP} -t 30 --tcp -m ${msg_size}
server: taskset -c 0 sockperf sr --tcp@Test res
The second column is the ratio of the result returned by client when rx dim is enabled to the result returned by client when rx dim is disabled.-------------------------------------- | msg_size | rx_dim=on / rx_dim=off | -------------------------------------- | 14B | + 3% | -------------------------------------- | 100B | + 16% | -------------------------------------- | 500B | + 25% | -------------------------------------- | 1400B | + 28% | -------------------------------------- | 2048B | + 22% | -------------------------------------- | 4096B | + 5% | -----------------------------------------
This patch set was part of the previous netdim patch set[1].
[1] was split into a merged bugfix set[2] and the current set. The previous relevant commentators have been Cced.[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/[email protected]/Heng Qi (5):
virtio-net: returns whether napi is complete
virtio-net: separate rx/tx coalescing moderation cmds
virtio-net: extract virtqueue coalescig cmd for reuse
virtio-net: support rx netdim
virtio-net: support tx netdimdrivers/net/virtio_net.c | 394 ++++++++++++++++++++++++++++++++------- 1 file changed, 322 insertions(+), 72 deletions(-)--
2.19.1.6.gb485710b
Quoted 9 lines · Heng Qi
Quoted 5 lines · Jason Wang
Quoted 4 lines · Heng Qi
Now, virtio-net already supports per-queue moderation parameter setting. Based on this, we use the netdim library of linux to support dynamic coalescing moderation for virtio-net.
Quoted 8 lines
Quoted 3 lines
Quoted 1 line
Due to hardware scheduling issues, we only tested rx dim.
Do you have PPS numbers? And TX numbers are also important as the throughput could be misleading due to various reasons.
Hi Jason!
The comparison of rx netdim performance is as follows:
(the backend supporting tx dim is not yet ready)
Thanks a lot for the numbers.
I'd still expect the TX result as I did play tx interrupt coalescing about 10 years ago.
I will start to review the series but let's try to have some TX numbers as well.
Btw, it would be more convenient to have a raw PPS benchmark. E.g you can try to use a software or hardware packet generator.
Thanks
Quoted 96 lines
I. Sockperf UDP
=================================================
1. Envrxq_0is affinity tocpu_02. Cmd
client: taskset -c 0 sockperf tp -p 8989 -i $IP -t 10 -m 16B
server: taskset -c 0 sockperf sr -p 89893. Result
dim off: 1143277.00 rxpps, throughput 17.844 MBps, cpu is 100%. dim on: 1124161.00 rxpps, throughput 17.610 MBps, cpu is 83.5%.
=================================================II. Redis
=================================================
1. Env
There are 8 rxqs andrxq_iis affinity tocpu_i.2. Result
When all cpus are 100%, ops/sec ofmemtier_benchmarkclient is
dim off: 978437.23
dim on: 1143638.28
=================================================III. Nginx
=================================================
1. Env
There are 8 rxqs andrxq_iis affinity tocpu_i.2. Result
When all cpus are 100%, requests/sec of wrk client is
dim off: 877931.67
dim on: 1019160.31
=================================================Thanks!
Quoted 52 lines
Thanks
Quoted 49 lines
@Test env
rxq0 has affinity to cpu0.@Test cmd
client: taskset -c 0 sockperf tp -i ${IP} -t 30 --tcp -m ${msg_size}
server: taskset -c 0 sockperf sr --tcp@Test res
The second column is the ratio of the result returned by client when rx dim is enabled to the result returned by client when rx dim is disabled.-------------------------------------- | msg_size | rx_dim=on / rx_dim=off | -------------------------------------- | 14B | + 3% | -------------------------------------- | 100B | + 16% | -------------------------------------- | 500B | + 25% | -------------------------------------- | 1400B | + 28% | -------------------------------------- | 2048B | + 22% | -------------------------------------- | 4096B | + 5% | -----------------------------------------
This patch set was part of the previous netdim patch set[1].
[1] was split into a merged bugfix set[2] and the current set. The previous relevant commentators have been Cced.[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/[email protected]/Heng Qi (5):
virtio-net: returns whether napi is complete
virtio-net: separate rx/tx coalescing moderation cmds
virtio-net: extract virtqueue coalescig cmd for reuse
virtio-net: support rx netdim
virtio-net: support tx netdimdrivers/net/virtio_net.c | 394 ++++++++++++++++++++++++++++++++------- 1 file changed, 322 insertions(+), 72 deletions(-)--
2.19.1.6.gb485710b
Re: [PATCH net-next 1/5] virtio-net: returns whether napi is complete
In reply to Heng QiQuoted 7 lines · Heng Qi
rx netdim needs to count the traffic during a complete napi process, and start updating and comparing samples to make decisions after the napi ends. Let
virtqueue_napi_complete()return true if napi is done, otherwise vice versa.Signed-off-by Heng Qi <[email protected]>
Thanks
Quoted 34 lines
--- drivers/net/virtio_net.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)drivers/net/virtio_net.c +5
-2@@ -431,7 +431,7 @@ static void virtqueue_napi_schedule(struct napi_struct *napi, } } -static void virtqueue_napi_complete (struct napi_struct *napi, +static bool virtqueue_napi_complete (struct napi_struct *napi,struct virtqueue *vq,int processed) {int opaque;@@ -440,9 +440,13 @@ static void virtqueue_napi_complete(struct napi_struct *napi,if (napi_complete_done (napi, processed)) {if (unlikely (virtqueue_poll (vq, opaque)))virtqueue_napi_schedule (napi, vq); +else +return true; }else {virtqueue_disable_cb (vq); } + +return false; }static void skb_xmit_done (struct virtqueue *vq) --2.19.1.6.gb485710b
Re: [PATCH net-next 3/5] virtio-net: extract virtqueue coalescig cmd for reuse
In reply to Heng QiQuoted 5 lines · Heng Qi
Extract commands to set virtqueue coalescing parameters for reuse by ethtool -Q, vq resize and netdim.
Signed-off-by Heng Qi <[email protected]>
Thanks
Quoted 161 lines
--- drivers/net/virtio_net.c | 106 +++++++++++++++++++++++---------------- 1 file changed, 64 insertions(+), 42 deletions(-)drivers/net/virtio_net.c +64
-43@@ -2846,6 +2846,58 @@ static void virtnet_cpu_notif_remove(struct virtnet_info *vi) &vi->node_dead); } +static int virtnet_send_ctrl_coal_vq_cmd (struct virtnet_info *vi, +u16 vqn,u32 max_usecs,u32 max_packets) +{ +struct scatterlist sgs; + + vi->ctrl->coal_vq.vqn =cpu_to_le16 (vqn); + vi->ctrl->coal_vq.coal.max_usecs =cpu_to_le32 (max_usecs); + vi->ctrl->coal_vq.coal.max_packets =cpu_to_le32 (max_packets); +sg_init_one (&sgs, &vi->ctrl->coal_vq,sizeof (vi->ctrl->coal_vq)); + +if (!virtnet_send_command (vi,VIRTIO_NET_CTRL_NOTF_COAL , +VIRTIO_NET_CTRL_NOTF_COAL_VQ_SET , + &sgs)) +return -EINVAL ; + +return 0 ; +} + +static int virtnet_send_rx_ctrl_coal_vq_cmd (struct virtnet_info *vi, +u16 queue,u32 max_usecs, +u32 max_packets) +{ +int err; + + err =virtnet_send_ctrl_coal_vq_cmd (vi,rxq2vq (queue), + max_usecs, max_packets); +if (err) +return err; + + vi->rq[queue].intr_coal.max_usecs = max_usecs; + vi->rq[queue].intr_coal.max_packets = max_packets; + +return 0 ; +} + +static int virtnet_send_tx_ctrl_coal_vq_cmd (struct virtnet_info *vi, +u16 queue,u32 max_usecs, +u32 max_packets) +{ +int err; + + err =virtnet_send_ctrl_coal_vq_cmd (vi,txq2vq (queue), + max_usecs, max_packets); +if (err) +return err; + + vi->sq[queue].intr_coal.max_usecs = max_usecs; + vi->sq[queue].intr_coal.max_packets = max_packets; + +return 0 ; +} + static void virtnet_get_ringparam(struct net_device *dev, struct ethtool_ringparam *ring, struct kernel_ethtool_ringparam *kernel_ring,@@ -2903,14 +2955,11 @@ static int virtnet_set_ringparam(struct net_device *dev,* through the VIRTIO_NET_CTRL_NOTF_COAL_TX_SET command, or, if the driver * did not set any TX coalescing parameters, to 0. */ - err =virtnet_send_ctrl_coal_vq_cmd (vi,txq2vq (i), - vi->intr_coal_tx.max_usecs, - vi->intr_coal_tx.max_packets); + err =virtnet_send_tx_ctrl_coal_vq_cmd (vi, i, + vi->intr_coal_tx.max_usecs, + vi->intr_coal_tx.max_packets);if (err)return err; - - vi->sq[i].intr_coal.max_usecs = vi->intr_coal_tx.max_usecs; - vi->sq[i].intr_coal.max_packets = vi->intr_coal_tx.max_packets; }if (ring->rx_pending != rx_pending) {@@ -2919,14 +2968,11 @@ static int virtnet_set_ringparam(struct net_device *dev,return err;/* The reason is same as the transmit virtqueue reset */ - err =virtnet_send_ctrl_coal_vq_cmd (vi,rxq2vq (i), - vi->intr_coal_rx.max_usecs, - vi->intr_coal_rx.max_packets); + err =virtnet_send_rx_ctrl_coal_vq_cmd (vi, i, + vi->intr_coal_rx.max_usecs, + vi->intr_coal_rx.max_packets);if (err)return err; - - vi->rq[i].intr_coal.max_usecs = vi->intr_coal_rx.max_usecs; - vi->rq[i].intr_coal.max_packets = vi->intr_coal_rx.max_packets; } }@@ -3327,48 +3373,24 @@ static int virtnet_send_notf_coal_cmds(struct virtnet_info *vi,return 0 ; } -static int virtnet_send_ctrl_coal_vq_cmd (struct virtnet_info *vi, -u16 vqn,u32 max_usecs,u32 max_packets) -{ -struct scatterlist sgs; - - vi->ctrl->coal_vq.vqn =cpu_to_le16 (vqn); - vi->ctrl->coal_vq.coal.max_usecs =cpu_to_le32 (max_usecs); - vi->ctrl->coal_vq.coal.max_packets =cpu_to_le32 (max_packets); -sg_init_one (&sgs, &vi->ctrl->coal_vq,sizeof (vi->ctrl->coal_vq)); - -if (!virtnet_send_command (vi,VIRTIO_NET_CTRL_NOTF_COAL , -VIRTIO_NET_CTRL_NOTF_COAL_VQ_SET , - &sgs)) -return -EINVAL ; - -return 0 ; -} -static int virtnet_send_notf_coal_vq_cmds (struct virtnet_info *vi,struct ethtool_coalesce *ec,u16 queue) {int err; - err =virtnet_send_ctrl_coal_vq_cmd (vi,rxq2vq (queue), - ec->rx_coalesce_usecs, - ec->rx_max_coalesced_frames); + err =virtnet_send_rx_ctrl_coal_vq_cmd (vi, queue, + ec->rx_coalesce_usecs, + ec->rx_max_coalesced_frames);if (err)return err; - vi->rq[queue].intr_coal.max_usecs = ec->rx_coalesce_usecs; - vi->rq[queue].intr_coal.max_packets = ec->rx_max_coalesced_frames; - - err =virtnet_send_ctrl_coal_vq_cmd (vi,txq2vq (queue), - ec->tx_coalesce_usecs, - ec->tx_max_coalesced_frames); + err =virtnet_send_tx_ctrl_coal_vq_cmd (vi, queue, + ec->tx_coalesce_usecs, + ec->tx_max_coalesced_frames);if (err)return err; - vi->sq[queue].intr_coal.max_usecs = ec->tx_coalesce_usecs; - vi->sq[queue].intr_coal.max_packets = ec->tx_max_coalesced_frames; -return 0 ; } --2.19.1.6.gb485710b
Re: [PATCH net-next 4/5] virtio-net: support rx netdim
In reply to Heng QiQuoted 134 lines · Heng Qi
By comparing the traffic information in the complete napi processes, let the virtio-net driver automatically adjust the coalescing moderation parameters of each receive queue.
Signed-off-by Heng Qi <[email protected]>--- drivers/net/virtio_net.c | 147 +++++++++++++++++++++++++++++++++------ 1 file changed, 126 insertions(+), 21 deletions(-)drivers/net/virtio_net.c +48
-2@@ -19,6 +19,7 @@#include <linux/average.h> #include <linux/filter.h> #include <linux/kernel.h> +#include <linux/dim.h> #include <net/route.h> #include <net/xdp.h> #include <net/net_failover.h> @@ -172,6 +173,17 @@ struct receive_queue {struct virtnet_rq_stats stats; +/* The number of rx notifications */ +u16 calls; + +/* Is dynamic interrupt moderation enabled? */ +bool dim_enabled; + +/* Dynamic Interrupt Moderation */ +struct dim dim; + +u32 packets_in_napi; +struct virtnet_interrupt_coalesce intr_coal;/* Chain pages by the private ptr. */ @@ -305,6 +317,9 @@ struct virtnet_info {u8 duplex;u32 speed; +/* Is rx dynamic interrupt moderation enabled? */ +bool rx_dim_enabled; +/* Interrupt coalescing settings */ struct virtnet_interrupt_coalesce intr_coal_tx;struct virtnet_interrupt_coalesce intr_coal_rx;@@ -2001,6 +2016,7 @@ static void skb_recv_done(struct virtqueue *rvq)struct virtnet_info *vi = rvq->vdev->priv;struct receive_queue *rq = &vi->rq[vq2rxq (rvq)]; + rq->calls++;virtqueue_napi_schedule (&rq->napi, rvq); }@@ -2138,6 +2154,25 @@ static void virtnet_poll_cleantx(struct receive_queue *rq) } } +static void virtnet_rx_dim_work (struct work_struct *work); + +static void virtnet_rx_dim_update (struct virtnet_info *vi,struct receive_queue *rq) +{ +struct virtnet_rq_stats *stats = &rq->stats; +struct dim_sample cur_sample = {}; + +if (!rq->packets_in_napi) +return ; + +u64_stats_update_begin (&rq->stats.syncp); +dim_update_sample (rq->calls, stats->packets, + stats->bytes, &cur_sample); +u64_stats_update_end (&rq->stats.syncp); + +net_dim (&rq->dim, cur_sample); + rq->packets_in_napi =0 ; +} +static int virtnet_poll (struct napi_struct *napi,int budget) { struct receive_queue *rq =@@ -2146,17 +2181,22 @@ static int virtnet_poll(struct napi_struct *napi, int budget)struct send_queue *sq;unsigned int received;unsigned int xdp_xmit =0 ; +bool napi_complete;virtnet_poll_cleantx (rq); received =virtnet_receive (rq, budget, &xdp_xmit); + rq->packets_in_napi += received;if (xdp_xmit &VIRTIO_XDP_REDIR )xdp_do_flush ();/* Out of packets? */ -if (received < budget) -virtqueue_napi_complete (napi, rq->vq, received); +if (received < budget) { + napi_complete =virtqueue_napi_complete (napi, rq->vq, received); +if (napi_complete && rq->dim_enabled) +virtnet_rx_dim_update (vi, rq); + }if (xdp_xmit &VIRTIO_XDP_TX ) { sq =virtnet_xdp_get_sq (vi);@@ -2176,6 +2216,7 @@ static void virtnet_disable_queue_pair(struct virtnet_info *vi, int qp_index)virtnet_napi_tx_disable (&vi->sq[qp_index].napi);napi_disable (&vi->rq[qp_index].napi);xdp_rxq_info_unreg (&vi->rq[qp_index].xdp_rxq); +cancel_work_sync (&vi->rq[qp_index].dim.work); }static int virtnet_enable_queue_pair (struct virtnet_info *vi,int qp_index)@@ -2193,6 +2234,9 @@ static int virtnet_enable_queue_pair(struct virtnet_info *vi, int qp_index)if (err <0 ) goto err_xdp_reg_mem_model; +INIT_WORK (&vi->rq[qp_index].dim.work, virtnet_rx_dim_work); + vi->rq[qp_index].dim.mode =DIM_CQ_PERIOD_MODE_START_FROM_EQE ; +virtnet_napi_enable (vi->rq[qp_index].vq, &vi->rq[qp_index].napi);virtnet_napi_tx_enable (vi, vi->sq[qp_index].vq, &vi->sq[qp_index].napi);@@ -3335,23 +3379,42 @@ static int virtnet_send_tx_notf_coal_cmds(struct virtnet_info *vi,static int virtnet_send_rx_notf_coal_cmds (struct virtnet_info *vi,struct ethtool_coalesce *ec) { +bool rx_ctrl_dim_on = !!ec->use_adaptive_rx_coalesce;struct scatterlist sgs_rx; +int i;
drivers/net/virtio_net.c static int virtnet_send_tx_notf_coal_cmds(struct virtnet_info *vi, · line 3387
Quoted 10 lines
drivers/net/virtio_net.c +2
-7- vi->ctrl->coal_rx.rx_usecs =cpu_to_le32 (ec->rx_coalesce_usecs); - vi->ctrl->coal_rx.rx_max_packets =cpu_to_le32 (ec->rx_max_coalesced_frames); -sg_init_one (&sgs_rx, &vi->ctrl->coal_rx,sizeof (vi->ctrl->coal_rx)); - -if (!virtnet_send_command (vi,VIRTIO_NET_CTRL_NOTF_COAL , -VIRTIO_NET_CTRL_NOTF_COAL_RX_SET , - &sgs_rx)) +if (rx_ctrl_dim_on && (ec->rx_coalesce_usecs != vi->intr_coal_rx.max_usecs || + ec->rx_max_coalesced_frames != vi->intr_coal_rx.max_packets))
Any reason we need to stick a check for usecs/packets? I think it might confuse the user since the value could be modified by netdim actually.
Quoted 79 lines
drivers/net/virtio_net.c +50
-11return -EINVAL ; -/* Save parameters */ - vi->intr_coal_rx.max_usecs = ec->rx_coalesce_usecs; - vi->intr_coal_rx.max_packets = ec->rx_max_coalesced_frames; -for (i =0 ; i < vi->max_queue_pairs; i++) { - vi->rq[i].intr_coal.max_usecs = ec->rx_coalesce_usecs; - vi->rq[i].intr_coal.max_packets = ec->rx_max_coalesced_frames; +if (rx_ctrl_dim_on) { +if (virtio_has_feature (vi->vdev,VIRTIO_NET_F_VQ_NOTF_COAL )) { + vi->rx_dim_enabled = true; +for (i =0 ; i < vi->max_queue_pairs; i++) + vi->rq[i].dim_enabled = true; + }else { +return -EOPNOTSUPP ; + } + }else { + vi->rx_dim_enabled = false; +for (i =0 ; i < vi->max_queue_pairs; i++) + vi->rq[i].dim_enabled = false; + + vi->ctrl->coal_rx.rx_usecs =cpu_to_le32 (ec->rx_coalesce_usecs); + vi->ctrl->coal_rx.rx_max_packets =cpu_to_le32 (ec->rx_max_coalesced_frames); +sg_init_one (&sgs_rx, &vi->ctrl->coal_rx,sizeof (vi->ctrl->coal_rx)); + +if (!virtnet_send_command (vi,VIRTIO_NET_CTRL_NOTF_COAL , +VIRTIO_NET_CTRL_NOTF_COAL_RX_SET , + &sgs_rx)) +return -EINVAL ; + + vi->intr_coal_rx.max_usecs = ec->rx_coalesce_usecs; + vi->intr_coal_rx.max_packets = ec->rx_max_coalesced_frames; +for (i =0 ; i < vi->max_queue_pairs; i++) { + vi->rq[i].intr_coal.max_usecs = ec->rx_coalesce_usecs; + vi->rq[i].intr_coal.max_packets = ec->rx_max_coalesced_frames; + } }return 0 ;@@ -3377,13 +3440,27 @@ static int virtnet_send_notf_coal_vq_cmds(struct virtnet_info *vi,struct ethtool_coalesce *ec, u16 queue) { + bool rx_ctrl_dim_on; +u32 max_usecs, max_packets;int err; - err =virtnet_send_rx_ctrl_coal_vq_cmd (vi, queue, - ec->rx_coalesce_usecs, - ec->rx_max_coalesced_frames); -if (err) -return err; + rx_ctrl_dim_on = !!ec->use_adaptive_rx_coalesce; + max_usecs = vi->rq[queue].intr_coal.max_usecs; + max_packets = vi->rq[queue].intr_coal.max_packets; +if (rx_ctrl_dim_on && (ec->rx_coalesce_usecs != max_usecs || + ec->rx_max_coalesced_frames != max_packets)) +return -EINVAL ; + +if (rx_ctrl_dim_on) { + vi->rq[queue].dim_enabled = true; + }else { + vi->rq[queue].dim_enabled = false; + err =virtnet_send_rx_ctrl_coal_vq_cmd (vi, queue, + ec->rx_coalesce_usecs, + ec->rx_max_coalesced_frames); +if (err) +return err; + } err = virtnet_send_tx_ctrl_coal_vq_cmd(vi, queue, ec->tx_coalesce_usecs,@@ -3394,6 +3471,32 @@ static int virtnet_send_notf_coal_vq_cmds(struct virtnet_info *vi,return 0 ; } +static void virtnet_rx_dim_work (struct work_struct *work) +{ + struct dim *dim = container_of(work, struct dim, work);
drivers/net/virtio_net.c static int virtnet_send_notf_coal_vq_cmds(struct virtnet_info *vi, · line 3486
Quoted 10 lines
drivers/net/virtio_net.c +10
-0+struct receive_queue *rq =container_of (dim, + struct receive_queue, dim); +struct virtnet_info *vi = rq->vq->vdev->priv; +struct net_device *dev = vi->dev; +struct dim_cq_moder update_moder; +int qnum = rq - vi->rq, err; + + update_moder =net_dim_get_rx_moderation (dim->mode, dim->profile_ix); +if (update_moder.usec != vi->rq[qnum].intr_coal.max_usecs || + update_moder.pkts != vi->rq[qnum].intr_coal.max_packets) {
Is this safe across the e.g vq reset?
Thanks
Quoted 44 lines
drivers/net/virtio_net.c +16
-2+rtnl_lock (); + err =virtnet_send_rx_ctrl_coal_vq_cmd (vi, qnum, + update_moder.usec, + update_moder.pkts); +if (err) +pr_debug ("%s: Failed to send dim parameters on rxq%d\n" , + dev->name, (int )(rq - vi->rq)); +rtnl_unlock (); + } + + dim->state =DIM_START_MEASURE ; +} +static int virtnet_coal_params_supported (struct ethtool_coalesce *ec) {/* usecs coalescing is supported only if VIRTIO_NET_F_NOTF_COAL @@ -3475,6 +3578,7 @@ static int virtnet_get_coalesce(struct net_device *dev, ec->tx_coalesce_usecs = vi->intr_coal_tx.max_usecs; ec->tx_max_coalesced_frames = vi->intr_coal_tx.max_packets; ec->rx_max_coalesced_frames = vi->intr_coal_rx.max_packets; + ec->use_adaptive_rx_coalesce = vi->rx_dim_enabled; }else { ec->rx_max_coalesced_frames =1 ;@@ -3532,6 +3636,7 @@ static int virtnet_get_per_queue_coalesce(struct net_device *dev, ec->tx_coalesce_usecs = vi->sq[queue].intr_coal.max_usecs; ec->tx_max_coalesced_frames = vi->sq[queue].intr_coal.max_packets; ec->rx_max_coalesced_frames = vi->rq[queue].intr_coal.max_packets; + ec->use_adaptive_rx_coalesce = vi->rq[queue].dim_enabled; }else { ec->rx_max_coalesced_frames =1 ;@@ -3657,7 +3762,7 @@ static int virtnet_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info)static const struct ethtool_ops virtnet_ethtool_ops = { .supported_coalesce_params =ETHTOOL_COALESCE_MAX_FRAMES | -ETHTOOL_COALESCE_USECS , +ETHTOOL_COALESCE_USECS |ETHTOOL_COALESCE_USE_ADAPTIVE_RX , .get_drvinfo = virtnet_get_drvinfo, .get_link = ethtool_op_get_link, .get_ringparam = virtnet_get_ringparam, --2.19.1.6.gb485710b
Re: [PATCH net-next 5/5] virtio-net: support tx netdim
In reply to Heng QiQuoted 57 lines · Heng Qi
Similar to rx netdim, this patch supports adaptive tx coalescing moderation for the virtio-net.
Signed-off-by Heng Qi <[email protected]>--- drivers/net/virtio_net.c | 143 ++++++++++++++++++++++++++++++++------- 1 file changed, 119 insertions(+), 24 deletions(-)drivers/net/virtio_net.c +24
-1@@ -154,6 +154,15 @@ struct send_queue {struct virtnet_sq_stats stats; +/* The number of tx notifications */ +u16 calls; + +/* Is dynamic interrupt moderation enabled? */ +bool dim_enabled; + +/* Dynamic Interrupt Moderation */ +struct dim dim; +struct virtnet_interrupt_coalesce intr_coal;struct napi_struct napi;@@ -317,8 +326,9 @@ struct virtnet_info {u8 duplex;u32 speed; -/* Is rx dynamic interrupt moderation enabled? */ +/* Is dynamic interrupt moderation enabled? */ bool rx_dim_enabled; +bool tx_dim_enabled;/* Interrupt coalescing settings */ struct virtnet_interrupt_coalesce intr_coal_tx;@@ -464,19 +474,40 @@ static bool virtqueue_napi_complete(struct napi_struct *napi,return false; } +static void virtnet_tx_dim_work (struct work_struct *work); + +static void virtnet_tx_dim_update (struct virtnet_info *vi,struct send_queue *sq) +{ +struct virtnet_sq_stats *stats = &sq->stats; +struct dim_sample cur_sample = {}; + +u64_stats_update_begin (&sq->stats.syncp); +dim_update_sample (sq->calls, stats->packets, + stats->bytes, &cur_sample); +u64_stats_update_end (&sq->stats.syncp); + +net_dim (&sq->dim, cur_sample);
drivers/net/virtio_net.c static bool virtqueue_napi_complete(struct napi_struct *napi, · line 498
Quoted 10 lines
drivers/net/virtio_net.c +6
-1+} +static void skb_xmit_done (struct virtqueue *vq) {struct virtnet_info *vi = vq->vdev->priv; -struct napi_struct *napi = &vi->sq[vq2txq (vq)].napi; +struct send_queue *sq = &vi->sq[vq2txq (vq)]; +struct napi_struct *napi = &sq->napi; + + sq->calls++;
I wonder what's the impact of this counters for netdim. As we have a mode of orphan skb in xmit.
We need to test to see.
Thanks
Michael S. Tsirkin
maintainerQuoted 5 lines · Heng Qi
Now, virtio-net already supports per-queue moderation parameter setting. Based on this, we use the netdim library of linux to support dynamic coalescing moderation for virtio-net.
Due to hardware scheduling issues, we only tested rx dim.
So patches 1 to 4 look ok but patch 5 is untested - we should probably wait until it's tested properly.
Quoted 47 lines
@Test env
rxq0 has affinity to cpu0.@Test cmd
client: taskset -c 0 sockperf tp -i ${IP} -t 30 --tcp -m ${msg_size}
server: taskset -c 0 sockperf sr --tcp@Test res
The second column is the ratio of the result returned by client when rx dim is enabled to the result returned by client when rx dim is disabled.-------------------------------------- | msg_size | rx_dim=on / rx_dim=off | -------------------------------------- | 14B | + 3% | -------------------------------------- | 100B | + 16% | -------------------------------------- | 500B | + 25% | -------------------------------------- | 1400B | + 28% | -------------------------------------- | 2048B | + 22% | -------------------------------------- | 4096B | + 5% | -----------------------------------------
This patch set was part of the previous netdim patch set[1].
[1] was split into a merged bugfix set[2] and the current set. The previous relevant commentators have been Cced.[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/[email protected]/Heng Qi (5):
virtio-net: returns whether napi is complete
virtio-net: separate rx/tx coalescing moderation cmds
virtio-net: extract virtqueue coalescig cmd for reuse
virtio-net: support rx netdim
virtio-net: support tx netdimdrivers/net/virtio_net.c | 394 ++++++++++++++++++++++++++++++++------- 1 file changed, 322 insertions(+), 72 deletions(-)Signature · 1 line
2.19.1.6.gb485710b
Michael S. Tsirkin
maintainerRe: [PATCH net-next 5/5] virtio-net: support tx netdim
In reply to Jason WangQuoted 72 lines · Jason Wang
Quoted 57 lines · Heng Qi
Similar to rx netdim, this patch supports adaptive tx coalescing moderation for the virtio-net.
Signed-off-by Heng Qi <[email protected]>--- drivers/net/virtio_net.c | 143 ++++++++++++++++++++++++++++++++------- 1 file changed, 119 insertions(+), 24 deletions(-)drivers/net/virtio_net.c +24
-1@@ -154,6 +154,15 @@ struct send_queue {struct virtnet_sq_stats stats; +/* The number of tx notifications */ +u16 calls; + +/* Is dynamic interrupt moderation enabled? */ +bool dim_enabled; + +/* Dynamic Interrupt Moderation */ +struct dim dim; +struct virtnet_interrupt_coalesce intr_coal;struct napi_struct napi;@@ -317,8 +326,9 @@ struct virtnet_info {u8 duplex;u32 speed; -/* Is rx dynamic interrupt moderation enabled? */ +/* Is dynamic interrupt moderation enabled? */ bool rx_dim_enabled; +bool tx_dim_enabled;/* Interrupt coalescing settings */ struct virtnet_interrupt_coalesce intr_coal_tx;@@ -464,19 +474,40 @@ static bool virtqueue_napi_complete(struct napi_struct *napi,return false; } +static void virtnet_tx_dim_work (struct work_struct *work); + +static void virtnet_tx_dim_update (struct virtnet_info *vi,struct send_queue *sq) +{ +struct virtnet_sq_stats *stats = &sq->stats; +struct dim_sample cur_sample = {}; + +u64_stats_update_begin (&sq->stats.syncp); +dim_update_sample (sq->calls, stats->packets, + stats->bytes, &cur_sample); +u64_stats_update_end (&sq->stats.syncp); + +net_dim (&sq->dim, cur_sample);drivers/net/virtio_net.c static bool virtqueue_napi_complete(struct napi_struct *napi, · line 498
Quoted 10 lines
drivers/net/virtio_net.c +6
-1+} +static void skb_xmit_done (struct virtqueue *vq) {struct virtnet_info *vi = vq->vdev->priv; -struct napi_struct *napi = &vi->sq[vq2txq (vq)].napi; +struct send_queue *sq = &vi->sq[vq2txq (vq)]; +struct napi_struct *napi = &sq->napi; + + sq->calls++;I wonder what's the impact of this counters for netdim. As we have a mode of orphan skb in xmit.
Quoted 3 lines
We need to test to see.
Thanks
Agreed, performance patches should come with performance results.
Signature · 1 line
MST
Michael S. Tsirkin
maintainerQuoted 24 lines · Jason Wang
Quoted 9 lines · Heng Qi
Quoted 5 lines · Jason Wang
Quoted 4 lines · Heng Qi
Now, virtio-net already supports per-queue moderation parameter setting. Based on this, we use the netdim library of linux to support dynamic coalescing moderation for virtio-net.
Quoted 8 lines
Quoted 3 lines
Quoted 1 line
Due to hardware scheduling issues, we only tested rx dim.
Do you have PPS numbers? And TX numbers are also important as the throughput could be misleading due to various reasons.
Hi Jason!
The comparison of rx netdim performance is as follows:
(the backend supporting tx dim is not yet ready)Thanks a lot for the numbers.
I'd still expect the TX result as I did play tx interrupt coalescing about 10 years ago.
Quoted 6 lines
I will start to review the series but let's try to have some TX numbers as well.
Btw, it would be more convenient to have a raw PPS benchmark. E.g you can try to use a software or hardware packet generator.
Thanks
Latency results are also kind of interesting.
Quoted 90 lines
Quoted 90 lines
I. Sockperf UDP
=================================================
1. Envrxq_0is affinity tocpu_02. Cmd
client: taskset -c 0 sockperf tp -p 8989 -i $IP -t 10 -m 16B
server: taskset -c 0 sockperf sr -p 89893. Result
dim off: 1143277.00 rxpps, throughput 17.844 MBps, cpu is 100%. dim on: 1124161.00 rxpps, throughput 17.610 MBps, cpu is 83.5%.
=================================================II. Redis
=================================================
1. Env
There are 8 rxqs andrxq_iis affinity tocpu_i.2. Result
When all cpus are 100%, ops/sec ofmemtier_benchmarkclient is
dim off: 978437.23
dim on: 1143638.28
=================================================III. Nginx
=================================================
1. Env
There are 8 rxqs andrxq_iis affinity tocpu_i.2. Result
When all cpus are 100%, requests/sec of wrk client is
dim off: 877931.67
dim on: 1019160.31
=================================================Thanks!
Quoted 48 lines
Thanks
Quoted 45 lines
@Test env
rxq0 has affinity to cpu0.@Test cmd
client: taskset -c 0 sockperf tp -i ${IP} -t 30 --tcp -m ${msg_size}
server: taskset -c 0 sockperf sr --tcp@Test res
The second column is the ratio of the result returned by client when rx dim is enabled to the result returned by client when rx dim is disabled.-------------------------------------- | msg_size | rx_dim=on / rx_dim=off | -------------------------------------- | 14B | + 3% | -------------------------------------- | 100B | + 16% | -------------------------------------- | 500B | + 25% | -------------------------------------- | 1400B | + 28% | -------------------------------------- | 2048B | + 22% | -------------------------------------- | 4096B | + 5% | -----------------------------------------
This patch set was part of the previous netdim patch set[1].
[1] was split into a merged bugfix set[2] and the current set. The previous relevant commentators have been Cced.[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/[email protected]/Heng Qi (5):
virtio-net: returns whether napi is complete
virtio-net: separate rx/tx coalescing moderation cmds
virtio-net: extract virtqueue coalescig cmd for reuse
virtio-net: support rx netdim
virtio-net: support tx netdimdrivers/net/virtio_net.c | 394 ++++++++++++++++++++++++++++++++------- 1 file changed, 322 insertions(+), 72 deletions(-)
Quoted 6 lines
Quoted 6 lines
Quoted 4 lines
Quoted 4 lines
--
2.19.1.6.gb485710b
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Quoted 12 lines · Jason Wang
Quoted 11 lines · Heng Qi
Quoted 8 lines · Jason Wang
Quoted 5 lines · Heng Qi
Now, virtio-net already supports per-queue moderation parameter setting. Based on this, we use the netdim library of linux to support dynamic coalescing moderation for virtio-net.
Due to hardware scheduling issues, we only tested rx dim.
Do you have PPS numbers? And TX numbers are also important as the throughput could be misleading due to various reasons.
Quoted 7 lines
Quoted 4 lines
Hi Jason!
The comparison of rx netdim performance is as follows:
(the backend supporting tx dim is not yet ready)Thanks a lot for the numbers.
I'd still expect the TX result as I did play tx interrupt coalescing
Hi, Jason.
Sorry for the late reply to this! Our team has been blocked by other priorities the past few days.
For tx dim, we have a fixed empirical value internally.
This value performs better overall than manually adjusting the tx timer register --> I'll do not have tx numbers. :( So in the short term I no longer try to push [5/5] patch for tx dim and try to return -EOPNOTSUPP for it, sorry for this.
Quoted 5 lines
about 10 years ago.
I will start to review the series but let's try to have some TX numbers as well.
Btw, it would be more convenient to have a raw PPS benchmark. E.g you
I got some raw pps data using pktgen from linux/sample/pktgen:
1. tx cmd
./pktgen_sample02_multiqueue.sh -i eth1 -s 44 -d ${dst_ip} -m ${dst_mac} -t 8 -f 0 -n 0
This uses 8 kpktgend threads to inject data into eth1.
2. Rx side loads a simple xdp prog which drops all received udp packets.
3. Data
pps: ~1000w
rx dim off: cpu idle= ~35%
rx dim on: cpu idle= ~76%
Thanks!
Quoted 97 lines
can try to use a software or hardware packet generator.
Thanks
Quoted 93 lines
I. Sockperf UDP
=================================================
1. Envrxq_0is affinity tocpu_02. Cmd
client: taskset -c 0 sockperf tp -p 8989 -i $IP -t 10 -m 16B
server: taskset -c 0 sockperf sr -p 89893. Result
dim off: 1143277.00 rxpps, throughput 17.844 MBps, cpu is 100%. dim on: 1124161.00 rxpps, throughput 17.610 MBps, cpu is 83.5%.
=================================================II. Redis
=================================================
1. Env
There are 8 rxqs andrxq_iis affinity tocpu_i.2. Result
When all cpus are 100%, ops/sec ofmemtier_benchmarkclient is
dim off: 978437.23
dim on: 1143638.28
=================================================III. Nginx
=================================================
1. Env
There are 8 rxqs andrxq_iis affinity tocpu_i.2. Result
When all cpus are 100%, requests/sec of wrk client is
dim off: 877931.67
dim on: 1019160.31
=================================================Thanks!
Quoted 51 lines
Thanks
Quoted 49 lines
@Test env
rxq0 has affinity to cpu0.@Test cmd
client: taskset -c 0 sockperf tp -i ${IP} -t 30 --tcp -m ${msg_size}
server: taskset -c 0 sockperf sr --tcp@Test res
The second column is the ratio of the result returned by client when rx dim is enabled to the result returned by client when rx dim is disabled.-------------------------------------- | msg_size | rx_dim=on / rx_dim=off | -------------------------------------- | 14B | + 3% | -------------------------------------- | 100B | + 16% | -------------------------------------- | 500B | + 25% | -------------------------------------- | 1400B | + 28% | -------------------------------------- | 2048B | + 22% | -------------------------------------- | 4096B | + 5% | -----------------------------------------
This patch set was part of the previous netdim patch set[1].
[1] was split into a merged bugfix set[2] and the current set. The previous relevant commentators have been Cced.[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/[email protected]/Heng Qi (5):
virtio-net: returns whether napi is complete
virtio-net: separate rx/tx coalescing moderation cmds
virtio-net: extract virtqueue coalescig cmd for reuse
virtio-net: support rx netdim
virtio-net: support tx netdimdrivers/net/virtio_net.c | 394 ++++++++++++++++++++++++++++++++------- 1 file changed, 322 insertions(+), 72 deletions(-)--
2.19.1.6.gb485710b
Quoted 8 lines · Michael S. Tsirkin
Quoted 5 lines · Heng Qi
Now, virtio-net already supports per-queue moderation parameter setting. Based on this, we use the netdim library of linux to support dynamic coalescing moderation for virtio-net.
Due to hardware scheduling issues, we only tested rx dim.
So patches 1 to 4 look ok but patch 5 is untested - we should probably wait until it's tested properly.
Hi, Michael.
For a few reasons (reply to Jason's thread), I won't be trying to push tx dim any more in the short term.
Please review the remaining patches.
Thanks a lot!
Quoted 49 lines
Quoted 49 lines
@Test env
rxq0 has affinity to cpu0.@Test cmd
client: taskset -c 0 sockperf tp -i ${IP} -t 30 --tcp -m ${msg_size}
server: taskset -c 0 sockperf sr --tcp@Test res
The second column is the ratio of the result returned by client when rx dim is enabled to the result returned by client when rx dim is disabled.-------------------------------------- | msg_size | rx_dim=on / rx_dim=off | -------------------------------------- | 14B | + 3% | -------------------------------------- | 100B | + 16% | -------------------------------------- | 500B | + 25% | -------------------------------------- | 1400B | + 28% | -------------------------------------- | 2048B | + 22% | -------------------------------------- | 4096B | + 5% | -----------------------------------------
This patch set was part of the previous netdim patch set[1].
[1] was split into a merged bugfix set[2] and the current set. The previous relevant commentators have been Cced.[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/[email protected]/Heng Qi (5):
virtio-net: returns whether napi is complete
virtio-net: separate rx/tx coalescing moderation cmds
virtio-net: extract virtqueue coalescig cmd for reuse
virtio-net: support rx netdim
virtio-net: support tx netdimdrivers/net/virtio_net.c | 394 ++++++++++++++++++++++++++++++++------- 1 file changed, 322 insertions(+), 72 deletions(-)Signature · 1 line
2.19.1.6.gb485710b
Michael S. Tsirkin
maintainerQuoted 12 lines · Heng Qi
Quoted 8 lines · Michael S. Tsirkin
Quoted 5 lines · Heng Qi
Now, virtio-net already supports per-queue moderation parameter setting. Based on this, we use the netdim library of linux to support dynamic coalescing moderation for virtio-net.
Due to hardware scheduling issues, we only tested rx dim.
So patches 1 to 4 look ok but patch 5 is untested - we should probably wait until it's tested properly.
Quoted 8 lines
Hi, Michael.
For a few reasons (reply to Jason's thread), I won't be trying to push tx dim any more in the short term.
Please review the remaining patches.
Thanks a lot!
You got a bunch of comments from Jason - want to address them in a new version then, and I'll review that?
Quoted 44 lines
Quoted 44 lines
Quoted 44 lines
@Test env
rxq0 has affinity to cpu0.@Test cmd
client: taskset -c 0 sockperf tp -i ${IP} -t 30 --tcp -m ${msg_size}
server: taskset -c 0 sockperf sr --tcp@Test res
The second column is the ratio of the result returned by client when rx dim is enabled to the result returned by client when rx dim is disabled.-------------------------------------- | msg_size | rx_dim=on / rx_dim=off | -------------------------------------- | 14B | + 3% | -------------------------------------- | 100B | + 16% | -------------------------------------- | 500B | + 25% | -------------------------------------- | 1400B | + 28% | -------------------------------------- | 2048B | + 22% | -------------------------------------- | 4096B | + 5% | -----------------------------------------
This patch set was part of the previous netdim patch set[1].
[1] was split into a merged bugfix set[2] and the current set. The previous relevant commentators have been Cced.[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/[email protected]/Heng Qi (5):
virtio-net: returns whether napi is complete
virtio-net: separate rx/tx coalescing moderation cmds
virtio-net: extract virtqueue coalescig cmd for reuse
virtio-net: support rx netdim
virtio-net: support tx netdim
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/net/virtio_net.c | 394 ++++++++++++++++++++++++++++++++------- 1 file changed, 322 insertions(+), 72 deletions(-)Signature · 1 line
2.19.1.6.gb485710b
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [PATCH net-next 4/5] virtio-net: support rx netdim
In reply to Jason WangQuoted 135 lines · Jason Wang
Quoted 134 lines · Heng Qi
By comparing the traffic information in the complete napi processes, let the virtio-net driver automatically adjust the coalescing moderation parameters of each receive queue.
Signed-off-by Heng Qi <[email protected]>--- drivers/net/virtio_net.c | 147 +++++++++++++++++++++++++++++++++------ 1 file changed, 126 insertions(+), 21 deletions(-)drivers/net/virtio_net.c +48
-2@@ -19,6 +19,7 @@#include <linux/average.h> #include <linux/filter.h> #include <linux/kernel.h> +#include <linux/dim.h> #include <net/route.h> #include <net/xdp.h> #include <net/net_failover.h> @@ -172,6 +173,17 @@ struct receive_queue {struct virtnet_rq_stats stats; +/* The number of rx notifications */ +u16 calls; + +/* Is dynamic interrupt moderation enabled? */ +bool dim_enabled; + +/* Dynamic Interrupt Moderation */ +struct dim dim; + +u32 packets_in_napi; +struct virtnet_interrupt_coalesce intr_coal;/* Chain pages by the private ptr. */ @@ -305,6 +317,9 @@ struct virtnet_info {u8 duplex;u32 speed; +/* Is rx dynamic interrupt moderation enabled? */ +bool rx_dim_enabled; +/* Interrupt coalescing settings */ struct virtnet_interrupt_coalesce intr_coal_tx;struct virtnet_interrupt_coalesce intr_coal_rx;@@ -2001,6 +2016,7 @@ static void skb_recv_done(struct virtqueue *rvq)struct virtnet_info *vi = rvq->vdev->priv;struct receive_queue *rq = &vi->rq[vq2rxq (rvq)]; + rq->calls++;virtqueue_napi_schedule (&rq->napi, rvq); }@@ -2138,6 +2154,25 @@ static void virtnet_poll_cleantx(struct receive_queue *rq) } } +static void virtnet_rx_dim_work (struct work_struct *work); + +static void virtnet_rx_dim_update (struct virtnet_info *vi,struct receive_queue *rq) +{ +struct virtnet_rq_stats *stats = &rq->stats; +struct dim_sample cur_sample = {}; + +if (!rq->packets_in_napi) +return ; + +u64_stats_update_begin (&rq->stats.syncp); +dim_update_sample (rq->calls, stats->packets, + stats->bytes, &cur_sample); +u64_stats_update_end (&rq->stats.syncp); + +net_dim (&rq->dim, cur_sample); + rq->packets_in_napi =0 ; +} +static int virtnet_poll (struct napi_struct *napi,int budget) { struct receive_queue *rq =@@ -2146,17 +2181,22 @@ static int virtnet_poll(struct napi_struct *napi, int budget)struct send_queue *sq;unsigned int received;unsigned int xdp_xmit =0 ; +bool napi_complete;virtnet_poll_cleantx (rq); received =virtnet_receive (rq, budget, &xdp_xmit); + rq->packets_in_napi += received;if (xdp_xmit &VIRTIO_XDP_REDIR )xdp_do_flush ();/* Out of packets? */ -if (received < budget) -virtqueue_napi_complete (napi, rq->vq, received); +if (received < budget) { + napi_complete =virtqueue_napi_complete (napi, rq->vq, received); +if (napi_complete && rq->dim_enabled) +virtnet_rx_dim_update (vi, rq); + }if (xdp_xmit &VIRTIO_XDP_TX ) { sq =virtnet_xdp_get_sq (vi);@@ -2176,6 +2216,7 @@ static void virtnet_disable_queue_pair(struct virtnet_info *vi, int qp_index)virtnet_napi_tx_disable (&vi->sq[qp_index].napi);napi_disable (&vi->rq[qp_index].napi);xdp_rxq_info_unreg (&vi->rq[qp_index].xdp_rxq); +cancel_work_sync (&vi->rq[qp_index].dim.work); }static int virtnet_enable_queue_pair (struct virtnet_info *vi,int qp_index)@@ -2193,6 +2234,9 @@ static int virtnet_enable_queue_pair(struct virtnet_info *vi, int qp_index)if (err <0 ) goto err_xdp_reg_mem_model; +INIT_WORK (&vi->rq[qp_index].dim.work, virtnet_rx_dim_work); + vi->rq[qp_index].dim.mode =DIM_CQ_PERIOD_MODE_START_FROM_EQE ; +virtnet_napi_enable (vi->rq[qp_index].vq, &vi->rq[qp_index].napi);virtnet_napi_tx_enable (vi, vi->sq[qp_index].vq, &vi->sq[qp_index].napi);@@ -3335,23 +3379,42 @@ static int virtnet_send_tx_notf_coal_cmds(struct virtnet_info *vi,static int virtnet_send_rx_notf_coal_cmds (struct virtnet_info *vi,struct ethtool_coalesce *ec) { +bool rx_ctrl_dim_on = !!ec->use_adaptive_rx_coalesce;struct scatterlist sgs_rx; +int i;
Quoted 12 lines
drivers/net/virtio_net.c static int virtnet_send_tx_notf_coal_cmds(struct virtnet_info *vi, · line 3387
Quoted 9 lines
drivers/net/virtio_net.c +2
-7- vi->ctrl->coal_rx.rx_usecs =cpu_to_le32 (ec->rx_coalesce_usecs); - vi->ctrl->coal_rx.rx_max_packets =cpu_to_le32 (ec->rx_max_coalesced_frames); -sg_init_one (&sgs_rx, &vi->ctrl->coal_rx,sizeof (vi->ctrl->coal_rx)); - -if (!virtnet_send_command (vi,VIRTIO_NET_CTRL_NOTF_COAL , -VIRTIO_NET_CTRL_NOTF_COAL_RX_SET , - &sgs_rx)) +if (rx_ctrl_dim_on && (ec->rx_coalesce_usecs != vi->intr_coal_rx.max_usecs || + ec->rx_max_coalesced_frames != vi->intr_coal_rx.max_packets))Any reason we need to stick a check for usecs/packets? I think it might confuse the user since the value could be modified by netdim actually.
Yes, that's exactly what's done here.
When dim is enabled, the user is prohibited from manually configuring parameters because dim may modify the parameters.
Quoted 77 lines
Quoted 77 lines
drivers/net/virtio_net.c +47
-11return -EINVAL ; -/* Save parameters */ - vi->intr_coal_rx.max_usecs = ec->rx_coalesce_usecs; - vi->intr_coal_rx.max_packets = ec->rx_max_coalesced_frames; -for (i =0 ; i < vi->max_queue_pairs; i++) { - vi->rq[i].intr_coal.max_usecs = ec->rx_coalesce_usecs; - vi->rq[i].intr_coal.max_packets = ec->rx_max_coalesced_frames; +if (rx_ctrl_dim_on) { +if (virtio_has_feature (vi->vdev,VIRTIO_NET_F_VQ_NOTF_COAL )) { + vi->rx_dim_enabled = true; +for (i =0 ; i < vi->max_queue_pairs; i++) + vi->rq[i].dim_enabled = true; + }else { +return -EOPNOTSUPP ; + } + }else { + vi->rx_dim_enabled = false; +for (i =0 ; i < vi->max_queue_pairs; i++) + vi->rq[i].dim_enabled = false; + + vi->ctrl->coal_rx.rx_usecs =cpu_to_le32 (ec->rx_coalesce_usecs); + vi->ctrl->coal_rx.rx_max_packets =cpu_to_le32 (ec->rx_max_coalesced_frames); +sg_init_one (&sgs_rx, &vi->ctrl->coal_rx,sizeof (vi->ctrl->coal_rx)); + +if (!virtnet_send_command (vi,VIRTIO_NET_CTRL_NOTF_COAL , +VIRTIO_NET_CTRL_NOTF_COAL_RX_SET , + &sgs_rx)) +return -EINVAL ; + + vi->intr_coal_rx.max_usecs = ec->rx_coalesce_usecs; + vi->intr_coal_rx.max_packets = ec->rx_max_coalesced_frames; +for (i =0 ; i < vi->max_queue_pairs; i++) { + vi->rq[i].intr_coal.max_usecs = ec->rx_coalesce_usecs; + vi->rq[i].intr_coal.max_packets = ec->rx_max_coalesced_frames; + } }return 0 ;@@ -3377,13 +3440,27 @@ static int virtnet_send_notf_coal_vq_cmds(struct virtnet_info *vi,struct ethtool_coalesce *ec, u16 queue) { + bool rx_ctrl_dim_on; +u32 max_usecs, max_packets;int err; - err =virtnet_send_rx_ctrl_coal_vq_cmd (vi, queue, - ec->rx_coalesce_usecs, - ec->rx_max_coalesced_frames); -if (err) -return err; + rx_ctrl_dim_on = !!ec->use_adaptive_rx_coalesce; + max_usecs = vi->rq[queue].intr_coal.max_usecs; + max_packets = vi->rq[queue].intr_coal.max_packets; +if (rx_ctrl_dim_on && (ec->rx_coalesce_usecs != max_usecs || + ec->rx_max_coalesced_frames != max_packets)) +return -EINVAL ; + +if (rx_ctrl_dim_on) { + vi->rq[queue].dim_enabled = true; + }else { + vi->rq[queue].dim_enabled = false; + err =virtnet_send_rx_ctrl_coal_vq_cmd (vi, queue, + ec->rx_coalesce_usecs, + ec->rx_max_coalesced_frames); +if (err) +return err; + } err = virtnet_send_tx_ctrl_coal_vq_cmd(vi, queue, ec->tx_coalesce_usecs,@@ -3394,6 +3471,32 @@ static int virtnet_send_notf_coal_vq_cmds(struct virtnet_info *vi,return 0 ; }
Quoted 14 lines
drivers/net/virtio_net.c static int virtnet_send_notf_coal_vq_cmds(struct virtnet_info *vi, · line 3486
Quoted 13 lines
drivers/net/virtio_net.c +13
-0+static void virtnet_rx_dim_work (struct work_struct *work) +{ + struct dim *dim = container_of(work, struct dim, work); +struct receive_queue *rq =container_of (dim, + struct receive_queue, dim); +struct virtnet_info *vi = rq->vq->vdev->priv; +struct net_device *dev = vi->dev; +struct dim_cq_moder update_moder; +int qnum = rq - vi->rq, err; + + update_moder =net_dim_get_rx_moderation (dim->mode, dim->profile_ix); +if (update_moder.usec != vi->rq[qnum].intr_coal.max_usecs || + update_moder.pkts != vi->rq[qnum].intr_coal.max_packets) {Is this safe across the e.g vq reset?
I think it might. This will be avoided in the next version using:
1. cancel virtnet_rx_dim_work before vq reset.
2. restore virtnet_rx_dim_work after vq re-enable.
Thanks a lot!
Quoted 47 lines
Thanks
Quoted 44 lines
drivers/net/virtio_net.c +16
-2+rtnl_lock (); + err =virtnet_send_rx_ctrl_coal_vq_cmd (vi, qnum, + update_moder.usec, + update_moder.pkts); +if (err) +pr_debug ("%s: Failed to send dim parameters on rxq%d\n" , + dev->name, (int )(rq - vi->rq)); +rtnl_unlock (); + } + + dim->state =DIM_START_MEASURE ; +} +static int virtnet_coal_params_supported (struct ethtool_coalesce *ec) {/* usecs coalescing is supported only if VIRTIO_NET_F_NOTF_COAL @@ -3475,6 +3578,7 @@ static int virtnet_get_coalesce(struct net_device *dev, ec->tx_coalesce_usecs = vi->intr_coal_tx.max_usecs; ec->tx_max_coalesced_frames = vi->intr_coal_tx.max_packets; ec->rx_max_coalesced_frames = vi->intr_coal_rx.max_packets; + ec->use_adaptive_rx_coalesce = vi->rx_dim_enabled; }else { ec->rx_max_coalesced_frames =1 ;@@ -3532,6 +3636,7 @@ static int virtnet_get_per_queue_coalesce(struct net_device *dev, ec->tx_coalesce_usecs = vi->sq[queue].intr_coal.max_usecs; ec->tx_max_coalesced_frames = vi->sq[queue].intr_coal.max_packets; ec->rx_max_coalesced_frames = vi->rq[queue].intr_coal.max_packets; + ec->use_adaptive_rx_coalesce = vi->rq[queue].dim_enabled; }else { ec->rx_max_coalesced_frames =1 ;@@ -3657,7 +3762,7 @@ static int virtnet_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info)static const struct ethtool_ops virtnet_ethtool_ops = { .supported_coalesce_params =ETHTOOL_COALESCE_MAX_FRAMES | -ETHTOOL_COALESCE_USECS , +ETHTOOL_COALESCE_USECS |ETHTOOL_COALESCE_USE_ADAPTIVE_RX , .get_drvinfo = virtnet_get_drvinfo, .get_link = ethtool_op_get_link, .get_ringparam = virtnet_get_ringparam, --2.19.1.6.gb485710b
Quoted 16 lines · Michael S. Tsirkin
Quoted 15 lines · Heng Qi
Quoted 8 lines · Michael S. Tsirkin
Quoted 5 lines · Heng Qi
Now, virtio-net already supports per-queue moderation parameter setting. Based on this, we use the netdim library of linux to support dynamic coalescing moderation for virtio-net.
Due to hardware scheduling issues, we only tested rx dim.
So patches 1 to 4 look ok but patch 5 is untested - we should probably wait until it's tested properly.
Hi, Michael.
For a few reasons (reply to Jason's thread), I won't be trying to push tx dim any more in the short term.
Quoted 6 lines
Quoted 3 lines
Please review the remaining patches.
Thanks a lot!
You got a bunch of comments from Jason - want to address them in a new version then, and I'll review that?
Certainly! I have replied to Jason's comments, and will push the next version once he acks my reply.
Thanks!
Quoted 49 lines
Quoted 49 lines
Quoted 49 lines
Quoted 49 lines
@Test env
rxq0 has affinity to cpu0.@Test cmd
client: taskset -c 0 sockperf tp -i ${IP} -t 30 --tcp -m ${msg_size}
server: taskset -c 0 sockperf sr --tcp@Test res
The second column is the ratio of the result returned by client when rx dim is enabled to the result returned by client when rx dim is disabled.-------------------------------------- | msg_size | rx_dim=on / rx_dim=off | -------------------------------------- | 14B | + 3% | -------------------------------------- | 100B | + 16% | -------------------------------------- | 500B | + 25% | -------------------------------------- | 1400B | + 28% | -------------------------------------- | 2048B | + 22% | -------------------------------------- | 4096B | + 5% | -----------------------------------------
This patch set was part of the previous netdim patch set[1].
[1] was split into a merged bugfix set[2] and the current set. The previous relevant commentators have been Cced.[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/[email protected]/Heng Qi (5):
virtio-net: returns whether napi is complete
virtio-net: separate rx/tx coalescing moderation cmds
virtio-net: extract virtqueue coalescig cmd for reuse
virtio-net: support rx netdim
virtio-net: support tx netdimdrivers/net/virtio_net.c | 394 ++++++++++++++++++++++++++++++++------- 1 file changed, 322 insertions(+), 72 deletions(-)Signature · 1 line
2.19.1.6.gb485710b
Quoted 22 lines · Michael S. Tsirkin
Quoted 21 lines · Jason Wang
Quoted 8 lines · Heng Qi
Quoted 5 lines · Jason Wang
Quoted 4 lines · Heng Qi
Now, virtio-net already supports per-queue moderation parameter setting. Based on this, we use the netdim library of linux to support dynamic coalescing moderation for virtio-net.
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
Due to hardware scheduling issues, we only tested rx dim.
Do you have PPS numbers? And TX numbers are also important as the throughput could be misleading due to various reasons.
Hi Jason!
The comparison of rx netdim performance is as follows:
(the backend supporting tx dim is not yet ready)Thanks a lot for the numbers.
I'd still expect the TX result as I did play tx interrupt coalescing about 10 years ago.
Quoted 7 lines
Quoted 6 lines
I will start to review the series but let's try to have some TX numbers as well.
Btw, it would be more convenient to have a raw PPS benchmark. E.g you can try to use a software or hardware packet generator.
Thanks
Latency results are also kind of interesting.
I test the latency using sockperf pp:
@Rx cmd
taskset -c 0 sockperf sr -p 8989
@Tx cmd
taskset -c 0 sockperf pp -i ${ip} -p 8989 -t 10
After running this cmd 5 times and averaging the results, we get the following data:
dim off: 17.7735 usec
dim on: 18.0110 usec
Thanks!
Quoted 95 lines
Quoted 95 lines
Quoted 95 lines
I. Sockperf UDP
=================================================
1. Envrxq_0is affinity tocpu_02. Cmd
client: taskset -c 0 sockperf tp -p 8989 -i $IP -t 10 -m 16B
server: taskset -c 0 sockperf sr -p 89893. Result
dim off: 1143277.00 rxpps, throughput 17.844 MBps, cpu is 100%. dim on: 1124161.00 rxpps, throughput 17.610 MBps, cpu is 83.5%.
=================================================II. Redis
=================================================
1. Env
There are 8 rxqs andrxq_iis affinity tocpu_i.2. Result
When all cpus are 100%, ops/sec ofmemtier_benchmarkclient is
dim off: 978437.23
dim on: 1143638.28
=================================================III. Nginx
=================================================
1. Env
There are 8 rxqs andrxq_iis affinity tocpu_i.2. Result
When all cpus are 100%, requests/sec of wrk client is
dim off: 877931.67
dim on: 1019160.31
=================================================Thanks!
Quoted 51 lines
Thanks
Quoted 49 lines
@Test env
rxq0 has affinity to cpu0.@Test cmd
client: taskset -c 0 sockperf tp -i ${IP} -t 30 --tcp -m ${msg_size}
server: taskset -c 0 sockperf sr --tcp@Test res
The second column is the ratio of the result returned by client when rx dim is enabled to the result returned by client when rx dim is disabled.-------------------------------------- | msg_size | rx_dim=on / rx_dim=off | -------------------------------------- | 14B | + 3% | -------------------------------------- | 100B | + 16% | -------------------------------------- | 500B | + 25% | -------------------------------------- | 1400B | + 28% | -------------------------------------- | 2048B | + 22% | -------------------------------------- | 4096B | + 5% | -----------------------------------------
This patch set was part of the previous netdim patch set[1].
[1] was split into a merged bugfix set[2] and the current set. The previous relevant commentators have been Cced.[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/[email protected]/Heng Qi (5):
virtio-net: returns whether napi is complete
virtio-net: separate rx/tx coalescing moderation cmds
virtio-net: extract virtqueue coalescig cmd for reuse
virtio-net: support rx netdim
virtio-net: support tx netdimdrivers/net/virtio_net.c | 394 ++++++++++++++++++++++++++++++++------- 1 file changed, 322 insertions(+), 72 deletions(-)--
2.19.1.6.gb485710b
Re: [PATCH net-next 4/5] virtio-net: support rx netdim
In reply to Heng QiQuoted 152 lines · Heng Qi
Quoted 135 lines · Jason Wang
Quoted 134 lines · Heng Qi
By comparing the traffic information in the complete napi processes, let the virtio-net driver automatically adjust the coalescing moderation parameters of each receive queue.
Signed-off-by Heng Qi <[email protected]>--- drivers/net/virtio_net.c | 147 +++++++++++++++++++++++++++++++++------ 1 file changed, 126 insertions(+), 21 deletions(-)drivers/net/virtio_net.c +48
-2@@ -19,6 +19,7 @@#include <linux/average.h> #include <linux/filter.h> #include <linux/kernel.h> +#include <linux/dim.h> #include <net/route.h> #include <net/xdp.h> #include <net/net_failover.h> @@ -172,6 +173,17 @@ struct receive_queue {struct virtnet_rq_stats stats; +/* The number of rx notifications */ +u16 calls; + +/* Is dynamic interrupt moderation enabled? */ +bool dim_enabled; + +/* Dynamic Interrupt Moderation */ +struct dim dim; + +u32 packets_in_napi; +struct virtnet_interrupt_coalesce intr_coal;/* Chain pages by the private ptr. */ @@ -305,6 +317,9 @@ struct virtnet_info {u8 duplex;u32 speed; +/* Is rx dynamic interrupt moderation enabled? */ +bool rx_dim_enabled; +/* Interrupt coalescing settings */ struct virtnet_interrupt_coalesce intr_coal_tx;struct virtnet_interrupt_coalesce intr_coal_rx;@@ -2001,6 +2016,7 @@ static void skb_recv_done(struct virtqueue *rvq)struct virtnet_info *vi = rvq->vdev->priv;struct receive_queue *rq = &vi->rq[vq2rxq (rvq)]; + rq->calls++;virtqueue_napi_schedule (&rq->napi, rvq); }@@ -2138,6 +2154,25 @@ static void virtnet_poll_cleantx(struct receive_queue *rq) } } +static void virtnet_rx_dim_work (struct work_struct *work); + +static void virtnet_rx_dim_update (struct virtnet_info *vi,struct receive_queue *rq) +{ +struct virtnet_rq_stats *stats = &rq->stats; +struct dim_sample cur_sample = {}; + +if (!rq->packets_in_napi) +return ; + +u64_stats_update_begin (&rq->stats.syncp); +dim_update_sample (rq->calls, stats->packets, + stats->bytes, &cur_sample); +u64_stats_update_end (&rq->stats.syncp); + +net_dim (&rq->dim, cur_sample); + rq->packets_in_napi =0 ; +} +static int virtnet_poll (struct napi_struct *napi,int budget) { struct receive_queue *rq =@@ -2146,17 +2181,22 @@ static int virtnet_poll(struct napi_struct *napi, int budget)struct send_queue *sq;unsigned int received;unsigned int xdp_xmit =0 ; +bool napi_complete;virtnet_poll_cleantx (rq); received =virtnet_receive (rq, budget, &xdp_xmit); + rq->packets_in_napi += received;if (xdp_xmit &VIRTIO_XDP_REDIR )xdp_do_flush ();/* Out of packets? */ -if (received < budget) -virtqueue_napi_complete (napi, rq->vq, received); +if (received < budget) { + napi_complete =virtqueue_napi_complete (napi, rq->vq, received); +if (napi_complete && rq->dim_enabled) +virtnet_rx_dim_update (vi, rq); + }if (xdp_xmit &VIRTIO_XDP_TX ) { sq =virtnet_xdp_get_sq (vi);@@ -2176,6 +2216,7 @@ static void virtnet_disable_queue_pair(struct virtnet_info *vi, int qp_index)virtnet_napi_tx_disable (&vi->sq[qp_index].napi);napi_disable (&vi->rq[qp_index].napi);xdp_rxq_info_unreg (&vi->rq[qp_index].xdp_rxq); +cancel_work_sync (&vi->rq[qp_index].dim.work); }static int virtnet_enable_queue_pair (struct virtnet_info *vi,int qp_index)@@ -2193,6 +2234,9 @@ static int virtnet_enable_queue_pair(struct virtnet_info *vi, int qp_index)if (err <0 ) goto err_xdp_reg_mem_model; +INIT_WORK (&vi->rq[qp_index].dim.work, virtnet_rx_dim_work); + vi->rq[qp_index].dim.mode =DIM_CQ_PERIOD_MODE_START_FROM_EQE ; +virtnet_napi_enable (vi->rq[qp_index].vq, &vi->rq[qp_index].napi);virtnet_napi_tx_enable (vi, vi->sq[qp_index].vq, &vi->sq[qp_index].napi);@@ -3335,23 +3379,42 @@ static int virtnet_send_tx_notf_coal_cmds(struct virtnet_info *vi,static int virtnet_send_rx_notf_coal_cmds (struct virtnet_info *vi,struct ethtool_coalesce *ec) { +bool rx_ctrl_dim_on = !!ec->use_adaptive_rx_coalesce;struct scatterlist sgs_rx; +int i;Quoted 12 lines
drivers/net/virtio_net.c static int virtnet_send_tx_notf_coal_cmds(struct virtnet_info *vi, · line 3387
Quoted 9 lines
drivers/net/virtio_net.c +2
-7- vi->ctrl->coal_rx.rx_usecs =cpu_to_le32 (ec->rx_coalesce_usecs); - vi->ctrl->coal_rx.rx_max_packets =cpu_to_le32 (ec->rx_max_coalesced_frames); -sg_init_one (&sgs_rx, &vi->ctrl->coal_rx,sizeof (vi->ctrl->coal_rx)); - -if (!virtnet_send_command (vi,VIRTIO_NET_CTRL_NOTF_COAL , -VIRTIO_NET_CTRL_NOTF_COAL_RX_SET , - &sgs_rx)) +if (rx_ctrl_dim_on && (ec->rx_coalesce_usecs != vi->intr_coal_rx.max_usecs || + ec->rx_max_coalesced_frames != vi->intr_coal_rx.max_packets))Any reason we need to stick a check for usecs/packets? I think it might confuse the user since the value could be modified by netdim actually.
Quoted 4 lines
Yes, that's exactly what's done here.
When dim is enabled, the user is prohibited from manually configuring parameters because dim may modify the parameters.
So it should be something like
if (rx_ctrl_dim_on)
return -EINVAL;
without the checking of whether it matches the current parameters?
Quoted 93 lines
Quoted 78 lines
Quoted 78 lines
drivers/net/virtio_net.c +47
-11return -EINVAL ; -/* Save parameters */ - vi->intr_coal_rx.max_usecs = ec->rx_coalesce_usecs; - vi->intr_coal_rx.max_packets = ec->rx_max_coalesced_frames; -for (i =0 ; i < vi->max_queue_pairs; i++) { - vi->rq[i].intr_coal.max_usecs = ec->rx_coalesce_usecs; - vi->rq[i].intr_coal.max_packets = ec->rx_max_coalesced_frames; +if (rx_ctrl_dim_on) { +if (virtio_has_feature (vi->vdev,VIRTIO_NET_F_VQ_NOTF_COAL )) { + vi->rx_dim_enabled = true; +for (i =0 ; i < vi->max_queue_pairs; i++) + vi->rq[i].dim_enabled = true; + }else { +return -EOPNOTSUPP ; + } + }else { + vi->rx_dim_enabled = false; +for (i =0 ; i < vi->max_queue_pairs; i++) + vi->rq[i].dim_enabled = false; + + vi->ctrl->coal_rx.rx_usecs =cpu_to_le32 (ec->rx_coalesce_usecs); + vi->ctrl->coal_rx.rx_max_packets =cpu_to_le32 (ec->rx_max_coalesced_frames); +sg_init_one (&sgs_rx, &vi->ctrl->coal_rx,sizeof (vi->ctrl->coal_rx)); + +if (!virtnet_send_command (vi,VIRTIO_NET_CTRL_NOTF_COAL , +VIRTIO_NET_CTRL_NOTF_COAL_RX_SET , + &sgs_rx)) +return -EINVAL ; + + vi->intr_coal_rx.max_usecs = ec->rx_coalesce_usecs; + vi->intr_coal_rx.max_packets = ec->rx_max_coalesced_frames; +for (i =0 ; i < vi->max_queue_pairs; i++) { + vi->rq[i].intr_coal.max_usecs = ec->rx_coalesce_usecs; + vi->rq[i].intr_coal.max_packets = ec->rx_max_coalesced_frames; + } }return 0 ;@@ -3377,13 +3440,27 @@ static int virtnet_send_notf_coal_vq_cmds(struct virtnet_info *vi,struct ethtool_coalesce *ec, u16 queue) { + bool rx_ctrl_dim_on; +u32 max_usecs, max_packets;int err; - err =virtnet_send_rx_ctrl_coal_vq_cmd (vi, queue, - ec->rx_coalesce_usecs, - ec->rx_max_coalesced_frames); -if (err) -return err; + rx_ctrl_dim_on = !!ec->use_adaptive_rx_coalesce; + max_usecs = vi->rq[queue].intr_coal.max_usecs; + max_packets = vi->rq[queue].intr_coal.max_packets; +if (rx_ctrl_dim_on && (ec->rx_coalesce_usecs != max_usecs || + ec->rx_max_coalesced_frames != max_packets)) +return -EINVAL ; + +if (rx_ctrl_dim_on) { + vi->rq[queue].dim_enabled = true; + }else { + vi->rq[queue].dim_enabled = false; + err =virtnet_send_rx_ctrl_coal_vq_cmd (vi, queue, + ec->rx_coalesce_usecs, + ec->rx_max_coalesced_frames); +if (err) +return err; + } err = virtnet_send_tx_ctrl_coal_vq_cmd(vi, queue, ec->tx_coalesce_usecs,@@ -3394,6 +3471,32 @@ static int virtnet_send_notf_coal_vq_cmds(struct virtnet_info *vi,return 0 ; }Quoted 14 lines
drivers/net/virtio_net.c static int virtnet_send_notf_coal_vq_cmds(struct virtnet_info *vi, · line 3486
Quoted 13 lines
drivers/net/virtio_net.c +13
-0+static void virtnet_rx_dim_work (struct work_struct *work) +{ + struct dim *dim = container_of(work, struct dim, work); +struct receive_queue *rq =container_of (dim, + struct receive_queue, dim); +struct virtnet_info *vi = rq->vq->vdev->priv; +struct net_device *dev = vi->dev; +struct dim_cq_moder update_moder; +int qnum = rq - vi->rq, err; + + update_moder =net_dim_get_rx_moderation (dim->mode, dim->profile_ix); +if (update_moder.usec != vi->rq[qnum].intr_coal.max_usecs || + update_moder.pkts != vi->rq[qnum].intr_coal.max_packets) {Is this safe across the e.g vq reset?
Quoted 3 lines
I think it might. This will be avoided in the next version using:
1. cancelvirtnet_rx_dim_workbefore vq reset.
2. restorevirtnet_rx_dim_workafter vq re-enable.
Ok.
Thanks
Quoted 40 lines
Thanks a lot!
Quoted 37 lines
Thanks
Quoted 34 lines
drivers/net/virtio_net.c +15
-0+rtnl_lock (); + err =virtnet_send_rx_ctrl_coal_vq_cmd (vi, qnum, + update_moder.usec, + update_moder.pkts); +if (err) +pr_debug ("%s: Failed to send dim parameters on rxq%d\n" , + dev->name, (int )(rq - vi->rq)); +rtnl_unlock (); + } + + dim->state =DIM_START_MEASURE ; +} +static int virtnet_coal_params_supported (struct ethtool_coalesce *ec) {/* usecs coalescing is supported only if VIRTIO_NET_F_NOTF_COAL @@ -3475,6 +3578,7 @@ static int virtnet_get_coalesce(struct net_device *dev, ec->tx_coalesce_usecs = vi->intr_coal_tx.max_usecs; ec->tx_max_coalesced_frames = vi->intr_coal_tx.max_packets; ec->rx_max_coalesced_frames = vi->intr_coal_rx.max_packets; + ec->use_adaptive_rx_coalesce = vi->rx_dim_enabled; }else { ec->rx_max_coalesced_frames =1 ;@@ -3532,6 +3636,7 @@ static int virtnet_get_per_queue_coalesce(struct net_device *dev, ec->tx_coalesce_usecs = vi->sq[queue].intr_coal.max_usecs; ec->tx_max_coalesced_frames = vi->sq[queue].intr_coal.max_packets; ec->rx_max_coalesced_frames = vi->rq[queue].intr_coal.max_packets; + ec->use_adaptive_rx_coalesce = vi->rq[queue].dim_enabled; }else { ec->rx_max_coalesced_frames =1 ;@@ -3657,7 +3762,7 @@ static int virtnet_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info)
Quoted 11 lines
Quoted 10 lines
Quoted 10 lines
drivers/net/virtio_net.c +1
-2static const struct ethtool_ops virtnet_ethtool_ops = { .supported_coalesce_params =ETHTOOL_COALESCE_MAX_FRAMES | -ETHTOOL_COALESCE_USECS , +ETHTOOL_COALESCE_USECS |ETHTOOL_COALESCE_USE_ADAPTIVE_RX , .get_drvinfo = virtnet_get_drvinfo, .get_link = ethtool_op_get_link, .get_ringparam = virtnet_get_ringparam, --2.19.1.6.gb485710b
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Quoted 39 lines · Heng Qi
Quoted 22 lines · Michael S. Tsirkin
Quoted 21 lines · Jason Wang
Quoted 8 lines · Heng Qi
Quoted 5 lines · Jason Wang
Quoted 4 lines · Heng Qi
Now, virtio-net already supports per-queue moderation parameter setting. Based on this, we use the netdim library of linux to support dynamic coalescing moderation for virtio-net.
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
Due to hardware scheduling issues, we only tested rx dim.
Do you have PPS numbers? And TX numbers are also important as the throughput could be misleading due to various reasons.
Hi Jason!
The comparison of rx netdim performance is as follows:
(the backend supporting tx dim is not yet ready)Thanks a lot for the numbers.
I'd still expect the TX result as I did play tx interrupt coalescing about 10 years ago.
Quoted 7 lines
Quoted 6 lines
I will start to review the series but let's try to have some TX numbers as well.
Btw, it would be more convenient to have a raw PPS benchmark. E.g you can try to use a software or hardware packet generator.
Thanks
Latency results are also kind of interesting.
I test the latency using sockperf pp:
@Rx cmd
taskset -c 0 sockperf sr -p 8989
Quoted 8 lines
@Tx cmd
taskset -c 0 sockperf pp -i ${ip} -p 8989 -t 10After running this cmd 5 times and averaging the results, we get the following data:
dim off: 17.7735 usec
dim on: 18.0110 usec
Let's add those numbers to the changelog of the next version.
Thanks
Quoted 99 lines
Thanks!
Quoted 95 lines
Quoted 95 lines
Quoted 95 lines
I. Sockperf UDP
=================================================
1. Envrxq_0is affinity tocpu_02. Cmd
client: taskset -c 0 sockperf tp -p 8989 -i $IP -t 10 -m 16B
server: taskset -c 0 sockperf sr -p 89893. Result
dim off: 1143277.00 rxpps, throughput 17.844 MBps, cpu is 100%. dim on: 1124161.00 rxpps, throughput 17.610 MBps, cpu is 83.5%.
=================================================II. Redis
=================================================
1. Env
There are 8 rxqs andrxq_iis affinity tocpu_i.2. Result
When all cpus are 100%, ops/sec ofmemtier_benchmarkclient is
dim off: 978437.23
dim on: 1143638.28
=================================================III. Nginx
=================================================
1. Env
There are 8 rxqs andrxq_iis affinity tocpu_i.2. Result
When all cpus are 100%, requests/sec of wrk client is
dim off: 877931.67
dim on: 1019160.31
=================================================Thanks!
Quoted 51 lines
Thanks
Quoted 49 lines
@Test env
rxq0 has affinity to cpu0.@Test cmd
client: taskset -c 0 sockperf tp -i ${IP} -t 30 --tcp -m ${msg_size}
server: taskset -c 0 sockperf sr --tcp@Test res
The second column is the ratio of the result returned by client when rx dim is enabled to the result returned by client when rx dim is disabled.-------------------------------------- | msg_size | rx_dim=on / rx_dim=off | -------------------------------------- | 14B | + 3% | -------------------------------------- | 100B | + 16% | -------------------------------------- | 500B | + 25% | -------------------------------------- | 1400B | + 28% | -------------------------------------- | 2048B | + 22% | -------------------------------------- | 4096B | + 5% | -----------------------------------------
This patch set was part of the previous netdim patch set[1].
[1] was split into a merged bugfix set[2] and the current set. The previous relevant commentators have been Cced.[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/[email protected]/Heng Qi (5):
virtio-net: returns whether napi is complete
virtio-net: separate rx/tx coalescing moderation cmds
virtio-net: extract virtqueue coalescig cmd for reuse
virtio-net: support rx netdim
virtio-net: support tx netdimdrivers/net/virtio_net.c | 394 ++++++++++++++++++++++++++++++++------- 1 file changed, 322 insertions(+), 72 deletions(-)--
2.19.1.6.gb485710b
Quoted 48 lines · Heng Qi
Quoted 12 lines · Jason Wang
Quoted 11 lines · Heng Qi
Quoted 8 lines · Jason Wang
Quoted 5 lines · Heng Qi
Now, virtio-net already supports per-queue moderation parameter setting. Based on this, we use the netdim library of linux to support dynamic coalescing moderation for virtio-net.
Due to hardware scheduling issues, we only tested rx dim.
Do you have PPS numbers? And TX numbers are also important as the throughput could be misleading due to various reasons.
Quoted 7 lines
Quoted 4 lines
Hi Jason!
The comparison of rx netdim performance is as follows:
(the backend supporting tx dim is not yet ready)Thanks a lot for the numbers.
I'd still expect the TX result as I did play tx interrupt coalescing
Hi, Jason.
Sorry for the late reply to this! Our team has been blocked by other priorities the past few days.
For tx dim, we have a fixed empirical value internally.
This value performs better overall than manually adjusting the tx timer register -->
I'll do not have tx numbers. :( So in the short term I no longer try to push [5/5]
patch for tx dim and try to return-EOPNOTSUPPfor it, sorry for this.Quoted 5 lines
about 10 years ago.
I will start to review the series but let's try to have some TX numbers as well.
Btw, it would be more convenient to have a raw PPS benchmark. E.g you
I got some raw pps data using pktgen from linux/sample/pktgen:
1. tx cmd
./pktgen_sample02_multiqueue.sh -i eth1 -s 44 -d ${dst_ip} -m ${dst_mac} -t 8 -f 0 -n 0
Quoted 6 lines
This uses 8 kpktgend threads to inject data into eth1.
2. Rx side loads a simple xdp prog which drops all received udp packets.
3. Data
pps: ~1000w
For "w" did you mean 10 million? Looks too huge to me?
Quoted 2 lines
rx dim off: cpu idle= ~35%
rx dim on: cpu idle= ~76%
This looks promising.
Thanks
Quoted 101 lines
Thanks!
Quoted 97 lines
can try to use a software or hardware packet generator.
Thanks
Quoted 93 lines
I. Sockperf UDP
=================================================
1. Envrxq_0is affinity tocpu_02. Cmd
client: taskset -c 0 sockperf tp -p 8989 -i $IP -t 10 -m 16B
server: taskset -c 0 sockperf sr -p 89893. Result
dim off: 1143277.00 rxpps, throughput 17.844 MBps, cpu is 100%. dim on: 1124161.00 rxpps, throughput 17.610 MBps, cpu is 83.5%.
=================================================II. Redis
=================================================
1. Env
There are 8 rxqs andrxq_iis affinity tocpu_i.2. Result
When all cpus are 100%, ops/sec ofmemtier_benchmarkclient is
dim off: 978437.23
dim on: 1143638.28
=================================================III. Nginx
=================================================
1. Env
There are 8 rxqs andrxq_iis affinity tocpu_i.2. Result
When all cpus are 100%, requests/sec of wrk client is
dim off: 877931.67
dim on: 1019160.31
=================================================Thanks!
Quoted 51 lines
Thanks
Quoted 49 lines
@Test env
rxq0 has affinity to cpu0.@Test cmd
client: taskset -c 0 sockperf tp -i ${IP} -t 30 --tcp -m ${msg_size}
server: taskset -c 0 sockperf sr --tcp@Test res
The second column is the ratio of the result returned by client when rx dim is enabled to the result returned by client when rx dim is disabled.-------------------------------------- | msg_size | rx_dim=on / rx_dim=off | -------------------------------------- | 14B | + 3% | -------------------------------------- | 100B | + 16% | -------------------------------------- | 500B | + 25% | -------------------------------------- | 1400B | + 28% | -------------------------------------- | 2048B | + 22% | -------------------------------------- | 4096B | + 5% | -----------------------------------------
This patch set was part of the previous netdim patch set[1].
[1] was split into a merged bugfix set[2] and the current set. The previous relevant commentators have been Cced.[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/[email protected]/Heng Qi (5):
virtio-net: returns whether napi is complete
virtio-net: separate rx/tx coalescing moderation cmds
virtio-net: extract virtqueue coalescig cmd for reuse
virtio-net: support rx netdim
virtio-net: support tx netdimdrivers/net/virtio_net.c | 394 ++++++++++++++++++++++++++++++++------- 1 file changed, 322 insertions(+), 72 deletions(-)--
2.19.1.6.gb485710b
Re: [PATCH net-next 4/5] virtio-net: support rx netdim
In reply to Jason WangQuoted 153 lines · Jason Wang
Quoted 152 lines · Heng Qi
Quoted 135 lines · Jason Wang
Quoted 134 lines · Heng Qi
By comparing the traffic information in the complete napi processes, let the virtio-net driver automatically adjust the coalescing moderation parameters of each receive queue.
Signed-off-by Heng Qi <[email protected]>--- drivers/net/virtio_net.c | 147 +++++++++++++++++++++++++++++++++------ 1 file changed, 126 insertions(+), 21 deletions(-)drivers/net/virtio_net.c +48
-2@@ -19,6 +19,7 @@#include <linux/average.h> #include <linux/filter.h> #include <linux/kernel.h> +#include <linux/dim.h> #include <net/route.h> #include <net/xdp.h> #include <net/net_failover.h> @@ -172,6 +173,17 @@ struct receive_queue {struct virtnet_rq_stats stats; +/* The number of rx notifications */ +u16 calls; + +/* Is dynamic interrupt moderation enabled? */ +bool dim_enabled; + +/* Dynamic Interrupt Moderation */ +struct dim dim; + +u32 packets_in_napi; +struct virtnet_interrupt_coalesce intr_coal;/* Chain pages by the private ptr. */ @@ -305,6 +317,9 @@ struct virtnet_info {u8 duplex;u32 speed; +/* Is rx dynamic interrupt moderation enabled? */ +bool rx_dim_enabled; +/* Interrupt coalescing settings */ struct virtnet_interrupt_coalesce intr_coal_tx;struct virtnet_interrupt_coalesce intr_coal_rx;@@ -2001,6 +2016,7 @@ static void skb_recv_done(struct virtqueue *rvq)struct virtnet_info *vi = rvq->vdev->priv;struct receive_queue *rq = &vi->rq[vq2rxq (rvq)]; + rq->calls++;virtqueue_napi_schedule (&rq->napi, rvq); }@@ -2138,6 +2154,25 @@ static void virtnet_poll_cleantx(struct receive_queue *rq) } } +static void virtnet_rx_dim_work (struct work_struct *work); + +static void virtnet_rx_dim_update (struct virtnet_info *vi,struct receive_queue *rq) +{ +struct virtnet_rq_stats *stats = &rq->stats; +struct dim_sample cur_sample = {}; + +if (!rq->packets_in_napi) +return ; + +u64_stats_update_begin (&rq->stats.syncp); +dim_update_sample (rq->calls, stats->packets, + stats->bytes, &cur_sample); +u64_stats_update_end (&rq->stats.syncp); + +net_dim (&rq->dim, cur_sample); + rq->packets_in_napi =0 ; +} +static int virtnet_poll (struct napi_struct *napi,int budget) { struct receive_queue *rq =@@ -2146,17 +2181,22 @@ static int virtnet_poll(struct napi_struct *napi, int budget)struct send_queue *sq;unsigned int received;unsigned int xdp_xmit =0 ; +bool napi_complete;virtnet_poll_cleantx (rq); received =virtnet_receive (rq, budget, &xdp_xmit); + rq->packets_in_napi += received;if (xdp_xmit &VIRTIO_XDP_REDIR )xdp_do_flush ();/* Out of packets? */ -if (received < budget) -virtqueue_napi_complete (napi, rq->vq, received); +if (received < budget) { + napi_complete =virtqueue_napi_complete (napi, rq->vq, received); +if (napi_complete && rq->dim_enabled) +virtnet_rx_dim_update (vi, rq); + }if (xdp_xmit &VIRTIO_XDP_TX ) { sq =virtnet_xdp_get_sq (vi);@@ -2176,6 +2216,7 @@ static void virtnet_disable_queue_pair(struct virtnet_info *vi, int qp_index)virtnet_napi_tx_disable (&vi->sq[qp_index].napi);napi_disable (&vi->rq[qp_index].napi);xdp_rxq_info_unreg (&vi->rq[qp_index].xdp_rxq); +cancel_work_sync (&vi->rq[qp_index].dim.work); }static int virtnet_enable_queue_pair (struct virtnet_info *vi,int qp_index)@@ -2193,6 +2234,9 @@ static int virtnet_enable_queue_pair(struct virtnet_info *vi, int qp_index)if (err <0 ) goto err_xdp_reg_mem_model; +INIT_WORK (&vi->rq[qp_index].dim.work, virtnet_rx_dim_work); + vi->rq[qp_index].dim.mode =DIM_CQ_PERIOD_MODE_START_FROM_EQE ; +virtnet_napi_enable (vi->rq[qp_index].vq, &vi->rq[qp_index].napi);virtnet_napi_tx_enable (vi, vi->sq[qp_index].vq, &vi->sq[qp_index].napi);@@ -3335,23 +3379,42 @@ static int virtnet_send_tx_notf_coal_cmds(struct virtnet_info *vi,static int virtnet_send_rx_notf_coal_cmds (struct virtnet_info *vi,struct ethtool_coalesce *ec) { +bool rx_ctrl_dim_on = !!ec->use_adaptive_rx_coalesce;struct scatterlist sgs_rx; +int i;Quoted 12 lines
drivers/net/virtio_net.c static int virtnet_send_tx_notf_coal_cmds(struct virtnet_info *vi, · line 3387
Quoted 9 lines
drivers/net/virtio_net.c +2
-7- vi->ctrl->coal_rx.rx_usecs =cpu_to_le32 (ec->rx_coalesce_usecs); - vi->ctrl->coal_rx.rx_max_packets =cpu_to_le32 (ec->rx_max_coalesced_frames); -sg_init_one (&sgs_rx, &vi->ctrl->coal_rx,sizeof (vi->ctrl->coal_rx)); - -if (!virtnet_send_command (vi,VIRTIO_NET_CTRL_NOTF_COAL , -VIRTIO_NET_CTRL_NOTF_COAL_RX_SET , - &sgs_rx)) +if (rx_ctrl_dim_on && (ec->rx_coalesce_usecs != vi->intr_coal_rx.max_usecs || + ec->rx_max_coalesced_frames != vi->intr_coal_rx.max_packets))Any reason we need to stick a check for usecs/packets? I think it might confuse the user since the value could be modified by netdim actually.
Yes, that's exactly what's done here.
Quoted 8 lines
Quoted 2 lines
When dim is enabled, the user is prohibited from manually configuring parameters because dim may modify the parameters.
So it should be something like
if (
rx_ctrl_dim_on)return -EINVAL;without the checking of whether it matches the current parameters?
I think yes.
Thanks!
Quoted 146 lines
Quoted 91 lines
Quoted 77 lines
Quoted 77 lines
drivers/net/virtio_net.c +47
-11return -EINVAL ; -/* Save parameters */ - vi->intr_coal_rx.max_usecs = ec->rx_coalesce_usecs; - vi->intr_coal_rx.max_packets = ec->rx_max_coalesced_frames; -for (i =0 ; i < vi->max_queue_pairs; i++) { - vi->rq[i].intr_coal.max_usecs = ec->rx_coalesce_usecs; - vi->rq[i].intr_coal.max_packets = ec->rx_max_coalesced_frames; +if (rx_ctrl_dim_on) { +if (virtio_has_feature (vi->vdev,VIRTIO_NET_F_VQ_NOTF_COAL )) { + vi->rx_dim_enabled = true; +for (i =0 ; i < vi->max_queue_pairs; i++) + vi->rq[i].dim_enabled = true; + }else { +return -EOPNOTSUPP ; + } + }else { + vi->rx_dim_enabled = false; +for (i =0 ; i < vi->max_queue_pairs; i++) + vi->rq[i].dim_enabled = false; + + vi->ctrl->coal_rx.rx_usecs =cpu_to_le32 (ec->rx_coalesce_usecs); + vi->ctrl->coal_rx.rx_max_packets =cpu_to_le32 (ec->rx_max_coalesced_frames); +sg_init_one (&sgs_rx, &vi->ctrl->coal_rx,sizeof (vi->ctrl->coal_rx)); + +if (!virtnet_send_command (vi,VIRTIO_NET_CTRL_NOTF_COAL , +VIRTIO_NET_CTRL_NOTF_COAL_RX_SET , + &sgs_rx)) +return -EINVAL ; + + vi->intr_coal_rx.max_usecs = ec->rx_coalesce_usecs; + vi->intr_coal_rx.max_packets = ec->rx_max_coalesced_frames; +for (i =0 ; i < vi->max_queue_pairs; i++) { + vi->rq[i].intr_coal.max_usecs = ec->rx_coalesce_usecs; + vi->rq[i].intr_coal.max_packets = ec->rx_max_coalesced_frames; + } }return 0 ;@@ -3377,13 +3440,27 @@ static int virtnet_send_notf_coal_vq_cmds(struct virtnet_info *vi,struct ethtool_coalesce *ec, u16 queue) { + bool rx_ctrl_dim_on; +u32 max_usecs, max_packets;int err; - err =virtnet_send_rx_ctrl_coal_vq_cmd (vi, queue, - ec->rx_coalesce_usecs, - ec->rx_max_coalesced_frames); -if (err) -return err; + rx_ctrl_dim_on = !!ec->use_adaptive_rx_coalesce; + max_usecs = vi->rq[queue].intr_coal.max_usecs; + max_packets = vi->rq[queue].intr_coal.max_packets; +if (rx_ctrl_dim_on && (ec->rx_coalesce_usecs != max_usecs || + ec->rx_max_coalesced_frames != max_packets)) +return -EINVAL ; + +if (rx_ctrl_dim_on) { + vi->rq[queue].dim_enabled = true; + }else { + vi->rq[queue].dim_enabled = false; + err =virtnet_send_rx_ctrl_coal_vq_cmd (vi, queue, + ec->rx_coalesce_usecs, + ec->rx_max_coalesced_frames); +if (err) +return err; + } err = virtnet_send_tx_ctrl_coal_vq_cmd(vi, queue, ec->tx_coalesce_usecs,@@ -3394,6 +3471,32 @@ static int virtnet_send_notf_coal_vq_cmds(struct virtnet_info *vi,return 0 ; }Quoted 14 lines
drivers/net/virtio_net.c static int virtnet_send_notf_coal_vq_cmds(struct virtnet_info *vi, · line 3486
Quoted 13 lines
drivers/net/virtio_net.c +13
-0+static void virtnet_rx_dim_work (struct work_struct *work) +{ + struct dim *dim = container_of(work, struct dim, work); +struct receive_queue *rq =container_of (dim, + struct receive_queue, dim); +struct virtnet_info *vi = rq->vq->vdev->priv; +struct net_device *dev = vi->dev; +struct dim_cq_moder update_moder; +int qnum = rq - vi->rq, err; + + update_moder =net_dim_get_rx_moderation (dim->mode, dim->profile_ix); +if (update_moder.usec != vi->rq[qnum].intr_coal.max_usecs || + update_moder.pkts != vi->rq[qnum].intr_coal.max_packets) {Is this safe across the e.g vq reset?
Quoted 3 lines
I think it might. This will be avoided in the next version using:
1. cancelvirtnet_rx_dim_workbefore vq reset.
2. restorevirtnet_rx_dim_workafter vq re-enable.Ok.
Thanks
Quoted 48 lines
Thanks a lot!
Quoted 46 lines
Thanks
Quoted 44 lines
drivers/net/virtio_net.c +16
-2+rtnl_lock (); + err =virtnet_send_rx_ctrl_coal_vq_cmd (vi, qnum, + update_moder.usec, + update_moder.pkts); +if (err) +pr_debug ("%s: Failed to send dim parameters on rxq%d\n" , + dev->name, (int )(rq - vi->rq)); +rtnl_unlock (); + } + + dim->state =DIM_START_MEASURE ; +} +static int virtnet_coal_params_supported (struct ethtool_coalesce *ec) {/* usecs coalescing is supported only if VIRTIO_NET_F_NOTF_COAL @@ -3475,6 +3578,7 @@ static int virtnet_get_coalesce(struct net_device *dev, ec->tx_coalesce_usecs = vi->intr_coal_tx.max_usecs; ec->tx_max_coalesced_frames = vi->intr_coal_tx.max_packets; ec->rx_max_coalesced_frames = vi->intr_coal_rx.max_packets; + ec->use_adaptive_rx_coalesce = vi->rx_dim_enabled; }else { ec->rx_max_coalesced_frames =1 ;@@ -3532,6 +3636,7 @@ static int virtnet_get_per_queue_coalesce(struct net_device *dev, ec->tx_coalesce_usecs = vi->sq[queue].intr_coal.max_usecs; ec->tx_max_coalesced_frames = vi->sq[queue].intr_coal.max_packets; ec->rx_max_coalesced_frames = vi->rq[queue].intr_coal.max_packets; + ec->use_adaptive_rx_coalesce = vi->rq[queue].dim_enabled; }else { ec->rx_max_coalesced_frames =1 ;@@ -3657,7 +3762,7 @@ static int virtnet_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info)static const struct ethtool_ops virtnet_ethtool_ops = { .supported_coalesce_params =ETHTOOL_COALESCE_MAX_FRAMES | -ETHTOOL_COALESCE_USECS , +ETHTOOL_COALESCE_USECS |ETHTOOL_COALESCE_USE_ADAPTIVE_RX , .get_drvinfo = virtnet_get_drvinfo, .get_link = ethtool_op_get_link, .get_ringparam = virtnet_get_ringparam, --2.19.1.6.gb485710b
Quoted 40 lines · Jason Wang
Quoted 39 lines · Heng Qi
Quoted 21 lines · Michael S. Tsirkin
Quoted 20 lines · Jason Wang
Quoted 7 lines · Heng Qi
Quoted 5 lines · Jason Wang
Quoted 4 lines · Heng Qi
Now, virtio-net already supports per-queue moderation parameter setting. Based on this, we use the netdim library of linux to support dynamic coalescing moderation for virtio-net.
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
Due to hardware scheduling issues, we only tested rx dim.
Do you have PPS numbers? And TX numbers are also important as the throughput could be misleading due to various reasons.
Hi Jason!
The comparison of rx netdim performance is as follows:
(the backend supporting tx dim is not yet ready)Thanks a lot for the numbers.
I'd still expect the TX result as I did play tx interrupt coalescing about 10 years ago.
Quoted 7 lines
Quoted 6 lines
I will start to review the series but let's try to have some TX numbers as well.
Btw, it would be more convenient to have a raw PPS benchmark. E.g you can try to use a software or hardware packet generator.
Thanks
Latency results are also kind of interesting.
I test the latency using sockperf pp:
@Rx cmd
taskset -c 0 sockperf sr -p 8989@Tx cmd
taskset -c 0 sockperf pp -i ${ip} -p 8989 -t 10
Quoted 6 lines
Quoted 5 lines
After running this cmd 5 times and averaging the results, we get the following data:
dim off: 17.7735 usec
dim on: 18.0110 usecLet's add those numbers to the changelog of the next version.
Ok. Thanks!
Quoted 97 lines
Thanks
Quoted 94 lines
Thanks!
Quoted 92 lines
Quoted 92 lines
Quoted 92 lines
I. Sockperf UDP
=================================================
1. Envrxq_0is affinity tocpu_02. Cmd
client: taskset -c 0 sockperf tp -p 8989 -i $IP -t 10 -m 16B
server: taskset -c 0 sockperf sr -p 89893. Result
dim off: 1143277.00 rxpps, throughput 17.844 MBps, cpu is 100%. dim on: 1124161.00 rxpps, throughput 17.610 MBps, cpu is 83.5%.
=================================================II. Redis
=================================================
1. Env
There are 8 rxqs andrxq_iis affinity tocpu_i.2. Result
When all cpus are 100%, ops/sec ofmemtier_benchmarkclient is
dim off: 978437.23
dim on: 1143638.28
=================================================III. Nginx
=================================================
1. Env
There are 8 rxqs andrxq_iis affinity tocpu_i.2. Result
When all cpus are 100%, requests/sec of wrk client is
dim off: 877931.67
dim on: 1019160.31
=================================================Thanks!
Quoted 51 lines
Thanks
Quoted 49 lines
@Test env
rxq0 has affinity to cpu0.@Test cmd
client: taskset -c 0 sockperf tp -i ${IP} -t 30 --tcp -m ${msg_size}
server: taskset -c 0 sockperf sr --tcp@Test res
The second column is the ratio of the result returned by client when rx dim is enabled to the result returned by client when rx dim is disabled.-------------------------------------- | msg_size | rx_dim=on / rx_dim=off | -------------------------------------- | 14B | + 3% | -------------------------------------- | 100B | + 16% | -------------------------------------- | 500B | + 25% | -------------------------------------- | 1400B | + 28% | -------------------------------------- | 2048B | + 22% | -------------------------------------- | 4096B | + 5% | -----------------------------------------
This patch set was part of the previous netdim patch set[1].
[1] was split into a merged bugfix set[2] and the current set. The previous relevant commentators have been Cced.[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/[email protected]/Heng Qi (5):
virtio-net: returns whether napi is complete
virtio-net: separate rx/tx coalescing moderation cmds
virtio-net: extract virtqueue coalescig cmd for reuse
virtio-net: support rx netdim
virtio-net: support tx netdim
drivers/net/virtio_net.c| 394 ++++++++++++++++++++++++++++++++------- 1 file changed, 322 insertions(+), 72 deletions(-)--
2.19.1.6.gb485710b
Quoted 45 lines · Jason Wang
Quoted 44 lines · Heng Qi
Quoted 11 lines · Jason Wang
Quoted 10 lines · Heng Qi
Quoted 8 lines · Jason Wang
Quoted 5 lines · Heng Qi
Now, virtio-net already supports per-queue moderation parameter setting. Based on this, we use the netdim library of linux to support dynamic coalescing moderation for virtio-net.
Due to hardware scheduling issues, we only tested rx dim.
Do you have PPS numbers? And TX numbers are also important as the throughput could be misleading due to various reasons.
Quoted 7 lines
Quoted 4 lines
Hi Jason!
The comparison of rx netdim performance is as follows:
(the backend supporting tx dim is not yet ready)Thanks a lot for the numbers.
I'd still expect the TX result as I did play tx interrupt coalescing
Hi, Jason.
Sorry for the late reply to this! Our team has been blocked by other priorities the past few days.
For tx dim, we have a fixed empirical value internally.
This value performs better overall than manually adjusting the tx timer register -->
I'll do not have tx numbers. :( So in the short term I no longer try to push [5/5]
patch for tx dim and try to return-EOPNOTSUPPfor it, sorry for this.Quoted 5 lines
about 10 years ago.
I will start to review the series but let's try to have some TX numbers as well.
Btw, it would be more convenient to have a raw PPS benchmark. E.g you
I got some raw pps data using pktgen from linux/sample/pktgen:
1. tx cmd
./pktgen_sample02_multiqueue.sh -i eth1 -s 44 -d ${dst_ip} -m ${dst_mac} -t 8 -f 0 -n 0
Quoted 7 lines
Quoted 6 lines
This uses 8 kpktgend threads to inject data into eth1.
2. Rx side loads a simple xdp prog which drops all received udp packets.
3. Data
pps: ~1000wFor "w" did you mean 10 million? Looks too huge to me?
Yes, all cpus in tx are 100% sys, rx uses xdp to drop all received udp packets. Then this means rx receiving ability is strong.
If there was no xdp in rx, I remember tx sent 10million pps, but rx could only receive 7.3+ million pps.
Thanks!
Quoted 104 lines
Quoted 3 lines
rx dim off: cpu idle= ~35%
rx dim on: cpu idle= ~76%This looks promising.
Thanks
Quoted 97 lines
Thanks!
Quoted 95 lines
can try to use a software or hardware packet generator.
Thanks
Quoted 91 lines
I. Sockperf UDP
=================================================
1. Envrxq_0is affinity tocpu_02. Cmd
client: taskset -c 0 sockperf tp -p 8989 -i $IP -t 10 -m 16B
server: taskset -c 0 sockperf sr -p 89893. Result
dim off: 1143277.00 rxpps, throughput 17.844 MBps, cpu is 100%. dim on: 1124161.00 rxpps, throughput 17.610 MBps, cpu is 83.5%.
=================================================II. Redis
=================================================
1. Env
There are 8 rxqs andrxq_iis affinity tocpu_i.2. Result
When all cpus are 100%, ops/sec ofmemtier_benchmarkclient is
dim off: 978437.23
dim on: 1143638.28
=================================================III. Nginx
=================================================
1. Env
There are 8 rxqs andrxq_iis affinity tocpu_i.2. Result
When all cpus are 100%, requests/sec of wrk client is
dim off: 877931.67
dim on: 1019160.31
=================================================Thanks!
Quoted 51 lines
Thanks
Quoted 49 lines
@Test env
rxq0 has affinity to cpu0.@Test cmd
client: taskset -c 0 sockperf tp -i ${IP} -t 30 --tcp -m ${msg_size}
server: taskset -c 0 sockperf sr --tcp@Test res
The second column is the ratio of the result returned by client when rx dim is enabled to the result returned by client when rx dim is disabled.-------------------------------------- | msg_size | rx_dim=on / rx_dim=off | -------------------------------------- | 14B | + 3% | -------------------------------------- | 100B | + 16% | -------------------------------------- | 500B | + 25% | -------------------------------------- | 1400B | + 28% | -------------------------------------- | 2048B | + 22% | -------------------------------------- | 4096B | + 5% | -----------------------------------------
This patch set was part of the previous netdim patch set[1].
[1] was split into a merged bugfix set[2] and the current set. The previous relevant commentators have been Cced.[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/[email protected]/Heng Qi (5):
virtio-net: returns whether napi is complete
virtio-net: separate rx/tx coalescing moderation cmds
virtio-net: extract virtqueue coalescig cmd for reuse
virtio-net: support rx netdim
virtio-net: support tx netdim
drivers/net/virtio_net.c| 394 ++++++++++++++++++++++++++++++++------- 1 file changed, 322 insertions(+), 72 deletions(-)--
2.19.1.6.gb485710b
Quoted 52 lines · Heng Qi
Quoted 49 lines · Jason Wang
Quoted 48 lines · Heng Qi
Quoted 11 lines · Jason Wang
Quoted 10 lines · Heng Qi
Quoted 8 lines · Jason Wang
Quoted 5 lines · Heng Qi
Now, virtio-net already supports per-queue moderation parameter setting. Based on this, we use the netdim library of linux to support dynamic coalescing moderation for virtio-net.
Due to hardware scheduling issues, we only tested rx dim.
Do you have PPS numbers? And TX numbers are also important as the throughput could be misleading due to various reasons.
Quoted 7 lines
Quoted 4 lines
Hi Jason!
The comparison of rx netdim performance is as follows:
(the backend supporting tx dim is not yet ready)Thanks a lot for the numbers.
I'd still expect the TX result as I did play tx interrupt coalescing
Hi, Jason.
Sorry for the late reply to this! Our team has been blocked by other priorities the past few days.
For tx dim, we have a fixed empirical value internally.
This value performs better overall than manually adjusting the tx timer register -->
I'll do not have tx numbers. :( So in the short term I no longer try to push [5/5]
patch for tx dim and try to return-EOPNOTSUPPfor it, sorry for this.Quoted 5 lines
about 10 years ago.
I will start to review the series but let's try to have some TX numbers as well.
Btw, it would be more convenient to have a raw PPS benchmark. E.g you
I got some raw pps data using pktgen from linux/sample/pktgen:
1. tx cmd
./pktgen_sample02_multiqueue.sh -i eth1 -s 44 -d ${dst_ip} -m ${dst_mac} -t 8 -f 0 -n 0This uses 8 kpktgend threads to inject data into eth1.
2. Rx side loads a simple xdp prog which drops all received udp packets.
Quoted 8 lines
Quoted 3 lines
Quoted 2 lines
3. Data
pps: ~1000wFor "w" did you mean 10 million? Looks too huge to me?
Yes, all cpus in tx are 100% sys, rx uses xdp to drop all received udp packets. Then this means rx receiving ability is strong.
If there was no xdp in rx, I remember tx sent 10million pps, but rx could only receive 7.3+ million pps.
In addition, in the test environment of pktgen, rx has 8 cpu and 8 queue.
Thanks!
Quoted 109 lines
Thanks!
Quoted 105 lines
Quoted 3 lines
rx dim off: cpu idle= ~35%
rx dim on: cpu idle= ~76%This looks promising.
Thanks
Quoted 98 lines
Thanks!
Quoted 96 lines
can try to use a software or hardware packet generator.
Thanks
Quoted 92 lines
I. Sockperf UDP
=================================================
1. Envrxq_0is affinity tocpu_02. Cmd
client: taskset -c 0 sockperf tp -p 8989 -i $IP -t 10 -m 16B
server: taskset -c 0 sockperf sr -p 89893. Result
dim off: 1143277.00 rxpps, throughput 17.844 MBps, cpu is 100%. dim on: 1124161.00 rxpps, throughput 17.610 MBps, cpu is 83.5%.
=================================================II. Redis
=================================================
1. Env
There are 8 rxqs andrxq_iis affinity tocpu_i.2. Result
When all cpus are 100%, ops/sec ofmemtier_benchmarkclient is dim off: 978437.23
dim on: 1143638.28
=================================================III. Nginx
=================================================
1. Env
There are 8 rxqs andrxq_iis affinity tocpu_i.2. Result
When all cpus are 100%, requests/sec of wrk client is dim off: 877931.67
dim on: 1019160.31
=================================================Thanks!
Quoted 52 lines
Thanks
Quoted 50 lines
@Test env
rxq0 has affinity to cpu0.@Test cmd
client: taskset -c 0 sockperf tp -i ${IP} -t 30 --tcp -m ${msg_size}
server: taskset -c 0 sockperf sr --tcp@Test res
The second column is the ratio of the result returned by client when rx dim is enabled to the result returned by client when rx dim is disabled.
--------------------------------------
|msg_size| rx_dim=on / rx_dim=off |
--------------------------------------
| 14B | + 3% |
--------------------------------------
| 100B | + 16% |
--------------------------------------
| 500B | + 25% |
--------------------------------------
| 1400B | + 28% |
--------------------------------------
| 2048B | + 22% |
--------------------------------------
| 4096B | + 5% |
-----------------------------------------
This patch set was part of the previous netdim patch set[1].
[1] was split into a merged bugfix set[2] and the current set. The previous relevant commentators have been Cced.[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/[email protected]/Heng Qi (5):
virtio-net: returns whether napi is complete
virtio-net: separate rx/tx coalescing moderation cmds
virtio-net: extract virtqueue coalescig cmd for reuse
virtio-net: support rx netdim
virtio-net: support tx netdim
drivers/net/virtio_net.c| 394
++++++++++++++++++++++++++++++++-------1 file changed, 322 insertions(+), 72 deletions(-)Signature · 1 line
2.19.1.6.gb485710b