From patchwork Tue Aug 20 07:33:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xuan Zhuo X-Patchwork-Id: 13769513 X-Patchwork-Delegate: kuba@kernel.org Received: from out30-111.freemail.mail.aliyun.com (out30-111.freemail.mail.aliyun.com [115.124.30.111]) (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 2C7A518A923; Tue, 20 Aug 2024 07:33:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=115.124.30.111 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724139226; cv=none; b=RjoZA2HKWpyP9XBGT9RKOuvU+IXMoSiL6UIfElNel6wtllb08DU2qgrZoEKTf8AUqPN+x+48QtGuCh9VQ3M6V9FvE52UAuIpo+134q4oVGCCiGbeWpw2E2qyfMZyp8DbQOsCE1GiBdTQr5Jnatl9KJGjgWLHmuPueSg/aNs+3WA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724139226; c=relaxed/simple; bh=dYKk7Z642P+ZCW9udIG8zVagouEMD9IzEVaZ9tlt+yE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=MHfModn5yozpTA8+JVmTtKKcaLJ9aQ4bjRjelXD/ytKFMQzvhbWu0Be6YvaDOF0vuE5yxFq4JUHqDHy114nBUgkVh0swzgicBvOL3bRQ2wPtU15YU0RRMbJY+L6gmB4wFfgHFQwhny+bsTdWecGSKIiKQyYoAZ0ltIpUTxHDdoc= 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=PRAHAhI2; arc=none smtp.client-ip=115.124.30.111 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="PRAHAhI2" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1724139220; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=5XMmlM3lwZFOeMlSpaQRq+RihKLNGednLcZtH25EAHw=; b=PRAHAhI2f5G6Q2ZBNeJKH6IwIn4X8OwyVBEOPEu9Cv9318C7PXXHWn6H2+mVGyT4LjmETACw7Q2oj29uhr0jnMrJ8Lht85ujWKChsEaWy9ahOI3xm+K6khW1ncHUAZP1z5doJRku/vN+zsQcDQ296saEC+LWiJOxiDEnUpg1DK4= Received: from localhost(mailfrom:xuanzhuo@linux.alibaba.com fp:SMTPD_---0WDHeY2w_1724139219) by smtp.aliyun-inc.com; Tue, 20 Aug 2024 15:33:39 +0800 From: Xuan Zhuo To: netdev@vger.kernel.org Cc: "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?utf-8?q?Eugenio_P=C3=A9rez?= , "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 09/13] virtio_net: xsk: prevent disable tx napi Date: Tue, 20 Aug 2024 15:33:26 +0800 Message-Id: <20240820073330.9161-10-xuanzhuo@linux.alibaba.com> X-Mailer: git-send-email 2.32.0.3.g01195cf9f In-Reply-To: <20240820073330.9161-1-xuanzhuo@linux.alibaba.com> References: <20240820073330.9161-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: b206d29d23af 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 6a36a204e967..221681926d23 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -5005,7 +5005,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 */ @@ -5034,6 +5034,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; }