Commit 019c8433 authored by David Howells's avatar David Howells Committed by Jakub Kicinski
Browse files

rxrpc: Remove some socket lock acquire/release annotations 



Remove some socket lock acquire/release annotations as lock_sock() and
release_sock() don't have them and so the checker gets confused.  Removing
all of them, however, causes warnings about "context imbalance" and "wrong
count at exit" to occur instead.

Probably lock_sock() and release_sock() should have annotations on
indicating their taking of sk_lock - there is a dep_map in socket_lock_t,
but I don't know if that matters to the static checker.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
cc: Marc Dionne <marc.dionne@auristor.com>
cc: Simon Horman <horms@kernel.org>
cc: linux-afs@lists.infradead.org
Link: https://patch.msgid.link/20250411095303.2316168-4-dhowells@redhat.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 23738cc8

net/rxrpc/ar-internal.h

+3 −1
Original line number Diff line number Diff line
@@ -1000,7 +1000,9 @@ struct rxrpc_call *rxrpc_alloc_call(struct rxrpc_sock *, gfp_t, unsigned int); 
struct rxrpc_call *rxrpc_new_client_call(struct rxrpc_sock *,

					 struct rxrpc_conn_parameters *,

					 struct rxrpc_call_params *, gfp_t,

					 unsigned int);

					 unsigned int)

	__releases(&rx->sk.sk_lock)

	__acquires(&call->user_mutex);

void rxrpc_start_call_timer(struct rxrpc_call *call);

void rxrpc_incoming_call(struct rxrpc_sock *, struct rxrpc_call *,

			 struct sk_buff *);

net/rxrpc/call_object.c

+1 −1
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ struct rxrpc_call *rxrpc_new_client_call(struct rxrpc_sock *rx, 
					 struct rxrpc_call_params *p,

					 gfp_t gfp,

					 unsigned int debug_id)

	__releases(&rx->sk.sk_lock.slock)

	__releases(&rx->sk.sk_lock)

	__acquires(&call->user_mutex)

{

	struct rxrpc_call *call, *xcall;

net/rxrpc/sendmsg.c

+1 −2
Original line number Diff line number Diff line
@@ -607,7 +607,7 @@ static int rxrpc_sendmsg_cmsg(struct msghdr *msg, struct rxrpc_send_params *p) 
static struct rxrpc_call *

rxrpc_new_client_call_for_sendmsg(struct rxrpc_sock *rx, struct msghdr *msg,

				  struct rxrpc_send_params *p)

	__releases(&rx->sk.sk_lock.slock)

	__releases(&rx->sk.sk_lock)

	__acquires(&call->user_mutex)

{

	struct rxrpc_conn_parameters cp;
@@ -657,7 +657,6 @@ rxrpc_new_client_call_for_sendmsg(struct rxrpc_sock *rx, struct msghdr *msg, 
 * - the socket may be either a client socket or a server socket

 */

int rxrpc_do_sendmsg(struct rxrpc_sock *rx, struct msghdr *msg, size_t len)

	__releases(&rx->sk.sk_lock.slock)

{

	struct rxrpc_call *call;

	bool dropped_lock = false;