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 272CBA034C for ; Fri, 25 Feb 2022 18:17:02 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2228E410FD; Fri, 25 Feb 2022 18:17:02 +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 77BB94114F for ; Fri, 25 Feb 2022 18:16:59 +0100 (CET) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (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 490D03FCAD for ; Fri, 25 Feb 2022 17:16:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1645809419; bh=p5nm/FGTVpvDewwiTrvPkUZ4TcE1H4ytdo1DpioJgOI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=ia7VH1OqpglhR9qiFCdJdRhiuD9kAPDVlV8jSIa1sdctTLlm1p+Xqvc0CGuoGFUey PAVKR21JYb1icpK3JhpKAM9vsWOKF2cvSLcO1GQbOZ8yDX/0D0qxAHMxLSy9W7wGAF V+Pn2INjCUvAnGpfpWtBtlpgdaWVRfODqo/flGaAYi02AExTHCRxp2HmbaiubIa/zU u+djAbfflp6/E+WmdxXU671sgACF70sIAauzV3jH0Xa84vkfhap3C3abNZ+0O0zAYZ lOHBlGuxsP4YCAeEFeNg9woCW/4aIPQPvMpS1/ZoYUt5Zthv3bbl6eF13qAjlr+AyW XUDFg6u8s29+g== Received: by mail-wm1-f72.google.com with SMTP id az39-20020a05600c602700b00380e48f5994so1627093wmb.0 for ; Fri, 25 Feb 2022 09:16:59 -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=p5nm/FGTVpvDewwiTrvPkUZ4TcE1H4ytdo1DpioJgOI=; b=hANtcq6f5amD0W3gwWo5HQKTKbnmqODpntemp+pu84HxaU0ZqbUqmKJVRweTkUNaTC 6RxnWF+ELFecXXZxXuwN86yf2plpVGQ3DGjO0fcILY6jc40XkcVELBTU4PLNc3r3VFfa mn1s/2IfGxggF5tv5lw7mDY/dG4PncNBFNv2+V0aIuv/honczAiPadBmOmzijtP2OvMd AN6NfzZcS7i1aZ7UUgTOiEJanPaNOYLekCnuN4C+F6XnO9Tkqf9m5Rl4BWuD/XHJ+Q7H f6vtcOLh9O9Qn+uGkQOxr2Nf/xvr5IIKS4rMVe5LhZ57kuNPNqYZh7/aty0UCeW/TpdW 7SBA== X-Gm-Message-State: AOAM531W15uKaHBWYSGeR7OAcqda4e/zDOe60ZX2n1847L5RY1wx/dWj kyHmiaiIqXx/Kf08j7hBjtjGN1+GFihNXTCAr+jkn6Ai3m4Ujkp05yRlkYvLXYtELbCmA2xhq2I z6tatP/VmbqpUVuTzJARAQPTO X-Received: by 2002:a05:600c:1c9a:b0:37b:bbbd:b8db with SMTP id k26-20020a05600c1c9a00b0037bbbbdb8dbmr3584487wms.185.1645809418903; Fri, 25 Feb 2022 09:16:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJysRQDso+uGPGhZd3d0bA8xd0HsRyWmv8v9XgzWWecgAQZUPf8R1dxXqk3gIjinjhPTUnNp+Q== X-Received: by 2002:a05:600c:1c9a:b0:37b:bbbd:b8db with SMTP id k26-20020a05600c1c9a00b0037bbbbdb8dbmr3584466wms.185.1645809418661; Fri, 25 Feb 2022 09:16:58 -0800 (PST) Received: from Keschdeichel.fritz.box (068-133-067-156.ip-addr.inexio.net. [156.67.133.68]) by smtp.gmail.com with ESMTPSA id bj8-20020a0560001e0800b001edbf1b462asm2745162wrb.77.2022.02.25.09.16.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 09:16:57 -0800 (PST) From: christian.ehrhardt@canonical.com To: Stephen Hemminger Cc: =?UTF-8?q?Morten=20Br=C3=B8rup?= , Ferruh Yigit , dpdk stable Subject: patch 'net/memif: remove unnecessary Rx interrupt stub' has been queued to stable release 19.11.12 Date: Fri, 25 Feb 2022 18:15:16 +0100 Message-Id: <20220225171550.3499040-23-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20220225171550.3499040-1-christian.ehrhardt@canonical.com> References: <20220225171550.3499040-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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.12 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/27/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/c39fd98e6fab1bb19bce9dedfaa177fd020b0c19 Thanks. Christian Ehrhardt --- >From c39fd98e6fab1bb19bce9dedfaa177fd020b0c19 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Fri, 14 Jan 2022 12:46:44 -0800 Subject: [PATCH] net/memif: remove unnecessary Rx interrupt stub MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit d6dccbd76692c64cff79a821bc73069dc5b043e4 ] The code in memif driver to stub out rx_irq_enable is unnecessary and causes different error returns than other drivers. The core ethdev code will return -ENOTSUP if the driver has a null rx_queue_intr_enable callback. Fixes: 09c7e63a71f9 ("net/memif: introduce memory interface PMD") Signed-off-by: Stephen Hemminger Acked-by: Morten Brørup Reviewed-by: Ferruh Yigit --- drivers/net/memif/rte_eth_memif.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/drivers/net/memif/rte_eth_memif.c b/drivers/net/memif/rte_eth_memif.c index 13758c6d9e..fddf84a8fd 100644 --- a/drivers/net/memif/rte_eth_memif.c +++ b/drivers/net/memif/rte_eth_memif.c @@ -1412,23 +1412,6 @@ memif_stats_reset(struct rte_eth_dev *dev) return 0; } -static int -memif_rx_queue_intr_enable(struct rte_eth_dev *dev __rte_unused, - uint16_t qid __rte_unused) -{ - MIF_LOG(WARNING, "Interrupt mode not supported."); - - return -1; -} - -static int -memif_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t qid __rte_unused) -{ - struct pmd_internals *pmd __rte_unused = dev->data->dev_private; - - return 0; -} - static const struct eth_dev_ops ops = { .dev_start = memif_dev_start, .dev_close = memif_dev_close, @@ -1438,8 +1421,6 @@ static const struct eth_dev_ops ops = { .rx_queue_setup = memif_rx_queue_setup, .rx_queue_release = memif_queue_release, .tx_queue_release = memif_queue_release, - .rx_queue_intr_enable = memif_rx_queue_intr_enable, - .rx_queue_intr_disable = memif_rx_queue_intr_disable, .link_update = memif_link_update, .stats_get = memif_stats_get, .stats_reset = memif_stats_reset, -- 2.35.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-25 16:58:45.172458366 +0100 +++ 0023-net-memif-remove-unnecessary-Rx-interrupt-stub.patch 2022-02-25 16:58:44.228990403 +0100 @@ -1 +1 @@ -From d6dccbd76692c64cff79a821bc73069dc5b043e4 Mon Sep 17 00:00:00 2001 +From c39fd98e6fab1bb19bce9dedfaa177fd020b0c19 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit d6dccbd76692c64cff79a821bc73069dc5b043e4 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index 59cb5a82a2..d3459c5007 100644 +index 13758c6d9e..fddf84a8fd 100644 @@ -28 +29 @@ -@@ -1500,23 +1500,6 @@ memif_stats_reset(struct rte_eth_dev *dev) +@@ -1412,23 +1412,6 @@ memif_stats_reset(struct rte_eth_dev *dev) @@ -51,2 +52,2 @@ - .dev_stop = memif_dev_stop, -@@ -1527,8 +1510,6 @@ static const struct eth_dev_ops ops = { + .dev_close = memif_dev_close, +@@ -1438,8 +1421,6 @@ static const struct eth_dev_ops ops = { @@ -54,2 +55,2 @@ - .rx_queue_release = memif_rx_queue_release, - .tx_queue_release = memif_tx_queue_release, + .rx_queue_release = memif_queue_release, + .tx_queue_release = memif_queue_release,