Received-SPF: pass (google.com: domain of linux-kernel+bounces-107732-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Tue, 19 Mar 2024 16:43:12 +0100
From: Joel Granados <j.granados@samsung.com>
To: Thomas =?utf-8?Q?Wei=C3=9Fschuh?= <linux@weissschuh.net>
CC: "Eric W. Biederman" <ebiederm@xmission.com>, Luis Chamberlain
	<mcgrof@kernel.org>, Kees Cook <keescook@chromium.org>,
	<linux-kernel@vger.kernel.org>, <linux-fsdevel@vger.kernel.org>
Subject: Re: [PATCH 2/4] sysctl: move sysctl type to ctl_table_header
Message-ID: <20240319154312.amfmomddvjyqh5yc@joelS2.panther.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; micalg="pgp-sha512";
	protocol="application/pgp-signature"; boundary="6v64fw4r57zc557r"
Content-Disposition: inline
In-Reply-To: <20240222-sysctl-empty-dir-v1-2-45ba9a6352e8@weissschuh.net>
CMS-TYPE: 201P
References: <20240222-sysctl-empty-dir-v1-0-45ba9a6352e8@weissschuh.net>
	<CGME20240222070824eucas1p1e0a6b38607370cf7b1cca4d07de474f2@eucas1p1.samsung.com>
	<20240222-sysctl-empty-dir-v1-2-45ba9a6352e8@weissschuh.net>

--6v64fw4r57zc557r
Content-Type: text/plain; charset="iso-8859-1"
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Thu, Feb 22, 2024 at 08:07:37AM +0100, Thomas Wei=DFschuh wrote:
> As static initialization of the is not possible anymore move it into
> init_header() where all the other header fields are also initialized.
Please say what was done. Something like: "Moved the
SYSCTL_TABLE_TYPE_{DEFAULT,PERMANENTLY_EMPTY} enumerations from
ctl_table to ctl_table_header."

And the then you can mention the why: "Removing the mutable memeber from
ctl_table opens the ...."

>=20
> Reduce memory consumption as there are less instances of
> ctl_table_header than ctl_table.
This is indeed true, but the main reasoning behind this is
constification. Right? If you want to leave this comment, I would
suggest you add something that talks about the amount of bytes saved.
Something like : "Reduce memory consumption by sizeof(int) for every
ctl_table entry in ctl_table_header". Or something similar.

>=20
> Removing this mutable member also opens the way to constify static
> instances of ctl_table.
>=20
> Signed-off-by: Thomas Wei=DFschuh <linux@weissschuh.net>
> ---
>  fs/proc/proc_sysctl.c  | 10 ++++++----
>  include/linux/sysctl.h | 22 +++++++++++-----------
>  2 files changed, 17 insertions(+), 15 deletions(-)
>=20
> diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
> index 2f4d4329d83d..fde7a2f773f0 100644
> --- a/fs/proc/proc_sysctl.c
> +++ b/fs/proc/proc_sysctl.c
> @@ -31,7 +31,7 @@ static const struct inode_operations proc_sys_dir_opera=
tions;
> =20
>  /* Support for permanently empty directories */
>  static struct ctl_table sysctl_mount_point[] =3D {
> -	{.type =3D SYSCTL_TABLE_TYPE_PERMANENTLY_EMPTY }
> +	{ }
>  };
> =20
>  /**
> @@ -49,11 +49,11 @@ struct ctl_table_header *register_sysctl_mount_point(=
const char *path)
>  EXPORT_SYMBOL(register_sysctl_mount_point);
> =20
>  #define sysctl_is_perm_empty_ctl_header(hptr)		\
> -	(hptr->ctl_table[0].type =3D=3D SYSCTL_TABLE_TYPE_PERMANENTLY_EMPTY)
> +	(hptr->type =3D=3D SYSCTL_TABLE_TYPE_PERMANENTLY_EMPTY)
>  #define sysctl_set_perm_empty_ctl_header(hptr)		\
> -	(hptr->ctl_table[0].type =3D SYSCTL_TABLE_TYPE_PERMANENTLY_EMPTY)
> +	(hptr->type =3D SYSCTL_TABLE_TYPE_PERMANENTLY_EMPTY)
>  #define sysctl_clear_perm_empty_ctl_header(hptr)	\
> -	(hptr->ctl_table[0].type =3D SYSCTL_TABLE_TYPE_DEFAULT)
> +	(hptr->type =3D SYSCTL_TABLE_TYPE_DEFAULT)
> =20
>  void proc_sys_poll_notify(struct ctl_table_poll *poll)
>  {
> @@ -208,6 +208,8 @@ static void init_header(struct ctl_table_header *head,
>  			node++;
>  		}
>  	}
> +	if (table =3D=3D sysctl_mount_point)
> +		sysctl_set_perm_empty_ctl_header(head);
>  }
> =20
>  static void erase_header(struct ctl_table_header *head)
> diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
> index ee7d33b89e9e..c87f73c06cb9 100644
> --- a/include/linux/sysctl.h
> +++ b/include/linux/sysctl.h
> @@ -137,17 +137,6 @@ struct ctl_table {
>  	void *data;
>  	int maxlen;
>  	umode_t mode;
> -	/**
> -	 * enum type - Enumeration to differentiate between ctl target types
> -	 * @SYSCTL_TABLE_TYPE_DEFAULT: ctl target with no special considerations
> -	 * @SYSCTL_TABLE_TYPE_PERMANENTLY_EMPTY: Used to identify a permanently
> -	 *                                       empty directory target to serve
> -	 *                                       as mount point.
> -	 */
> -	enum {
> -		SYSCTL_TABLE_TYPE_DEFAULT,
> -		SYSCTL_TABLE_TYPE_PERMANENTLY_EMPTY
> -	} type;
>  	proc_handler *proc_handler;	/* Callback for text formatting */
>  	struct ctl_table_poll *poll;
>  	void *extra1;
> @@ -188,6 +177,17 @@ struct ctl_table_header {
>  	struct ctl_dir *parent;
>  	struct ctl_node *node;
>  	struct hlist_head inodes; /* head for proc_inode->sysctl_inodes */
> +	/**
> +	 * enum type - Enumeration to differentiate between ctl target types
> +	 * @SYSCTL_TABLE_TYPE_DEFAULT: ctl target with no special considerations
> +	 * @SYSCTL_TABLE_TYPE_PERMANENTLY_EMPTY: Used to identify a permanently
> +	 *                                       empty directory target to serve
> +	 *                                       as mount point.
> +	 */
> +	enum {
> +		SYSCTL_TABLE_TYPE_DEFAULT,
> +		SYSCTL_TABLE_TYPE_PERMANENTLY_EMPTY,
> +	} type;
>  };
> =20
>  struct ctl_dir {
>=20
> --=20
> 2.43.2
>=20

--=20

Joel Granados

--6v64fw4r57zc557r
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQGzBAABCgAdFiEErkcJVyXmMSXOyyeQupfNUreWQU8FAmX5so8ACgkQupfNUreW
QU8aYAv/UprU+nc9BoDYqe8bRl+/aiJFFJI4z9YvG8q+qmQxbxNrAvEq8cn0Qo76
qpjwbEvuYO+HbisUuzX7F6I/fu6zH3djnbNP6Q+NhZRRVxFWskzfH9IOCoemJfxD
a47KEf3HbUy5sLVHsNmucJBgXRtH/mIx2Da8UFRn1BhW3TQgoguO0ZzgsyO7JQbL
8ar2SKzCY8YzS5IgiuEOEBvEDM0bMaFq8R3Af9TizlXh95lOsncgq383khl4dNjg
9xJUXW0Dv9gxrQVMb+Z2F7qLVSLEJIgVjI/m0dbY0mbWL/U8bY1mlggjrZ2RTja9
CHTVQsrpuHmie4m3bWKDxs704qJcvKxR84jUE8ZakiwQYOJFjYKd+tyfC09k8ehm
DJ1NCih93QK/ZWjuAF4l7hAiiUvB7+678F3Eufee3aZeHHHc+kRiiZ5wk4GnlBWY
oNeYTPMH6LVI0bUJBly5d6l8tZ+SCYyUgwly7ZeGfD8B3Onve2PgcdqkKIHH7Bbk
giNcBVa9
=WYc3
-----END PGP SIGNATURE-----

--6v64fw4r57zc557r--