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 E980FA0032 for ; Fri, 18 Feb 2022 13:42:33 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E4FF240395; Fri, 18 Feb 2022 13:42:33 +0100 (CET) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mails.dpdk.org (Postfix) with ESMTP id 5790840E2D for ; Fri, 18 Feb 2022 13:42:33 +0100 (CET) Received: by mail-wr1-f51.google.com with SMTP id d27so14404693wrb.5 for ; Fri, 18 Feb 2022 04:42:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YDqz6D/nsUyao4V4J/r7l6AFrQ84oJFNsj6TgpiMGxM=; b=WUqONECVZrfSkyvUZgXN43M6C2RvHbALBLD5S3H5wsxvy0twwzp1jN6/uMFWDHzmk2 Bn6jAQkwoWsa+LNJj5Jl6TMuCdd7P+LTDUmfDsArdtrSpzRQPG5CJcNM1ZNMinFZEpKu +GUj58ErRAzGiOa4TT/4tZMTuhEqPYTFCS48D2rrDBBeYxUlFQmNkW9agM/4yOCuHjFM U56ktqSkUNTzugmV2cb1W3e19E+YwK6CHQaycdUqhQJSLzUrDmZ88BtSmxKwvWfZGgBO n3mXC3IeTJa1sfvOFx++/5C/YCedwoEj+g4udCZPUSRSLn5KTYZH3Mv+U8TCi/eP/jI2 wzYg== 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=YDqz6D/nsUyao4V4J/r7l6AFrQ84oJFNsj6TgpiMGxM=; b=zZtQtzl3kbD6JgquxFs+qbw09dCM9/X32cs/K33USbNle7PnAoyrpPKgUnMo4v0X+4 /r15hHb/GWVILK19KoRQp/d7Mjwb5TtzWlDM0rPvP7iKzXqZzlIcPdODdO2ysDS5qz8y EW/Gv3z6Rzzsw5utXdOrMhUADHvB8zi95FqV6BmN4G6nA5xm7WZ73RRcDbdJ6bebaoKP SwQeMgtjsVoa3Qs/xTqAgCoUFKaNkNWKw6rxXzFZapIUEHDQ00H3aNMaHZiTTf8IvVRi gYXJ6Q5pQwc10xe7tWSt/TG2SPpAqYabmKsKOcyINdng3PYQ+CRzDJ4A6XDm0SWCm/nB KzYg== X-Gm-Message-State: AOAM533w8+s2nQSj4a2w/9aoBwD3URIIHJQblKgJbv918mu+6mVKtg0L hD2yBlSRoVz6P1ivkkTLVRE= X-Google-Smtp-Source: ABdhPJwwLvBbbYj7SGNs34hvVowlNUiT+yi48gkJ6zPf9wIgWklhTNbqohJCN4eToHuqewuSChxAdA== X-Received: by 2002:a5d:6a09:0:b0:1e3:3f5e:e8d with SMTP id m9-20020a5d6a09000000b001e33f5e0e8dmr5924551wru.670.1645188153066; Fri, 18 Feb 2022 04:42:33 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id o125sm4646068wme.37.2022.02.18.04.42.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 04:42:32 -0800 (PST) From: luca.boccassi@gmail.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 20.11.5 Date: Fri, 18 Feb 2022 12:38:26 +0000 Message-Id: <20220218123931.1749595-57-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220218123931.1749595-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-1-luca.boccassi@gmail.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 20.11.5 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/20/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/1ed391676f5980415daecc2c152f74daafe6b8eb Thanks. Luca Boccassi --- >From 1ed391676f5980415daecc2c152f74daafe6b8eb 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 c81c6d6818..3dc357aef3 100644 --- a/drivers/net/memif/rte_eth_memif.c +++ b/drivers/net/memif/rte_eth_memif.c @@ -1449,23 +1449,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_stop = memif_dev_stop, @@ -1476,8 +1459,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.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-18 12:37:40.210005249 +0000 +++ 0057-net-memif-remove-unnecessary-Rx-interrupt-stub.patch 2022-02-18 12:37:37.690791920 +0000 @@ -1 +1 @@ -From d6dccbd76692c64cff79a821bc73069dc5b043e4 Mon Sep 17 00:00:00 2001 +From 1ed391676f5980415daecc2c152f74daafe6b8eb 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 c81c6d6818..3dc357aef3 100644 @@ -28 +29 @@ -@@ -1500,23 +1500,6 @@ memif_stats_reset(struct rte_eth_dev *dev) +@@ -1449,23 +1449,6 @@ memif_stats_reset(struct rte_eth_dev *dev) @@ -52 +53 @@ -@@ -1527,8 +1510,6 @@ static const struct eth_dev_ops ops = { +@@ -1476,8 +1459,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,