From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by dpdk.org (Postfix) with ESMTP id D53911B2D1 for ; Fri, 26 Jan 2018 14:16:28 +0100 (CET) Received: by mail-wm0-f66.google.com with SMTP id r71so1208710wmd.1 for ; Fri, 26 Jan 2018 05:16:28 -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; bh=8zDhOXsrSA40Dtc9rGPl5aEkYsbJl8A1LTZTnFAMcVc=; b=CK23dBBAbWckZpd9s13Kd/pKBwbL95GYq1PEbkQcVD0mrp8oAGC3cZsFKv86SEY/x5 ZwGjcrzUSSFfNxDg6zhvcL9q/otZIQ+I2wfcv3xRuVfTU4024pc11mlmRKkseek8YFr1 yKBjTInvo0iAU/zuFG3K5caY6SIZyw/PSSnLgAPef8axtCPwGXx7F93gXQrbQhj7yrYg KUVV27T+sKGolkniqTWVYAdoxJhPeuhitgc/ySYsV9xVqORr2TWa2e9jsuVgm9hmS68F 9BdHPgCuYpuhz2QDDLyWDYE2m0XA/xZnaodmirUdXC3VJ6Q9hg01GwzEfHZUxabtt3jK TOjw== 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; bh=8zDhOXsrSA40Dtc9rGPl5aEkYsbJl8A1LTZTnFAMcVc=; b=kq0ljslB9SkiHlxtDGSREmEosroTmKQ77O98GpzlSD/foXl1qg/TvMcfVmSmaMBrhr 4Aw04mxsJPWR/MgTAlYiM1dKAddFYiplJoaH700ctk28S46JdPZU+O9srOb+JJxDPhow nz6p0NvXE8YR4RyKi1beqIVzAwFY5HpA7051J52xh7gtuPpq2ryhWDHr78e/Wrp9KW+k hqG8Zm7i+FfrxK6E46l/zhfs6fhz4A/OV3qiMysMFS9KiqvlNl7F9TKxE6KyacC+9joH KXS/Hv4cOLHOruLLNPzFOW3eI6rOaupeguBZZZZydF8mnHLUL5m5FBEIrOnxBqyvQElJ fSjA== X-Gm-Message-State: AKwxyteyPrzwFWUj+ma2MmOV48T3oQVgpa8Zn7xxWLPP5EkbJur0ba5/ MHz8J0t5RytC4uUalS87OsQ= X-Google-Smtp-Source: AH8x226VP8VziVr67ErNlEQRdwpw8eycKWe0mrDF2sCPa2SteKP46MKfoxAaH/gwQFaQEnjJUgOGrw== X-Received: by 10.28.174.210 with SMTP id x201mr9749428wme.105.1516972588583; Fri, 26 Jan 2018 05:16:28 -0800 (PST) Received: from localhost ([2a00:23c5:bef3:400:9531:588b:44ae:bec4]) by smtp.gmail.com with ESMTPSA id j125sm4190693wmd.19.2018.01.26.05.16.27 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Jan 2018 05:16:28 -0800 (PST) From: luca.boccassi@gmail.com To: David Harton Cc: Harry van Haaren , Wei Zhao , dpdk stable Date: Fri, 26 Jan 2018 13:13:15 +0000 Message-Id: <20180126131332.15346-45-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180126131332.15346-1-luca.boccassi@gmail.com> References: <20180126131332.15346-1-luca.boccassi@gmail.com> Subject: [dpdk-stable] patch 'net/i40e: fix VF reset stats crash' has been queued to LTS release 16.11.5 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: , X-List-Received-Date: Fri, 26 Jan 2018 13:16:29 -0000 Hi, FYI, your patch has been queued to LTS release 16.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 01/28/18. So please shout if anyone has objections. Thanks. Luca Boccassi --- >>From 13167e5ad5ce79ff77cb944f63e02ddb3c6a1a5d Mon Sep 17 00:00:00 2001 From: David Harton Date: Thu, 11 Jan 2018 10:13:58 -0500 Subject: [PATCH] net/i40e: fix VF reset stats crash [ upstream commit cde1f0252811e81a3c485ca1932cc655736f1e49 ] Calling i40evf_dev_xstats_reset can sometimes crash. Fixed issue by checking return code before using pstats. Fixes: 8210e9e0d805 ("net/i40e: fix clear xstats bug in VF") Signed-off-by: David Harton Acked-by: Harry van Haaren Acked-by: Wei Zhao --- drivers/net/i40e/i40e_ethdev_vf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c index 1686914a1..1a082f1a2 100644 --- a/drivers/net/i40e/i40e_ethdev_vf.c +++ b/drivers/net/i40e/i40e_ethdev_vf.c @@ -1035,14 +1035,16 @@ i40evf_get_statics(struct rte_eth_dev *dev, struct rte_eth_stats *stats) static void i40evf_dev_xstats_reset(struct rte_eth_dev *dev) { + int ret; struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private); struct i40e_eth_stats *pstats = NULL; /* read stat values to clear hardware registers */ - i40evf_update_stats(dev, &pstats); + ret = i40evf_update_stats(dev, &pstats); /* set stats offset base on current values */ - vf->vsi.eth_stats_offset = *pstats; + if (ret == 0) + vf->vsi.eth_stats_offset = *pstats; } static int i40evf_dev_xstats_get_names(__rte_unused struct rte_eth_dev *dev, -- 2.14.2