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 77684A0C41 for ; Tue, 30 Nov 2021 17:37:39 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6B10F411A7; Tue, 30 Nov 2021 17:37:39 +0100 (CET) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 71C93410F7 for ; Tue, 30 Nov 2021 17:37:38 +0100 (CET) Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (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-1.canonical.com (Postfix) with ESMTPS id 4E85740009 for ; Tue, 30 Nov 2021 16:37:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290258; bh=rYvIRZpQ9HCo8ldfClUk0WxNpTOMiX/uYQQIIbktyNA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Y+tDiWH5X+p1IL6zFxvOYNmWIMgcjBOJMLgwiYQd7hpeYGcG/KGoIqQkQEsZeSt8h 6+h9DCgA5B/mRdhp5RgdIncLPJ4PlzqdeQGT6DLjOcR7+7yOXYWEmOympNIxBGjvQM UWidV9Czictb+ghFMEZlTOaoxbepvhPz6W4hYQDyAiHn+3O19wrISDgJYj4Sev2dol DU4DViFhLs6rcPNDqthAXO5X3CeNJvSeJwQFpFs3rEUF5hTmQ4x6HzZV/gLRkPeejm OizuQKG3fydPVPujaS53F3bUSTCeG25qQKo6usoAv5sSKUWt8fu5ThyFY8w6z1CBy6 wMGkTk6pOzowQ== Received: by mail-ed1-f70.google.com with SMTP id s12-20020a50ab0c000000b003efdf5a226fso11295677edc.10 for ; Tue, 30 Nov 2021 08:37:38 -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=rYvIRZpQ9HCo8ldfClUk0WxNpTOMiX/uYQQIIbktyNA=; b=kJWvxw6JI7y0OZViDYUGNlbVwe3rNQwpaUA+8tUNOMKFOCzz/1AGvL1Heas7ONX+9g Xz2fAHxDqDYq7bXCjel0ptw+eD6C6l1ta3JlaiXcr4/JASqgWOrbbKBV6T7wC6Oa0K8m JHT4GxjoQjs5DWznWRG2dNlYnrJ7zFHzkueNHW7hG0esnXrrDAwOS0kMe4W7fO5UIcAt N+q1e3EXsXH4PBC62IUxT66kI+9bNuQmg24cqyNmbTgLqOBL/7WYvGWPyQlExNy6K0Fx LDYNI5pN/D5WgpB6+O0sZD8UM5+g4qTXW8Ww5LByRHQ+Y7lln0OP5IfPshB9EBUzVg/X w/BA== X-Gm-Message-State: AOAM532hozGPK2tOlOuIvy8/tpcXBD7x8/mvBuGtKWYNOMYw61RjHYAm tNAClLRis7zQjGtgPSUZle8JE1sFMkF4SC9jiCbk5dqumcDGtxFK2X5PNd+Rmxvl6L89wZBDqAu XcE7l1s1+/AW1lzNDMPDqb8OQ X-Received: by 2002:a17:906:1613:: with SMTP id m19mr257909ejd.136.1638290256544; Tue, 30 Nov 2021 08:37:36 -0800 (PST) X-Google-Smtp-Source: ABdhPJwE53uOeiJJHVa7ocIm0dz90906sOtHO53/fHFdXXzM73LfhcK34+8Ebi9SlUdtm4k0HV3BVA== X-Received: by 2002:a17:906:1613:: with SMTP id m19mr257884ejd.136.1638290256354; Tue, 30 Nov 2021 08:37:36 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id sd28sm10442587ejc.37.2021.11.30.08.37.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:37:35 -0800 (PST) From: christian.ehrhardt@canonical.com To: David Marchand Cc: Maxime Coquelin , dpdk stable Subject: patch 'net/virtio: avoid unneeded link interrupt configuration' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:33:52 +0100 Message-Id: <20211130163605.2460997-28-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/d7a91388de0c5282bb4134d592491b148948a211 Thanks. Christian Ehrhardt --- >From d7a91388de0c5282bb4134d592491b148948a211 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Tue, 31 Aug 2021 17:54:10 +0200 Subject: [PATCH] net/virtio: avoid unneeded link interrupt configuration [ upstream commit 5be2325ecec83ab9dd5e25dde6112aed56f3e4f6 ] There is no reason to re-register a interrupt handler for LSC if this feature was not requested in the first place. A simple use case is when asking for Rx interrupts without LSC interrupt. Fixes: 26b683b4f7d0 ("net/virtio: setup Rx queue interrupts") Signed-off-by: David Marchand Reviewed-by: Maxime Coquelin --- drivers/net/virtio/virtio_ethdev.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index 0eca488c40..4e615d2b4b 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -1643,13 +1643,15 @@ virtio_configure_intr(struct rte_eth_dev *dev) } } - /* Re-register callback to update max_intr */ - rte_intr_callback_unregister(dev->intr_handle, - virtio_interrupt_handler, - dev); - rte_intr_callback_register(dev->intr_handle, - virtio_interrupt_handler, - dev); + if (dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC) { + /* Re-register callback to update max_intr */ + rte_intr_callback_unregister(dev->intr_handle, + virtio_interrupt_handler, + dev); + rte_intr_callback_register(dev->intr_handle, + virtio_interrupt_handler, + dev); + } /* DO NOT try to remove this! This function will enable msix, or QEMU * will encounter SIGSEGV when DRIVER_OK is sent. -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:07.724067766 +0100 +++ 0028-net-virtio-avoid-unneeded-link-interrupt-configurati.patch 2021-11-30 16:50:05.614872238 +0100 @@ -1 +1 @@ -From 5be2325ecec83ab9dd5e25dde6112aed56f3e4f6 Mon Sep 17 00:00:00 2001 +From d7a91388de0c5282bb4134d592491b148948a211 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5be2325ecec83ab9dd5e25dde6112aed56f3e4f6 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 9690eb4fb2..061d02f666 100644 +index 0eca488c40..4e615d2b4b 100644 @@ -23 +24 @@ -@@ -1685,13 +1685,15 @@ virtio_configure_intr(struct rte_eth_dev *dev) +@@ -1643,13 +1643,15 @@ virtio_configure_intr(struct rte_eth_dev *dev)