1. 24 9月, 2018 1 次提交
  2. 17 9月, 2018 1 次提交
  3. 13 9月, 2018 1 次提交
    • P
      tracing/Makefile: Fix handling redefinition of CC_FLAGS_FTRACE · b1f4ff74
      Paulo Zanoni 提交于
      As a Kernel developer, I make heavy use of "make targz-pkg" in order
      to locally compile and remotely install my development Kernels. The
      nice feature I rely on is that after a normal "make", "make targz-pkg"
      only generates the tarball without having to recompile everything.
      
      That was true until commit f28bc3c3 ("tracing: Handle
      CC_FLAGS_FTRACE more accurately"). After it, running "make targz-pkg"
      after "make" will recompile the whole Kernel tree, making my
      development workflow much slower.
      
      The Kernel is choosing to recompile everything because it claims the
      command line has changed. A diff of the .cmd files show a repeated
      -mfentry in one of the files. That is because "make targz-pkg" calls
      "make modules_install" and the environment is already populated with
      the exported variables, CC_FLAGS_FTRACE being one of them. Then,
      -mfentry gets duplicated because it is not protected behind an ifndef
      block, like -pg.
      
      To complicate the problem a little bit more, architectures can define
      their own version CC_FLAGS_FTRACE, so our code not only has to
      consider recursive Makefiles, but also architecture overrides.
      
      So in this patch we move CC_FLAGS_FTRACE up and unconditionally
      define it to -pg. Then we let the architecture Makefiles possibly
      override it, and finally append the extra options later. This ensures
      the variable is always fully redefined at each invocation so recursive
      Makefiles don't keep appending, and hopefully it maintains the
      intended behavior on how architectures can override the defaults..
      
      Thanks Steven Rostedt and Vasily Gorbik for the help on this
      regression.
      
      Cc: Michal Marek <michal.lkml@markovi.net>
      Cc: Ingo Molnar <mingo@redhat.com>
      Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
      Cc: linux-kbuild@vger.kernel.org
      Fixes: commit f28bc3c3 ("tracing: Handle CC_FLAGS_FTRACE more accurately")
      Acked-by: NVasily Gorbik <gor@linux.ibm.com>
      Signed-off-by: NPaulo Zanoni <paulo.r.zanoni@intel.com>
      Signed-off-by: NSteven Rostedt (VMware) <rostedt@goodmis.org>
      b1f4ff74
  4. 10 9月, 2018 1 次提交
  5. 05 9月, 2018 1 次提交
  6. 03 9月, 2018 1 次提交
  7. 31 8月, 2018 1 次提交
  8. 27 8月, 2018 1 次提交
  9. 24 8月, 2018 2 次提交
  10. 22 8月, 2018 1 次提交
  11. 21 8月, 2018 1 次提交
  12. 16 8月, 2018 3 次提交
  13. 13 8月, 2018 1 次提交
  14. 09 8月, 2018 1 次提交
  15. 07 8月, 2018 1 次提交
  16. 06 8月, 2018 1 次提交
  17. 30 7月, 2018 1 次提交
  18. 28 7月, 2018 1 次提交
  19. 25 7月, 2018 4 次提交
    • M
      kbuild: remove auto.conf from prerequisite of phony targets · 2063945f
      Masahiro Yamada 提交于
      The top-level Makefile adds include/config/auto.conf as
      prerequisites of 'scripts', 'prepare1', etc.
      
      They were needed to terminate the build when include/config/auto.conf
      is missing.
      
      Now that the inclusion of include/config/auto.conf is mandatory
      in the top-level Makefile if dot-config is 1 (Note 'include' directive
      is used instead of '-include').
      
      Make terminates the build by itself if it fails to create or update
      include/config/auto.conf so we are sure that include/config/auto.conf
      exists in the very first stage of make.
      
      I am still keeping include/config/auto.conf as the prerequisite of
      %/modules.builtin because modules.builtin is a real file.  According
      to commit a6c36632 ("kbuild: Do not unnecessarily regenerate
      modules.builtin"), it is intentional to compare time-stamps between
      %/modules.builtin and include/config/auto.conf .  I moved tristate.conf
      here because it is only included from scripts/Makefile.modbuiltin.
      Signed-off-by: NMasahiro Yamada <yamada.masahiro@socionext.com>
      2063945f
    • M
      kbuild: do not update config for 'make kernelrelease' · a29d4d8c
      Masahiro Yamada 提交于
      'make kernelrelease' depends on CONFIG_LOCALVERSION(_AUTO), but
      for the same reason as install targets, we do not want to update
      the configuration just for printing the kernelrelease string.
      
      This is likely to happen when you compiled the kernel with
      CROSS_COMPILE, but forget to pass it to 'make kernelrelease'.
      Signed-off-by: NMasahiro Yamada <yamada.masahiro@socionext.com>
      a29d4d8c
    • M
      kbuild: do not update config when running install targets · d7942413
      Masahiro Yamada 提交于
      "make syncconfig" is automatically invoked when any of the following
      happens:
      
       - .config is updated
       - any of Kconfig files is updated
       - any of environment variables referenced in Kconfig is changed
      
      Then, it updates configuration files such as include/config/auto.conf
      include/generated/autoconf.h, etc.
      
      Even install targets (install, modules_install, etc.) are no exception.
      However, they should never ever modify the source tree.  Install
      targets are often run with root privileges.  Once those configuration
      files are owned by root, "make mrproper" would end up with permission
      error.
      
      Install targets should just copy things blindly.  They should not care
      whether the configuration is up-to-date or not.  This makes more sense
      because we are interested in the configuration that was used in the
      previous kernel building.
      
      This issue has existed since before, but rarely happened.  I expect
      more chance where people are hit by this; with the new Kconfig syntax
      extension, the .config now contains the compiler information.  If you
      cross-compile the kernel with CROSS_COMPILE, but forget to pass it
      for "make install", you meet "any of environment variables referenced
      in Kconfig is changed" because $(CC) is referenced in Kconfig.
      Another scenario is the compiler upgrade before the installation.
      
      Install targets need the configuration.  "make modules_install" refer
      to CONFIG_MODULES etc.  "make dtbs_install" also needs CONFIG_ARCH_*
      to decide which dtb files to install.  However, the auto-update of
      the configuration files should be avoided.  We already do this for
      external modules.
      
      Now, Make targets are categorized into 3 groups:
      
      [1] Do not need the kernel configuration at all
      
          help, coccicheck, headers_install etc.
      
      [2] Need the latest kernel configuration
      
          If new config options are added, Kconfig will show prompt to
          ask user's selection.
      
          Build targets such as vmlinux, in-kernel modules are the cases.
      
      [3] Need the kernel configuration, but do not want to update it
      
          Install targets except headers_install, and external modules
          are the cases.
      Signed-off-by: NMasahiro Yamada <yamada.masahiro@socionext.com>
      d7942413
    • M
      kbuild: use 'include' directive to load auto.conf from top Makefile · 0a16d2e8
      Masahiro Yamada 提交于
      When you build targets that require the kernel configuration, dot-config
      is set to 1, then the top-level Makefile includes auto.conf.  However,
      Make considers its inclusion is optional because the '-include' directive
      is used here.
      
      If a necessary configuration file is missing for the external module
      building, the following error message is displayed:
      
        ERROR: Kernel configuration is invalid.
               include/generated/autoconf.h or include/config/auto.conf are missing.
               Run 'make oldconfig && make prepare' on kernel src to fix it.
      
      However, Make still continues building; /bin/false let the creation of
      'include/config/auto.config' fail, but Make can ignore the error since
      it is included by the '-include' directive.
      
      I guess the reason of using '-include' directive was to suppress
      the warning when you build the kernel from a pristine source tree:
      
        Makefile:605: include/config/auto.conf: No such file or directory
      
      The previous commit made sure include/config/auto.conf exists after
      the 'make *config' stage.  Now, we can use the 'include' directive
      without showing the warning.
      Signed-off-by: NMasahiro Yamada <yamada.masahiro@socionext.com>
      0a16d2e8
  20. 23 7月, 2018 1 次提交
  21. 18 7月, 2018 5 次提交
  22. 16 7月, 2018 1 次提交
  23. 12 7月, 2018 1 次提交
  24. 09 7月, 2018 1 次提交
  25. 06 7月, 2018 1 次提交
  26. 02 7月, 2018 1 次提交
  27. 28 6月, 2018 1 次提交
  28. 24 6月, 2018 1 次提交
  29. 17 6月, 2018 1 次提交
  30. 14 6月, 2018 1 次提交
    • L
      Kbuild: rename CC_STACKPROTECTOR[_STRONG] config variables · 050e9baa
      Linus Torvalds 提交于
      The changes to automatically test for working stack protector compiler
      support in the Kconfig files removed the special STACKPROTECTOR_AUTO
      option that picked the strongest stack protector that the compiler
      supported.
      
      That was all a nice cleanup - it makes no sense to have the AUTO case
      now that the Kconfig phase can just determine the compiler support
      directly.
      
      HOWEVER.
      
      It also meant that doing "make oldconfig" would now _disable_ the strong
      stackprotector if you had AUTO enabled, because in a legacy config file,
      the sane stack protector configuration would look like
      
        CONFIG_HAVE_CC_STACKPROTECTOR=y
        # CONFIG_CC_STACKPROTECTOR_NONE is not set
        # CONFIG_CC_STACKPROTECTOR_REGULAR is not set
        # CONFIG_CC_STACKPROTECTOR_STRONG is not set
        CONFIG_CC_STACKPROTECTOR_AUTO=y
      
      and when you ran this through "make oldconfig" with the Kbuild changes,
      it would ask you about the regular CONFIG_CC_STACKPROTECTOR (that had
      been renamed from CONFIG_CC_STACKPROTECTOR_REGULAR to just
      CONFIG_CC_STACKPROTECTOR), but it would think that the STRONG version
      used to be disabled (because it was really enabled by AUTO), and would
      disable it in the new config, resulting in:
      
        CONFIG_HAVE_CC_STACKPROTECTOR=y
        CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
        CONFIG_CC_STACKPROTECTOR=y
        # CONFIG_CC_STACKPROTECTOR_STRONG is not set
        CONFIG_CC_HAS_SANE_STACKPROTECTOR=y
      
      That's dangerously subtle - people could suddenly find themselves with
      the weaker stack protector setup without even realizing.
      
      The solution here is to just rename not just the old RECULAR stack
      protector option, but also the strong one.  This does that by just
      removing the CC_ prefix entirely for the user choices, because it really
      is not about the compiler support (the compiler support now instead
      automatially impacts _visibility_ of the options to users).
      
      This results in "make oldconfig" actually asking the user for their
      choice, so that we don't have any silent subtle security model changes.
      The end result would generally look like this:
      
        CONFIG_HAVE_CC_STACKPROTECTOR=y
        CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
        CONFIG_STACKPROTECTOR=y
        CONFIG_STACKPROTECTOR_STRONG=y
        CONFIG_CC_HAS_SANE_STACKPROTECTOR=y
      
      where the "CC_" versions really are about internal compiler
      infrastructure, not the user selections.
      Acked-by: NMasahiro Yamada <yamada.masahiro@socionext.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      050e9baa