From patchwork Mon Mar 25 17:37:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 13602586 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 C6A4745976 for ; Mon, 25 Mar 2024 17:37:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711388239; cv=none; b=h5rdozfaZqTmqPchoz/SymfQpXDEIdsMoQxlXSFUIlBFwzF8niCiDuo75C6qo2W8iEVsBaS7lUAwIRXGw77tU0qMk0ch23Gy2o8XNUEPzK5cV7Xrchhx/DJjB8J7KUgf8+P0yHwM/fUUSBymcdGoWwCySpmw23b5Av42YwYI8Kg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711388239; c=relaxed/simple; bh=71/3YUKHSYP3wNa970mRxUmp9Wfm8Z0TR5LXphIqR0o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D8LkoeyHQ+jQuT00h5eVs2BjeIZThOTwxytxJO7b4mJvkP/nbJvYC9QlyGd7uJ6gqvqJkI6NaAwP3An3Rl/YeV9oN1uqSAMJKv51b2TYM2l3khuOpCEOlz7gPyNOhdQyTwCLFmJj2ZH1jtdc5WUUXVpFW62U3tQB3Tst3uASz1w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=HgvUnkQj; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="HgvUnkQj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 27211C43394; Mon, 25 Mar 2024 17:37:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711388239; bh=71/3YUKHSYP3wNa970mRxUmp9Wfm8Z0TR5LXphIqR0o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HgvUnkQjUq9Mx0l9wwDd9bMLbq1lH4MsH6MGBy4drxnLXDVX6MH60N3I1GttgWcpv jvPhZ/L3dWw8SzqPZOfdkXuIevBFLKnbtyi1tnWtuJybPbDcSKImpFNXWlqJ+9qoi3 JsMe4S4w1WlQymfdIPqq9fgGgCxrF84uVPhu91wAzCPgNTzeSN0hm67+yuH178JUYe MUVqVTN4gDR9liJrLT4KebFdwtsvgKDEfC1AsiRhxZ4kdaeq8TRH0bYEwk0aQV9gfq ohJ0RBeb+Ytfabrzy1uqTfzNn37Atht1itWMWuiVNu+G9z+w23HYBJWTUda15KsF/r hVXu6GGeuxXyA== From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com, dw@davidwei.uk, jiri@resnulli.us, andriy.shevchenko@linux.intel.com, Jakub Kicinski , kuniyu@amazon.com Subject: [PATCH net-next v2 1/3] netlink: create a new header for internal genetlink symbols Date: Mon, 25 Mar 2024 10:37:14 -0700 Message-ID: <20240325173716.2390605-2-kuba@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240325173716.2390605-1-kuba@kernel.org> References: <20240325173716.2390605-1-kuba@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org There are things in linux/genetlink.h which are only used under net/netlink/. Move them to a new local header. A new header with just 2 externs isn't great, but alternative would be to include af_netlink.h in genetlink.c which feels even worse. Signed-off-by: Jakub Kicinski --- CC: kuniyu@amazon.com CC: jiri@resnulli.us --- include/linux/genetlink.h | 5 ----- net/netlink/af_netlink.c | 2 +- net/netlink/genetlink.c | 2 ++ net/netlink/genetlink.h | 11 +++++++++++ 4 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 net/netlink/genetlink.h diff --git a/include/linux/genetlink.h b/include/linux/genetlink.h index c285968e437a..9dbd7ba9b858 100644 --- a/include/linux/genetlink.h +++ b/include/linux/genetlink.h @@ -4,15 +4,10 @@ #include - /* All generic netlink requests are serialized by a global lock. */ extern void genl_lock(void); extern void genl_unlock(void); -/* for synchronisation between af_netlink and genetlink */ -extern atomic_t genl_sk_destructing_cnt; -extern wait_queue_head_t genl_sk_destructing_waitq; - #define MODULE_ALIAS_GENL_FAMILY(family)\ MODULE_ALIAS_NET_PF_PROTO_NAME(PF_NETLINK, NETLINK_GENERIC, "-family-" family) diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 7554803218a2..dc8c3c01d51b 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -59,7 +59,6 @@ #include #include #include -#include #include #include #include @@ -73,6 +72,7 @@ #include #include "af_netlink.h" +#include "genetlink.h" struct listeners { struct rcu_head rcu; diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c index 3b7666944b11..feb54c63a116 100644 --- a/net/netlink/genetlink.c +++ b/net/netlink/genetlink.c @@ -22,6 +22,8 @@ #include #include +#include "genetlink.h" + static DEFINE_MUTEX(genl_mutex); /* serialization of message processing */ static DECLARE_RWSEM(cb_lock); diff --git a/net/netlink/genetlink.h b/net/netlink/genetlink.h new file mode 100644 index 000000000000..89bd9d2631c3 --- /dev/null +++ b/net/netlink/genetlink.h @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __NET_GENETLINK_H +#define __NET_GENETLINK_H + +#include + +/* for synchronisation between af_netlink and genetlink */ +extern atomic_t genl_sk_destructing_cnt; +extern wait_queue_head_t genl_sk_destructing_waitq; + +#endif /* __LINUX_GENERIC_NETLINK_H */