From patchwork Tue Apr 23 08:42:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heng Qi X-Patchwork-Id: 13639616 X-Patchwork-Delegate: kuba@kernel.org Received: from out30-133.freemail.mail.aliyun.com (out30-133.freemail.mail.aliyun.com [115.124.30.133]) (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 B082B56772 for ; Tue, 23 Apr 2024 08:42:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=115.124.30.133 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713861759; cv=none; b=QZbCd2SJS/06e8aPra9l/H5LMNjxRh2HJRYftpF2PE7SJvU+wC1nAiv4Pi20YboWnTEusGLVvrKNEkgxOM83JKL1D+rO16Xc4yrCSu0bYmMh7YJ3ZjiiJC1p7rHZKm5hjq689q9xY+IaON27VPiTqI1lNY86OYrdBTMt+Ry0juk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713861759; c=relaxed/simple; bh=420ieITu/mOMgWUiG5XIDKXkNpQTIIyPR7xSDcGkETs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=jbHHfBZE/y9DP2A+ft1rNQSb/UWIzxFSCI4OfSeHOu6uvMfJUIk4gQcHAzE+RjXKUB2JK4It4m9BONmuh6sG2q9wsDOPhCLEz13tdNh/qOJvOiE9Vqk/X3Z+m5N99wGFq8+3WIFrWvi6eB3C4BV4r5y0RHDHvksWXdvGaE7060Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com; spf=pass smtp.mailfrom=linux.alibaba.com; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b=ZJooopv3; arc=none smtp.client-ip=115.124.30.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b="ZJooopv3" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1713861750; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=ErnL2XZDXVRSR5BJwDKdTnza46FQIEIcG4s5MNDVDX4=; b=ZJooopv3jLCbBI6kMXsX7tg7ULARxb9P4asV8zGZY3pB0K8hXtF3VliemBd6+5HOi5EJKPXA+vwSkHnWOEFIjzpdJy9skhqYkjP11/g6Fm5g/cBA9gWh2Mgke9eIEpvADnoaneuTYmuGFp7gBmzDd2klVAG8gvAghVpEiS4Ud+8= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R691e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033068173054;MF=hengqi@linux.alibaba.com;NM=1;PH=DS;RN=9;SR=0;TI=SMTPD_---0W58Gl8W_1713861748; Received: from localhost(mailfrom:hengqi@linux.alibaba.com fp:SMTPD_---0W58Gl8W_1713861748) by smtp.aliyun-inc.com; Tue, 23 Apr 2024 16:42:29 +0800 From: Heng Qi To: netdev@vger.kernel.org, virtualization@lists.linux.dev Cc: "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , Eric Dumazet , "David S. Miller" , Jakub Kicinski , Paolo Abeni Subject: [PATCH net-next 1/2] virtio_net: virtnet_send_command supports command-specific-result Date: Tue, 23 Apr 2024 16:42:25 +0800 Message-Id: <20240423084226.25440-2-hengqi@linux.alibaba.com> X-Mailer: git-send-email 2.32.0.3.g01195cf9f In-Reply-To: <20240423084226.25440-1-hengqi@linux.alibaba.com> References: <20240423084226.25440-1-hengqi@linux.alibaba.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Xuan Zhuo As the spec https://github.com/oasis-tcs/virtio-spec/commit/42f389989823039724f95bbbd243291ab0064f82 The virtnet cvq supports to get result from the device. Signed-off-by: Xuan Zhuo --- drivers/net/virtio_net.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 7176b956460b..3bc9b1e621db 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -2527,11 +2527,12 @@ static int virtnet_tx_resize(struct virtnet_info *vi, * supported by the hypervisor, as indicated by feature bits, should * never fail unless improperly formatted. */ -static bool virtnet_send_command(struct virtnet_info *vi, u8 class, u8 cmd, - struct scatterlist *out) +static bool virtnet_send_command_reply(struct virtnet_info *vi, u8 class, u8 cmd, + struct scatterlist *out, + struct scatterlist *in) { - struct scatterlist *sgs[4], hdr, stat; - unsigned out_num = 0, tmp; + struct scatterlist *sgs[5], hdr, stat; + u32 out_num = 0, tmp, in_num = 0; int ret; /* Caller should know better */ @@ -2549,10 +2550,13 @@ static bool virtnet_send_command(struct virtnet_info *vi, u8 class, u8 cmd, /* Add return status. */ sg_init_one(&stat, &vi->ctrl->status, sizeof(vi->ctrl->status)); - sgs[out_num] = &stat; + sgs[out_num + in_num++] = &stat; - BUG_ON(out_num + 1 > ARRAY_SIZE(sgs)); - ret = virtqueue_add_sgs(vi->cvq, sgs, out_num, 1, vi, GFP_ATOMIC); + if (in) + sgs[out_num + in_num++] = in; + + BUG_ON(out_num + in_num > ARRAY_SIZE(sgs)); + ret = virtqueue_add_sgs(vi->cvq, sgs, out_num, in_num, vi, GFP_ATOMIC); if (ret < 0) { dev_warn(&vi->vdev->dev, "Failed to add sgs for command vq: %d\n.", ret); @@ -2574,6 +2578,12 @@ static bool virtnet_send_command(struct virtnet_info *vi, u8 class, u8 cmd, return vi->ctrl->status == VIRTIO_NET_OK; } +static bool virtnet_send_command(struct virtnet_info *vi, u8 class, u8 cmd, + struct scatterlist *out) +{ + return virtnet_send_command_reply(vi, class, cmd, out, NULL); +} + static int virtnet_set_mac_address(struct net_device *dev, void *p) { struct virtnet_info *vi = netdev_priv(dev); From patchwork Tue Apr 23 08:42:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heng Qi X-Patchwork-Id: 13639614 X-Patchwork-Delegate: kuba@kernel.org Received: from out30-101.freemail.mail.aliyun.com (out30-101.freemail.mail.aliyun.com [115.124.30.101]) (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 A980456B65 for ; Tue, 23 Apr 2024 08:42:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=115.124.30.101 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713861757; cv=none; b=vDHKOeCezAaqtcBsk8IVrEuRWOGI5YnkvDEems+1pYiXrCN0NL7qOBRFrAIS2aJGNBIXi2IOI2Q35MiKgiDC0zZbpJOkZe0Z3vRmMWkPaEt7KYjzmnYBVzj7DnqhF1AEq6jhpqtANzf4xNC8yu8RrC3H9szzyl+mvmCRkLLyzwg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713861757; c=relaxed/simple; bh=TGYFaIai2Z0dam9L8nAVwO8TpywOklb2AgAye2mg+Xc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Ao3V66mBFENeU9++IqUXmu961yDlleErjiCCTcbthSjSlewUQq3f9A3u3S9H2sbLrC66EAKp2hhtU2VrGtJxsa/77n3SHXtQNSGBv2jG3JKZaWNTsNDH0EFMf82eQ/90B3y40i5OrwbAPlE96I4vSbKuPUWQQbst6sPcMHOCJJ0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com; spf=pass smtp.mailfrom=linux.alibaba.com; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b=TqMEdO+K; arc=none smtp.client-ip=115.124.30.101 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b="TqMEdO+K" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1713861752; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=CZkfS1T+3iklRYyYG/M6nVAjZnl0ZNjEuysnrUnFU68=; b=TqMEdO+Kf4fvYJyM7ucwimd2OHWBBmJ0RENV/Ijx0d0YaE7lvSSNIgyRffUkEKvVQvyqKTvWIS7TJ86wPthLl6/JvTn13nirgpdcjaRoTv+JO8UNhUH3tDyHmZ7xYcK4XgXbAobHhmdRjaeu2plFw/mZn8kOxyjNQXkEY0CXE9E= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R121e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045168;MF=hengqi@linux.alibaba.com;NM=1;PH=DS;RN=9;SR=0;TI=SMTPD_---0W58UuWL_1713861750; Received: from localhost(mailfrom:hengqi@linux.alibaba.com fp:SMTPD_---0W58UuWL_1713861750) by smtp.aliyun-inc.com; Tue, 23 Apr 2024 16:42:31 +0800 From: Heng Qi To: netdev@vger.kernel.org, virtualization@lists.linux.dev Cc: "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , Eric Dumazet , "David S. Miller" , Jakub Kicinski , Paolo Abeni Subject: [PATCH net-next 2/2] virtio_net: get init coalesce value when probe Date: Tue, 23 Apr 2024 16:42:26 +0800 Message-Id: <20240423084226.25440-3-hengqi@linux.alibaba.com> X-Mailer: git-send-email 2.32.0.3.g01195cf9f In-Reply-To: <20240423084226.25440-1-hengqi@linux.alibaba.com> References: <20240423084226.25440-1-hengqi@linux.alibaba.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Currently, virtio-net lacks a way to obtain the default coalesce values of the device during the probe phase. That is, the device may have default experience values, but the user uses "ethtool -c" to query that the values are still 0. Therefore, we reuse VIRTIO_NET_CTRL_NOTF_COAL_VQ_GET to complete the goal. Signed-off-by: Heng Qi --- drivers/net/virtio_net.c | 68 +++++++++++++++++++++++++++++++++++----- 1 file changed, 61 insertions(+), 7 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 3bc9b1e621db..fe0c15819dd3 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -4623,6 +4623,46 @@ static int virtnet_validate(struct virtio_device *vdev) return 0; } +static int virtnet_get_coal_init_value(struct virtnet_info *vi, + u16 _vqn, bool is_tx) +{ + struct virtio_net_ctrl_coal *coal = &vi->ctrl->coal_vq.coal; + __le16 *vqn = &vi->ctrl->coal_vq.vqn; + struct scatterlist sgs_in, sgs_out; + u32 usecs, pkts, i; + bool ret; + + *vqn = cpu_to_le16(_vqn); + + sg_init_one(&sgs_out, vqn, sizeof(*vqn)); + sg_init_one(&sgs_in, coal, sizeof(*coal)); + ret = virtnet_send_command_reply(vi, VIRTIO_NET_CTRL_NOTF_COAL, + VIRTIO_NET_CTRL_NOTF_COAL_VQ_GET, + &sgs_out, &sgs_in); + if (!ret) + return ret; + + usecs = le32_to_cpu(coal->max_usecs); + pkts = le32_to_cpu(coal->max_packets); + if (is_tx) { + vi->intr_coal_tx.max_usecs = usecs; + vi->intr_coal_tx.max_packets = pkts; + for (i = 0; i < vi->max_queue_pairs; i++) { + vi->sq[i].intr_coal.max_usecs = usecs; + vi->sq[i].intr_coal.max_packets = pkts; + } + } else { + vi->intr_coal_rx.max_usecs = usecs; + vi->intr_coal_rx.max_packets = pkts; + for (i = 0; i < vi->max_queue_pairs; i++) { + vi->rq[i].intr_coal.max_usecs = usecs; + vi->rq[i].intr_coal.max_packets = pkts; + } + } + + return 0; +} + static bool virtnet_check_guest_gso(const struct virtnet_info *vi) { return virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_TSO4) || @@ -4885,13 +4925,6 @@ static int virtnet_probe(struct virtio_device *vdev) vi->intr_coal_tx.max_packets = 0; } - if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_VQ_NOTF_COAL)) { - /* The reason is the same as VIRTIO_NET_F_NOTF_COAL. */ - for (i = 0; i < vi->max_queue_pairs; i++) - if (vi->sq[i].napi.weight) - vi->sq[i].intr_coal.max_packets = 1; - } - #ifdef CONFIG_SYSFS if (vi->mergeable_rx_bufs) dev->sysfs_rx_queue_group = &virtio_net_mrg_rx_group; @@ -4926,6 +4959,27 @@ static int virtnet_probe(struct virtio_device *vdev) virtio_device_ready(vdev); + if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_VQ_NOTF_COAL)) { + /* The reason is the same as VIRTIO_NET_F_NOTF_COAL. */ + for (i = 0; i < vi->max_queue_pairs; i++) + if (vi->sq[i].napi.weight) + vi->sq[i].intr_coal.max_packets = 1; + + /* The loop exits if the default value from any + * queue is successfully read. + */ + for (i = 0; i < vi->max_queue_pairs; i++) { + err = virtnet_get_coal_init_value(vi, rxq2vq(i), false); + if (!err) + break; + } + for (i = 0; i < vi->max_queue_pairs; i++) { + err = virtnet_get_coal_init_value(vi, txq2vq(i), true); + if (!err) + break; + } + } + _virtnet_set_queues(vi, vi->curr_queue_pairs); /* a random MAC address has been assigned, notify the device.