From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.openvz.org (mail.openvz.org [69.168.225.77]) by lore.virtuozzo.com (Postfix) with ESMTPS id 9323E80E7E for ; Fri, 6 Nov 2026 14:56:32 +0000 (UTC) Received: from mail.openvz.org (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6A6EtBxj019089; Fri, 6 Nov 2026 17:55:12 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6A6EtBxj019089 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="jcNHP02/" Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6A6Et9jg019085 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Fri, 6 Nov 2026 17:55:09 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6A6Et9jg019085 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-48c6a1d4034so767081f8f.0 for ; Fri, 06 Nov 2026 06:55:09 -0800 (PST) X-Gm-Message-State: APuU4Z8B222ZrK+mkJgffxDez87XVMVGsWSbRJzJMLakg/m7fM+gbh8G fZL60j25x7zxqAMdoDvrp6F0ih/IU5fT3Xr4KGLxmwNdR1X3QFFzbKXeMaqU2LZdhr4FPdPiU03 gLQwGUXDuApWWU59OmMcce37u/JCgB2EcmAQQZgqeFt/scjKXfDgw4g== X-Gm-Gg: AYBFou20Ykr8sx12Bp+WVtipICWkH9I2g/SYlP+sv4SOwMxDL4QYv6xCEiVNrvR6sVn bwkkBpAL7lKp+oeI8NU5c3bmDlsuCO6FmOvXkzQJqQBSDzWVA9DaqRWAZIlYcOl3Xopz2sViB2g UyYRiMAY3mi0BT28UEF1RQopXZfHQ2CKo2m4X/lE/HLNBRB/4ou7R+Fie3cnusi7NDeGUBPFrdP W8LqIyC2MGGvIYzIPD8vo25BQ+nVA1XFSynOtnW3KydNTv1z222rV8tdYY8dilT7DnG6goEoMWK PMOJ/VCEL9/vebNXcjncS+i1EjhzcE3SCnufgI2lfQB283D4xdiHy1M33J/gO1t7J4+GUOizG64 k2EGAaxN4KO1TdgNXQ/z3QohDcQ== X-Received: by 2002:a05:600c:310f:b0:4b6:bb67:bb9 with SMTP id 5b1f17b1804b1-4b6ded4a3b0mr45867665e9.29.1793976908741; Fri, 06 Nov 2026 06:55:08 -0800 (PST) X-Received: by 2002:a05:600c:310f:b0:4b6:bb67:bb9 with SMTP id 5b1f17b1804b1-4b6ded4a3b0mr45867275e9.29.1793976908226; Fri, 06 Nov 2026 06:55:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1793976908; cv=none; d=google.com; s=arc-20260327; b=af3DApf1xKeW9TPko2bVwPwhwA/NE8kGOAUQ1Kkp9HyEMqr067d2GxM0BCpdW94bfR n0Az0+aCV1hcrOOM0IFyGdmO6mWSaf5Rcqz4YwuM+E4e/kkflBz65m2KEL4Q/eaSqPGy viWA/XXQrjkll6Y/tptKTsVNmGhElcmziGYXZWNTH2sQkHjuE/PwBmNUHFS/X9Kbjoay YM8y+SnETChcI+P9k5TootnPByaQCcIlsURl+1QS9lQxN4qaAiMi/pdKb/6X+iSArVCs PJncBXp2LKjPENFos24zgo9222jVfuoYfVwlB1PAg6vFEqjgaz4xbZE6Do242UivDuW8 V5xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=b74lg9sryNJ09lTUJmveWjDsRenCo27oaduCd2Mawas=; fh=WpT6aB7RBAGHZeWZzqAr71yzRFbPTYkPWKsRagLn48Q=; b=rXF7HdedKSf9mmcUtIzjjhmFPwybWfpq5QG2qP2kFNRdzf8YNEEDl9cj59aKw3VSfK IGa+uqw3brT4dXJ3KJ9aMAxVh7Y6zO+Igd31WR10dCdoWJSwHrdvxBuTkLbxYEgVTyi1 dcUgSsY6Ce/wvtgGnnuQFZkR66W+SmpnJnsZek/lNNKgMX1cILW5pmMfXgh8Wjqd18wp 2vwdocNzOQgmwLtd21qnEyw6U/Uc+0qO4xMBPxcj5cqw3oVnGgrcMVg+JkFQjztampRN K+UvJDs9joQDYzgQRp5SmAjU/KDSGMrMGXii/OaybTedo3JFI2s6kDwEwvk6ch8PwH8l mzAA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b="jcNHP02/"; spf=pass (google.com: domain of eva.kurchatova@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=eva.kurchatova@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Received: from relay.virtuozzo.com (relay.virtuozzo.com. [130.117.225.111]) by mx.google.com with ESMTPS id ffacd0b85a97d-492fb0e3666si5758509f8f.275.2026.11.06.06.55.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Nov 2026 06:55:08 -0800 (PST) Received-SPF: pass (google.com: domain of eva.kurchatova@virtuozzo.com designates 130.117.225.111 as permitted sender) client-ip=130.117.225.111; Authentication-Results: mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b="jcNHP02/"; spf=pass (google.com: domain of eva.kurchatova@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=eva.kurchatova@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuozzo.com; s=relay; h=MIME-Version:Message-ID:Date:Subject:From: Content-Type; bh=b74lg9sryNJ09lTUJmveWjDsRenCo27oaduCd2Mawas=; b=jcNHP02/XUzG PR0gu5ghcf16lat9koGrZXH+RxW5et5cFHF1l64JTRCez6Ui7MrhueLUdnm4HaQhKCYRnYfXL2Dow dVq6zmCT05mXqjGxiHK4KS2GfQvUjCcufKFYl2XHL0Z/Eqit4CGcRUqjd06IIlyew6I4knKsueU4H X6VqSsTS+FTpuIA0nSylZ4hEPJpXcIdNn6gDdY6O3ubQNtFRmKw5PiHZY0n141jPRtGf4QK+ZPybD ePiwXg8v4T03NFwT2kE1cIQAkLEBTT5dgho7VWVED3BwDHgtufd2LXIehHGMBgx9JhqFK5XYxGD7Q rvlFIEIZXUTwTAjMw2xCoQ==; Received: from ch-vpn.virtuozzo.com ([130.117.225.6] helo=LekKit-T14) by relay.virtuozzo.com with esmtp (Exim 4.96) (envelope-from ) id 1xPLHP-00CdDj-2L; Fri, 06 Nov 2026 15:55:03 +0100 From: Eva Kurchatova To: khorenko@virtuozzo.com Date: Fri, 6 Nov 2026 16:54:56 +0200 Message-ID: <20261106145505.132348-1-eva.kurchatova@virtuozzo.com> X-Mailer: git-send-email 2.56.0 MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1] ms/selftests/xsk: properly handle batch ending in the middle of a packet X-BeenThere: devel@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: OpenVZ development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: devel-bounces@openvz.org Errors-To: devel-bounces@openvz.org From: Larysa Zaremba Referenced commit reduced the scope of the variable pkt, so now it has to be reinitialized via pkt_stream_get_next_rx_pkt(), which also increments some counters. When the packet is interrupted by the batch ending, pkt stream therefore proceeds to the next packet, while xsk ring still contains the previous one, this results in a pkt_nb mismatch. Decrement the affected counters when packet is interrupted. Fixes: 8913e653e9b8 ("selftests/xsk: Iterate over all the sockets in the receive pkts function") Reviewed-by: Aleksandr Loktionov Signed-off-by: Larysa Zaremba Link: https://lore.kernel.org/r/20260203155103.2305816-2-larysa.zaremba@intel.com Signed-off-by: Alexei Starovoitov (cherry picked from commit 42e41b2a0afa04ca49ee2725aadf90ccb058ed28) Rebase note: applied to xskxceiver.c, which mainline split into prog_tests/test_xsk.c in commit 3ab77f35a75e ("selftests/bpf: test_xsk: Split xskxceiver"), missing here. The code is the same. https://virtuozzo.atlassian.net/browse/VSTOR-153754 Feature: fix selftests Signed-off-by: Eva Kurchatova --- tools/testing/selftests/bpf/xskxceiver.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/testing/selftests/bpf/xskxceiver.c b/tools/testing/selftests/bpf/xskxceiver.c index a4a0b4e2516c..04fda63b6350 100644 --- a/tools/testing/selftests/bpf/xskxceiver.c +++ b/tools/testing/selftests/bpf/xskxceiver.c @@ -1260,6 +1260,8 @@ static int __receive_pkts(struct test_spec *test, struct xsk_socket_info *xsk) xsk_ring_prod__cancel(&umem->fq, nb_frags); } frags_processed -= nb_frags; + pkt_stream_cancel(pkt_stream); + pkts_sent--; } if (ifobj->use_fill_ring) -- 2.56.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel