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 05220A0C41 for ; Tue, 30 Nov 2021 17:42:44 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F3E4741142; Tue, 30 Nov 2021 17:42:43 +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 A6272410F7 for ; Tue, 30 Nov 2021 17:42:42 +0100 (CET) Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (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 7AB363F1B1 for ; Tue, 30 Nov 2021 16:42:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290562; bh=7pAojf7H0GEB9MjuTEoddtgt2yU7eELtim3G8kholR0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=LbNfUrITGRboj74TGQxNd/RwDTE9HAhWWJFdTAmrq+M5vT/M/E8jeRSQ1lUjrOTDC sdJxlPzAj6m7GGSqMdaQCe7d31hIlmb9Aqoo0gmGbB7hEEHs30/sHlxnxZgIB1R56T 2EEkp1NCP0phwwAYgtEakjXHh2ZWSfVIAhi24CfEWROWibwQESgxDDW9lQfXLbeN+q KebGsM3bfTMZ808+QTfK2VlegEEaAwbY3D+bzbp2G7N8l2KeytJ0q1TccuPn6KVFah JXonQvYkLU6ZS60a4lQbW2R5KMsEEUmBlJ2GSEL02Ey9JKb+uB0FZ+zligy971c9Vq 3kVx4QAKZOOeA== Received: by mail-ed1-f71.google.com with SMTP id i19-20020a05640242d300b003e7d13ebeedso17454831edc.7 for ; Tue, 30 Nov 2021 08:42:42 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7pAojf7H0GEB9MjuTEoddtgt2yU7eELtim3G8kholR0=; b=cqJpwhSsbrT9le5dSgV2/DqMe6i3xB55LFuOr3qCPw63/0LYEuz/gUbQPGsHO6K+WE Qq8sZGChEFalT1HBi8aP6GiuwtPQ1MBJ6TLFJk7DxzJA0RjVGYckoZ4TtnD4FmoX6oJj WPfTWvLa7INkxqw9hpkOk6/rSgkDePXAHLW2uETMLNA8KtJNGl9wRhD55iLKpS9Db4We 2RZYBqpZBwhHU5cjas454jxsJnccCh4SYeSjSoxW+oxT4r2iXLllqmIQzNXNaK+Y2Q2t PsKdH9LrW4H2YP5pnaZABLYkH1XE+8zBUOWHsmIGVfzbHUCCo541iLfJNWjcNgWy7n6l WEfA== X-Gm-Message-State: AOAM530ynKmeO4Kyxu5hOP5yLaeSqYZuae/deA6VGzMAj0xje9TEvVb6 zj4CFMg4ZATW9TjxryIAFZrIMaLHFsZ3jg4K0gEc0cpxY6NjyhalyLvXwT4707r0Cu6h/0r55AP HeDIPlGOb2HIFeNgEYBpJdOjq X-Received: by 2002:a17:907:96a9:: with SMTP id hd41mr186125ejc.413.1638290562021; Tue, 30 Nov 2021 08:42:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJyi6wLBogYNb4/6ojpWzLSt8lXWFeptMUpB7COwm7x2Yj4zjjnaTGQdqUyYhLipaBcBvg7SCQ== X-Received: by 2002:a17:907:96a9:: with SMTP id hd41mr186107ejc.413.1638290561815; Tue, 30 Nov 2021 08:42:41 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id bd12sm11541754edb.11.2021.11.30.08.42.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:42:41 -0800 (PST) From: christian.ehrhardt@canonical.com To: Maciej Szwed Cc: dpdk stable Subject: patch 'interrupt: fix request notifier interrupt processing' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:35:30 +0100 Message-Id: <20211130163605.2460997-126-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> References: <20211130163605.2460997-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.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before December 10th 2021. 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/ced22e5b524795bc8e8e70814f93e330f3f6cbda Thanks. Christian Ehrhardt --- >From ced22e5b524795bc8e8e70814f93e330f3f6cbda Mon Sep 17 00:00:00 2001 From: Maciej Szwed Date: Tue, 19 Oct 2021 12:06:57 +0200 Subject: [PATCH] interrupt: fix request notifier interrupt processing [ upstream commit aeed570a211fe31c976f9f4de07039cb7c8a125e ] We should call read() on RTE_INTR_HANDLE_VFIO_REQ event to confirm that event. Fixes: 0eb8a1c4c786 ("vfio: add request notifier interrupt") Signed-off-by: Maciej Szwed --- lib/librte_eal/linux/eal/eal_interrupts.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/librte_eal/linux/eal/eal_interrupts.c b/lib/librte_eal/linux/eal/eal_interrupts.c index e570c0684e..348aef2ece 100644 --- a/lib/librte_eal/linux/eal/eal_interrupts.c +++ b/lib/librte_eal/linux/eal/eal_interrupts.c @@ -877,17 +877,14 @@ eal_intr_process_interrupts(struct epoll_event *events, int nfds) bytes_read = sizeof(buf.timerfd_num); break; #ifdef VFIO_PRESENT +#ifdef HAVE_VFIO_DEV_REQ_INTERFACE + case RTE_INTR_HANDLE_VFIO_REQ: +#endif case RTE_INTR_HANDLE_VFIO_MSIX: case RTE_INTR_HANDLE_VFIO_MSI: case RTE_INTR_HANDLE_VFIO_LEGACY: bytes_read = sizeof(buf.vfio_intr_count); break; -#ifdef HAVE_VFIO_DEV_REQ_INTERFACE - case RTE_INTR_HANDLE_VFIO_REQ: - bytes_read = 0; - call = true; - break; -#endif #endif case RTE_INTR_HANDLE_VDEV: case RTE_INTR_HANDLE_EXT: -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:13.295555014 +0100 +++ 0126-interrupt-fix-request-notifier-interrupt-processing.patch 2021-11-30 16:50:05.958874763 +0100 @@ -1 +1 @@ -From aeed570a211fe31c976f9f4de07039cb7c8a125e Mon Sep 17 00:00:00 2001 +From ced22e5b524795bc8e8e70814f93e330f3f6cbda Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit aeed570a211fe31c976f9f4de07039cb7c8a125e ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -14 +15 @@ - lib/eal/linux/eal_interrupts.c | 9 +++------ + lib/librte_eal/linux/eal/eal_interrupts.c | 9 +++------ @@ -17,5 +18,5 @@ -diff --git a/lib/eal/linux/eal_interrupts.c b/lib/eal/linux/eal_interrupts.c -index 15a27a2abf..6e3925efd4 100644 ---- a/lib/eal/linux/eal_interrupts.c -+++ b/lib/eal/linux/eal_interrupts.c -@@ -947,17 +947,14 @@ eal_intr_process_interrupts(struct epoll_event *events, int nfds) +diff --git a/lib/librte_eal/linux/eal/eal_interrupts.c b/lib/librte_eal/linux/eal/eal_interrupts.c +index e570c0684e..348aef2ece 100644 +--- a/lib/librte_eal/linux/eal/eal_interrupts.c ++++ b/lib/librte_eal/linux/eal/eal_interrupts.c +@@ -877,17 +877,14 @@ eal_intr_process_interrupts(struct epoll_event *events, int nfds)