Changes in diffconfig

87c7ee67 - scripts: handle BrokenPipeError for python scripts

Thu, 12 Jan 2023 02:30:06 +0000

scripts: handle BrokenPipeError for python scriptsIn the follow-up of commit fb3041d61f68 ("kbuild: fix SIGPIPE errormessage for AR=gcc-ar and AR=llvm-ar"), Kees Cook pointed out thattools should _not_ catch their own SIGPIPEs [1] [2].Based on his feedback, LLVM was fixed [3].However, Python's default behavior is to show noisy bracktrace whenSIGPIPE is sent. So, scripts written in Python are basically in thesame situation as the buggy llvm tools.Example: $ make -s allnoconfig $ make -s allmodconfig $ scripts/diffconfig .config.old .config | head -n1 -ALIX n Traceback (most recent call last): File "/home/masahiro/linux/scripts/diffconfig", line 132, in main() File "/home/masahiro/linux/scripts/diffconfig", line 130, in main print_config("+", config, None, b[config]) File "/home/masahiro/linux/scripts/diffconfig", line 64, in print_config print("+%s %s" % (config, new_value)) BrokenPipeError: [Errno 32] Broken pipePython documentation [4] notes how to make scripts die immediately andsilently: """ Piping output of your program to tools like head(1) will cause a SIGPIPE signal to be sent to your process when the receiver of its standard output closes early. This results in an exception like BrokenPipeError: [Errno 32] Broken pipe. To handle this case, wrap your entry point to catch this exception as follows: import os import sys def main(): try: # simulate large output (your code replaces this loop) for x in range(10000): print("y") # flush output here to force SIGPIPE to be triggered # while inside this try block. sys.stdout.flush() except BrokenPipeError: # Python flushes standard streams on exit; redirect remaining output # to devnull to avoid another BrokenPipeError at shutdown devnull = os.open(os.devnull, os.O_WRONLY) os.dup2(devnull, sys.stdout.fileno()) sys.exit(1) # Python exits with error code 1 on EPIPE if __name__ == '__main__': main() Do not set SIGPIPE’s disposition to SIG_DFL in order to avoid BrokenPipeError. Doing that would cause your program to exit unexpectedly whenever any socket connection is interrupted while your program is still writing to it. """Currently, tools/perf/scripts/python/intel-pt-events.py seems to be theonly script that fixes the issue that way.tools/perf/scripts/python/compaction-times.py uses another approachsignal.signal(signal.SIGPIPE, signal.SIG_DFL) but the Pythondocumentation clearly says "Don't do it".I cannot fix all Python scripts since there are so many.I fixed some in the scripts/ directory.[1]: https://lore.kernel.org/all/202211161056.1B9611A@keescook/[2]: https://github.com/llvm/llvm-project/issues/59037[3]: https://github.com/llvm/llvm-project/commit/4787efa38066adb51e2c049499d25b3610c0877b[4]: https://docs.python.org/3/library/signal.html#note-on-sigpipeSigned-off-by: Masahiro Yamada Reviewed-by: Nick Desaulniers Reviewed-by: Nicolas Schier List of files: /linux-6.15/scripts/diffconfig

51839e29 - scripts: switch explicitly to Python 3

Wed, 09 Dec 2020 11:50:17 +0000

scripts: switch explicitly to Python 3Some distributions are about to switch to Python 3 support only.This means that /usr/bin/python, which is Python 2, is not availableanymore. Hence, switch scripts to use Python 3 explicitly.Signed-off-by: Andy Shevchenko Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/diffconfig

c25ce589 - tweewide: Fix most Shebang lines

Mon, 23 Nov 2020 14:15:33 +0000

tweewide: Fix most Shebang linesChange every shebang which does not need an argument to use /usr/bin/env.This is needed as not every distro has everything under /usr/bin,sometimes not even bash.Signed-off-by: Finn Behrens Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/diffconfig

b2441318 - License cleanup: add SPDX GPL-2.0 license identifier to files with no license

Wed, 01 Nov 2017 14:07:57 +0000

License cleanup: add SPDX GPL-2.0 license identifier to files with no licenseMany source files in the tree are missing licensing information, whichmakes it harder for compliance tools to determine the correct license.By default all files without license information are under the defaultlicense of the kernel, which is GPL version 2.Update the files which contain no license information with the 'GPL-2.0'SPDX license identifier. The SPDX identifier is a legally bindingshorthand, which can be used instead of the full boiler plate text.This patch is based on work done by Thomas Gleixner and Kate Stewart andPhilippe Ombredanne.How this work was done:Patches were generated and checked against linux-4.14-rc6 for a subset ofthe use cases: - file had no licensing information it it. - file was a */uapi/* one with no licensing information in it, - file was a */uapi/* one with existing licensing information,Further patches will be generated in subsequent months to fix up caseswhere non-standard license headers were used, and references to licensehad to be inferred by heuristics based on keywords.The analysis to determine which SPDX License Identifier to be applied toa file was done in a spreadsheet of side by side results from of theoutput of two independent scanners (ScanCode & Windriver) producing SPDXtag:value files created by Philippe Ombredanne. Philippe prepared thebase worksheet, and did an initial spot review of a few 1000 files.The 4.13 kernel was the starting point of the analysis with 60,537 filesassessed. Kate Stewart did a file by file comparison of the scannerresults in the spreadsheet to determine which SPDX license identifier(s)to be applied to the file. She confirmed any determination that was notimmediately clear with lawyers working with the Linux Foundation.Criteria used to select files for SPDX license identifier tagging was: - Files considered eligible had to be source code files. - Make and config files were included as candidates if they contained >5 lines of source - File already had some variant of a license header in it (even if <5 lines).All documentation files were explicitly excluded.The following heuristics were used to determine which SPDX licenseidentifiers to apply. - when both scanners couldn't find any license traces, file was considered to have no license information in it, and the top level COPYING file license applied. For non */uapi/* files that summary was: SPDX license identifier # files ---------------------------------------------------|------- GPL-2.0 11139 and resulted in the first patch in this series. If that file was a */uapi/* path one, it was "GPL-2.0 WITH Linux-syscall-note" otherwise it was "GPL-2.0". Results of that was: SPDX license identifier # files ---------------------------------------------------|------- GPL-2.0 WITH Linux-syscall-note 930 and resulted in the second patch in this series. - if a file had some form of licensing information in it, and was one of the */uapi/* ones, it was denoted with the Linux-syscall-note if any GPL family license was found in the file or had no licensing in it (per prior point). Results summary: SPDX license identifier # files ---------------------------------------------------|------ GPL-2.0 WITH Linux-syscall-note 270 GPL-2.0+ WITH Linux-syscall-note 169 ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) 21 ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) 17 LGPL-2.1+ WITH Linux-syscall-note 15 GPL-1.0+ WITH Linux-syscall-note 14 ((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) 5 LGPL-2.0+ WITH Linux-syscall-note 4 LGPL-2.1 WITH Linux-syscall-note 3 ((GPL-2.0 WITH Linux-syscall-note) OR MIT) 3 ((GPL-2.0 WITH Linux-syscall-note) AND MIT) 1 and that resulted in the third patch in this series. - when the two scanners agreed on the detected license(s), that became the concluded license(s). - when there was disagreement between the two scanners (one detected a license but the other didn't, or they both detected different licenses) a manual inspection of the file occurred. - In most cases a manual inspection of the information in the file resulted in a clear resolution of the license that should apply (and which scanner probably needed to revisit its heuristics). - When it was not immediately clear, the license identifier was confirmed with lawyers working with the Linux Foundation. - If there was any question as to the appropriate license identifier, the file was flagged for further research and to be revisited later in time.In total, over 70 hours of logged manual review was done on thespreadsheet to determine the SPDX license identifiers to apply to thesource files by Kate, Philippe, Thomas and, in some cases, confirmationby lawyers working with the Linux Foundation.Kate also obtained a third independent scan of the 4.13 code base fromFOSSology, and compared selected files where the other two scannersdisagreed against that SPDX file, to see if there was new insights. TheWindriver scanner is based on an older version of FOSSology in part, sothey are related.Thomas did random spot checks in about 500 files from the spreadsheetsfor the uapi headers and agreed with SPDX license identifier in thefiles he inspected. For the non-uapi files Thomas did random spot checksin about 15000 files.In initial set of patches against 4.14-rc6, 3 files were found to havecopy/paste license identifier errors, and have been fixed to reflect thecorrect identifier.Additionally Philippe spent 10 hours this week doing a detailed manualinspection and review of the 12,461 patched files from the initial patchversion early this week with: - a full scancode scan run, collecting the matched texts, detected license ids and scores - reviewing anything where there was a license detected (about 500+ files) to ensure that the applied SPDX license was correct - reviewing anything where there was no detection but the patch license was not GPL-2.0 WITH Linux-syscall-note to ensure that the applied SPDX license was correctThis produced a worksheet with 20 files needing minor correction. Thisworksheet was then exported into 3 different .csv files for thedifferent types of files to be modified.These .csv files were then reviewed by Greg. Thomas wrote a script toparse the csv files and add the proper SPDX tag to the file, in theformat that the file expected. This script was further refined by Gregbased on the output to detect more types of files automatically and todistinguish between header and source .c files (which need differentcomment types.) Finally Greg ran the script using the .csv files togenerate the patches.Reviewed-by: Kate Stewart Reviewed-by: Philippe Ombredanne Reviewed-by: Thomas Gleixner Signed-off-by: Greg Kroah-Hartman List of files: /linux-6.15/scripts/diffconfig

6cd176a5 - vfs,ext2: remove CONFIG_EXT2_FS_XIP and rename CONFIG_FS_XIP to CONFIG_FS_DAX

Mon, 16 Feb 2015 23:59:25 +0000

vfs,ext2: remove CONFIG_EXT2_FS_XIP and rename CONFIG_FS_XIP to CONFIG_FS_DAXThe fewer Kconfig options we have the better. Use the genericCONFIG_FS_DAX to enable XIP support in ext2 as well as in the core.Signed-off-by: Matthew Wilcox Cc: Andreas Dilger Cc: Boaz Harrosh Cc: Christoph Hellwig Cc: Dave Chinner Cc: Jan Kara Cc: Jens Axboe Cc: Kirill A. Shutemov Cc: Mathieu Desnoyers Cc: Randy Dunlap Cc: Ross Zwisler Cc: Theodore Ts'o Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds List of files: /linux-6.15/scripts/diffconfig

c8272faf - diffconfig: Update script to support python versions 2.5 through 3.3

Tue, 20 Aug 2013 18:41:12 +0000

diffconfig: Update script to support python versions 2.5 through 3.3Support past and active versions of python while maintaining backwardcompatibility. Script has been tested on python versions up to andincluding 3.3.X.Signed-off-by: Mike Pagano Signed-off-by: Michal Marek List of files: /linux-6.15/scripts/diffconfig

6bf2e84b - diffconfig: Gracefully exit if the default config files are not present

Fri, 16 Aug 2013 18:40:56 +0000

diffconfig: Gracefully exit if the default config files are not presentHandle gracefully the instance where config files are not present.Compatible with python versions 2.5, 2.6 and 2.7.The try/except is forward compatible with python version 3 once the entire script is ported.Signed-off-by: Mike Pagano Signed-off-by: Michal Marek List of files: /linux-6.15/scripts/diffconfig

a717417e - kconfig: add diffconfig utility

Tue, 24 Jun 2008 17:56:06 +0000

kconfig: add diffconfig utilityDiffconfig is a simple utility for comparing two kernel configuration files.See usage in the script for more info.Signed-off-by: Tim Bird Signed-off-by: Sam Ravnborg List of files: /linux-6.15/scripts/diffconfig