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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,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 708E1C43381 for ; Thu, 28 Feb 2019 17:15:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3E1C520857 for ; Thu, 28 Feb 2019 17:15:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551374108; bh=uL9YPdf1xRccz4bGe+o/hwx0QUTBjTL0NzHICcfSr5o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2rI5CC+UnpcM+ogvC3KuRfCxytrnImOxzpAcxsE7kZGFxyecbVqosMTd0zpE6V/Ru c1oPu0vfNx5YnIhzDZI1jjq3MlXNFVSHgQCBFoATnNvpn9LYUVHUACzyAOQT7zS9Iq v5hlNl6McQ31hWNvG90PbM5xbHkMh0NZqKgPnF4g= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388175AbfB1RPG (ORCPT ); Thu, 28 Feb 2019 12:15:06 -0500 Received: from mail.kernel.org ([198.145.29.99]:59946 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388135AbfB1RPC (ORCPT ); Thu, 28 Feb 2019 12:15:02 -0500 Received: from lerouge.home (lfbn-1-18527-45.w90-101.abo.wanadoo.fr [90.101.69.45]) (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 5682B218AE; Thu, 28 Feb 2019 17:14:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551374101; bh=uL9YPdf1xRccz4bGe+o/hwx0QUTBjTL0NzHICcfSr5o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NN4qV7yi8KePPAj7bnlD+Fc/ZPuErcUVfJqynC43mvp22V2ZTfQTyHYBYm198sLfo vgxbsmjOuEgZFW/13uCnSx/mRNaLqJ8taCGzIVOSb/0irDtNFKVDpr1N6Ug5JGETxG /WPXbTqIiUF8+RJYM5mba0U/CRw0hvxGzGGCszr8= From: Frederic Weisbecker To: LKML Cc: Frederic Weisbecker , Sebastian Andrzej Siewior , Peter Zijlstra , "David S . Miller" , Linus Torvalds , Mauro Carvalho Chehab , Thomas Gleixner , "Paul E . McKenney" , Frederic Weisbecker , Pavan Kondeti , Ingo Molnar , Joel Fernandes Subject: [PATCH 37/37] net: Make softirq vector masking finegrained on release_sock() Date: Thu, 28 Feb 2019 18:12:42 +0100 Message-Id: <20190228171242.32144-38-frederic@kernel.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190228171242.32144-1-frederic@kernel.org> References: <20190228171242.32144-1-frederic@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is a usage example of spin_lock_bh_mask(). NET_RX, TIMER and TASKLET are the three softirqs that have been reported by lockdep to be used for this socket lock, at least on my own usecases. Reviewed-by: David S. Miller Signed-off-by: Frederic Weisbecker Cc: Mauro Carvalho Chehab Cc: Joel Fernandes Cc: Thomas Gleixner Cc: Pavan Kondeti Cc: Paul E . McKenney Cc: David S . Miller Cc: Ingo Molnar Cc: Sebastian Andrzej Siewior Cc: Linus Torvalds Cc: Peter Zijlstra --- net/core/sock.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/net/core/sock.c b/net/core/sock.c index 6aa2e7e0b4fb..d6c7dca82ad9 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -2795,7 +2795,11 @@ EXPORT_SYMBOL(lock_sock_nested); void release_sock(struct sock *sk) { - spin_lock_bh(&sk->sk_lock.slock); + unsigned int bh; + + bh = spin_lock_bh_mask(&sk->sk_lock.slock, + BIT(NET_RX_SOFTIRQ) | BIT(TIMER_SOFTIRQ) | + BIT(HRTIMER_SOFTIRQ) | BIT(TASKLET_SOFTIRQ)); if (sk->sk_backlog.tail) __release_sock(sk); @@ -2808,7 +2812,7 @@ void release_sock(struct sock *sk) sock_release_ownership(sk); if (waitqueue_active(&sk->sk_lock.wq)) wake_up(&sk->sk_lock.wq); - spin_unlock_bh(&sk->sk_lock.slock); + spin_unlock_bh_mask(&sk->sk_lock.slock, bh); } EXPORT_SYMBOL(release_sock); -- 2.21.0