From nobody Fri Apr 26 20:31:06 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:1d48:0:0:0:0:0 with SMTP id 69csp216609jaj; Fri, 3 Sep 2021 07:49:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxLdDB6Aymlui++YK8Wsw6keFN2uf8TiqYoa3KLlesKspVD6X5g7TJXoR9fRdbnDG5y0WKR X-Received: by 2002:a17:90a:194a:: with SMTP id 10mr10082373pjh.221.1630680599094; Fri, 03 Sep 2021 07:49:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630680599; cv=none; d=google.com; s=arc-20160816; b=N77Y6NVvR9lIEmeZr2Dm911c3F8Ow4PLFGDzgqOEGIhJRdnkuwlMw9VF9sGZHFocS1 1nQHShBixUeFNrPEB0YSqm0G1tk6hQaig4XnY8d63InSJV8jJQ/C4uyfwZjjAi2kv/qY mNbh/Gs9kPoxtzklX3a2DPhjfn/EYCdjOabPj3KKHEbfjV6qKZ+0VAAboohBXtrQaUZa zkQlf2UwPRWY4VNerifTaMsB5ldd3q9xT0ZObc5+zsYanPNpKhdk/pkrIhN53cFR6S/v Q0nLVaW2dLopKruOe4EFyxk4kQeMfqQCMVVbwkapW4UGgDA3UamRXROObr/rg0kLFcc4 UzyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:to:from :dkim-signature; bh=KqoSlox+28Xc6IWPe+MAl7EldR4ii3wl+hTK5Dge7Fs=; b=px/fJspbOGtdcb6GnC+09POJTPs21Om7BVsx/RjmCeGgKG2TsoADTxijAEjGdMQ4ZC YI3TlT4+eWgxbeuexBgcCQwB9UlTWoR6pics3MOU+Pcwqw28UoL6au9zWzZulONT2WbT MvJZ7TUAm1htnxG1SSSPR5T3ZUKjkb6/m8yy+tDmjWhsMwarYqcg3hz279kspTXS3EaJ ApyCyg1JpP8VFXoI6O11lxObOaGBGGyrKd/XTfkFEq/Y7VhAXEFD42OywIF9EOGO0KdD yl7+J0VvEEwD+iAOjgiGF6pUX0r6asirV+Cj6hRlKwYdu/PVtxZtaek3RyqzUroZyzj4 JZyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ZT6n0QUu; spf=pass (google.com: domain of mptcp+bounces-1836-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-1836-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id j6si6746892pld.359.2021.09.03.07.49.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Sep 2021 07:49:59 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-1836-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) client-ip=2604:1380:1:3600::1; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ZT6n0QUu; spf=pass (google.com: domain of mptcp+bounces-1836-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-1836-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ewr.edge.kernel.org (Postfix) with ESMTPS id 5D4361C0BCE for ; Fri, 3 Sep 2021 14:49:56 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1A82C2FAE; Fri, 3 Sep 2021 14:49:55 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2DB7F3FC1 for ; Fri, 3 Sep 2021 14:49:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630680593; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KqoSlox+28Xc6IWPe+MAl7EldR4ii3wl+hTK5Dge7Fs=; b=ZT6n0QUuowdF58UeBBvDzQXOUBbI1uSmWua8C/yVHRyjgy8sBVdyLhguzXB9+ToazX3heZ WjvEO17mwuAX4Wph6975QXJfFno/svgsr/Rw35xLmg5iQP/nZVOtAYSqclfjop5RPdOXn1 qj0ZtCXkFgloLxcSSut4/YZ0Fe1T18c= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-416-P-s_erctNZ2NMRt7IbFzoA-1; Fri, 03 Sep 2021 10:49:51 -0400 X-MC-Unique: P-s_erctNZ2NMRt7IbFzoA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2F58DFC89 for ; Fri, 3 Sep 2021 14:49:51 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.194.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9B8FF5D9D3 for ; Fri, 3 Sep 2021 14:49:50 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH mptcp-next] mptcp: use lockdep_assert_held_once() instead of open-codying it Date: Fri, 3 Sep 2021 16:49:40 +0200 Message-Id: <837dc50592c4843c4de722a4b9cbad6663458a07.1630680563.git.pabeni@redhat.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pabeni@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" We have a few more places where the mptcp code duplicates lockdep_assert_held_once(). Let's use the existing macro and avoid a bunch of compiler's conditional. Signed-off-by: Paolo Abeni Reviewed-by: Matthieu Baerts --- net/mptcp/protocol.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 101e61bb2a80..472319b7e046 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -956,9 +956,7 @@ static void __mptcp_update_wmem(struct sock *sk) { struct mptcp_sock *msk =3D mptcp_sk(sk); =20 -#ifdef CONFIG_LOCKDEP - WARN_ON_ONCE(!lockdep_is_held(&sk->sk_lock.slock)); -#endif + lockdep_assert_held_once(&sk->sk_lock.slock); =20 if (!msk->wmem_reserved) return; @@ -1117,9 +1115,8 @@ static void __mptcp_clean_una(struct sock *sk) =20 static void __mptcp_clean_una_wakeup(struct sock *sk) { -#ifdef CONFIG_LOCKDEP - WARN_ON_ONCE(!lockdep_is_held(&sk->sk_lock.slock)); -#endif + lockdep_assert_held_once(&sk->sk_lock.slock); + __mptcp_clean_una(sk); mptcp_write_space(sk); } --=20 2.26.3