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 6C70FA0527 for ; Mon, 9 Nov 2020 19:44:05 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 65B1F7CAE; Mon, 9 Nov 2020 19:44:04 +0100 (CET) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by dpdk.org (Postfix) with ESMTP id 5CEF47CAE for ; Mon, 9 Nov 2020 19:44:03 +0100 (CET) Received: by mail-wr1-f42.google.com with SMTP id d12so8358381wrr.13 for ; Mon, 09 Nov 2020 10:44:03 -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=nOOaE7xDyhhH+jc/hS71LGznoprG/T/CwqdlAmcvoq8=; b=ANRH9lov+h1kFxUjrUkLPOi4OSM7RXNqaPdcblaCfIEOAQ8DGmWQFwmSau9an73mkm vbL204dH6WzFO2ysZihbTu2UIPzDwe05Rd+NwXPQKW7ClOXxenyw2Yh7Pb75jhp9HrYG Ov1xP9/ayP6SSdRf8untACND9bP+seNPhxO5qOyI/Eu1S+T6aPf+ncWUe/iwVsi8vVMO VvJuFtQYg2d/Xo9U50ELmfGEFJvBEO57HPgKC8YWee28pY9Vf5wlMHbx5z1jPbJtejCm PM9YRC7Z3ym5FYAY/41rp5BDbd+J263nF4g3XZn2E0uuUmRhciT/WS9S54imIv9OKkb0 5igQ== 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=nOOaE7xDyhhH+jc/hS71LGznoprG/T/CwqdlAmcvoq8=; b=odFkVp+h9fQ44nnOLg1TWf5r8Jik112Zemla3id+wBLR3Vj/bomusNdkkjdwatc3EE R4kwg22bSQnvRQ6eNvfasRUFfyFBzWnAom9pUR/U8HX3nlPolipRBM7X1YpMtTnhizDT Qq+Allz3WbVGcvxf3TteQrHcQAqgIODsxh3A7bc+yY90PZJFoFGkzJLgZ7QFSf4Gew0Y sipRHdsx/cCaqWlcI+lutrfaQwvtjFVIcPn4+sBedcmtee4+Wo/G1F28vlDjezUmrJCI koS9/jAL7zn/w52JCU/0H0iL1EdZmYBpQcAx3+eftKGgzIQy6WLCxuxQTSwEcPe96YJ3 LA/w== X-Gm-Message-State: AOAM530w1Ay8w9JeM2AxO0vvE4DArRDUNMOB8QhdCTZ/TATuj++1NWPV SlYpfaiOeYtdjpNdjdyfnXllgOmGyWOQ+d70 X-Google-Smtp-Source: ABdhPJx7rWBqbei6wwdkKIk6J8mzh2pIc2+ccnFx18DctRE/Q6ckpMY6LxhlPceeKW3Pm8pyJGuDHw== X-Received: by 2002:adf:8465:: with SMTP id 92mr18567582wrf.50.1604947442001; Mon, 09 Nov 2020 10:44:02 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id u10sm14841930wrw.36.2020.11.09.10.44.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 10:44:01 -0800 (PST) From: luca.boccassi@gmail.com To: Wei Huang Cc: Tianfei Zhang , Rosen Xu , dpdk stable Date: Mon, 9 Nov 2020 18:40:38 +0000 Message-Id: <20201109184111.3463090-50-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201109184111.3463090-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-207-luca.boccassi@gmail.com> <20201109184111.3463090-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'raw/ifpga/base: handle unsupported interrupt type' has been queued to stable release 19.11.6 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 stable release 19.11.6 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/11/20. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/a53c1f6348e17897b483a5fe749c6140ebb57c23 Thanks. Luca Boccassi --- >From a53c1f6348e17897b483a5fe749c6140ebb57c23 Mon Sep 17 00:00:00 2001 From: Wei Huang Date: Fri, 23 Oct 2020 04:59:56 -0400 Subject: [PATCH] raw/ifpga/base: handle unsupported interrupt type [ upstream commit 509579206fe07a2d714d5be1ed6f1adc51340be6 ] Handle unsupported interrupt type requests properly, on unsupported interrupt case: 'ifpga_unregister_msix_irq()' returns success, 'ifpga_register_msix_irq()' return failure. Fixes: e0a1aafe2af9 ("raw/ifpga: introduce IRQ functions") Signed-off-by: Wei Huang Signed-off-by: Tianfei Zhang Acked-by: Rosen Xu --- drivers/raw/ifpga/ifpga_rawdev.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/raw/ifpga/ifpga_rawdev.c b/drivers/raw/ifpga/ifpga_rawdev.c index acbfdfda27..fee24a98e1 100644 --- a/drivers/raw/ifpga/ifpga_rawdev.c +++ b/drivers/raw/ifpga/ifpga_rawdev.c @@ -1342,6 +1342,8 @@ ifpga_unregister_msix_irq(enum ifpga_irq_type type, intr_handle = &ifpga_irq_handle[0]; else if (type == IFPGA_AFU_IRQ) intr_handle = &ifpga_irq_handle[vec_start + 1]; + else + return 0; rte_intr_efd_disable(intr_handle); @@ -1371,8 +1373,11 @@ ifpga_register_msix_irq(struct rte_rawdev *dev, int port_id, if (type == IFPGA_FME_IRQ) { intr_handle = &ifpga_irq_handle[0]; count = 1; - } else if (type == IFPGA_AFU_IRQ) + } else if (type == IFPGA_AFU_IRQ) { intr_handle = &ifpga_irq_handle[vec_start + 1]; + } else { + return -EINVAL; + } intr_handle->type = RTE_INTR_HANDLE_VFIO_MSIX; -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-09 18:40:13.141497263 +0000 +++ 0050-raw-ifpga-base-handle-unsupported-interrupt-type.patch 2020-11-09 18:40:11.179312029 +0000 @@ -1 +1 @@ -From 509579206fe07a2d714d5be1ed6f1adc51340be6 Mon Sep 17 00:00:00 2001 +From a53c1f6348e17897b483a5fe749c6140ebb57c23 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 509579206fe07a2d714d5be1ed6f1adc51340be6 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index e5b938d9d6..6319988066 100644 +index acbfdfda27..fee24a98e1 100644 @@ -25 +26 @@ -@@ -1338,6 +1338,8 @@ ifpga_unregister_msix_irq(enum ifpga_irq_type type, +@@ -1342,6 +1342,8 @@ ifpga_unregister_msix_irq(enum ifpga_irq_type type, @@ -34 +35 @@ -@@ -1367,8 +1369,11 @@ ifpga_register_msix_irq(struct rte_rawdev *dev, int port_id, +@@ -1371,8 +1373,11 @@ ifpga_register_msix_irq(struct rte_rawdev *dev, int port_id,