lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-Id: <4d57c072ca7d12034a1be4d9284e2be5988e1330.1698929590.git.hengqi@linux.alibaba.com> Date: Thu, 2 Nov 2023 21:09:33 +0800 From: Heng Qi <hengqi@...ux.alibaba.com> To: netdev@...r.kernel.org, virtualization@...ts.linux-foundation.org Cc: Jason Wang <jasowang@...hat.com>, "Michael S. Tsirkin" <mst@...hat.com>, Eric Dumazet <edumazet@...gle.com>, Paolo Abeni <pabeni@...hat.com>, "David S. Miller" <davem@...emloft.net>, Jesper Dangaard Brouer <hawk@...nel.org>, John Fastabend <john.fastabend@...il.com>, Alexei Starovoitov <ast@...nel.org>, Simon Horman <horms@...nel.org>, Jakub Kicinski <kuba@...nel.org>, "Liu, Yujie" <yujie.liu@...el.com> Subject: [PATCH net-next v2 5/5] virtio-net: return -EOPNOTSUPP for adaptive-tx We do not currently support tx dim, so respond to -EOPNOTSUPP. Signed-off-by: Heng Qi <hengqi@...ux.alibaba.com> --- v1->v2: - Use -EOPNOTSUPP instead of specific implementation. drivers/net/virtio_net.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 5473aa1ee5cd..03edeadd0725 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -3364,9 +3364,15 @@ 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; + if (tx_ctrl_dim_on) { + pr_debug("Failed to enable adaptive-tx, which is not supported\n"); + return -EOPNOTSUPP; + } + 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)); @@ -3497,6 +3503,25 @@ static int virtnet_send_rx_notf_coal_vq_cmds(struct virtnet_info *vi, return 0; } +static int virtnet_send_tx_notf_coal_vq_cmds(struct virtnet_info *vi, + struct ethtool_coalesce *ec, + u16 queue) +{ + bool tx_ctrl_dim_on = !!ec->use_adaptive_tx_coalesce; + int err; + + if (tx_ctrl_dim_on) { + pr_debug("Enabling adaptive-tx for txq%d is not supported\n", queue); + return -EOPNOTSUPP; + } + + err = virtnet_send_tx_ctrl_coal_vq_cmd(vi, queue, + ec->tx_coalesce_usecs, + ec->tx_max_coalesced_frames); + + return err; +} + static int virtnet_send_notf_coal_vq_cmds(struct virtnet_info *vi, struct ethtool_coalesce *ec, u16 queue) @@ -3507,9 +3532,7 @@ static int virtnet_send_notf_coal_vq_cmds(struct virtnet_info *vi, if (err) return err; - err = virtnet_send_tx_ctrl_coal_vq_cmd(vi, queue, - ec->tx_coalesce_usecs, - ec->tx_max_coalesced_frames); + err = virtnet_send_tx_notf_coal_vq_cmds(vi, ec, queue); if (err) return err; -- 2.19.1.6.gb485710b
Powered by blists - more mailing lists