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 53A6DA2E1B for ; Thu, 5 Sep 2019 12:18:38 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4BF001E9D9; Thu, 5 Sep 2019 12:18:38 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id D413A1EF7B for ; Thu, 5 Sep 2019 12:18:36 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4E71118C4264; Thu, 5 Sep 2019 10:18:36 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-52.ams2.redhat.com [10.36.117.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id 71CF119C77; Thu, 5 Sep 2019 10:18:35 +0000 (UTC) From: Kevin Traynor To: Ferruh Yigit Cc: dpdk stable Date: Thu, 5 Sep 2019 11:17:16 +0100 Message-Id: <20190905101754.21933-16-ktraynor@redhat.com> In-Reply-To: <20190905101754.21933-1-ktraynor@redhat.com> References: <20190905101754.21933-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.62]); Thu, 05 Sep 2019 10:18:36 +0000 (UTC) Subject: [dpdk-stable] patch 'igb_uio: fix build on Linux 5.3 for fall through' has been queued to LTS release 18.11.3 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 LTS release 18.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 09/12/19. 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/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/b081b185c07da807661d62c1b20653012b8d7e3c Thanks. Kevin Traynor --- >From b081b185c07da807661d62c1b20653012b8d7e3c Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Mon, 29 Jul 2019 13:32:16 +0100 Subject: [PATCH] igb_uio: fix build on Linux 5.3 for fall through MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit c96bbbd010f7abb88c2ca2ed9dfc5ecd37e9027d ] build error: kernel/linux/igb_uio/igb_uio.c: In function ‘igbuio_pci_enable_interrupts’: kernel/linux/igb_uio/igb_uio.c:230:6: error: this statement may fall through [-Werror=implicit-fallthrough=] 230 | if (pci_alloc_irq_vectors(udev->pdev, 1, 1, .... kernel/linux/igb_uio/igb_uio.c:240:2: note: here 240 | case RTE_INTR_MODE_MSI: | ^~~~ The build error is caused by Linux kernel commit in 5.3 that enables the "-Wimplicit-fallthrough=3" gcc flag. Commit a035d552a93b ("Makefile: Globally enable fall-through warning") To fix the error, either a gcc attribute can be provided [1] or a code comment with some defined syntax need to be provided [2], since there is already comments, updated them slightly to match the required syntax to fix the build error. [1] "__attribute__ ((fallthrough));" [2] [ \t.!]*([Ee]lse,? |[Ii]ntentional(ly)? )? fall(s | |-)?thr(ough|u)[ \t.!]*(-[^\n\r]*)? Signed-off-by: Ferruh Yigit --- kernel/linux/igb_uio/igb_uio.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/linux/igb_uio/igb_uio.c b/kernel/linux/igb_uio/igb_uio.c index 3cf394bdf..039f5a5f6 100644 --- a/kernel/linux/igb_uio/igb_uio.c +++ b/kernel/linux/igb_uio/igb_uio.c @@ -237,5 +237,5 @@ igbuio_pci_enable_interrupts(struct rte_uio_pci_dev *udev) #endif - /* fall back to MSI */ + /* falls through - to MSI */ case RTE_INTR_MODE_MSI: #ifndef HAVE_ALLOC_IRQ_VECTORS @@ -256,5 +256,5 @@ igbuio_pci_enable_interrupts(struct rte_uio_pci_dev *udev) } #endif - /* fall back to INTX */ + /* falls through - to INTX */ case RTE_INTR_MODE_LEGACY: if (pci_intx_mask_supported(udev->pdev)) { @@ -266,5 +266,5 @@ igbuio_pci_enable_interrupts(struct rte_uio_pci_dev *udev) } dev_notice(&udev->pdev->dev, "PCI INTX mask not supported\n"); - /* fall back to no IRQ */ + /* falls through - to no IRQ */ case RTE_INTR_MODE_NONE: udev->mode = RTE_INTR_MODE_NONE; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-09-05 10:36:48.489815891 +0100 +++ 0016-igb_uio-fix-build-on-Linux-5.3-for-fall-through.patch 2019-09-05 10:36:47.493700929 +0100 @@ -1 +1 @@ -From c96bbbd010f7abb88c2ca2ed9dfc5ecd37e9027d Mon Sep 17 00:00:00 2001 +From b081b185c07da807661d62c1b20653012b8d7e3c Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit c96bbbd010f7abb88c2ca2ed9dfc5ecd37e9027d ] + @@ -35,2 +36,0 @@ - -Cc: stable@dpdk.org