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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 19CB0FA372C for ; Fri, 8 Nov 2019 11:48:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DA055222C5 for ; Fri, 8 Nov 2019 11:48:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573213699; bh=ON1L6FHRZCSgyfc+YX7cNsYgDakQmYbouwjMn0KnQBE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=jNB5LK/wzdwGjp7ZvOjT3F9O0bOP9p9peMUicdKJmzQYzPuy859ZkT/L21+pc2th/ 2pqbcy3ohFE4Frba5qBGU1mszdRUCy9k8e6qGnCZikfyR6QnpdPvtG6G4fScn0HxDY A7qQmE2zlxIuFmrPs26cyWUH3c1LlwZDBIwWyh4I= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391661AbfKHLsP (ORCPT ); Fri, 8 Nov 2019 06:48:15 -0500 Received: from mail.kernel.org ([198.145.29.99]:37212 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390870AbfKHLsO (ORCPT ); Fri, 8 Nov 2019 06:48:14 -0500 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 F069321924; Fri, 8 Nov 2019 11:48:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573213693; bh=ON1L6FHRZCSgyfc+YX7cNsYgDakQmYbouwjMn0KnQBE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YSJRyYrvxoB0SuEZqD1v+hCgSBzjg08rHs4XZajrz2GOKseovxg6TCGjOJ7o99lNa Jq2bhtHI8lKy/Zz3sk1btfOBHB/0T3V3Vc4X6cA+6sUtuxkX2JAuIwECTx/O86rgGQ qFGcQARX49Iwd+5RxD/k/cFuMH3v+P2kOJz4JUfA= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Cong Wang , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 37/44] llc: avoid blocking in llc_sap_close() Date: Fri, 8 Nov 2019 06:47:13 -0500 Message-Id: <20191108114721.15944-37-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191108114721.15944-1-sashal@kernel.org> References: <20191108114721.15944-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Cong Wang [ Upstream commit 9708d2b5b7c648e8e0a40d11e8cea12f6277f33c ] llc_sap_close() is called by llc_sap_put() which could be called in BH context in llc_rcv(). We can't block in BH. There is no reason to block it here, kfree_rcu() should be sufficient. Signed-off-by: Cong Wang Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- include/net/llc.h | 1 + net/llc/llc_core.c | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/net/llc.h b/include/net/llc.h index 82d989995d18a..95e5ced4c1339 100644 --- a/include/net/llc.h +++ b/include/net/llc.h @@ -66,6 +66,7 @@ struct llc_sap { int sk_count; struct hlist_nulls_head sk_laddr_hash[LLC_SK_LADDR_HASH_ENTRIES]; struct hlist_head sk_dev_hash[LLC_SK_DEV_HASH_ENTRIES]; + struct rcu_head rcu; }; static inline diff --git a/net/llc/llc_core.c b/net/llc/llc_core.c index e896a2c53b120..f1e442a39db8d 100644 --- a/net/llc/llc_core.c +++ b/net/llc/llc_core.c @@ -127,9 +127,7 @@ void llc_sap_close(struct llc_sap *sap) list_del_rcu(&sap->node); spin_unlock_bh(&llc_sap_list_lock); - synchronize_rcu(); - - kfree(sap); + kfree_rcu(sap, rcu); } static struct packet_type llc_packet_type __read_mostly = { -- 2.20.1