From patchwork Fri Dec 22 19:47:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Herbert X-Patchwork-Id: 852550 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=quantonium-net.20150623.gappssmtp.com header.i=@quantonium-net.20150623.gappssmtp.com header.b="lXtNSOt6"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3z3JwC5xR9z9ryr for ; Sat, 23 Dec 2017 06:48:27 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756716AbdLVTsZ (ORCPT ); Fri, 22 Dec 2017 14:48:25 -0500 Received: from mail-pl0-f66.google.com ([209.85.160.66]:34677 "EHLO mail-pl0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756515AbdLVTsW (ORCPT ); Fri, 22 Dec 2017 14:48:22 -0500 Received: by mail-pl0-f66.google.com with SMTP id d21so13448848pll.1 for ; Fri, 22 Dec 2017 11:48:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quantonium-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=i6gpgGexekXDgCc9wKLelDFvDZ141OcpU0zEo9lO9Ek=; b=lXtNSOt64TAW32og6rYDzvL8zaBrt30E7rClMTnyFR1y0w7W0FqMyIjsqFCMYtDwR1 bj4plL6LBOiWnAPP0vWIPWwQVfY0gLoNpinaVfFeRbmFeZWs34rL3BCcYfLngM1tHLC9 VT60wCZsjv45joaqu0+yOs1kFPhwXPJelHHwFptKK9XkLyqZxqpHL2J3FtdEtHq49s0a 5jdVJYqfvpjEBnVaw3hoP2VGD2zKxGAZqhHw/WATfNpn9LkjMKrdNNu6cfbmlWaYDv7Y hdjJxysg2QaEXR60jFXQdzLMXNgfSX3qExZRySOQsrxmpvN03ODFl0GU4hzDzpLSyPs3 Qbfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=i6gpgGexekXDgCc9wKLelDFvDZ141OcpU0zEo9lO9Ek=; b=HMoywdo55psNw9D0CNuyDC6gCBkYyHToaBMBTEBgnU8b8NMgUQiic8JumkoEEMdnj6 LbyWOFkTBpSbGaxcfhqL/oh4JKBCR2aEcXL9hC7bxCTiG2Yj07I526FollsZjfQs1FbB ud8Hf/MORVgs0WnoNb0mAhP/xgJ8ZlePS3sKiXnwd+vjzLB2NqIE/V1HBumHtAYoD0ss nkFKqNT4/qV5uq54CjDegvRkdW61xdJ2aPEQAkzGGOSSMoL5I23Je50ckkD/tU9GSIJn /JCEeXOW/mav128qPL+UAnCTcuzBMnKnLMbarzQo+/n3KqDWI6xrvpfvY0k5A427bqQV o2ew== X-Gm-Message-State: AKGB3mKdF2oh1jL0erASbZqxnt4pWOfa2r8g4//S7xIJ8UyL+GDCjdT3 H4MHnhmkKLwh/4YOefhd9DVRhA== X-Google-Smtp-Source: ACJfBotgVK/C7CBE9G0r9n4QuPcHKUJZ6HyMuNjB3vuAjtzEUYl7LkmPRlcKXPnj+31LIAqOBnYECw== X-Received: by 10.84.134.34 with SMTP id 31mr15097270plg.382.1513972102265; Fri, 22 Dec 2017 11:48:22 -0800 (PST) Received: from localhost.localdomain (c-73-162-13-107.hsd1.ca.comcast.net. [73.162.13.107]) by smtp.gmail.com with ESMTPSA id e7sm50080812pfj.44.2017.12.22.11.48.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Dec 2017 11:48:21 -0800 (PST) From: Tom Herbert To: davem@davemloft.net Cc: netdev@vger.kernel.org, dvyukov@google.com, john.fastabend@gmail.com, rohit@quantonium.net, Tom Herbert Subject: [PATCH net-next 3/4] sock_lock: Add try_sock_lock Date: Fri, 22 Dec 2017 11:47:54 -0800 Message-Id: <20171222194755.8544-4-tom@quantonium.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171222194755.8544-1-tom@quantonium.net> References: <20171222194755.8544-1-tom@quantonium.net> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org try_sock lock is an opportunistic attempt to acquire a socket lock without blocking or sleeping. If the socket lock is acquired then true is returned, else false is returned. Signed-off-by: Tom Herbert --- include/net/sock.h | 7 +++++++ net/core/sock.c | 20 ++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/include/net/sock.h b/include/net/sock.h index 3b4ca2046f8c..69fdd1a89591 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1462,6 +1462,13 @@ static inline void lock_sock(struct sock *sk) lock_sock_nested(sk, 0); } +bool try_lock_sock_nested(struct sock *sk, int subclass); + +static inline bool try_lock_sock(struct sock *sk) +{ + return try_lock_sock_nested(sk, 0); +} + void release_sock(struct sock *sk); /* BH context may only use the following locking interface. */ diff --git a/net/core/sock.c b/net/core/sock.c index 72d14b221784..40fb772e2d52 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -2782,6 +2782,26 @@ void lock_sock_nested(struct sock *sk, int subclass) } EXPORT_SYMBOL(lock_sock_nested); +bool try_lock_sock_nested(struct sock *sk, int subclass) +{ + spin_lock_bh(&sk->sk_lock.slock); + if (sk->sk_lock.owned) { + spin_unlock_bh(&sk->sk_lock.slock); + return false; + } + + sk->sk_lock.owned = 1; + spin_unlock(&sk->sk_lock.slock); + + /* The sk_lock has mutex_lock() semantics here: */ + + mutex_acquire(&sk->sk_lock.dep_map, subclass, 0, _RET_IP_); + local_bh_enable(); + + return true; +} +EXPORT_SYMBOL(try_lock_sock_nested); + void release_sock(struct sock *sk) { spin_lock_bh(&sk->sk_lock.slock);