From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1751982AbdHHI2W (ORCPT <rfc822;w@1wt.eu>);
        Tue, 8 Aug 2017 04:28:22 -0400
Received: from bombadil.infradead.org ([65.50.211.133]:36258 "EHLO
        bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1750818AbdHHI2U (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Tue, 8 Aug 2017 04:28:20 -0400
Date: Tue, 8 Aug 2017 10:28:03 +0200
From: Peter Zijlstra <peterz@infradead.org>
To: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Cc: Prarit Bhargava <prarit@redhat.com>,
        John Stultz <john.stultz@linaro.org>,
        lkml <linux-kernel@vger.kernel.org>,
        Mark Salyzyn <salyzyn@android.com>, Jonathan Corbet <corbet@lwn.net>,
        Petr Mladek <pmladek@suse.com>,
        Sergey Senozhatsky <sergey.senozhatsky@gmail.com>,
        Steven Rostedt <rostedt@goodmis.org>,
        Thomas Gleixner <tglx@linutronix.de>,
        Stephen Boyd <sboyd@codeaurora.org>,
        Andrew Morton <akpm@linux-foundation.org>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Christoffer Dall <cdall@linaro.org>,
        Deepa Dinamani <deepa.kernel@gmail.com>,
        Ingo Molnar <mingo@kernel.org>, Joel Fernandes <joelaf@google.com>,
        Kees Cook <keescook@chromium.org>,
        Geert Uytterhoeven <geert+renesas@glider.be>,
        "Luis R. Rodriguez" <mcgrof@kernel.org>,
        Nicholas Piggin <npiggin@gmail.com>,
        "Jason A. Donenfeld" <Jason@zx2c4.com>,
        Olof Johansson <olof@lixom.net>, Josh Poimboeuf <jpoimboe@redhat.com>,
        linux-doc@vger.kernel.org
Subject: Re: [PATCH v4] printk: Add monotonic, boottime, and realtime
 timestamps
Message-ID: <20170808082803.opp33rd3g64pe7bw@hirez.programming.kicks-ass.net>
References: <1502121162-27981-1-git-send-email-prarit@redhat.com>
 <CALAqxLU32nRBaDtGZwOeFgF_t-A3orCiis4w=o8=0sWmkD3zeQ@mail.gmail.com>
 <9452a611-aefb-543e-e2f7-32301b29a2cc@redhat.com>
 <CALAqxLURwWifcr=CRVEbcGQ7=xCC1zfUOu=BncUg5GvBGAjG4w@mail.gmail.com>
 <d453a4a9-590c-c15e-948e-49817f94168a@redhat.com>
 <20170807203639.GY3730@linux.vnet.ibm.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20170807203639.GY3730@linux.vnet.ibm.com>
User-Agent: NeoMutt/20170609 (1.8.3)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Mon, Aug 07, 2017 at 01:36:39PM -0700, Paul E. McKenney wrote:
> On Mon, Aug 07, 2017 at 04:06:09PM -0400, Prarit Bhargava wrote:

> > peterz?  Want to offer a suggestion?  The issue is that I'm changing a bool
> > config option to an int and that impacts all the arch's defconfigs.  John points
> > out that this is a lot of churn and we're both wondering if there's a better way
> > to do the configs.
> 
> The usual approach is to keep the old bool Kconfig option, and add another
> int Kconfig option that depends on the original one.  The tests for
> the int value get a bit more complex, but one way to handle this is to
> define a cpp macro something like the following:
> 
> #ifdef CONFIG_OLD_OPTION
> #define CPP_NEW_OPTION 0
> #else
> #define CPP_NEW_OPTION CONFIG_NEW_OPTION
> #endif
> 
> Then use CPP_NEW_OPTION, where zero means disabled and other numbers
> select the available options.
> 
> Adjust to suit depending on what values mean what.
> 
> Another approach is to make the range of the new Kconfig option
> depend on the old option:
> 
> config NEW_OPTION
> 	int "your description here"
> 	range 1 5 if OLD_OPTION
> 	range 0 0 if !OLD_OPTION
> 	default 0
> 	help
> 	  your help here
> 
> Again, adjust to suit depending on what values mean what.

Right this. Except I don't see the !OLD_OPTION working as expected.
A 'new' config will not include the old one, so the !OLD_OPTION thing
will 'always' be true.

So your:

> @@ -1,8 +1,46 @@
>  menu "printk and dmesg options"
>
> +choice
> +       prompt "printk default clock"
> +       config PRINTK_TIME_DISABLE
> +       bool "Disabled"
> +       help
> +        Selecting this option disables the time stamps of printk().
> +
> +       config PRINTK_TIME_LOCAL
> +       bool "Local Clock"
> +       help
> +         Selecting this option causes the time stamps of printk() to be
> +         stamped with the unadjusted hardware clock.
> +
> +       config PRINTK_TIME_BOOT
> +       bool "CLOCK_BOOTTIME"
> +       help
> +         Selecting this option causes the time stamps of printk() to be
> +         stamped with the adjusted boottime clock.
> +
> +       config PRINTK_TIME_MONO
> +       bool "CLOCK_MONOTONIC"
> +       help
> +         Selecting this option causes the time stamps of printk() to be
> +         stamped with the adjusted monotonic clock.
> +
> +       config PRINTK_TIME_REAL
> +       bool "CLOCK_REALTIME"
> +       help
> +         Selecting this option causes the time stamps of printk() to be
> +         stamped with the adjusted realtime clock.
> +
> +endchoice
> +
>  config PRINTK_TIME

Change that into something like:

config PRINTK_CLOCK


> -       bool "Show timing information on printks"
> +       int "Show time stamp information on printks"
>         depends on PRINTK
> +       default 0 if PRINTK_TIME_DISABLE
> +       default 1 if PRINTK_TIME_LOCAL

And that into:

	default 1 if PRINTK_TIME_LOCAL || PRINTK_TIME

> +       default 2 if PRINTK_TIME_BOOT
> +       default 3 if PRINTK_TIME_MONO
> +       default 4 if PRINTK_TIME_REAL
>	  help
>	    Selecting this option causes time stamps of the printk()

Then the old PRINTK_TIME symbol will auto-convert into the new
equivalent.