From patchwork Wed Oct 30 08:24:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xuan Zhuo X-Patchwork-Id: 13856111 X-Patchwork-Delegate: kuba@kernel.org Received: from out30-124.freemail.mail.aliyun.com (out30-124.freemail.mail.aliyun.com [115.124.30.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 1AE861E3DD5; Wed, 30 Oct 2024 08:25:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=115.124.30.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730276717; cv=none; b=VZG7t5xGRIkiMwv03D3wPX0/kAMcHY8GLdcAvEDDAR1dJspp4MjV1fHoJX/8659TL13uzrtRtPXt+n0YVRqgyiXjrLU9vhugxWhu/5BF79JPZy0jLhEErPxdOaJpFeGqqacpOQA7CHpnYixFEJwESj2I+9OErNttFQ/ywGdpw9Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730276717; c=relaxed/simple; bh=hfkLg4L8bHjV1zFm3uwAnW37bKrTEOsvNGMfwPODmM8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ZdyxfadSMRGFimPdmq2lJSN3E8zqsgOb9vUbRnBviHQIgadYrdfe8e7PFBDcjChrZXjCXzocRtxjBPYPZmBnzHM3ad26cG0FwPrxcBYcxuKM93rfDatPWGzMSVGcykKPDkhht/vsu9O3+Y61HGbsQxBTDeuHKir+ZMUX0ks7uiM= 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=XjyNb6gd; arc=none smtp.client-ip=115.124.30.124 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="XjyNb6gd" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1730276707; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=i1AlCInLjc07ylXZTCy79n/HnZbO7DVMvN6PW7ZBXX4=; b=XjyNb6gdnqPvEIjisB4fiLk9i8gi1fauslLoE6uZyeyGRa87KRzt3v6MyPrTMErEJNOyjKv078Ubd8eZnzxBdj/GuWpixncY17plv0IPJLe2ApD2ENMdkaS7URmRwTs0LNshPSniHgWBxFaAXIaE4Nh5rhVwhZgH7sN8fdM2ct0= Received: from localhost(mailfrom:xuanzhuo@linux.alibaba.com fp:SMTPD_---0WIDKNLP_1730276703 cluster:ay36) by smtp.aliyun-inc.com; Wed, 30 Oct 2024 16:25:04 +0800 From: Xuan Zhuo To: netdev@vger.kernel.org Cc: "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?utf-8?q?Eugenio_P=C3=A9rez?= , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , virtualization@lists.linux.dev, bpf@vger.kernel.org Subject: [PATCH net-next v2 10/13] virtio_net: xsk: prevent disable tx napi Date: Wed, 30 Oct 2024 16:24:50 +0800 Message-Id: <20241030082453.97310-11-xuanzhuo@linux.alibaba.com> X-Mailer: git-send-email 2.32.0.3.g01195cf9f In-Reply-To: <20241030082453.97310-1-xuanzhuo@linux.alibaba.com> References: <20241030082453.97310-1-xuanzhuo@linux.alibaba.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Git-Hash: 87bfcb32ef14 X-Patchwork-Delegate: kuba@kernel.org Since xsk's TX queue is consumed by TX NAPI, if sq is bound to xsk, then we must stop tx napi from being disabled. Signed-off-by: Xuan Zhuo Acked-by: Jason Wang --- drivers/net/virtio_net.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 2d2658fcad07..a5bad8a5f642 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -5025,7 +5025,7 @@ static int virtnet_set_coalesce(struct net_device *dev, struct netlink_ext_ack *extack) { struct virtnet_info *vi = netdev_priv(dev); - int ret, queue_number, napi_weight; + int ret, queue_number, napi_weight, i; bool update_napi = false; /* Can't change NAPI weight if the link is up */ @@ -5054,6 +5054,14 @@ static int virtnet_set_coalesce(struct net_device *dev, return ret; if (update_napi) { + /* xsk xmit depends on the tx napi. So if xsk is active, + * prevent modifications to tx napi. + */ + for (i = queue_number; i < vi->max_queue_pairs; i++) { + if (vi->sq[i].xsk_pool) + return -EBUSY; + } + for (; queue_number < vi->max_queue_pairs; queue_number++) vi->sq[queue_number].napi.weight = napi_weight; }