From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1B31012C49E for ; Wed, 12 Jun 2024 22:31:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718231470; cv=none; b=HnAXXk6cIGl/UJYMpJMKIM1VKKhURtYCBBukv9p3kF0xTJ6cA8UCwjAMhncHRMSZcnCqbjQk9cAdy+Js3Xsdcy/hyZmHGBRAUuvYUfWbcoJd5VqwowxvB0iee3L/FNwJpAmwsRsbMrfyoBeFwcSAd4oWEFaWlXtLRjoOgrHKKpE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718231470; c=relaxed/simple; bh=d28hJqnE/fp4WWmHC4Chpo+kVBJe1kKRBfBoZJZ+0dg=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: In-Reply-To:Content-Type:Content-Disposition; b=LVXmst4lA3m3d6j6nj/EbhtRQdoYBmO7ieAUS54Fp61NS21QdHj+sJm1vJBum/m3mbco8oDJgj9LbQoi92en7MDrQvNyF3hBAYez08i+iruPQukqWjBCJYTaqgSvilPGcYxYyCXW9VgRmuwtRO3VV9VKhWL+A1FHxvfPd+xwbTs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=gx8EZuHu; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="gx8EZuHu" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718231465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Nl2m2MbhkCyqfeFvn0SH6yKdu/HPUWtJGaL2h1R8ncA=; b=gx8EZuHukxY9RxfYUHOI0lNMIjKyP18OU12DTz3ozmx7S8uLYHvICjVw/JDRQnHkQ7539a ZcCzbTOlW349pCVTbuPHeLitM9gpQSYuaOAWZtz0Kos1b2NlJF+LtVVQUUInVq26KI8Spp 1q/7jQJMKpLWj5rMrFoeIC0EaGHiszM= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-155-FGlqWB8AMCa5KvMaF0W3Jw-1; Wed, 12 Jun 2024 18:31:03 -0400 X-MC-Unique: FGlqWB8AMCa5KvMaF0W3Jw-1 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-422a0f21366so3085295e9.1 for ; Wed, 12 Jun 2024 15:31:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718231462; x=1718836262; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Nl2m2MbhkCyqfeFvn0SH6yKdu/HPUWtJGaL2h1R8ncA=; b=QsGhjqgVaCjidYiBpkIcWNggRodjvVrVQlmhG4hTIGEOf+kaSvuV7Q32QOG5R7zRVZ gGa9/7mtrnjmz1a47F9DbUist7niCHwQLYlDZpU+44Lj76MOcnmsgTQcg0pjTl1i8YqZ 1ANPWOwX+xdvPnr9AaMgAoeBVkc+1vjgnZlrpzTBQcT7BXqiVfBNHyxQtL+/zvQZyTua fJfuSxwHErTcgjMJAZWQCR7Mk7chnuY48T7atcdH0fGQI1mXXmsgQRuhvsGLSsdxODSu 8+QZa8x6t+uzSATaJInlrqs4y/FnAhEVqWvnZ4e2a5y1YD/AIYqo0A2x5qcyw3Kqn5v9 LVeQ== X-Forwarded-Encrypted: i=1; AJvYcCW2Wd8XmuM03Fb9bh3olVkx77B36nhDkr26BwCMsPa3QUFrveHqAx5y6AlI/Wg+8NZrNsM/FUYIahZGzeMuFGD8GPb19SSsrOlpFOZ1aqY= X-Gm-Message-State: AOJu0Yw8Hm74V40QuFduz+YUiRmqGN57tMdTFi2CAbrEXdt2eAHE3fzd 9IHLgSoqdbID2g/sXmhc3naEPdik4PxtxbiOPddY9DXTPBk7gxPSjcBPxagUiNP0pEv2wgXsLt4 LzrdvRTIlkMiroPhj8vxLyA+q9hXeRlnqlPkIxb5TCxEJe+Nn+Hk/au0YHHWtQCbd X-Received: by 2002:a05:600c:45cc:b0:421:21d2:abf5 with SMTP id 5b1f17b1804b1-422865acc67mr26883825e9.31.1718231462235; Wed, 12 Jun 2024 15:31:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHEDRZahJSJq6/Ujb2z7gkEtgTdOve/kBATPKQ7YP56k6eRdRbTyGe1GQ9Myo2uG8lTGG78Rg== X-Received: by 2002:a05:600c:45cc:b0:421:21d2:abf5 with SMTP id 5b1f17b1804b1-422865acc67mr26883415e9.31.1718231461601; Wed, 12 Jun 2024 15:31:01 -0700 (PDT) Received: from redhat.com ([2a0d:6fc7:341:5539:9b1a:2e49:4aac:204e]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-422f5f33c38sm2114725e9.9.2024.06.12.15.30.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jun 2024 15:31:00 -0700 (PDT) Date: Wed, 12 Jun 2024 18:30:55 -0400 From: "Michael S. Tsirkin" To: Jiri Pirko Cc: netdev@vger.kernel.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, jasowang@redhat.com, xuanzhuo@linux.alibaba.com, virtualization@lists.linux.dev, ast@kernel.org, daniel@iogearbox.net, hawk@kernel.org, john.fastabend@gmail.com, dave.taht@gmail.com, kerneljasonxing@gmail.com, hengqi@linux.alibaba.com Subject: Re: [PATCH net-next v2] virtio_net: add support for Byte Queue Limits Message-ID: <20240612182944-mutt-send-email-mst@kernel.org> References: <20240612170851.1004604-1-jiri@resnulli.us> Precedence: bulk X-Mailing-List: virtualization@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 In-Reply-To: <20240612170851.1004604-1-jiri@resnulli.us> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Wed, Jun 12, 2024 at 07:08:51PM +0200, Jiri Pirko wrote: > From: Jiri Pirko > > Add support for Byte Queue Limits (BQL). > > Tested on qemu emulated virtio_net device with 1, 2 and 4 queues. > Tested with fq_codel and pfifo_fast. Super netperf with 50 threads is > running in background. Netperf TCP_RR results: > > NOBQL FQC 1q: 159.56 159.33 158.50 154.31 agv: 157.925 > NOBQL FQC 2q: 184.64 184.96 174.73 174.15 agv: 179.62 > NOBQL FQC 4q: 994.46 441.96 416.50 499.56 agv: 588.12 > NOBQL PFF 1q: 148.68 148.92 145.95 149.48 agv: 148.2575 > NOBQL PFF 2q: 171.86 171.20 170.42 169.42 agv: 170.725 > NOBQL PFF 4q: 1505.23 1137.23 2488.70 3507.99 agv: 2159.7875 > BQL FQC 1q: 1332.80 1297.97 1351.41 1147.57 agv: 1282.4375 > BQL FQC 2q: 768.30 817.72 864.43 974.40 agv: 856.2125 > BQL FQC 4q: 945.66 942.68 878.51 822.82 agv: 897.4175 > BQL PFF 1q: 149.69 151.49 149.40 147.47 agv: 149.5125 > BQL PFF 2q: 2059.32 798.74 1844.12 381.80 agv: 1270.995 > BQL PFF 4q: 1871.98 4420.02 4916.59 13268.16 agv: 6119.1875 > > Signed-off-by: Jiri Pirko I see you now support both napi and non-napi. Thanks a lot Jiri! Just coming out of a national holiday here, as usual with a backlog - pls allow until Monday to review. Thanks! > --- > v1->v2: > - moved netdev_tx_completed_queue() call into __free_old_xmit(), > propagate use_napi flag to __free_old_xmit() and only call > netdev_tx_completed_queue() in case it is true > - added forgotten call to netdev_tx_reset_queue() > - fixed stats for xdp packets > - fixed bql accounting when __free_old_xmit() is called from xdp path > - handle the !use_napi case in start_xmit() kick section > --- > drivers/net/virtio_net.c | 50 +++++++++++++++++++++++++--------------- > 1 file changed, 32 insertions(+), 18 deletions(-) > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > index 61a57d134544..5863c663ccab 100644 > --- a/drivers/net/virtio_net.c > +++ b/drivers/net/virtio_net.c > @@ -84,7 +84,9 @@ struct virtnet_stat_desc { > > struct virtnet_sq_free_stats { > u64 packets; > + u64 xdp_packets; > u64 bytes; > + u64 xdp_bytes; > }; > > struct virtnet_sq_stats { > @@ -506,29 +508,33 @@ static struct xdp_frame *ptr_to_xdp(void *ptr) > return (struct xdp_frame *)((unsigned long)ptr & ~VIRTIO_XDP_FLAG); > } > > -static void __free_old_xmit(struct send_queue *sq, bool in_napi, > +static void __free_old_xmit(struct send_queue *sq, struct netdev_queue *txq, > + bool in_napi, bool use_napi, > struct virtnet_sq_free_stats *stats) > { > unsigned int len; > void *ptr; > > while ((ptr = virtqueue_get_buf(sq->vq, &len)) != NULL) { > - ++stats->packets; > - > if (!is_xdp_frame(ptr)) { > struct sk_buff *skb = ptr; > > pr_debug("Sent skb %p\n", skb); > > + stats->packets++; > stats->bytes += skb->len; > napi_consume_skb(skb, in_napi); > } else { > struct xdp_frame *frame = ptr_to_xdp(ptr); > > - stats->bytes += xdp_get_frame_len(frame); > + stats->xdp_packets++; > + stats->xdp_bytes += xdp_get_frame_len(frame); > xdp_return_frame(frame); > } > } > + if (use_napi) > + netdev_tx_completed_queue(txq, stats->packets, stats->bytes); > + > } > > /* Converting between virtqueue no. and kernel tx/rx queue no. > @@ -955,21 +961,22 @@ static void virtnet_rq_unmap_free_buf(struct virtqueue *vq, void *buf) > virtnet_rq_free_buf(vi, rq, buf); > } > > -static void free_old_xmit(struct send_queue *sq, bool in_napi) > +static void free_old_xmit(struct send_queue *sq, struct netdev_queue *txq, > + bool in_napi, bool use_napi) > { > struct virtnet_sq_free_stats stats = {0}; > > - __free_old_xmit(sq, in_napi, &stats); > + __free_old_xmit(sq, txq, in_napi, use_napi, &stats); > > /* Avoid overhead when no packets have been processed > * happens when called speculatively from start_xmit. > */ > - if (!stats.packets) > + if (!stats.packets && !stats.xdp_packets) > return; > > u64_stats_update_begin(&sq->stats.syncp); > - u64_stats_add(&sq->stats.bytes, stats.bytes); > - u64_stats_add(&sq->stats.packets, stats.packets); > + u64_stats_add(&sq->stats.bytes, stats.bytes + stats.xdp_bytes); > + u64_stats_add(&sq->stats.packets, stats.packets + stats.xdp_packets); > u64_stats_update_end(&sq->stats.syncp); > } > > @@ -1003,7 +1010,9 @@ static void check_sq_full_and_disable(struct virtnet_info *vi, > * early means 16 slots are typically wasted. > */ > if (sq->vq->num_free < 2+MAX_SKB_FRAGS) { > - netif_stop_subqueue(dev, qnum); > + struct netdev_queue *txq = netdev_get_tx_queue(dev, qnum); > + > + netif_tx_stop_queue(txq); > u64_stats_update_begin(&sq->stats.syncp); > u64_stats_inc(&sq->stats.stop); > u64_stats_update_end(&sq->stats.syncp); > @@ -1012,7 +1021,7 @@ static void check_sq_full_and_disable(struct virtnet_info *vi, > virtqueue_napi_schedule(&sq->napi, sq->vq); > } else if (unlikely(!virtqueue_enable_cb_delayed(sq->vq))) { > /* More just got used, free them then recheck. */ > - free_old_xmit(sq, false); > + free_old_xmit(sq, txq, false, use_napi); > if (sq->vq->num_free >= 2+MAX_SKB_FRAGS) { > netif_start_subqueue(dev, qnum); > u64_stats_update_begin(&sq->stats.syncp); > @@ -1138,7 +1147,8 @@ static int virtnet_xdp_xmit(struct net_device *dev, > } > > /* Free up any pending old buffers before queueing new ones. */ > - __free_old_xmit(sq, false, &stats); > + __free_old_xmit(sq, netdev_get_tx_queue(dev, sq - vi->sq), > + false, sq->napi.weight, &stats); > > for (i = 0; i < n; i++) { > struct xdp_frame *xdpf = frames[i]; > @@ -2313,7 +2323,7 @@ static void virtnet_poll_cleantx(struct receive_queue *rq) > > do { > virtqueue_disable_cb(sq->vq); > - free_old_xmit(sq, true); > + free_old_xmit(sq, txq, true, true); > } while (unlikely(!virtqueue_enable_cb_delayed(sq->vq))); > > if (sq->vq->num_free >= 2 + MAX_SKB_FRAGS) { > @@ -2412,6 +2422,7 @@ static int virtnet_enable_queue_pair(struct virtnet_info *vi, int qp_index) > goto err_xdp_reg_mem_model; > > virtnet_napi_enable(vi->rq[qp_index].vq, &vi->rq[qp_index].napi); > + netdev_tx_reset_queue(netdev_get_tx_queue(vi->dev, qp_index)); > virtnet_napi_tx_enable(vi, vi->sq[qp_index].vq, &vi->sq[qp_index].napi); > > return 0; > @@ -2471,7 +2482,7 @@ static int virtnet_poll_tx(struct napi_struct *napi, int budget) > txq = netdev_get_tx_queue(vi->dev, index); > __netif_tx_lock(txq, raw_smp_processor_id()); > virtqueue_disable_cb(sq->vq); > - free_old_xmit(sq, true); > + free_old_xmit(sq, txq, true, true); > > if (sq->vq->num_free >= 2 + MAX_SKB_FRAGS) { > if (netif_tx_queue_stopped(txq)) { > @@ -2559,17 +2570,18 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev) > struct send_queue *sq = &vi->sq[qnum]; > int err; > struct netdev_queue *txq = netdev_get_tx_queue(dev, qnum); > - bool kick = !netdev_xmit_more(); > + bool xmit_more = netdev_xmit_more(); > bool use_napi = sq->napi.weight; > + bool kick; > > /* Free up any pending old buffers before queueing new ones. */ > do { > if (use_napi) > virtqueue_disable_cb(sq->vq); > > - free_old_xmit(sq, false); > + free_old_xmit(sq, txq, false, use_napi); > > - } while (use_napi && kick && > + } while (use_napi && !xmit_more && > unlikely(!virtqueue_enable_cb_delayed(sq->vq))); > > /* timestamp packet in software */ > @@ -2598,7 +2610,9 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev) > > check_sq_full_and_disable(vi, dev, sq); > > - if (kick || netif_xmit_stopped(txq)) { > + kick = use_napi ? __netdev_tx_sent_queue(txq, skb->len, xmit_more) : > + !xmit_more && netif_xmit_stopped(txq); > + if (kick) { > if (virtqueue_kick_prepare(sq->vq) && virtqueue_notify(sq->vq)) { > u64_stats_update_begin(&sq->stats.syncp); > u64_stats_inc(&sq->stats.kicks); > -- > 2.45.1