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 8DDA4A04DB for ; Tue, 17 Nov 2020 12:15:22 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 86FC14C90; Tue, 17 Nov 2020 12:15:21 +0100 (CET) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by dpdk.org (Postfix) with ESMTP id 45FD44C90 for ; Tue, 17 Nov 2020 12:15:19 +0100 (CET) Received: by mail-wm1-f44.google.com with SMTP id s13so2847508wmh.4 for ; Tue, 17 Nov 2020 03:15:19 -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=Af+nTkeQBB5nUai1H1UPhD28I9Byb8KY4RjvlWV2rqQ=; b=oTmxGciWFm7D9el/PglWNUFd9diQzltmm5I+1w0tB9cnM6kV+N58kyi3AooHyfwBeY gJKcbHHkHrJoi9fjFesKxGx1Unz3SsneUSTJ6Lf0D2GhdEEUsGcUw3rQCbKk+uyS+0Rd SS13KefGi6sYg+O0kYAneM2RsNdsvYFdo6AAloddcONrAVzZOXl4W0+QoYKNsUTBKv3H U4L8Y8hDPKfmnn3JUSoM4QvX1yB2VINlG9ztXjm4InzA75gBwQfdMb1CzpoF29vc05JR adFCHiKnVCyDL8/51h09wtM2W2dCutjxlY3vHB9HTvrl3KHxpLrZicP57oFqY9ywSQ+C +frQ== 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=Af+nTkeQBB5nUai1H1UPhD28I9Byb8KY4RjvlWV2rqQ=; b=bsbwz7E+ip/h9qdji/JkYEwRrIyRiJPn2tmY0j8nIuu1tU1HGkkoT6evmMoCGzD5QZ s4F8imh7SrCx3S707l7T7RuruM/4iBoy2yQieC6/fpC6uiJaGQg/JrDktyc0grv6Udco d3uJd0tlx+xOtraIOhwRNiwIRPw3gyoC0PG9PrnMh5v2D6KbfzjotVCzbnRLF3ktgrq2 /2y/+3UOb7/gLB1t9/zEm+wZi46xxZYkYKOa0sNXzH5WSbYRhMMtN4CggJBPjwWEYQN0 OlxenvTJnFFF4clajzFDrZqiACmy0REt7QhAXY5gYNx4gggGHOFO83wOzy7BOp0M6GUG 6MzA== X-Gm-Message-State: AOAM532YfiiS7dbfweQzy+DdSO/irPztHMKCFGvXDpWBNvo8bx9p6d9+ J2/iL7joAIlP88cA1ejdg7Q= X-Google-Smtp-Source: ABdhPJxWNmYIN+XFgucoe7UvCeF7cZPZS3sWOcUF0UeEQM8FC6gZtwVHDjQAFvXQk32ZuJmry/X+sg== X-Received: by 2002:a1c:964d:: with SMTP id y74mr3657785wmd.129.1605611718047; Tue, 17 Nov 2020 03:15:18 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id x2sm21429574wru.44.2020.11.17.03.15.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2020 03:15:17 -0800 (PST) From: luca.boccassi@gmail.com To: Lijun Ou Cc: dpdk stable Date: Tue, 17 Nov 2020 11:13:53 +0000 Message-Id: <20201117111416.1961049-19-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201117111416.1961049-1-luca.boccassi@gmail.com> References: <20201109185030.3478760-2-luca.boccassi@gmail.com> <20201117111416.1961049-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/hns3: check PCI config space write' 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/19/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/99ce983148f897470afccb3bed09b0b2e036b9f3 Thanks. Luca Boccassi --- >From 99ce983148f897470afccb3bed09b0b2e036b9f3 Mon Sep 17 00:00:00 2001 From: Lijun Ou Date: Mon, 9 Nov 2020 22:29:00 +0800 Subject: [PATCH] net/hns3: check PCI config space write [ upstream commit 6dd32ded17d85eec8c15f4635b668528520256c4 ] Here adds a check for the return value when calling rte_pci_write_config. Coverity issue: 363714 Fixes: cea37e513329 ("net/hns3: fix FLR reset") Signed-off-by: Lijun Ou --- drivers/net/hns3/hns3_ethdev_vf.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c index b61616090b..4359b2efdb 100644 --- a/drivers/net/hns3/hns3_ethdev_vf.c +++ b/drivers/net/hns3/hns3_ethdev_vf.c @@ -167,8 +167,12 @@ hns3vf_enable_msix(const struct rte_pci_device *device, bool op) control |= PCI_MSIX_FLAGS_ENABLE; else control &= ~PCI_MSIX_FLAGS_ENABLE; - rte_pci_write_config(device, &control, sizeof(control), - (pos + PCI_MSIX_FLAGS)); + ret = rte_pci_write_config(device, &control, sizeof(control), + (pos + PCI_MSIX_FLAGS)); + if (ret < 0) { + PMD_INIT_LOG(ERR, "failed to write PCI offset 0x%x", + (pos + PCI_MSIX_FLAGS)); + } return 0; } return -1; -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-17 11:13:13.777693290 +0000 +++ 0019-net-hns3-check-PCI-config-space-write.patch 2020-11-17 11:13:12.901116206 +0000 @@ -1 +1 @@ -From 6dd32ded17d85eec8c15f4635b668528520256c4 Mon Sep 17 00:00:00 2001 +From 99ce983148f897470afccb3bed09b0b2e036b9f3 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6dd32ded17d85eec8c15f4635b668528520256c4 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 6f71cd6606..1535f26713 100644 +index b61616090b..4359b2efdb 100644 @@ -22 +23 @@ -@@ -148,8 +148,12 @@ hns3vf_enable_msix(const struct rte_pci_device *device, bool op) +@@ -167,8 +167,12 @@ hns3vf_enable_msix(const struct rte_pci_device *device, bool op) @@ -36 +37 @@ - return -ENXIO; + return -1;