From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 19A3EC28CC2 for ; Thu, 30 May 2019 04:38:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DE6CF2590B for ; Thu, 30 May 2019 04:38:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559191136; bh=wCSwVXjdOLI6nyJgiCgO9fwcnCb+fHP6vdUDUQCEPHI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=bDukSBPE6aT81e/yqP3KyC40jOGOvSGQyJ9qkEUmcw+SMEOsQXIKS2Hi9TYf0J9Nj X6EOmP5mYHK4c/s/aF7j9wOvVZey2IlGHWQNKHRTlh8AArobFxD1i5sLwq3IqnIb61 t+RGtxOpilxPutfvGNYbwBAAEx8Hk02bQjhSfS88= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729175AbfE3DMm (ORCPT ); Wed, 29 May 2019 23:12:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:50026 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728380AbfE3DLI (ORCPT ); Wed, 29 May 2019 23:11:08 -0400 Received: from localhost (ip67-88-213-2.z213-88-67.customer.algx.net [67.88.213.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2DF5D24482; Thu, 30 May 2019 03:11:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559185868; bh=wCSwVXjdOLI6nyJgiCgO9fwcnCb+fHP6vdUDUQCEPHI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NlYZokVqtRenJ98UH3M/QtF2SytrubIPU6bKlFLE3JNFWpq7Tl6nlfDS/BD5QEP/0 5PIp6G9tojfNWY9CiiOAZjRv048QGrkQnixM8srKzAngayDPwr4P601T8SBacBwbFm qbyRCaqciNkQqcfRd41qdcarc9kxbYTuraBRY5TE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Peng Li , Huazhong Tan , "David S. Miller" , Sasha Levin Subject: [PATCH 5.1 208/405] net: hns3: free the pending skb when clean RX ring Date: Wed, 29 May 2019 20:03:26 -0700 Message-Id: <20190530030551.653211198@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190530030540.291644921@linuxfoundation.org> References: <20190530030540.291644921@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit cc5ff6e90f808f9a4c8229bf2f1de0dfe5d7931c ] If there is pending skb in RX flow when close the port, and the pending buffer is not cleaned, the new packet will be added to the pending skb when the port opens again, and the first new packet has error data. This patch cleans the pending skb when clean RX ring. Signed-off-by: Peng Li Signed-off-by: Huazhong Tan Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c index 0208efe282775..d6b488c2de332 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c @@ -3851,6 +3851,13 @@ static int hns3_clear_rx_ring(struct hns3_enet_ring *ring) ring_ptr_move_fw(ring, next_to_use); } + /* Free the pending skb in rx ring */ + if (ring->skb) { + dev_kfree_skb_any(ring->skb); + ring->skb = NULL; + ring->pending_buf = 0; + } + return 0; } -- 2.20.1