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 BBB86A0527 for ; Mon, 9 Nov 2020 19:44:58 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AE81E6883; Mon, 9 Nov 2020 19:44:57 +0100 (CET) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id AD75B9AEB for ; Mon, 9 Nov 2020 19:44:55 +0100 (CET) Received: by mail-wr1-f68.google.com with SMTP id r17so5964780wrw.1 for ; Mon, 09 Nov 2020 10:44:55 -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=JduK4VL1Stg0uxGv4Q//wqgT5AJFunnx2VePqFgthPE=; b=VEkwfkl4Or20GmtUzROoyZa6qZAgZr8A2W5/GJV2frQllJA49hlMjRYAaSyOkCvk17 //LGrnivm7votKzhl+FAieYavHZy4YU1l7E3MKn6f/zYdcdTTqRDe5gV6nIbCGmFiwxO 6log7oJv7kAkLL9LpN9ywUJz+WhWYcSRQJfjzI0mk69JYomj2nM7Y0QKQN6U6Qdy25RX Vgd29mVilhZJ7Hn5CSTx8VP4b89RinhHiq+ORxd3rLO5ZDsLZuZmaazCQ3qv7HdFTUCF pn9PuzJX1Trol6flVuRQpWgbf6u99lQXwH31/5HHDJkuLK06jPhghuzCa7yTW5qDI23t TbXA== 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=JduK4VL1Stg0uxGv4Q//wqgT5AJFunnx2VePqFgthPE=; b=GTMqpo9m1S+EpWu2zUFHm8CV2xRUad0+pCYlMhsNnNvg78iMB6lHEHNnAmUL2pKhK1 QLF3x560Jsv6IgVLf7ql07b6tNIq8xGNFd2ubc59GHMg9FqiazQwE5jyV1rmRsChX0Oj gvY6zUijLAT7JZDG23abWfQBLROJXm1nD69U/QJWN0oiy7J292ydrR4AH34oqjaWj+JZ v48T4CJZF2k7zaZjWUDDLqFzcEnK71mX6Si61aFayXNlvxwK45nUR8J7WhkXvQv/yulu 351ggC+XfjJPH3C3XBKh69y8M7ddami331TUl8FKADK8SA7/FRZRkJSVaSXrvwIPdRuN yCvg== X-Gm-Message-State: AOAM531MVFzjJ6mQ0s9GowMP/FTlyvXXmz8Z8CzMCRBdu4pZIofmwl25 ESrgIzg2kXubZlzx65VAxbk= X-Google-Smtp-Source: ABdhPJz/p+o7SmCrkuL1WI3ejkUwYBg04bOj2aZpxWKIR8j+K19Uhk3UihgjWiVTxuaNgnVe8/nVxA== X-Received: by 2002:a5d:51c1:: with SMTP id n1mr13841341wrv.395.1604947495423; Mon, 09 Nov 2020 10:44:55 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id b14sm14074243wrx.35.2020.11.09.10.44.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 10:44:54 -0800 (PST) From: luca.boccassi@gmail.com To: Hongbo Zheng Cc: Lijun Ou , dpdk stable Date: Mon, 9 Nov 2020 18:40:53 +0000 Message-Id: <20201109184111.3463090-65-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201109184111.3463090-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-207-luca.boccassi@gmail.com> <20201109184111.3463090-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/hns3: check setting VF PCI bus return value' 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/11/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/8ce5fa4a5a81afc4af01a7b7c0aafae9fbe7d554 Thanks. Luca Boccassi --- >From 8ce5fa4a5a81afc4af01a7b7c0aafae9fbe7d554 Mon Sep 17 00:00:00 2001 From: Hongbo Zheng Date: Thu, 29 Oct 2020 20:51:56 +0800 Subject: [PATCH] net/hns3: check setting VF PCI bus return value [ upstream commit 7ac3ae7649985c54a10f6904c298918e00a07e92 ] Currently hns3vf_reinit_dev only judge whether the return value of setting PCI bus function is not 0, while it will return a negative value when execute failed. Fixes: 243651cb6c8c ("net/hns3: check PCI config space reads") Signed-off-by: Hongbo Zheng Signed-off-by: Lijun Ou --- drivers/net/hns3/hns3_ethdev_vf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c index 5d1da44155..b61616090b 100644 --- a/drivers/net/hns3/hns3_ethdev_vf.c +++ b/drivers/net/hns3/hns3_ethdev_vf.c @@ -2147,7 +2147,7 @@ hns3vf_reinit_dev(struct hns3_adapter *hns) if (hw->reset.level == HNS3_VF_FULL_RESET) { rte_intr_disable(&pci_dev->intr_handle); ret = hns3vf_set_bus_master(pci_dev, true); - if (ret) { + if (ret < 0) { hns3_err(hw, "failed to set pci bus, ret = %d", ret); return ret; } -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-09 18:40:13.635309865 +0000 +++ 0065-net-hns3-check-setting-VF-PCI-bus-return-value.patch 2020-11-09 18:40:11.203312403 +0000 @@ -1 +1 @@ -From 7ac3ae7649985c54a10f6904c298918e00a07e92 Mon Sep 17 00:00:00 2001 +From 8ce5fa4a5a81afc4af01a7b7c0aafae9fbe7d554 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7ac3ae7649985c54a10f6904c298918e00a07e92 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 9fb7941eb3..05a9341269 100644 +index 5d1da44155..b61616090b 100644 @@ -23 +24 @@ -@@ -2619,7 +2619,7 @@ hns3vf_reinit_dev(struct hns3_adapter *hns) +@@ -2147,7 +2147,7 @@ hns3vf_reinit_dev(struct hns3_adapter *hns)