From patchwork Thu Aug 1 12:27:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heng Qi X-Patchwork-Id: 13750269 X-Patchwork-Delegate: kuba@kernel.org Received: from out30-110.freemail.mail.aliyun.com (out30-110.freemail.mail.aliyun.com [115.124.30.110]) (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 626221A00F7 for ; Thu, 1 Aug 2024 12:27:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=115.124.30.110 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722515271; cv=none; b=Dopz/bNMf0aEQRcfHlsqr/aUfthEbTdekOZIZ5L27Y8jSJuY7TtvQcPOPwC1cqcNWr4U6dYiGqyopA8ZKuPqWZvwf9Vg3kPxcE1v+u0eeu6Pgz9qiB/9qro34ndYGSBE5jass7xwO8yGJaaZhPUMeTKpGQYblBo+a9w5PdHnwRg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722515271; c=relaxed/simple; bh=pxAMgUl6RpgEzddwp0OuSLVZnmbZKSASw1sE3RPnW5A=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TVuwoWEruQzZBTS969RRs31xx4gFBi9ZfWMTm3SF9NIpPG8Uj/dDK3fjvA/LesmSZ4g8Zls+h6ZyhKeWZ0+0iNxcjyNvXwxZGDbcw/rcx602q54izeQiFcvQDVJCby0P8zNGXLp0gYYnswUPuqF6yaXskjMD6vNwGTFcPdrY4NM= 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=R8YBDqqd; arc=none smtp.client-ip=115.124.30.110 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="R8YBDqqd" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1722515261; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=nmlezCt3y4sHPiSBV8DTZAgWvKS3ESvpRmOQCDwrnNQ=; b=R8YBDqqd2if+ovCqsGIZ2VJJixark+MR41xZCMJWolQTxyZF1oZLAWzZrKVgHxMjF4VqSv2ysqvXOZsszEy6hy54W4uRZz4dG8e70Dbm9mIiRygueM7hmv6oSadROSXgNEYtMugbNC3j0Qy8YibOmsxjiVvkoWetpD4sOCzq6Jo= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R171e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033032019045;MF=hengqi@linux.alibaba.com;NM=1;PH=DS;RN=10;SR=0;TI=SMTPD_---0WBtI8bF_1722515260; Received: from localhost(mailfrom:hengqi@linux.alibaba.com fp:SMTPD_---0WBtI8bF_1722515260) by smtp.aliyun-inc.com; Thu, 01 Aug 2024 20:27:41 +0800 From: Heng Qi To: netdev@vger.kernel.org, Jason Wang , "Michael S. Tsirkin" Cc: virtualization@lists.linux.dev, Paolo Abeni , Jakub Kicinski , Eric Dumazet , "David S. Miller" , =?utf-8?q?Eugenio_P=C3=A9rez?= , Xuan Zhuo Subject: [PATCH net v3 1/2] virtio-net: check feature before configuring the vq coalescing command Date: Thu, 1 Aug 2024 20:27:38 +0800 Message-Id: <20240801122739.49008-2-hengqi@linux.alibaba.com> X-Mailer: git-send-email 2.32.0.3.g01195cf9f In-Reply-To: <20240801122739.49008-1-hengqi@linux.alibaba.com> References: <20240801122739.49008-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 Virtio spec says: The driver MUST have negotiated the VIRTIO_NET_F_VQ_NOTF_COAL feature when issuing commands VIRTIO_NET_CTRL_NOTF_COAL_VQ_SET and VIRTIO_NET_CTRL_NOTF_COAL_VQ_GET. So we add the feature negotiation check to virtnet_send_{r,t}x_ctrl_coal_vq_cmd as a basis for the next bugfix patch. Suggested-by: Michael S. Tsirkin Signed-off-by: Heng Qi --- v2->v3: - Break out the feature check and the fix into separate patches. drivers/net/virtio_net.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 0383a3e136d6..b1176be8fcfd 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -3658,6 +3658,9 @@ static int virtnet_send_rx_ctrl_coal_vq_cmd(struct virtnet_info *vi, { int err; + if (!virtio_has_feature(vi->vdev, VIRTIO_NET_F_VQ_NOTF_COAL)) + return -EOPNOTSUPP; + err = virtnet_send_ctrl_coal_vq_cmd(vi, rxq2vq(queue), max_usecs, max_packets); if (err) @@ -3675,6 +3678,9 @@ static int virtnet_send_tx_ctrl_coal_vq_cmd(struct virtnet_info *vi, { int err; + if (!virtio_has_feature(vi->vdev, VIRTIO_NET_F_VQ_NOTF_COAL)) + return -EOPNOTSUPP; + err = virtnet_send_ctrl_coal_vq_cmd(vi, txq2vq(queue), max_usecs, max_packets); if (err) From patchwork Thu Aug 1 12:27:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Heng Qi X-Patchwork-Id: 13750270 X-Patchwork-Delegate: kuba@kernel.org Received: from out30-110.freemail.mail.aliyun.com (out30-110.freemail.mail.aliyun.com [115.124.30.110]) (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 83ECD1A01B9 for ; Thu, 1 Aug 2024 12:27:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=115.124.30.110 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722515273; cv=none; b=SpjX/SR/9NZEX+goVEQRkyxjMd+Nr/AgOEd9qSqbpIBm2q93kZ3V6KRK/gDWbg/+KJtCfrVIxjlmbO8ewRN+aeWxstOcL/9A1yT9SPspoeRnYBVgRBp3Ei5ejaeMkW64kXCg9HGiwcyZciUGxQMpWic9YKtpRqSpdkD3Ed1ZnPM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722515273; c=relaxed/simple; bh=ZCbf4dagKeXob6Jv7lK9X2wnUSfRPgMXFasbsE/FxhU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=iizv99C+J/BcpIxVngVzLHQjfVBqCJ8bbfyMfyppMn1cZC5MlKcKRbCHT0Di75TLKMtMoLmqJVDdJLwNtw6KrCB5jfJxxoevpUoaBkRiqBlIdzraHbmrni4CmTmuH0CQ3EmrrsHZGDzbjrfGCuX66xFokb2A4AaKP/znjLM0ggU= 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=VzMd5OL7; arc=none smtp.client-ip=115.124.30.110 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="VzMd5OL7" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1722515262; h=From:To:Subject:Date:Message-Id:MIME-Version:Content-Type; bh=39RrBFAmDzvWDA7/34qtG1o/5bUpFe1kib+dVzow0vA=; b=VzMd5OL7lAVJMvUbWe8gsX/NWCiRcEiTn1/XessF8b4fwohK5fki+7iKO/ugKEqfJSYBKJbLIuPvZ2orM5GU3WR5qMC7KiX1m0HpKQPPv9x06+DqboQNuWyRMsl7duqh9XgwR5JU6ttbe22BiSzsyFgUpRCaiT52mkVcbtyzy4g= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R141e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033045046011;MF=hengqi@linux.alibaba.com;NM=1;PH=DS;RN=10;SR=0;TI=SMTPD_---0WBtHmkj_1722515261; Received: from localhost(mailfrom:hengqi@linux.alibaba.com fp:SMTPD_---0WBtHmkj_1722515261) by smtp.aliyun-inc.com; Thu, 01 Aug 2024 20:27:42 +0800 From: Heng Qi To: netdev@vger.kernel.org, Jason Wang , "Michael S. Tsirkin" Cc: virtualization@lists.linux.dev, Paolo Abeni , Jakub Kicinski , Eric Dumazet , "David S. Miller" , =?utf-8?q?Eugenio_P=C3=A9rez?= , Xuan Zhuo Subject: [PATCH net v3 2/2] virtio-net: unbreak vq resizing when coalescing is not negotiated Date: Thu, 1 Aug 2024 20:27:39 +0800 Message-Id: <20240801122739.49008-3-hengqi@linux.alibaba.com> X-Mailer: git-send-email 2.32.0.3.g01195cf9f In-Reply-To: <20240801122739.49008-1-hengqi@linux.alibaba.com> References: <20240801122739.49008-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 Don't break the resize action if the vq coalescing feature named VIRTIO_NET_F_VQ_NOTF_COAL is not negotiated. Fixes: f61fe5f081cf ("virtio-net: fix the vq coalescing setting for vq resize") Signed-off-by: Heng Qi Reviewed-by: Xuan Zhuo Acked-by: Eugenio Pé rez Acked-by: Jason Wang --- v2->v3: - Break out the feature check and the fix into separate patches. v1->v2: - Rephrase the subject. - Put the feature check inside the virtnet_send_{r,t}x_ctrl_coal_vq_cmd(). drivers/net/virtio_net.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index b1176be8fcfd..2b566d893ea3 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -3749,7 +3749,7 @@ static int virtnet_set_ringparam(struct net_device *dev, err = virtnet_send_tx_ctrl_coal_vq_cmd(vi, i, vi->intr_coal_tx.max_usecs, vi->intr_coal_tx.max_packets); - if (err) + if (err && err != -EOPNOTSUPP) return err; } @@ -3764,7 +3764,7 @@ static int virtnet_set_ringparam(struct net_device *dev, vi->intr_coal_rx.max_usecs, vi->intr_coal_rx.max_packets); mutex_unlock(&vi->rq[i].dim_lock); - if (err) + if (err && err != -EOPNOTSUPP) return err; } }