Received: by 2002:a25:c593:0:0:0:0:0 with SMTP id v141csp891902ybe; Wed, 4 Sep 2019 09:14:52 -0700 (PDT) X-Google-Smtp-Source: APXvYqwRkDn+JH351kUJgAEcYDtU/4x5wD4X7URyrdF9k3LxZFink6DYRvte+a1epuAGnCP98Uq+ X-Received: by 2002:a17:90a:e654:: with SMTP id ep20mr5762694pjb.65.1567613692165; Wed, 04 Sep 2019 09:14:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567613692; cv=none; d=google.com; s=arc-20160816; b=MWbd3pG3AWr4AlSUz+PsUxnJVXcYSz5Zs2qk6FMa+h/+STZMwUFLzXHUYdVMWS6MC0 u0zUUNCMUqBkqxv3Zi5MQtWb6sjz7w9ngB/kPY+oOLFeYRTmpzuUICj/uxz74CnAb2ti hZm7telLszanOoSWImK7qQGLr0O0B0LDMuvLYWABYyWc5o7WumfjN6g317x1S37KZ+bX U4NpOwFsa1tE7vGZoYT4acFkFfApUehj2ZmApt3hNwahQEmEYEfzV80yzo88mBg6fyEo tr0Q4K6znzHWJcVWk3OvD6HB2gpYqL+r5548nPeFRVVhL1EX942aZFTFZPwbXDq7tSYX CEgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ar1T4gzRJeBj1mim11iu9GEMFkEMsoI6IGPNp0QUcWs=; b=e+8A6/VYjgQMnWWWyzJ0Z0qYTuQVjpLA1BW5wS3VH7twI21kY3WZGmuEpz/bYrcKrx x+NTRjKzfjmudP7JVKrf1cjA5fs0flYR5yfYHiXLTC4VvOxPWzeubsnJNySTlGDtqmRp FPRN0NUjKyyxqIfTspZuaMQryAH3PIVC1Qq8H+Rm9q1qkwbK6KtCB94MFHZHQjSb+Dnx KC7nSDWRvBntSt7+KnL6ZlanoC4DqowEaf2TxbNYygkSbCeiwx04j+uVf36zUS+fPBCt 94xwJkvtw9EF1eI11Vk8BnuiVfg2HG7+lbRxFPLlr8/onWkNFzLGrcTREm+cDFzJzKFC /FSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Q8kONzCM; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j4si18728986pff.230.2019.09.04.09.14.36; Wed, 04 Sep 2019 09:14:52 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Q8kONzCM; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733094AbfIDQNT (ORCPT + 99 others); Wed, 4 Sep 2019 12:13:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:34584 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732510AbfIDP76 (ORCPT ); Wed, 4 Sep 2019 11:59:58 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9C39022CF5; Wed, 4 Sep 2019 15:59:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567612797; bh=HaJIQUt1q4yjUOn3fBZcxEDzdsuOckbpaxjgOjv2+7k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q8kONzCME8QJ/BftDjC9U9EP6cC0lTn+J+i5Ise8gr8W5/W+V4B2did/OSPPUojIP PBFPpr8SCvCUoWnss7V9GQe9ET1iREeH+JN5bicO6Y155t0pDRT9vYhNvX5jr1u0vH zkQfAoKFYbdVqz9+56Za6icOp7TGFMtLSKhTgFWE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dmitry Bogdanov , Igor Russkikh , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.2 91/94] net: aquantia: fix out of memory condition on rx side Date: Wed, 4 Sep 2019 11:57:36 -0400 Message-Id: <20190904155739.2816-91-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904155739.2816-1-sashal@kernel.org> References: <20190904155739.2816-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dmitry Bogdanov [ Upstream commit be6cef69ba570ebb327eba1ef6438f7af49aaf86 ] On embedded environments with hard memory limits it is a normal although rare case when skb can't be allocated on rx part under high traffic. In such OOM cases napi_complete_done() was not called. So the napi object became in an invalid state like it is "scheduled". Kernel do not re-schedules the poll of that napi object. Consequently, kernel can not remove that object the system hangs on `ifconfig down` waiting for a poll. We are fixing this by gracefully closing napi poll routine with correct invocation of napi_complete_done. This was reproduced with artificially failing the allocation of skb to simulate an "out of memory" error case and check that traffic does not get stuck. Fixes: 970a2e9864b0 ("net: ethernet: aquantia: Vector operations") Signed-off-by: Igor Russkikh Signed-off-by: Dmitry Bogdanov Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/aquantia/atlantic/aq_vec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_vec.c b/drivers/net/ethernet/aquantia/atlantic/aq_vec.c index 715685aa48c39..28892b8acd0e1 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_vec.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_vec.c @@ -86,6 +86,7 @@ static int aq_vec_poll(struct napi_struct *napi, int budget) } } +err_exit: if (!was_tx_cleaned) work_done = budget; @@ -95,7 +96,7 @@ static int aq_vec_poll(struct napi_struct *napi, int budget) 1U << self->aq_ring_param.vec_idx); } } -err_exit: + return work_done; } -- 2.20.1