LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Philipp Klocke <Phil_K97@gmx.de>
To: unlisted-recipients:; (no To-header on input)
Cc: lukas.bulwahn@gmail.com, kernelnewbies@kernelnewbies.org,
	llvmlinux@lists.linuxfoundation.org, sil2review@lists.osadl.org,
	der.herr@hofr.at, Philipp Klocke <Phil_K97@gmx.de>,
	Ingo Molnar <mingo@redhat.com>,
	Peter Zijlstra <peterz@infradead.org>,
	linux-kernel@vger.kernel.org
Subject: [PATCH] sched/fair: Change sched_feat(x) in !CONFIG_SCHED_DEBUG case
Date: Mon, 16 Apr 2018 10:54:26 +0200	[thread overview]
Message-ID: <20180416085426.24157-1-Phil_K97@gmx.de> (raw)

Make sched_feat(x) return 1 or 0 instead of 2**x or 0 when
sysctl_sched_features is constant, by changing the left shift of the
mask-bit to a right shift of the bitmap. The behaviour of the code
remains unchanged.
We prove this by showing that the compiler can evaluate this shift
during compile time, which results in generating the same
machine code as before.

This patch is motivated by the clang warning Wconstant-logical-operand,
issued when logically comparing a variable to a constant integer that is
neither 1 nor 0.  It happens for sched_feat(x) when sysctl_sched_features
is constant, i.e., CONFIG_SCHED_DEBUG is not set.

kernel/sched/fair.c:3927:14: warning: use of logical '&&' with constant operand [-Wconstant-logical-operand]
        if (initial && sched_feat(START_DEBIT))
                    ^  ~~~~~~~~~~~~~~~~~~~~~~~
kernel/sched/fair.c:3927:14: note: use '&' for a bitwise operation
        if (initial && sched_feat(START_DEBIT))
                    ^~
                    &
kernel/sched/fair.c:3927:14: note: remove constant to silence this warning
        if (initial && sched_feat(START_DEBIT))
                   ~^~~~~~~~~~~~~~~~~~~~~~~~~~

This resolves the warning, leaves the code base largely as is.

Tested with gcc 7.3.1 and clang 6.0.0 on x86_64, comparing resulting
binaries with diff.
Applicable to all modern compilers and architectures

Signed-off-by: Philipp Klocke <Phil_K97@gmx.de>
Suggested-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
---
 kernel/sched/sched.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index fb5fc458547f..d2aedee6ab0f 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -1305,7 +1305,11 @@ static const_debug __maybe_unused unsigned int sysctl_sched_features =
 	0;
 #undef SCHED_FEAT
 
+#ifdef CONFIG_SCHED_DEBUG
 #define sched_feat(x) (sysctl_sched_features & (1UL << __SCHED_FEAT_##x))
+#else
+#define sched_feat(x) ((sysctl_sched_features >> __SCHED_FEAT_##x) & 1UL)
+#endif
 
 #endif /* SCHED_DEBUG && HAVE_JUMP_LABEL */
 
-- 
2.17.0

             reply	other threads:[~2018-04-16  8:56 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-16  8:54 Philipp Klocke [this message]
2018-04-18 13:49 ` Nicholas Mc Guire
2018-04-20  7:57 ` Peter Zijlstra
2018-04-20 16:29   ` Philipp Klocke
2018-04-20 16:51     ` Peter Zijlstra
2018-04-20 21:29       ` Lukas Bulwahn
2018-04-23  9:45         ` Peter Zijlstra
2018-04-20 10:34 ` Peter Zijlstra

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180416085426.24157-1-Phil_K97@gmx.de \
    --to=phil_k97@gmx.de \
    --cc=der.herr@hofr.at \
    --cc=kernelnewbies@kernelnewbies.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=llvmlinux@lists.linuxfoundation.org \
    --cc=lukas.bulwahn@gmail.com \
    --cc=mingo@redhat.com \
    --cc=peterz@infradead.org \
    --cc=sil2review@lists.osadl.org \
    --subject='Re: [PATCH] sched/fair: Change sched_feat(x) in '\!'CONFIG_SCHED_DEBUG case' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).