From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 345EEA04F3 for ; Thu, 19 Dec 2019 15:35:36 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 25E061BF74; Thu, 19 Dec 2019 15:35:36 +0100 (CET) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 6BBA21BF74 for ; Thu, 19 Dec 2019 15:35:34 +0100 (CET) Received: by mail-wr1-f66.google.com with SMTP id g17so6221663wro.2 for ; Thu, 19 Dec 2019 06:35:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=K15+2fcOvlIIoSpEvPPg1f1+6+M8jkDu29Xu55OdbZI=; b=oOoQLiavQXg4puQ52akT5cuq7H+SpHk4Rup8pELdaaJK7qFY9+1ZbQfJUU6S+Rwa4K 6CGp6nXn8W6o3F/5nngbXIZsCJRkdbYRlgY3p5YES9CIUUAsMQtk6b+PDEwvUuCqSM3X AA8FW2jzV9SqYlrsua0qjMBJ6iz0rnmpYXr+Lxv98hYNiAYTfaZC0sD/Jcq+JoNRc08H xzVfS3qw1DGcn7zniQG/7+wsUujvN8A+1iwHzycwoSkSV+udRcN6CUwrehGkAR1yCh1I Yf2ZkPvgR+2FJHlEWJR6DMzpm+Drdb0e6QIoMFXjvFrD4WZk/GwGu4OBjU0TsMq2+mok JpQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=K15+2fcOvlIIoSpEvPPg1f1+6+M8jkDu29Xu55OdbZI=; b=e/davDiRZzgu23UGzt8ZnXkLegWfE1HcC7Q5gAo60sBB8IMEglZ2xhRkVz7/SmR7dc 08LnLS5PJNE/KnAo90IDfwQQLmL/HwaJN/oMqX9HZdTIYQlvFM9F/1nbnHIgnh+XeWVA V18qGuR3C86DBVD/PbuJjRXsCynXokPHMHUx9o4pef1/zr+uM0hM4xXyRF8QgDjQW/h6 /WDv0C2iGPZlh3ktfEhHiHCYNiIA/DF2ba6GewDGb0DqfzwTd+j3Ef62ogOa+bdlVkrP XbnKeP6chqka+qHm3yg5jKcplM53I+H8sNIqkuEtwbblKn0h+4aufW7HUIWWRclXJBcM QK5A== X-Gm-Message-State: APjAAAUjjkbp78hLmXmTI47X7TCO4PX91Cdho1OJEGgEoQ3Raf2+NSfU Gnkcid6cdCan9d51eMQ509o= X-Google-Smtp-Source: APXvYqxaJnG/NL9cpOsw5bUY+BFqJDegzcGHRxfhc0hSD3YO8IiFgEIcCMSzDweq68MxO0J1wIhP3g== X-Received: by 2002:adf:d4ca:: with SMTP id w10mr9246959wrk.53.1576766134181; Thu, 19 Dec 2019 06:35:34 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id n10sm6467014wrt.14.2019.12.19.06.35.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 06:35:33 -0800 (PST) From: luca.boccassi@gmail.com To: Aaron Conole Cc: David Marchand , dpdk stable Date: Thu, 19 Dec 2019 14:32:44 +0000 Message-Id: <20191219143447.21506-17-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191219143447.21506-1-luca.boccassi@gmail.com> References: <20191219143447.21506-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'test/interrupt: account for race with callback' has been queued to LTS release 17.11.10 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to LTS release 17.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/21/19. 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. Thanks. Luca Boccassi --- >From 59a289f01f0e8dcfbe3bc1848abd36c764bf7bc6 Mon Sep 17 00:00:00 2001 From: Aaron Conole Date: Thu, 8 Aug 2019 13:38:35 -0400 Subject: [PATCH] test/interrupt: account for race with callback [ upstream commit 73afc9df00d8ba4ff58d4a7a86691ca10520d462 ] Because the eal interrupt framework can race when invoking the callback and a separate unregister call, the test needs to accommodate the chance that the two collide. Do this by checking the return value of unregister against the race-condition flag (EAGAIN). Fixes: f1a6c22424ce ("app/test: update interrupts test") Signed-off-by: Aaron Conole Reviewed-by: David Marchand --- test/test/test_interrupts.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/test/test/test_interrupts.c b/test/test/test_interrupts.c index e0cd8a82fc..fedd34b0ef 100644 --- a/test/test/test_interrupts.c +++ b/test/test/test_interrupts.c @@ -378,9 +378,13 @@ test_interrupt_full_path_check(enum test_interrupt_handle_type intr_type) rte_delay_ms(TEST_INTERRUPT_CHECK_INTERVAL); rte_delay_ms(TEST_INTERRUPT_CHECK_INTERVAL); - if (rte_intr_callback_unregister(&test_intr_handle, - test_interrupt_callback, &test_intr_handle) < 0) - return -1; + while ((count = + rte_intr_callback_unregister(&test_intr_handle, + test_interrupt_callback, + &test_intr_handle)) < 0) { + if (count != -EAGAIN) + return -1; + } if (flag == 0) { printf("callback has not been called\n"); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-12-19 14:32:27.013971218 +0000 +++ 0017-test-interrupt-account-for-race-with-callback.patch 2019-12-19 14:32:25.449284817 +0000 @@ -1,27 +1,28 @@ -From 73afc9df00d8ba4ff58d4a7a86691ca10520d462 Mon Sep 17 00:00:00 2001 +From 59a289f01f0e8dcfbe3bc1848abd36c764bf7bc6 Mon Sep 17 00:00:00 2001 From: Aaron Conole Date: Thu, 8 Aug 2019 13:38:35 -0400 Subject: [PATCH] test/interrupt: account for race with callback +[ upstream commit 73afc9df00d8ba4ff58d4a7a86691ca10520d462 ] + Because the eal interrupt framework can race when invoking the callback and a separate unregister call, the test needs to accommodate the chance that the two collide. Do this by checking the return value of unregister against the race-condition flag (EAGAIN). Fixes: f1a6c22424ce ("app/test: update interrupts test") -Cc: stable@dpdk.org Signed-off-by: Aaron Conole Reviewed-by: David Marchand --- - app/test/test_interrupts.c | 10 +++++++--- + test/test/test_interrupts.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) -diff --git a/app/test/test_interrupts.c b/app/test/test_interrupts.c -index d8c2d8124a..233b14a70b 100644 ---- a/app/test/test_interrupts.c -+++ b/app/test/test_interrupts.c -@@ -370,9 +370,13 @@ test_interrupt_full_path_check(enum test_interrupt_handle_type intr_type) +diff --git a/test/test/test_interrupts.c b/test/test/test_interrupts.c +index e0cd8a82fc..fedd34b0ef 100644 +--- a/test/test/test_interrupts.c ++++ b/test/test/test_interrupts.c +@@ -378,9 +378,13 @@ test_interrupt_full_path_check(enum test_interrupt_handle_type intr_type) rte_delay_ms(TEST_INTERRUPT_CHECK_INTERVAL); rte_delay_ms(TEST_INTERRUPT_CHECK_INTERVAL);