Re: [Ocfs2-devel] [PATCH 09/11] sysctl: Remove the end element in sysctl table arrays - Joel Granados via Ocfs2-devel

From: Joel Granados via Ocfs2-devel <ocfs2-devel@oss.oracle.com>
To: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Juri Lelli <juri.lelli@redhat.com>,
	Miaohe Lin <linmiaohe@huawei.com>,
	"Rafael J. Wysocki" <rafael@kernel.org>,
	Catalin Marinas <catalin.marinas@arm.com>,
	dri-devel@lists.freedesktop.org, Ben Segall <bsegall@google.com>,
	linux-sctp@vger.kernel.org, ocfs2-devel@oss.oracle.com,
	Miquel Raynal <miquel.raynal@bootlin.com>,
	Alexander Gordeev <agordeev@linux.ibm.com>,
	"K. Y. Srinivasan" <kys@microsoft.com>,
	Stefan Schmidt <stefan@datenfreihafen.org>,
	Wei Liu <wei.liu@kernel.org>,
	Vincent Guittot <vincent.guittot@linaro.org>,
	Michael Ellerman <mpe@ellerman.id.au>,
	bridge@lists.linux-foundation.org,
	James Morris <jmorris@namei.org>,
	Christophe Leroy <christophe.leroy@csgroup.eu>,
	Jozsef Kadlecsik <kadlec@netfilter.org>,
	Eric Biggers <ebiggers@kernel.org>,
	linux-cachefs@redhat.com, Mel Gorman <mgorman@suse.de>,
	Waiman Long <longman@redhat.com>,
	Christian Borntraeger <borntraeger@linux.ibm.com>,
	Petr Mladek <pmladek@suse.com>, Martin Schiller <ms@dev.tdt.de>,
	Russ Weight <russell.h.weight@intel.com>,
	Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>,
	Boqun Feng <boqun.feng@gmail.com>,
	Nicholas Piggin <npiggin@gmail.com>,
	John Ogness <john.ogness@linutronix.de>,
	Alexander Viro <viro@zeniv.linux.org.uk>,
	Andy Lutomirski <luto@kernel.org>,
	Remi Denis-Courmont <courmisch@gmail.com>,
	xen-devel@lists.xenproject.org,
	Thomas Gleixner <tglx@linutronix.de>,
	Trond Myklebust <trond.myklebust@hammerspace.com>,
	Anton Altaparmakov <anton@tuxera.com>,
	Christian Brauner <brauner@kernel.org>,
	Will Drewry <wad@chromium.org>,
	Neil Horman <nhorman@tuxdriver.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	linux-kernel@vger.kernel.org, Ralf Baechle <ralf@linux-mips.org>,
	Sergey Senozhatsky <senozhatsky@chromium.org>,
	mcgrof@kernel.org, Chuck Lever <chuck.lever@oracle.com>,
	netfilter-devel@vger.kernel.org,
	Masami Hiramatsu <mhiramat@kernel.org>,
	Jiri Olsa <jolsa@kernel.org>,
	linux-fsdevel@vger.kernel.org,
	Matthieu Baerts <matthieu.baerts@tessares.net>,
	linux-trace-kernel@vger.kernel.org, linux-wpan@vger.kernel.org,
	Mark Rutland <mark.rutland@arm.com>,
	linux-aio@kvack.org, "Jason A. Donenfeld" <Jason@zx2c4.com>,
	linux-ia64@vger.kernel.org,
	Naoya Horiguchi <naoya.horiguchi@nec.com>,
	Dave Hansen <dave.hansen@linux.intel.com>,
	Clemens Ladisch <clemens@ladisch.de>,
	Phillip Potter <phil@philpotter.co.uk>,
	Song Liu <song@kernel.org>, Eric Dumazet <edumazet@google.com>,
	keyrings@vger.kernel.org, John Stultz <jstultz@google.com>,
	Stanislav Fomichev <sdf@google.com>,
	Jan Karcher <jaka@linux.ibm.com>,
	codalist@telemann.coda.cs.cmu.edu, linux-s390@vger.kernel.org,
	Valentin Schneider <vschneid@redhat.com>,
	Stefano Stabellini <sstabellini@kernel.org>,
	Corey Minyard <minyard@acm.org>,
	Leon Romanovsky <leon@kernel.org>,
	Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>,
	Will Deacon <will@kernel.org>,
	John Fastabend <john.fastabend@gmail.com>,
	Andrii Nakryiko <andrii@kernel.org>,
	Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>,
	Mat Martineau <martineau@kernel.org>,
	Matthew Bobrowski <repnop@google.com>,
	Julian Anastasov <ja@ssi.bg>,
	coreteam@netfilter.org, Roopa Prabhu <roopa@nvidia.com>,
	Yonghong Song <yhs@fb.com>, Iurii Zaikin <yzaikin@google.com>,
	Sven Schnelle <svens@linux.ibm.com>,
	Vasily Gorbik <gor@linux.ibm.com>,
	Mike Travis <mike.travis@hpe.com>,
	Wenjia Zhang <wenjia@linux.ibm.com>,
	Simon Horman <horms@verge.net.au>,
	Xin Long <lucien.xin@gmail.com>,
	linux-arm-kernel@lists.infradead.org, fsverity@lists.linux.dev,
	Hao Luo <haoluo@google.com>, Theodore Ts'o <tytso@mit.edu>,
	Stephen Boyd <sboyd@kernel.org>,
	Muchun Song <muchun.song@linux.dev>,
	Florian Westphal <fw@strlen.de>,
	Robin Holt <robinmholt@gmail.com>,
	"David S. Miller" <davem@davemloft.net>,
	Jon Maloy <jmaloy@redhat.com>,
	Jarkko Sakkinen <jarkko@kernel.org>,
	Eric Biederman <ebiederm@xmission.com>,
	Anna Schumaker <anna@kernel.org>,
	Daniel Bristot de Oliveira <bristot@redhat.com>,
	Mike Kravetz <mike.kravetz@oracle.com>,
	Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>,
	Benjamin Herrenschmidt <benh@kernel.crashing.org>,
	linux-hams@vger.kernel.org,
	Nikolay Aleksandrov <razor@blackwall.org>,
	Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
	Alexei Starovoitov <ast@kernel.org>,
	Marc Dionne <marc.dionne@auristor.com>,
	Jiri Slaby <jirislaby@kernel.org>,
	linux-afs@lists.infradead.org,
	Daniel Borkmann <daniel@iogearbox.net>,
	linux-rdma@vger.kernel.org, Dexuan Cui <decui@microsoft.com>,
	lvs-devel@vger.kernel.org, coda@cs.cmu.edu,
	Doug Gilbert <dgilbert@interlog.com>,
	"Naveen N. Rao" <naveen.n.rao@linux.ibm.com>,
	Gerald Schaefer <gerald.schaefer@linux.ibm.com>,
	Paolo Abeni <pabeni@redhat.com>,
	Pablo Neira Ayuso <pablo@netfilter.org>,
	"Serge E. Hallyn" <serge@hallyn.com>,
	Kees Cook <keescook@chromium.org>, Arnd Bergmann <arnd@arndb.de>,
	Haiyang Zhang <haiyangz@microsoft.com>,
	intel-gfx@lists.freedesktop.org,
	Steven Rostedt <rostedt@goodmis.org>,
	linux-crypto@vger.kernel.org, Borislav Petkov <bp@alien8.de>,
	Rodrigo Vivi <rodrigo.vivi@intel.com>,
	openipmi-developer@lists.sourceforge.net, mptcp@lists.linux.dev,
	Jan Harkes <jaharkes@cs.cmu.edu>,
	linux-nfs@vger.kernel.org, linux-mm@kvack.org,
	Jeff Layton <jlayton@kernel.org>,
	Andy Lutomirski <luto@amacapital.net>,
	linux-xfs@vger.kernel.org, linux-ntfs-dev@lists.sourceforge.net,
	netdev@vger.kernel.org, Ying Xue <ying.xue@windriver.com>,
	bpf@vger.kernel.org, Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
	Dietmar Eggemann <dietmar.eggemann@arm.com>,
	Alexander Aring <alex.aring@gmail.com>, Jan Kara <jack@suse.cz>,
	Steve Wahl <steve.wahl@hpe.com>,
	Peter Zijlstra <peterz@infradead.org>,
	Balbir Singh <bsingharora@gmail.com>,
	Amir Goldstein <amir73il@gmail.com>,
	KP Singh <kpsingh@kernel.org>,
	David Howells <dhowells@redhat.com>,
	"H. Peter Anvin" <hpa@zytor.com>,
	David Airlie <airlied@gmail.com>,
	Steffen Klassert <steffen.klassert@secunet.com>,
	rds-devel@oss.oracle.com,
	Herbert Xu <herbert@gondor.apana.org.au>,
	linux-scsi@vger.kernel.org, dccp@vger.kernel.org, x86@kernel.org,
	Russell King <linux@armlinux.org.uk>,
	Jason Gunthorpe <jgg@ziepe.ca>, Ingo Molnar <mingo@redhat.com>,
	Jakub Kicinski <kuba@kernel.org>,
	"James E.J. Bottomley" <jejb@linux.ibm.com>,
	Joerg Reuter <jreuter@yaina.de>,
	linux-hyperv@vger.kernel.org, Heiko Carstens <hca@linux.ibm.com>,
	Santosh Shilimkar <santosh.shilimkar@oracle.com>,
	apparmor@lists.ubuntu.com, linux-raid@vger.kernel.org,
	Paul Moore <paul@paul-moore.com>, Juergen Gross <jgross@suse.com>,
	John Johansen <john.johansen@canonical.com>,
	linux-x25@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
	David Ahern <dsahern@kernel.org>,
	kexec@lists.infradead.org, linux-security-module@vger.kernel.org,
	Benjamin LaHaise <bcrl@kvack.org>,
	tipc-discussion@lists.sourceforge.net,
	Daniel Vetter <daniel@ffwll.ch>,
	Martin KaFai Lau <martin.lau@linux.dev>,
	Karsten Graul <kgraul@linux.ibm.com>
Subject: Re: [Ocfs2-devel] [PATCH 09/11] sysctl: Remove the end element in sysctl table arrays
Date: Wed, 21 Jun 2023 15:43:48 +0200	[thread overview]
Message-ID: <20230621134348.rcdzl7fi7yq2uj6h@localhost> (raw)
In-Reply-To: <878rcd2by5.fsf@intel.com>

[-- Attachment #1.1: Type: text/plain, Size: 4805 bytes --]

On Wed, Jun 21, 2023 at 04:15:46PM +0300, Jani Nikula wrote:
> On Wed, 21 Jun 2023, Joel Granados <j.granados@samsung.com> wrote:
> > On Wed, Jun 21, 2023 at 02:16:55PM +0300, Jani Nikula wrote:
> >> On Wed, 21 Jun 2023, Joel Granados <j.granados@samsung.com> wrote:
> >> > Remove the empty end element from all the arrays that are passed to the
> >> > register sysctl calls. In some files this means reducing the explicit
> >> > array size by one. Also make sure that we are using the size in
> >> > ctl_table_header instead of evaluating the .procname element.
> >> 
> >> Where's the harm in removing the end elements driver by driver? This is
> >> an unwieldy patch to handle.
> >
> > I totally agree. Its a big one!!! but I'm concerned of breaking bisectibility:
> > * I could for example separate all the removes into separate commits and
> >   then have a final commit that removes the check for the empty element.
> >   But this will leave the tree in a state where the for loop will have
> >   undefined behavior when it looks for the empty end element. It might
> >   or might not work (probably not :) until the final commit where I fix
> >   that.
> >
> > * I could also change the logic that looks for the final element,
> >   commit that first and then remove the empty element one commit per
> >   driver after that. But then for all the arrays that still have an
> >   empty element, there would again be undefined behavior as it would
> >   think that the last element is valid (when it is really the sentinel).
> >
> > Any ideas on how to get around these?
> 
> First add size to the register calls, and allow the last one to be
> sentinel but do not require the sentinel.
> 
> Start removing sentinels, adjusting the size passed in.
This is a great idea! and I think I don't even have to adjust the size
because if I change the logic to stop on the sentinel or the size; so when
the sentinel is there, it will stop before the size. And when the
sentinel is not there, it will stop on the correct size.

There might be issues with indirection calls. And there might also be
lots of places where I need to adjust a for loop (as dan has pointed
out) but its worth a try for V2.

Best
> 
> Once enough sentinels have been removed, add warning if the final entry
> is a sentinel.
> 
> Never really remove the check? (But surely you can rework the logic to
> not count the number of elements up front, only while iterating.)
> 
> 
> BR,
> Jani.
> 
> >> 
> >> > diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
> >> > index f43950219ffc..e4d7372afb10 100644
> >> > --- a/drivers/gpu/drm/i915/i915_perf.c
> >> > +++ b/drivers/gpu/drm/i915/i915_perf.c
> >> > @@ -4884,24 +4884,23 @@ int i915_perf_remove_config_ioctl(struct drm_device *dev, void *data,
> >> >  
> >> >  static struct ctl_table oa_table[] = {
> >> >  	{
> >> > -	 .procname = "perf_stream_paranoid",
> >> > -	 .data = &i915_perf_stream_paranoid,
> >> > -	 .maxlen = sizeof(i915_perf_stream_paranoid),
> >> > -	 .mode = 0644,
> >> > -	 .proc_handler = proc_dointvec_minmax,
> >> > -	 .extra1 = SYSCTL_ZERO,
> >> > -	 .extra2 = SYSCTL_ONE,
> >> > -	 },
> >> > +		.procname = "perf_stream_paranoid",
> >> > +		.data = &i915_perf_stream_paranoid,
> >> > +		.maxlen = sizeof(i915_perf_stream_paranoid),
> >> > +		.mode = 0644,
> >> > +		.proc_handler = proc_dointvec_minmax,
> >> > +		.extra1 = SYSCTL_ZERO,
> >> > +		.extra2 = SYSCTL_ONE,
> >> > +	},
> >> >  	{
> >> > -	 .procname = "oa_max_sample_rate",
> >> > -	 .data = &i915_oa_max_sample_rate,
> >> > -	 .maxlen = sizeof(i915_oa_max_sample_rate),
> >> > -	 .mode = 0644,
> >> > -	 .proc_handler = proc_dointvec_minmax,
> >> > -	 .extra1 = SYSCTL_ZERO,
> >> > -	 .extra2 = &oa_sample_rate_hard_limit,
> >> > -	 },
> >> > -	{}
> >> > +		.procname = "oa_max_sample_rate",
> >> > +		.data = &i915_oa_max_sample_rate,
> >> > +		.maxlen = sizeof(i915_oa_max_sample_rate),
> >> > +		.mode = 0644,
> >> > +		.proc_handler = proc_dointvec_minmax,
> >> > +		.extra1 = SYSCTL_ZERO,
> >> > +		.extra2 = &oa_sample_rate_hard_limit,
> >> > +	}
> >> >  };
> >> 
> >> The existing indentation is off, but fixing it doesn't really belong in
> >> this patch.
> >
> > Agreed. But I actually was trying to fix something that checkpatch
> > flagged. I'll change these back (which will cause this patch to be
> > flagged).
> >
> > An alternative solution would be to fix the indentation as part of the
> > preparation patches. Tell me what you think.
> >
> > Thx
> >
> >> 
> >> BR,
> >> Jani.
> >> 
> >> 
> >> -- 
> >> Jani Nikula, Intel Open Source Graphics Center
> 
> -- 
> Jani Nikula, Intel Open Source Graphics Center

-- 

Joel Granados

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

[-- Attachment #2: Type: text/plain, Size: 151 bytes --]

_______________________________________________
Ocfs2-devel mailing list
Ocfs2-devel@oss.oracle.com
https://oss.oracle.com/mailman/listinfo/ocfs2-devel