[net-next,23/36] rxrpc: Don't use sk->sk_receive_queue.lock to guard socket state changes
Message ID | 166994029870.1732290.2707382831157581122.stgit@warthog.procyon.org.uk |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp561374wrr; Thu, 1 Dec 2022 16:26:34 -0800 (PST) X-Google-Smtp-Source: AA0mqf7LOTH99S2LSQxdNNPH96dRi4ZywXvEbg5JhfhjZmJ3HPAMXeveqabIpH8t4SsJb4w6wSHb X-Received: by 2002:a17:906:660d:b0:7ba:5085:864 with SMTP id b13-20020a170906660d00b007ba50850864mr34996510ejp.357.1669940794409; Thu, 01 Dec 2022 16:26:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669940794; cv=none; d=google.com; s=arc-20160816; b=FbinrEiC0Ap8/6IH1wp9LTTh7fwxAk/GzV7eE0BBLITqFHiwTsmHiPcnON9UGT41kW L6ySHOh5ZSQGOJQ6kSRZV9WDGtyonV9DkKwjKlZ0/sjLF2YqdaqXICHGJRIQ3vcKBK5H nxiszeMTxgLqgLXuI5imWtM0OhvFCt7U9cm5fcvR54BJL+Ql5hLsZxpiOqRiqC3x8jEj 0SGuqI3LJEEmBEAWOV/UJ0JX2XwPA0igjyDzFrq7q34DxU2ReXya1LsVAoHy4rQwUaMg aZ6eWngyFG9+kj6lc+bEcGVU4w92s0LehjLjD83rhdrEQs171ooAIPj8TwUPavVsgGGa Ba0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:cc:to:from :subject:organization:dkim-signature; bh=5PNaYT+Sz99XRNBjyLDOgrtAK/xBqCVeZx4CGkNAneI=; b=cu28GME1sGWfYBdNNO3H5vUQ+Uf4usytU9pRXY/aTjjbrREwFrjEZTN4/3m5cDssRr zZgNrsG96cCJFtydb2lDpQ+CFIlI5J+o8ao6oyNyLzWpKjEzEG6DIXwu72Lj3cbIa6Ux Yi3MoH5gX9JZdnmI6up0bkIbTX+NF+kCgLu8J6Ei+yT1P6NSssRJo7blfXBNxkfeGttv uZiGMG/cDIH7XLiliG2TiAATMnQ0aaRyrLDRXFAUBEAaCOx3ClBV7JKWne2vWcPDPv5y MuOW6hB0AszoIqoXRs+Q2KQowgBSgKPMDNIw0TsvIgjv5GSCFu3APqsOuHvlar37w6+P LNyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Zcb47r2K; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c12-20020a50d64c000000b00461be535949si4631702edj.424.2022.12.01.16.26.10; Thu, 01 Dec 2022 16:26:34 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Zcb47r2K; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231935AbiLBAWj (ORCPT <rfc822;heyuhang3455@gmail.com> + 99 others); Thu, 1 Dec 2022 19:22:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51902 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231422AbiLBAWH (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Thu, 1 Dec 2022 19:22:07 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 59F0CD11FB for <linux-kernel@vger.kernel.org>; Thu, 1 Dec 2022 16:18:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669940305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5PNaYT+Sz99XRNBjyLDOgrtAK/xBqCVeZx4CGkNAneI=; b=Zcb47r2K42yTZx/zafJiNc60RpQv5AvwGu75JJMQu7ubHMkkZ1lLYNy2APUUZBRt/qfPlL SCklpPsxETkSjgVlxti+nISr1oE0PpAV8F5FJsvseJI19Qnixlx0FsYMMwp8no1FiaWejy SEX2BJPyYAw+l8shH52/YPUJ1dz5k9s= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-47-ccu-uha7M2OmfwxskVWfqw-1; Thu, 01 Dec 2022 19:18:22 -0500 X-MC-Unique: ccu-uha7M2OmfwxskVWfqw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F0F9738012D8; Fri, 2 Dec 2022 00:18:21 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 533C12023A16; Fri, 2 Dec 2022 00:18:21 +0000 (UTC) Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 Subject: [PATCH net-next 23/36] rxrpc: Don't use sk->sk_receive_queue.lock to guard socket state changes From: David Howells <dhowells@redhat.com> To: netdev@vger.kernel.org Cc: Marc Dionne <marc.dionne@auristor.com>, linux-afs@lists.infradead.org, dhowells@redhat.com, linux-afs@lists.infradead.org, linux-kernel@vger.kernel.org Date: Fri, 02 Dec 2022 00:18:18 +0000 Message-ID: <166994029870.1732290.2707382831157581122.stgit@warthog.procyon.org.uk> In-Reply-To: <166994010342.1732290.13771061038178613124.stgit@warthog.procyon.org.uk> References: <166994010342.1732290.13771061038178613124.stgit@warthog.procyon.org.uk> User-Agent: StGit/1.5 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751059838826684662?= X-GMAIL-MSGID: =?utf-8?q?1751059838826684662?= |
Series |
rxrpc: Increasing SACK size and moving away from softirq, parts 2 & 3
|
|
Commit Message
David Howells
Dec. 2, 2022, 12:18 a.m. UTC
Don't use sk->sk_receive_queue.lock to guard socket state changes as the
socket mutex is sufficient.
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Marc Dionne <marc.dionne@auristor.com>
cc: linux-afs@lists.infradead.org
---
net/rxrpc/af_rxrpc.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c index 7a0dc01741e7..8ad4d85acb0b 100644 --- a/net/rxrpc/af_rxrpc.c +++ b/net/rxrpc/af_rxrpc.c @@ -812,14 +812,12 @@ static int rxrpc_shutdown(struct socket *sock, int flags) lock_sock(sk); - spin_lock_bh(&sk->sk_receive_queue.lock); if (sk->sk_state < RXRPC_CLOSE) { sk->sk_state = RXRPC_CLOSE; sk->sk_shutdown = SHUTDOWN_MASK; } else { ret = -ESHUTDOWN; } - spin_unlock_bh(&sk->sk_receive_queue.lock); rxrpc_discard_prealloc(rx); @@ -872,9 +870,7 @@ static int rxrpc_release_sock(struct sock *sk) break; } - spin_lock_bh(&sk->sk_receive_queue.lock); sk->sk_state = RXRPC_CLOSE; - spin_unlock_bh(&sk->sk_receive_queue.lock); if (rx->local && rcu_access_pointer(rx->local->service) == rx) { write_lock(&rx->local->services_lock);