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=-10.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 463FCC433DF for ; Thu, 30 Jul 2020 08:19:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 21DBC2075F for ; Thu, 30 Jul 2020 08:19:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596097178; bh=8OEVqAg2npBQtJltoNq0N3vs9+ceXdAM6Ofa1mRSckg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=BBq6FPXhnifEGOZ7E+bxjBDKlSFi7FOzY9HomPOYPn89Wnk/kiP3OGphatisz/9Yp nPzI3WQnsKg/EEbGPKMS0Rmrk5JICVLbuzN1SF8ZamA9GRKKdLacKx/QD2MRgEAgtn LASt8XhuWwEkhBjkh3HDCCWRncvSgIIiLS20Mgdc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729824AbgG3IT3 (ORCPT ); Thu, 30 Jul 2020 04:19:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:46032 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729520AbgG3IHy (ORCPT ); Thu, 30 Jul 2020 04:07:54 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 CE2352074B; Thu, 30 Jul 2020 08:07:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596096474; bh=8OEVqAg2npBQtJltoNq0N3vs9+ceXdAM6Ofa1mRSckg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uttkYVCeR5jWZEJgaxAwBTbo7g89s74CDS09sKnkMMYbeebpVqvtLcPBF/ajidXQH 96PlQTp0MYYzUC2luUbxwQXKaZA3NChoD7T3pAJnMWaIzG2rMALx1+jrMc3m+y5Qu2 5UdKDNdWMilW90sTJMlbaoiLlJekAGS83s8bzbls= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Subash Abhinov Kasiviswanathan , "David S. Miller" Subject: [PATCH 4.14 03/14] dev: Defer free of skbs in flush_backlog Date: Thu, 30 Jul 2020 10:04:46 +0200 Message-Id: <20200730074419.062729090@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200730074418.882736401@linuxfoundation.org> References: <20200730074418.882736401@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Subash Abhinov Kasiviswanathan [ Upstream commit 7df5cb75cfb8acf96c7f2342530eb41e0c11f4c3 ] IRQs are disabled when freeing skbs in input queue. Use the IRQ safe variant to free skbs here. Fixes: 145dd5f9c88f ("net: flush the softnet backlog in process context") Signed-off-by: Subash Abhinov Kasiviswanathan Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/core/dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/core/dev.c +++ b/net/core/dev.c @@ -4626,7 +4626,7 @@ static void flush_backlog(struct work_st skb_queue_walk_safe(&sd->input_pkt_queue, skb, tmp) { if (skb->dev->reg_state == NETREG_UNREGISTERING) { __skb_unlink(skb, &sd->input_pkt_queue); - kfree_skb(skb); + dev_kfree_skb_irq(skb); input_queue_head_incr(sd); } }