From patchwork Thu Apr 17 07:28:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bui Quang Minh X-Patchwork-Id: 14055034 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8698521D3D2; Thu, 17 Apr 2025 07:29:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744874969; cv=none; b=ahgieUe9Jb4FHjesjG6TIEeenMHYN67fvglehx3SoerAos5iogjwS12zsojFf08rAbPRlpqPJUWdG745TgVIZGC6BkqIAfgNtyAxkX3+vcLxuar0p10v6NIhaGTFrVKq3s20T0wuFOdZq1ztfEewUmJee+ZqQGvl1b7krSLCUiM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744874969; c=relaxed/simple; bh=KiR5G6Fufw0SgHFVKQy2aPbgCtBtp88qoVVLIiw5sm0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=R3iJqjB4l4OP+smX7B+2uJOkFYOqLb3+STMhdtHOvYw1xIcPCSGuG12e4bGsiVO4qIDr6TK1g24RWdmpIorGkb9TXmjv+MfkAKr2Fa24X5CBxvHWfRcwtq39nFijA3dsmhZnwx1knMOGc5/CRMVfds0cCotB+TxCTn+Q27X/Qmw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=gMmtmZtY; arc=none smtp.client-ip=209.85.214.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gMmtmZtY" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-227d6b530d8so4971015ad.3; Thu, 17 Apr 2025 00:29:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744874967; x=1745479767; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=F3MstdJ91xUeyQ36419gRDtbusN2ivJYwyYBaexXaX8=; b=gMmtmZtYuqzs/X6MhGYT3nwBrCZ/GiPagROJbC1tjkS4dPJzQM3/lFZxoDyEW+xyQz Iv3wly3lblNXC8sHmMqm4V5Q9iKIcSMDQ4u+4NVZVIXKi5D7ixJSZEu2xRRAhno0cxug rno0TuRSrkV3LO5bIN4eZkdnSufxc7WbKaE75xA1S1OHVaSwrkOM7tfIBRy2J2DhT0Fc gllrC7yVryQen7wFJUCToCfi2eH7sb0O3V1p04r2qCJ36mWe0QHgVR3yDWFw7p8xFYNo BPGNCuFx+PDI+dhE5q4dGqaRlPBOCuEJdgS32CyvryWbwM1DgzcijXY6mpCj+avBFt9Z zNtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744874967; x=1745479767; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=F3MstdJ91xUeyQ36419gRDtbusN2ivJYwyYBaexXaX8=; b=ZrVW6hsfkg96fdxArZdRkEqoc7nmzXO92Icx6CJNs8ox9KNc4LNVgBv3uGy2eqULSn BkT40sAx+b92ra/FYOse/DSzErvCl6Hru6vSO59Spewrd2QThU2STLDrow5M7u78+gQi xczmgikCbYD+jXm7bxZ/bTzSx1Tl32GveECfgZnBTmPtHufNLptt6Zw4W8snNsP8aQO5 Vs+0VSoLqsrwjkO+PGlyuA2BN8FAiSMrHhUi5PRW123J5b3Y9exkD5xS6VX4slvjcH/O 3WXYQ8Frk+nkEMti2P1CD28sMotmNqSqgX3exTIDH9mgvwXvXPCwpcLW8r+kQyqB3YcP oyng== X-Forwarded-Encrypted: i=1; AJvYcCUAyMtri+7imPx7DsvPAzoyLCD8D+dCODsUY/SmuzztyH+7/M0Yce0bofCozuZtEZRKGpcO+nDpQ1AO34Uq@vger.kernel.org, AJvYcCUytND7jZuHtyf18IKo41X1VGYpNt5cHM2qUapNBbcEgH3xy21tNnJhDk3pr9BNl81HHxKBnNOe@vger.kernel.org, AJvYcCWQgbzmCijdQ70BBzfT4qajN7iguIqerm8bueNFQi0hUiUrWcfjAbLE82ioK0QzzmaPm/A=@vger.kernel.org X-Gm-Message-State: AOJu0YzspI9X+9pG35/qzFoW0bwCRYsW6OAYQTY1A8G7BMtLn9fsHGzc tvsz8h9wFMB+Vvc/s16GKakz4LuBtEmuV53OUrr/NtjHLVK+L7zc X-Gm-Gg: ASbGncvFokwvXKFsFTqIIEnBd/ovBvrE8SWKFtnBnlGCiQfvL/GiDdoR0See+jW59yx S78cCYgxrhXBr13LrTb5+xqZWTu0SPCGbU3zz6/XXX6UJavpQy2hSFxZ+5ZTjOpOHhZSIxHP7/z zmHqOJWHUgyOVuw3tR21TPATwDCWXFEeG6YeJMcM5GCvsqZkaIdL3EfWsp0n3UWzWaljsAolAW6 nMdrHYY4Sa9I2uDmxYnBXOKr5oIozui5l9i5aGnKTb8SaCwvDE6jdtDvdEr+3N5TKcLLvKS9Xvl rJcWO2wrq729ew1Hd+zeVWIVW+qB4OS6vM2plEIPLKZq7DOrKbnrVY5h X-Google-Smtp-Source: AGHT+IH5uYTC/cGu4Dc/9NlFeecZ6WGePFx+PPCoX4AhrVa3ZlbIOZm4LGGHrLfJG5dI1m1/e/4FAw== X-Received: by 2002:a17:902:db10:b0:22c:3609:97ed with SMTP id d9443c01a7336-22c36099969mr63425985ad.30.1744874966710; Thu, 17 Apr 2025 00:29:26 -0700 (PDT) Received: from minh.192.168.1.1 ([2001:ee0:4f0e:fb30:ab45:ee9c:5719:f829]) by smtp.googlemail.com with ESMTPSA id d2e1a72fcca58-73bd22f0f3fsm11625344b3a.115.2025.04.17.00.29.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Apr 2025 00:29:26 -0700 (PDT) From: Bui Quang Minh To: virtualization@lists.linux.dev Cc: "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , Andrew Lunn , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , =?utf-8?q?Eugenio_P=C3=A9rez?= , "David S. Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, Bui Quang Minh Subject: [PATCH v4 1/4] virtio-net: disable delayed refill when pausing rx Date: Thu, 17 Apr 2025 14:28:03 +0700 Message-ID: <20250417072806.18660-2-minhquangbui99@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250417072806.18660-1-minhquangbui99@gmail.com> References: <20250417072806.18660-1-minhquangbui99@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org When pausing rx (e.g. set up xdp, xsk pool, rx resize), we call napi_disable() on the receive queue's napi. In delayed refill_work, it also calls napi_disable() on the receive queue's napi. When napi_disable() is called on an already disabled napi, it will sleep in napi_disable_locked while still holding the netdev_lock. As a result, later napi_enable gets stuck too as it cannot acquire the netdev_lock. This leads to refill_work and the pause-then-resume tx are stuck altogether. This scenario can be reproducible by binding a XDP socket to virtio-net interface without setting up the fill ring. As a result, try_fill_recv will fail until the fill ring is set up and refill_work is scheduled. This commit adds virtnet_rx_(pause/resume)_all helpers and fixes up the virtnet_rx_resume to disable future and cancel all inflights delayed refill_work before calling napi_disable() to pause the rx. Fixes: 413f0271f396 ("net: protect NAPI enablement with netdev_lock()") Acked-by: Michael S. Tsirkin Signed-off-by: Bui Quang Minh --- drivers/net/virtio_net.c | 69 +++++++++++++++++++++++++++++++++------- 1 file changed, 57 insertions(+), 12 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 7e4617216a4b..848fab51dfa1 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -3342,7 +3342,8 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev) return NETDEV_TX_OK; } -static void virtnet_rx_pause(struct virtnet_info *vi, struct receive_queue *rq) +static void __virtnet_rx_pause(struct virtnet_info *vi, + struct receive_queue *rq) { bool running = netif_running(vi->dev); @@ -3352,17 +3353,63 @@ static void virtnet_rx_pause(struct virtnet_info *vi, struct receive_queue *rq) } } -static void virtnet_rx_resume(struct virtnet_info *vi, struct receive_queue *rq) +static void virtnet_rx_pause_all(struct virtnet_info *vi) +{ + int i; + + /* + * Make sure refill_work does not run concurrently to + * avoid napi_disable race which leads to deadlock. + */ + disable_delayed_refill(vi); + cancel_delayed_work_sync(&vi->refill); + for (i = 0; i < vi->max_queue_pairs; i++) + __virtnet_rx_pause(vi, &vi->rq[i]); +} + +static void virtnet_rx_pause(struct virtnet_info *vi, struct receive_queue *rq) +{ + /* + * Make sure refill_work does not run concurrently to + * avoid napi_disable race which leads to deadlock. + */ + disable_delayed_refill(vi); + cancel_delayed_work_sync(&vi->refill); + __virtnet_rx_pause(vi, rq); +} + +static void __virtnet_rx_resume(struct virtnet_info *vi, + struct receive_queue *rq, + bool refill) { bool running = netif_running(vi->dev); - if (!try_fill_recv(vi, rq, GFP_KERNEL)) + if (refill && !try_fill_recv(vi, rq, GFP_KERNEL)) schedule_delayed_work(&vi->refill, 0); if (running) virtnet_napi_enable(rq); } +static void virtnet_rx_resume_all(struct virtnet_info *vi) +{ + int i; + + enable_delayed_refill(vi); + for (i = 0; i < vi->max_queue_pairs; i++) { + if (i < vi->curr_queue_pairs) + __virtnet_rx_resume(vi, &vi->rq[i], true); + else + __virtnet_rx_resume(vi, &vi->rq[i], false); + } +} + +static void virtnet_rx_resume(struct virtnet_info *vi, struct receive_queue *rq) +{ + enable_delayed_refill(vi); + __virtnet_rx_resume(vi, rq, true); +} + static int virtnet_rx_resize(struct virtnet_info *vi, struct receive_queue *rq, u32 ring_num) { @@ -5959,12 +6006,12 @@ static int virtnet_xdp_set(struct net_device *dev, struct bpf_prog *prog, if (prog) bpf_prog_add(prog, vi->max_queue_pairs - 1); + virtnet_rx_pause_all(vi); + /* Make sure NAPI is not using any XDP TX queues for RX. */ if (netif_running(dev)) { - for (i = 0; i < vi->max_queue_pairs; i++) { - virtnet_napi_disable(&vi->rq[i]); + for (i = 0; i < vi->max_queue_pairs; i++) virtnet_napi_tx_disable(&vi->sq[i]); - } } if (!prog) { @@ -5996,13 +6043,12 @@ static int virtnet_xdp_set(struct net_device *dev, struct bpf_prog *prog, vi->xdp_enabled = false; } + virtnet_rx_resume_all(vi); for (i = 0; i < vi->max_queue_pairs; i++) { if (old_prog) bpf_prog_put(old_prog); - if (netif_running(dev)) { - virtnet_napi_enable(&vi->rq[i]); + if (netif_running(dev)) virtnet_napi_tx_enable(&vi->sq[i]); - } } return 0; @@ -6014,11 +6060,10 @@ static int virtnet_xdp_set(struct net_device *dev, struct bpf_prog *prog, rcu_assign_pointer(vi->rq[i].xdp_prog, old_prog); } + virtnet_rx_resume_all(vi); if (netif_running(dev)) { - for (i = 0; i < vi->max_queue_pairs; i++) { - virtnet_napi_enable(&vi->rq[i]); + for (i = 0; i < vi->max_queue_pairs; i++) virtnet_napi_tx_enable(&vi->sq[i]); - } } if (prog) bpf_prog_sub(prog, vi->max_queue_pairs - 1); From patchwork Thu Apr 17 07:28:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bui Quang Minh X-Patchwork-Id: 14055035 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C90292192FE; Thu, 17 Apr 2025 07:29:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744874975; cv=none; b=g/xaghPeAEn9rPSjA1SyHpr4TxJ/uPmhk1c+sfHzgGW1kvKSg98leMWQVeuabaQj7eY/XNfI8c+am/8HQ4ZWbj8L4hJUVhqI6RkvGKl5MbUxrQCPObvZIAAiWjgyYjnnyc3znWMjNJBXEtaXgEDiBVAHgbE5Osy7fxyrWtQEJas= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744874975; c=relaxed/simple; bh=fm0FD+nFpM4KIujT0zC25XQeJrJxwhYW3rijMoqQ0r0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hVzWQk9LsSWGzpIZO5BhjgCf+9Y8cxKFuktRc17Ky/ep1Amqz8VEDeQd3YfROaLVjbiAkR/rHWp6Sdjc92UthAhsKL+rBnQkIHQ0KINuABOn60x0MPiwDYdp1A86ZVbWihxFGLyb+t08bKF6aW0dRyD2X0W2+4OfV5r1WxRnLHg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=b6Cogwvb; arc=none smtp.client-ip=209.85.210.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="b6Cogwvb" Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-7399838db7fso458896b3a.0; Thu, 17 Apr 2025 00:29:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744874973; x=1745479773; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CcTGqksFhMMv7htGFoe+A1pXwVfny33zxtLopOer7xA=; b=b6CogwvbQqOCLdum32WeISTqERuoNWe6jjrdmHeTedh4mJkmYvALlxQMp/lyK7XzbH fNG4UUXLJu/Bclv8YKUSU6MoxYf8MtRYE3M7N6CqkVlKXPU8Zp5JzJQI2rm04BNl1o19 B+/Fn/8RIq+lyq/VBwIWScUl1une7QL78yb0ZO2/R2PJHwKCGdLdTyQwmHqN9xxUVgNg 4++y1k3fib4j084dBNxeI+dO7gHVsBsP7n/qDLLF05ybqS41AUOoA3JQ9C8tVjdQLCSm kPMw3v3m3NM0WK13FnVKc3NVntVThf2ychdYvKP9YPdT625qd3gVkl13n3+MlToXE5a2 vVXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744874973; x=1745479773; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CcTGqksFhMMv7htGFoe+A1pXwVfny33zxtLopOer7xA=; b=YmpkQuUfXa95kvUBO0KVf64Eb2ib8/43yu22MyJSHF00x+HqFMJ9quMioerWzRHEah GSRr6vclASu7o7fSkra54TZriy7FFwt+V85DFuR7NUXRT/d3842DzjqWrJJTiLZ2t7SR YEWuXhhZLp/Fkvp0X5/Uf+umDP534aZEQ5beRB5LKbnB3x78qWTNUL6YXUlATwzoLz1A HCJm5HsldC1T5g2V22x/cI3Sx88hzTDp+AGaksLkh38goKC/u3iSjlwmrXl+XKVwYzD3 sEt95hm4PJRIpQXO+3ANgiNXUNAt2WWpoZ2oKVWh2uZBYLz27kDzPqwS6xZ5gCJTLBfW tpDQ== X-Forwarded-Encrypted: i=1; AJvYcCVzMGdAlmOgheDY4xpoSO/0SH4yEFGw4zv6ByERsvkA26celPwJWh3sAKACf7uHak2tg6d+CJ15@vger.kernel.org, AJvYcCWztpZoID1HyNVq3zTWPYK9m2buUrRG4IndvAk0eVPlAzA4P5HpS2OMiWhkjPXOlR3Hk7bsInYjKI50k0Ai@vger.kernel.org, AJvYcCXeP+As3S3+iwlEVln5gjnjPz0FKHwCHZE9gc2X+cRHWT6BdSwr0+966c/q+JF6h33ai/A=@vger.kernel.org X-Gm-Message-State: AOJu0Yw5ni6v5c/OZd14NpllkH+EYLSYD5+drSdols5tqcCS4bCBxkPU IhLA/5rRbylK4Ihc8BnoZRUO1rmIayP7b+wBHcxH/mjTj6lzLds1 X-Gm-Gg: ASbGncuwcDhWCKLEjMJNZETn5924JRrZssRvDURjyy1s2mtCjla2ccb9M8wSsfOcAKz 1W9olDAx2D64CHMlx4YVMajQK/mO8Nq3adw8ig/JF4YFi30WbUkRsl+FOIjzl7cDqeFZ7Z6n+Gh AHBxKCk7vVXP+0ifW7paLk14QGWa5XqliHG1B7nZSf80LgCDgklblg2U/9m95prkhxieAvNJaMN hK1e9TJC3WM9oTW2jpy63NImJQrZm6IPSzzm4O1WbjYl/htN/W8X+C5hWENWVx27UsjvP+OipKX 4WRM6AD8lJ/tamZlmVUEPIDuMTiMtpQx10QMoMrUVcMVTDombGjfmPY3C1B4m/N+iNw= X-Google-Smtp-Source: AGHT+IEPUyy0fzYHOBy5qcKeDGEAL1lZs+bWSz+cNnQwUcKvh5PbOd1OY9+pCbu7+dik767iIp715Q== X-Received: by 2002:a05:6a00:1141:b0:736:b400:b58f with SMTP id d2e1a72fcca58-73cd000d338mr3662142b3a.0.1744874972941; Thu, 17 Apr 2025 00:29:32 -0700 (PDT) Received: from minh.192.168.1.1 ([2001:ee0:4f0e:fb30:ab45:ee9c:5719:f829]) by smtp.googlemail.com with ESMTPSA id d2e1a72fcca58-73bd22f0f3fsm11625344b3a.115.2025.04.17.00.29.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Apr 2025 00:29:32 -0700 (PDT) From: Bui Quang Minh To: virtualization@lists.linux.dev Cc: "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , Andrew Lunn , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , =?utf-8?q?Eugenio_P=C3=A9rez?= , "David S. Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, Bui Quang Minh Subject: [PATCH v4 2/4] selftests: net: move xdp_helper to net/lib Date: Thu, 17 Apr 2025 14:28:04 +0700 Message-ID: <20250417072806.18660-3-minhquangbui99@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250417072806.18660-1-minhquangbui99@gmail.com> References: <20250417072806.18660-1-minhquangbui99@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Move xdp_helper to net/lib to make it easier for other selftests to use the helper. Signed-off-by: Bui Quang Minh --- tools/testing/selftests/drivers/net/Makefile | 2 -- tools/testing/selftests/drivers/net/queues.py | 4 ++-- tools/testing/selftests/net/lib/.gitignore | 1 + tools/testing/selftests/net/lib/Makefile | 1 + tools/testing/selftests/{drivers/net => net/lib}/xdp_helper.c | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename tools/testing/selftests/{drivers/net => net/lib}/xdp_helper.c (100%) diff --git a/tools/testing/selftests/drivers/net/Makefile b/tools/testing/selftests/drivers/net/Makefile index 0c95bd944d56..cd74f1eb3193 100644 --- a/tools/testing/selftests/drivers/net/Makefile +++ b/tools/testing/selftests/drivers/net/Makefile @@ -6,8 +6,6 @@ TEST_INCLUDES := $(wildcard lib/py/*.py) \ ../../net/net_helper.sh \ ../../net/lib.sh \ -TEST_GEN_FILES := xdp_helper - TEST_PROGS := \ netcons_basic.sh \ netcons_fragmented_msg.sh \ diff --git a/tools/testing/selftests/drivers/net/queues.py b/tools/testing/selftests/drivers/net/queues.py index 06abd3f233e1..236005290a33 100755 --- a/tools/testing/selftests/drivers/net/queues.py +++ b/tools/testing/selftests/drivers/net/queues.py @@ -26,13 +26,13 @@ def nl_get_queues(cfg, nl, qtype='rx'): def check_xsk(cfg, nl, xdp_queue_id=0) -> None: # Probe for support - xdp = cmd(f'{cfg.test_dir / "xdp_helper"} - -', fail=False) + xdp = cmd(f'{cfg.net_lib_dir / "xdp_helper"} - -', fail=False) if xdp.ret == 255: raise KsftSkipEx('AF_XDP unsupported') elif xdp.ret > 0: raise KsftFailEx('unable to create AF_XDP socket') - with bkg(f'{cfg.test_dir / "xdp_helper"} {cfg.ifindex} {xdp_queue_id}', + with bkg(f'{cfg.net_lib_dir / "xdp_helper"} {cfg.ifindex} {xdp_queue_id}', ksft_wait=3): rx = tx = False diff --git a/tools/testing/selftests/net/lib/.gitignore b/tools/testing/selftests/net/lib/.gitignore index 1ebc6187f421..bbc97d6bf556 100644 --- a/tools/testing/selftests/net/lib/.gitignore +++ b/tools/testing/selftests/net/lib/.gitignore @@ -1,2 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only csum +xdp_helper diff --git a/tools/testing/selftests/net/lib/Makefile b/tools/testing/selftests/net/lib/Makefile index c22623b9a2a5..88c4bc461459 100644 --- a/tools/testing/selftests/net/lib/Makefile +++ b/tools/testing/selftests/net/lib/Makefile @@ -10,6 +10,7 @@ TEST_FILES += ../../../../net/ynl TEST_GEN_FILES += csum TEST_GEN_FILES += $(patsubst %.c,%.o,$(wildcard *.bpf.c)) +TEST_GEN_FILES += xdp_helper TEST_INCLUDES := $(wildcard py/*.py sh/*.sh) diff --git a/tools/testing/selftests/drivers/net/xdp_helper.c b/tools/testing/selftests/net/lib/xdp_helper.c similarity index 100% rename from tools/testing/selftests/drivers/net/xdp_helper.c rename to tools/testing/selftests/net/lib/xdp_helper.c From patchwork Thu Apr 17 07:28:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bui Quang Minh X-Patchwork-Id: 14055036 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7141E2222D5; Thu, 17 Apr 2025 07:29:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744874980; cv=none; b=UUitoppi7tefHV0ggen2+5Msw7+0CTBFPWrWJV2ZqeiNbqshzLtZ3Px+3Tal5K/4eBAQuvW0+zjs9E9UrenBMHDKKbyYaJEiAKRjnD4urba+Qyt9rLJTHQBd26rhBQkLwyghmwEoM8+Z2wLHIfdiwvse0YumKdBrUbK6dG3h3Kc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744874980; c=relaxed/simple; bh=NzBtddZRCsg1/4g3wwT54tpCt+iF1Q/Oq+nE2yGOUck=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FA0QBoogf842MeXSKMM/xCZX/jj2jP46itiwEl7Z31jd9h6yJIgrcwQTeW/xpJA8rkLxHg0Nx0Ae1n2EyEEy6BtpsnpIKfBT0YuMqM3EVaarDUsPVHsZQ9ZmiG/pQpKUpA8AJNvtT/USO/hMUgFH2LtG+Y6QqfCvK66W+QKJhqI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=lCNgSEc4; arc=none smtp.client-ip=209.85.210.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lCNgSEc4" Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-73712952e1cso350654b3a.1; Thu, 17 Apr 2025 00:29:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744874979; x=1745479779; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Wxx88K9tSumEw+2ZtRWFe/vr19Ozn+M+DEZTmr3En7Y=; b=lCNgSEc4/4oKNxcSBYoirovgCC6mn7E/+Y85xHD2FusUH8XcD1k7RtD5M726hgT+Cv djcaN6EG3yK76OntTXWXGKvVcZAbaGtbB1il9HxS6jF3dxLCmY75BayBHExofRb2MfoM fesgFhInI+FHYAp8I18rsRic/9pkMsSB26NLHZbpBi4p++MLdPCBAJhWga9I8SB/3qWF EYluZ7IFwXdxtWXkv5aLwNu06zxKrYxqRgcdWhfOVjgUK+Sy35KmWaOq/w3ANTRrUGOv sBP4zbuhpHJGl2f/GcIvcvzZVinFLqsNYtZ6wBnhQMfUqXycJ4j/hUu0hIyhJj2Zz6eu 9o5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744874979; x=1745479779; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Wxx88K9tSumEw+2ZtRWFe/vr19Ozn+M+DEZTmr3En7Y=; b=qiOKjZThVVbaGFXx9Adz0aegB+6u4XbCr92YPF8NR2vl2QzppEM27vDfW567osRujl 4+nkHeJENO7lPgcWoW3icxEQiIu4hC7uL77azbjxCTuGzKqnHodY7vBlQCKgktNAljXa 0B5NrX7IJCdHEoUSnOLbJ9xtZWzapfewDIRehAFM8T3B+EpwF34VzMIXljhtcvcKOGKC w3nQfV++QoubJ+4tENYFJa2Vs3ui3yW3331QUtH2fzw4rV4PdytsagiCZp51Fx14f293 KNsQDZ8vwB/ZqryCWseqbw68qhorFXAlpwMCI0jyZF/f++ytovwlQ7CeGdL1SBM7nJ6+ ko4w== X-Forwarded-Encrypted: i=1; AJvYcCUmiwXnx2cBrunqiYZBmzxRiA3/SQ+u18DRxnMT7iVAVDMlDPFALT7ZV2td3iuRpmMI84kHFdxJke5DjkbD@vger.kernel.org, AJvYcCW3gr6aNtitNVv0fb125iZ8r+lwNwjY4uzr6Le/fnvtLXzr6B6ytD06vUR9bHeZG8ehSsiv312e@vger.kernel.org, AJvYcCWVjiHpFwlOJ+R9KOPMr0Vj0Gpikpt5svO7UdybEmeWsJhm/mpjEetgCPjwhvzUbxvzCG8=@vger.kernel.org X-Gm-Message-State: AOJu0Yzxz9QAALC6ZbEcI/EK0kPmybcANjj0ZD4xs866Eb66N0TVzlQd LE73Ojmwyh1M/jREfh4Fx9uNyRG6OuYYQ0CywfeZgMkuuOVxgppi X-Gm-Gg: ASbGnctBkEFiqGeK76TnwlSFqwqVac6Xal3FfMFxf6m8MS80f+oh4xB7QUsJZvZtZcD RDipN+OkolT9QFF3zxaI0mL4mDxv36qEf1HifQglX8X4Dj0GioN6M861ezMq2Y2FcsTsXTtjyLg 2HF0m1uFQcwuXLY4Q3NdRR7RdGoBoC8RRpoyAe1pe9cn1Ecv9DteR0rFA0qATxkcRoHaN3Pf6ov 2NCzmEq60ceLpAbT3FkPiIOfmT2mA/LmDSlg9KQDF63EbTSHxGzVFnLNY4kYaCvuIZedoIIvQr1 lBmbE0JyYmqS7mVOtNM6tglCQFaSvgi+eGkO9FYpMjyshULmeOzUBX46 X-Google-Smtp-Source: AGHT+IF/swlYlHVVTdpnx/l1Jc8S2a9LeAy6m92Hd3dKyvQqvGjdPqWMZCjUUCXypFPFgGvgke5VPw== X-Received: by 2002:a05:6a00:3e27:b0:736:2ff4:f255 with SMTP id d2e1a72fcca58-73c267c183cmr6529845b3a.15.1744874978576; Thu, 17 Apr 2025 00:29:38 -0700 (PDT) Received: from minh.192.168.1.1 ([2001:ee0:4f0e:fb30:ab45:ee9c:5719:f829]) by smtp.googlemail.com with ESMTPSA id d2e1a72fcca58-73bd22f0f3fsm11625344b3a.115.2025.04.17.00.29.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Apr 2025 00:29:38 -0700 (PDT) From: Bui Quang Minh To: virtualization@lists.linux.dev Cc: "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , Andrew Lunn , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , =?utf-8?q?Eugenio_P=C3=A9rez?= , "David S. Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, Bui Quang Minh Subject: [PATCH v4 3/4] selftests: net: add flag to force zerocopy mode in xdp_helper Date: Thu, 17 Apr 2025 14:28:05 +0700 Message-ID: <20250417072806.18660-4-minhquangbui99@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250417072806.18660-1-minhquangbui99@gmail.com> References: <20250417072806.18660-1-minhquangbui99@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org This commit adds an optional -z flag to xdp_helper. When this flag is provided, the XDP socket binding is forced to be in zerocopy mode. Signed-off-by: Bui Quang Minh --- tools/testing/selftests/net/lib/xdp_helper.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/lib/xdp_helper.c b/tools/testing/selftests/net/lib/xdp_helper.c index aeed25914104..6afd77bfbe8b 100644 --- a/tools/testing/selftests/net/lib/xdp_helper.c +++ b/tools/testing/selftests/net/lib/xdp_helper.c @@ -81,8 +81,9 @@ int main(int argc, char **argv) int sock_fd; int queue; - if (argc != 3) { - fprintf(stderr, "Usage: %s ifindex queue_id\n", argv[0]); + if (argc != 3 && argc != 4) { + fprintf(stderr, "Usage: %s ifindex queue_id [-z]\n\n" + "where:\n\t-z: force zerocopy mode", argv[0]); return 1; } @@ -132,6 +133,14 @@ int main(int argc, char **argv) sxdp.sxdp_queue_id = queue; sxdp.sxdp_flags = 0; + if (argc == 4 && strcmp(argv[3], "-z")) { + fprintf(stderr, "Usage: %s ifindex queue_id [-z]\n\n" + "where:\n\t-z: force zerocopy mode\n", argv[0]); + return 1; + } else if (argc == 4) { + sxdp.sxdp_flags = XDP_ZEROCOPY; + } + if (bind(sock_fd, (struct sockaddr *)&sxdp, sizeof(sxdp)) != 0) { munmap(umem_area, UMEM_SZ); perror("bind failed"); From patchwork Thu Apr 17 07:28:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bui Quang Minh X-Patchwork-Id: 14055037 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0B21521D599; Thu, 17 Apr 2025 07:29:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744874986; cv=none; b=ixbL2zAWkQ5lksyS7v7IOEIlzMecFbQG0eIKqXjRNdrbSI0gxqMuwrb3Nd/VENnDnnoEICiwwLJb4YOWWT+9Z3UessbjZfO0NSu5A1cFCSivlTtQ9YZ0VZsN61tBLPkQ7P7TN/lGuGyjzdKqvq1OtkEgCERG2rhRdhypi01Z0JY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744874986; c=relaxed/simple; bh=8TizWOwqu3GwN2fiGsHw8X4OMKIAXAGE1CXOpps+ka0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=f/scuB5GseJzNA/Mgqhma93jVyGo5rH1K11OvcP8j1gbeAg48RSw6T/1OJ2yIw8UNrYVIxEa2gja7gVDB7kJv/4SSLbKKmwK+HZPcKoVD3LS+4X5P954+2OrMIJ4I7CFUlzdInfekFPIHD+Zr39HHIAvAgsRlZnybzdkHEeMQpI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=QAphGrvB; arc=none smtp.client-ip=209.85.210.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="QAphGrvB" Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-7376dd56f8fso561702b3a.2; Thu, 17 Apr 2025 00:29:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744874984; x=1745479784; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lJO7LyGExRfq4nKL5SVSlHdNbKD8n5gs12N9jLBapQU=; b=QAphGrvBTit428FaKJPfaL3VfMQLv9HkiC1R9pITU2ZgCK6BHURrnwhs9mja2phxxq CeVE+tBGc1JVlNzvHlcHCL231ZLxr3sKfr0URdZfVv0682Mn4D4dBfcrHtL7wqRyfg+p 30EoR8eZAdPt3cmY4qH6hsYIl5vFeuyclidBNHA7d8lKm+p8BDMq4Aziyfn4hqh7CzuX AYvBx+CVk5OvJ81hmelQ+zZI/yvvSysgCRbRa14GgkbF8K6NlyDjX6GCxUXReaiX6FgS 8OB35kAtdcDP0ss6IedFHisV/Mhs/UQ1N8uelUlPYE985woIToGQHZ8oAhnN/d9HfAvf YMdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744874984; x=1745479784; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lJO7LyGExRfq4nKL5SVSlHdNbKD8n5gs12N9jLBapQU=; b=dbMfN1Beq4QrPJ0AAdLHEg2OmCv9kVlb8sP+CD+eWUVbYZ7O3eEK4o8F8UkAI6DZ8D KdYWFBi6OVNyZA8cUdhRfiGhX2nEZwWPYUqCH34Z4A0k5N39B0S/2AGWlvocK/SwXm3N zgfXWfFYlBRtkuS7GM43ptgui2LZ8W8CFKjUjs3yNR6H2DT2+qi6Biu1/CjxRpqF7Go0 K5ic59furKALyTfu1qvB54QRJe4un6vm5BfVQ/WA7q08NOgN7tLlXbY+twlclf0gqgub f5ly6fVsxOEFIEAuDWNFkIhK/iJ9Mg/I8j2h2iGvdYaN9kuVoGtibP5/ftuVvOu824li rtwQ== X-Forwarded-Encrypted: i=1; AJvYcCVHh5rJfGCsVqWxW1KqerL4M+48hiR7z/jM49KeDQBn1XwXKYraAwWOinGD74j9XrKIspXTp8hx4Wdk2ndD@vger.kernel.org, AJvYcCXitdyxNBb4hUUmiTbOfSiq1+Fjroo19A0k5vvlP4z6wLY6TLjn4EvMvRkuo3CMhQ8jwc4=@vger.kernel.org, AJvYcCXydzeMs/Ggk5nzUg7rE0+pb7YSH6jdJuD+AVYQjjfyZ0yNZ6+cwOaMqmVR0NVjgUFVA45vUWZk@vger.kernel.org X-Gm-Message-State: AOJu0YwT8It3L7xD3y3PpCHlMvX/gMDJ9brZCIkuaA2jNTiYXZjrC9vf g2NXPiF6pLxw2Gi3yT57Kh1t7fuYq/9YMFz7OigIWEv/g/KiGHWF X-Gm-Gg: ASbGncvsHPh6DY4Wq/EK2ncVBLLYRlr4Ily+W7nbKbCaX+JqrnskNJDA5bCVpi/1het E2Mh1ULGl2u5I5CsJJxpXe+5XBnDSonjgI+iMavuMdqh/C7enXQJt6YgHjIYmvFwWwzwL2mitUG Ab4GFCkbA/3fhrFTh1C3/JI1XHE1xJ5egYHrgSlTTZVDOn4705FLNtHoOBfb8MOcfxgBdIUlaMp EcydvqbqMekvEU45IvSFfyw4l5EPDUoXaWfBJRSEeP+w3BYYWTpXz4uboDiqxfe0DVrdCGyIQRu yAbYp4VmaoxMJLsc0w2fMnNF4jAEXghz8MstbCnVWVpil3TRQKX2nWZL X-Google-Smtp-Source: AGHT+IGNH4XYkq81bCriDB/5ZWI5rMHEk/ZZFNYuEACnhmopqi5kSRd+SZ67knR5813pGgdy8GwUJQ== X-Received: by 2002:a05:6a00:2985:b0:736:bfc4:ef2c with SMTP id d2e1a72fcca58-73c264bf96amr7064882b3a.0.1744874984214; Thu, 17 Apr 2025 00:29:44 -0700 (PDT) Received: from minh.192.168.1.1 ([2001:ee0:4f0e:fb30:ab45:ee9c:5719:f829]) by smtp.googlemail.com with ESMTPSA id d2e1a72fcca58-73bd22f0f3fsm11625344b3a.115.2025.04.17.00.29.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Apr 2025 00:29:43 -0700 (PDT) From: Bui Quang Minh To: virtualization@lists.linux.dev Cc: "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , Andrew Lunn , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , =?utf-8?q?Eugenio_P=C3=A9rez?= , "David S. Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, Bui Quang Minh Subject: [PATCH v4 4/4] selftests: net: add a virtio_net deadlock selftest Date: Thu, 17 Apr 2025 14:28:06 +0700 Message-ID: <20250417072806.18660-5-minhquangbui99@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250417072806.18660-1-minhquangbui99@gmail.com> References: <20250417072806.18660-1-minhquangbui99@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The selftest reproduces the deadlock scenario when binding/unbinding XDP program, XDP socket, rx ring resize on virtio_net interface. Signed-off-by: Bui Quang Minh --- .../testing/selftests/drivers/net/hw/Makefile | 1 + .../selftests/drivers/net/hw/virtio_net.py | 65 +++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100755 tools/testing/selftests/drivers/net/hw/virtio_net.py diff --git a/tools/testing/selftests/drivers/net/hw/Makefile b/tools/testing/selftests/drivers/net/hw/Makefile index 07cddb19ba35..b5af7c1412bf 100644 --- a/tools/testing/selftests/drivers/net/hw/Makefile +++ b/tools/testing/selftests/drivers/net/hw/Makefile @@ -21,6 +21,7 @@ TEST_PROGS = \ rss_ctx.py \ rss_input_xfrm.py \ tso.py \ + virtio_net.py \ # TEST_FILES := \ diff --git a/tools/testing/selftests/drivers/net/hw/virtio_net.py b/tools/testing/selftests/drivers/net/hw/virtio_net.py new file mode 100755 index 000000000000..7cad7ab98635 --- /dev/null +++ b/tools/testing/selftests/drivers/net/hw/virtio_net.py @@ -0,0 +1,65 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0 + +# This is intended to be run on a virtio-net guest interface. +# The test binds the XDP socket to the interface without setting +# the fill ring to trigger delayed refill_work. This helps to +# make it easier to reproduce the deadlock when XDP program, +# XDP socket bind/unbind, rx ring resize race with refill_work on +# the buggy kernel. +# +# The Qemu command to setup virtio-net +# -netdev tap,id=hostnet1,vhost=on,script=no,downscript=no +# -device virtio-net-pci,netdev=hostnet1,iommu_platform=on,disable-legacy=on + +from lib.py import ksft_exit, ksft_run +from lib.py import KsftSkipEx, KsftFailEx +from lib.py import NetDrvEnv +from lib.py import bkg, ip, cmd, ethtool +import re + +def _get_rx_ring_entries(cfg): + output = ethtool(f"-g {cfg.ifname}").stdout + values = re.findall(r'RX:\s+(\d+)', output) + return int(values[1]) + +def setup_xsk(cfg, xdp_queue_id = 0) -> bkg: + # Probe for support + xdp = cmd(f'{cfg.net_lib_dir / "xdp_helper"} - -', fail=False) + if xdp.ret == 255: + raise KsftSkipEx('AF_XDP unsupported') + elif xdp.ret > 0: + raise KsftFailEx('unable to create AF_XDP socket') + + try: + xsk_bkg = bkg(f'{cfg.net_lib_dir / "xdp_helper"} {cfg.ifindex} ' \ + '{xdp_queue_id} -z', ksft_wait=3) + return xsk_bkg + except: + raise KsftSkipEx('Failed to bind XDP socket in zerocopy. ' \ + 'Please consider adding iommu_platform=on ' \ + 'when setting up virtio-net-pci') + +def check_xdp_bind(cfg): + ip(f"link set dev %s xdp obj %s sec xdp" % + (cfg.ifname, cfg.net_lib_dir / "xdp_dummy.bpf.o")) + ip(f"link set dev %s xdp off" % cfg.ifname) + +def check_rx_resize(cfg, queue_size = 128): + rx_ring = _get_rx_ring_entries(cfg) + ethtool(f"-G %s rx %d" % (cfg.ifname, queue_size)) + ethtool(f"-G %s rx %d" % (cfg.ifname, rx_ring)) + +def main(): + with NetDrvEnv(__file__, nsim_test=False) as cfg: + try: + xsk_bkg = setup_xsk(cfg) + except KsftSkipEx as e: + print(f"WARN: xsk pool is not set up, err: {e}") + + ksft_run([check_xdp_bind, check_rx_resize], + args=(cfg, )) + ksft_exit() + +if __name__ == "__main__": + main()