From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id CF974A0544 for ; Fri, 11 Nov 2022 12:41:14 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C86104014F; Fri, 11 Nov 2022 12:41:14 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id 9C06840141 for ; Fri, 11 Nov 2022 12:41:13 +0100 (CET) Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 730BC423E2 for ; Fri, 11 Nov 2022 11:41:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1668166873; bh=8FGf7WGx4HEqcar6PGDV9osXhDQRyRSXCf9EIuXrIsE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=FbsmByWGVt9aRRTcgchZ3HF0kqvRtfaByn1Umo+bYWNKc/GGc5tAoZd88g5VU0onv WKdLdDbEz1z5dgAV1erKaqt2p9CplK7h3RjDNt1QMQlVLhxT6d42a13BH5wIMk6ZFI 5R8PIdwoDMAxoyFSIkjh90vCht+JZcuQco50gqG4JZo9AvHYkqDooCPHvVnlmsPKHg 4y3Kb/3IZvClwcNTYbNuDhq2STweuMDT6SNweO4oGXV2Syxl4AIFNnEbPQh5A5Mmgl Cqlon5zdc6S8RzOJPNKCd2WTyHnagVt3hz8eyhN06qPrkIvPfZtkyNb7CywgTlavw5 Me7+RG9rxJTfA== Received: by mail-ed1-f69.google.com with SMTP id b14-20020a056402278e00b004621a2642d7so3467778ede.1 for ; Fri, 11 Nov 2022 03:41:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=8FGf7WGx4HEqcar6PGDV9osXhDQRyRSXCf9EIuXrIsE=; b=un4QnAMTYcx1t1fZkkpiDQx2RxgqFw4kWnopPbVJMmyPAqYCbyMl1sq5kJcTwyYmHZ fdP1ZczN0+C1l9F8S9puUzkPvG4WL6cvYNed1KbyE9xTYoZAwmt5PH/UXZPobqgou6DQ cw+ksLBFNQvjKdn297COCHv8P5Uy1kVKmznAiiH/APepTvGROdCJTyzfYKuFXNdNqcuw c+33ntkVz6XjT1+byO+3vuEii0W6fMcwe9Bv8RAj4/YZutcUJeMNfGOMUYfU4vlvOB4Y KxaCxd+jYe9e4mDPvYE6FVGfViT+Eg+Ee9ZtZFRJtvITQvtjqYYcj08DKf5yoMtT5cA7 AAFw== X-Gm-Message-State: ANoB5pmQ4IY3jrHnbClIzy8/GLsyrx/rxT7Np+ERUCg3FxYYUntg8dxM Rvv/W96GmxEAlqIqMujmGV4A6AnMSYlgev707kJWTLwtibGWnf18ScsFA4ajp8maf9LOXUc9teQ 93JCJgI3YMS0l2i0E9gZgHIoc X-Received: by 2002:a17:906:2ac3:b0:7ad:b152:90f2 with SMTP id m3-20020a1709062ac300b007adb15290f2mr1559599eje.345.1668166872942; Fri, 11 Nov 2022 03:41:12 -0800 (PST) X-Google-Smtp-Source: AA0mqf7A3QD27S0Z7w6OEG6xK4zutkGjJNWIaEDU4dikJJJ+dZ/h+BJmjH1ojsIUoD3kzDOy9xPo6Q== X-Received: by 2002:a17:906:2ac3:b0:7ad:b152:90f2 with SMTP id m3-20020a1709062ac300b007adb15290f2mr1559583eje.345.1668166872715; Fri, 11 Nov 2022 03:41:12 -0800 (PST) Received: from localhost.localdomain ([2a02:6d40:39af:c100:1891:6c61:50fd:e567]) by smtp.gmail.com with ESMTPSA id i2-20020a1709061e4200b007ad84cf1346sm788585ejj.110.2022.11.11.03.41.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Nov 2022 03:41:11 -0800 (PST) From: christian.ehrhardt@canonical.com To: Olivier Matz Cc: David Marchand , dpdk stable Subject: patch 'event/sw: fix flow ID init in self test' has been queued to stable release 19.11.14 Date: Fri, 11 Nov 2022 12:38:54 +0100 Message-Id: <20221111113904.1549618-37-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221111113904.1549618-1-christian.ehrhardt@canonical.com> References: <20221111113904.1549618-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 19.11.14 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/18/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/f1293694005f77bd1d6e8c8b69aaac15c0dfc139 Thanks. Christian Ehrhardt --- >From f1293694005f77bd1d6e8c8b69aaac15c0dfc139 Mon Sep 17 00:00:00 2001 From: Olivier Matz Date: Fri, 14 Oct 2022 22:37:09 +0200 Subject: [PATCH] event/sw: fix flow ID init in self test [ upstream commit ab059e82e12f2a9dc7561960004819de68b37110 ] The issue is seen by unit tests: MALLOC_PERTURB_=204 \ DPDK_TEST=eventdev_selftest_sw \ /root/dpdk/x86_64-native-linuxapp-gcc/app/test/dpdk-test -c 0xff (...) *** Running XStats ID Reset test... 12: 1761: qid_0_port_2_pinned_flows value , expected 1 got 7 1778: qid_0_port_2_pinned_flows value incorrect, expected 1 got 7 ERROR - XStats ID Reset test FAILED. SW Eventdev Selftest Failed. Test Failed The flow ID is not set in the event, which results in an undefined flow, whose value depends on what was previously in stack. Having different flows for the packets makes the test to fail, since only one flow is expected. This only happens in -O3, where the same stack area is shared by the event object and the address of the mbuf allocated in rte_gen_arp(). Fix this by properly initializing the flow id. Bugzilla ID: 1101 Fixes: e21df4b062b5 ("test/eventdev: add SW xstats tests") Signed-off-by: Olivier Matz Reviewed-by: David Marchand --- drivers/event/sw/sw_evdev_selftest.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/event/sw/sw_evdev_selftest.c b/drivers/event/sw/sw_evdev_selftest.c index 38c21fa0fa..f89b77ce9e 100644 --- a/drivers/event/sw/sw_evdev_selftest.c +++ b/drivers/event/sw/sw_evdev_selftest.c @@ -1481,6 +1481,7 @@ xstats_id_reset_tests(struct test *t) goto fail; } ev.queue_id = t->qid[i]; + ev.flow_id = 0; ev.op = RTE_EVENT_OP_NEW; ev.mbuf = arp; arp->seqn = i; -- 2.38.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-11 12:35:06.084677137 +0100 +++ 0037-event-sw-fix-flow-ID-init-in-self-test.patch 2022-11-11 12:35:04.797192195 +0100 @@ -1 +1 @@ -From ab059e82e12f2a9dc7561960004819de68b37110 Mon Sep 17 00:00:00 2001 +From f1293694005f77bd1d6e8c8b69aaac15c0dfc139 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ab059e82e12f2a9dc7561960004819de68b37110 ] + @@ -31 +32,0 @@ -Cc: stable@dpdk.org @@ -40 +41 @@ -index 62d66744f2..9f27d8a189 100644 +index 38c21fa0fa..f89b77ce9e 100644 @@ -43 +44 @@ -@@ -1483,6 +1483,7 @@ xstats_id_reset_tests(struct test *t) +@@ -1481,6 +1481,7 @@ xstats_id_reset_tests(struct test *t) @@ -50 +51 @@ - *rte_event_pmd_selftest_seqn(arp) = i; + arp->seqn = i;