From 63b58a54f66fbc59dfc3b465cd697918dd746715 Mon Sep 17 00:00:00 2001 From: Vladimir Sokolovsky Date: Wed, 22 Feb 2012 10:42:12 +0200 Subject: [PATCH] compat-rdma: Initial commit Based on https://github.com/mcgrof/compat-wireless master Signed-off-by: Vladimir Sokolovsky --- .gitignore | 16 ++ COPYRIGHT | 356 ++++++++++++++++++++++++++++ config.mk | 41 ++++ crap/README | 17 ++ linux-next-cherry-picks/README | 20 ++ linux-next-pending/README | 18 ++ pending-stable/.ignore | 1 + pending-stable/README | 23 ++ scripts/admin_rdma.sh | 421 +++++++++++++++++++++++++++++++++ 9 files changed, 913 insertions(+) create mode 100644 .gitignore create mode 100644 COPYRIGHT create mode 100644 config.mk create mode 100644 crap/README create mode 100644 linux-next-cherry-picks/README create mode 100644 linux-next-pending/README create mode 100644 pending-stable/.ignore create mode 100644 pending-stable/README create mode 100755 scripts/admin_rdma.sh diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1ad998b --- /dev/null +++ b/.gitignore @@ -0,0 +1,16 @@ +drivers +Documentation +kernel +lib +net +fs +*~ +git-describe +compat-release +master-tag +Module.symvers +module.order +.pc +code-metrics.txt +compat_base_tree +compat_base_tree_version diff --git a/COPYRIGHT b/COPYRIGHT new file mode 100644 index 0000000..ca442d3 --- /dev/null +++ b/COPYRIGHT @@ -0,0 +1,356 @@ + + NOTE! This copyright does *not* cover user programs that use kernel + services by normal system calls - this is merely considered normal use + of the kernel, and does *not* fall under the heading of "derived work". + Also note that the GPL below is copyrighted by the Free Software + Foundation, but the instance of code that it refers to (the Linux + kernel) is copyrighted by me and others who actually wrote it. + + Also note that the only valid version of the GPL as far as the kernel + is concerned is _this_ particular version of the license (ie v2, not + v2.2 or v3.x or whatever), unless explicitly otherwise stated. + + Linus Torvalds + +---------------------------------------- + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/config.mk b/config.mk new file mode 100644 index 0000000..d3122f4 --- /dev/null +++ b/config.mk @@ -0,0 +1,41 @@ +export + +## NOTE +## Make sure to have each variable declaration start +## in the first column, no whitespace allowed. +# include $(KLIB_BUILD)/.config + +ifneq ($(wildcard $(KLIB_BUILD)/Makefile),) + +COMPAT_LATEST_VERSION = 3 + +KERNEL_VERSION := $(shell $(MAKE) -C $(KLIB_BUILD) kernelversion | sed -n 's/^\([0-9]\)\..*/\1/p') + +ifneq ($(KERNEL_VERSION),2) +KERNEL_SUBLEVEL := $(shell $(MAKE) -C $(KLIB_BUILD) kernelversion | sed -n 's/^3\.\([0-9]\+\).*/\1/p') +else +COMPAT_26LATEST_VERSION = 39 +KERNEL_26SUBLEVEL := $(shell $(MAKE) -C $(KLIB_BUILD) kernelversion | sed -n 's/^2\.6\.\([0-9]\+\).*/\1/p') +COMPAT_26VERSIONS := $(shell I=$(COMPAT_26LATEST_VERSION); while [ "$$I" -gt $(KERNEL_26SUBLEVEL) ]; do echo $$I; I=$$(($$I - 1)); done) +$(foreach ver,$(COMPAT_26VERSIONS),$(eval CONFIG_COMPAT_KERNEL_2_6_$(ver)=y)) +KERNEL_SUBLEVEL := -1 +endif + +COMPAT_VERSIONS := $(shell I=$(COMPAT_LATEST_VERSION); while [ "$$I" -gt $(KERNEL_SUBLEVEL) ]; do echo $$I; I=$$(($$I - 1)); done) +$(foreach ver,$(COMPAT_VERSIONS),$(eval CONFIG_COMPAT_KERNEL_3_$(ver)=y)) + +RHEL_MAJOR := $(shell grep ^RHEL_MAJOR $(KLIB_BUILD)/Makefile | sed -n 's/.*= *\(.*\)/\1/p') + +ifneq ($(RHEL_MAJOR),) +RHEL_MINOR := $(shell grep ^RHEL_MINOR $(KLIB_BUILD)/Makefile | sed -n 's/.*= *\(.*\)/\1/p') +COMPAT_RHEL_VERSIONS := $(shell I=$(RHEL_MINOR); while [ "$$I" -ge 0 ]; do echo $$I; I=$$(($$I - 1)); done) +$(foreach ver,$(COMPAT_RHEL_VERSIONS),$(eval CONFIG_COMPAT_RHEL_$(RHEL_MAJOR)_$(ver)=y)) +endif + +endif # kernel Makefile check + +ifdef CONFIG_COMPAT_KERNEL_2_6_36 +ifndef CONFIG_COMPAT_RHEL_6_1 + CONFIG_COMPAT_KFIFO=y +endif #CONFIG_COMPAT_RHEL_6_1 +endif #CONFIG_COMPAT_KERNEL_2_6_36 diff --git a/crap/README b/crap/README new file mode 100644 index 0000000..c1b512e --- /dev/null +++ b/crap/README @@ -0,0 +1,17 @@ + +compat-wireless crap patches +============================ + +If you are including patches into this directory you +must be fixing some critical bug for a customer which needs +immediate release or immediate testing. + +Alternatively you would use this to apply some sort of +crap code you are maintaining. + +You must have a really good reason to be adding files +in this directory. If possible you should explain your +reasoning of why the patch is getting included here and +not upstream and why it hasn't even yet been posted. + +You should avoid these patches at all costs. diff --git a/linux-next-cherry-picks/README b/linux-next-cherry-picks/README new file mode 100644 index 0000000..7dc4808 --- /dev/null +++ b/linux-next-cherry-picks/README @@ -0,0 +1,20 @@ +compat-rdma linux-next chery picked patches +=============================================== + +We work hard to get patches in time onto the stable +tree but sometimes a few things slip out, and sometimes a +stable fix is simply too big in size to be merged into +stable. In such cases though we do believe some of these +patches are still relatively important to either enable new +hardware which escaped the late rc cycles or to correct some +behaviour which might be too late for stable. We apply +these patches by default as they will be supported on these +releases. + +The larger the number of patches you see in this directory +the more we should be ashamed. We should strive to reduce this +to 0 all the time. + +This directory will always be empty for bleeding edge +releases as bleeding edge releases are always based on +linux-next already. diff --git a/linux-next-pending/README b/linux-next-pending/README new file mode 100644 index 0000000..ee00550 --- /dev/null +++ b/linux-next-pending/README @@ -0,0 +1,18 @@ + +compat-rdma linux-next-pending patches +========================================== + +You must have a really good reason to be adding files +in this directory. The requirement is your patches must have +been posted to a public mailing list for the subsystem you are +working on. Each patch you add here must have a really good +explanation on the top of the file which clarifies why the +patch has not yet been merged OR specify it on the commit log +when you add it on compat-rdma. + +We try to avoid having patch files because but we understand +if you might because you need to test code posted but not yet +merged into linux-next or a stable kernel release. This can happen +often during the merge window, when the maintainers are unavailable, +on vacation, suck at what they do, or for any other uncontrollable +reasons. diff --git a/pending-stable/.ignore b/pending-stable/.ignore new file mode 100644 index 0000000..d95fa13 --- /dev/null +++ b/pending-stable/.ignore @@ -0,0 +1 @@ +ath9k-lock-reset-and-PCU-start-stopping.patch diff --git a/pending-stable/README b/pending-stable/README new file mode 100644 index 0000000..8605152 --- /dev/null +++ b/pending-stable/README @@ -0,0 +1,23 @@ +compat-rdma pending-stable/ patches +======================================= + +Often right before the merge window we get a block on non +oops/regression fixes for stable fixes. Some stable fixes +often get propagated afterwards during the extraversion +maintenance of the kernels. Right before the merge window +circa rc4 and rc5 subsystem maintainers get pegged if they +throw in non oops/regression fixes for Linus or their +respective upstream maintainer. While this makes sense +for tree management and stable release considerations we +still need to get users some stable patches propagated. + +This directory is there to help with that. Only patches +which have been merged into linux-next.git will be included +in this directory which means you must post it and the maintainer +should have merged it and Stephen would have picked it up. + +This directory will always be empty for bleeding edge +releases as bleeding edge releases are always based on +linux-next already. This directory only makes sense for +stable release of the kernel, and it we will always try +to use it, in case there are stable fixes not yet propagated. diff --git a/scripts/admin_rdma.sh b/scripts/admin_rdma.sh new file mode 100755 index 0000000..30e1942 --- /dev/null +++ b/scripts/admin_rdma.sh @@ -0,0 +1,421 @@ +#!/bin/bash +# +# Copyright 2012 Mellanox Technologies Ltd. +# Copyright 2007, 2008, 2010 Luis R. Rodriguez +# +# Use this to create compat-rdma-2.6 + +# Usage: you should have the latest pull of linux-2.6.git +# + +GIT_URL="git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git" +# GIT_COMPAT_URL="git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/compat.git" + +FILES="scripts/checkout_files" +SRC=${SRC:-'.'} + +# Pretty colors +GREEN="\033[01;32m" +YELLOW="\033[01;33m" +NORMAL="\033[00m" +BLUE="\033[34m" +RED="\033[31m" +PURPLE="\033[35m" +CYAN="\033[36m" +UNDERLINE="\033[02m" + +CODE_METRICS=code-metrics.txt + +usage() { + printf "Usage: $0 [ refresh] [ --help | -h | -s | -n | -p | -c ]\n" + + printf "${GREEN}%10s${NORMAL} - will update your all your patch offsets using quilt\n" "refresh" + printf "${GREEN}%10s${NORMAL} - get and apply pending-stable/ fixes purging old files there\n" "-s" + printf "${GREEN}%10s${NORMAL} - apply the patches linux-next-cherry-picks directory\n" "-n" + printf "${GREEN}%10s${NORMAL} - apply the patches on the linux-next-pending directory\n" "-p" + printf "${GREEN}%10s${NORMAL} - apply the patches on the crap directory\n" "-c" +} + +# Execute command w/ echo and exit if it fail +ex() +{ + echo "$@" + if ! "$@"; then + printf "\nFailed executing $@\n\n" + exit 1 + fi +} + +brag_backport() { + COMPAT_FILES_CODE=$(find ./ -type f -name \*.[ch] | egrep "^./compat/|include/linux/compat" | + xargs wc -l | tail -1 | awk '{print $1}') + let COMPAT_ALL_CHANGES=$2+$COMPAT_FILES_CODE + printf "${GREEN}%10s${NORMAL} - backport code changes\n" $2 + printf "${GREEN}%10s${NORMAL} - backport code additions\n" $3 + printf "${GREEN}%10s${NORMAL} - backport code deletions\n" $4 + printf "${GREEN}%10s${NORMAL} - backport from compat module\n" $COMPAT_FILES_CODE + printf "${GREEN}%10s${NORMAL} - total backport code\n" $COMPAT_ALL_CHANGES + printf "${RED}%10s${NORMAL} - %% of code consists of backport work\n" \ + $(perl -e 'printf("%.4f", 100 * '$COMPAT_ALL_CHANGES' / '$1');') +} + +nag_pending_stable() { + printf "${YELLOW}%10s${NORMAL} - Code changes brought in from pending-stable\n" $2 + printf "${YELLOW}%10s${NORMAL} - Code additions brought in from pending-stable\n" $3 + printf "${YELLOW}%10s${NORMAL} - Code deletions brought in from pending-stable\n" $4 + printf "${RED}%10s${NORMAL} - %% of code being cherry picked from pending-stable\n" $(perl -e 'printf("%.4f", 100 * '$2' / '$1');') +} + +nag_next_cherry_pick() { + printf "${YELLOW}%10s${NORMAL} - Code changes brought in from linux-next\n" $2 + printf "${YELLOW}%10s${NORMAL} - Code additions brought in from linux-next\n" $3 + printf "${YELLOW}%10s${NORMAL} - Code deletions brought in from linux-next\n" $4 + printf "${RED}%10s${NORMAL} - %% of code being cherry picked from linux-next\n" $(perl -e 'printf("%.4f", 100 * '$2' / '$1');') +} + +nag_pending() { + printf "${YELLOW}%10s${NORMAL} - Code changes posted but not yet merged\n" $2 + printf "${YELLOW}%10s${NORMAL} - Code additions posted but not yet merged\n" $3 + printf "${YELLOW}%10s${NORMAL} - Code deletions posted but not yet merged\n" $4 + printf "${RED}%10s${NORMAL} - %% of code not yet merged\n" $(perl -e 'printf("%.4f", 100 * '$2' / '$1');') +} + +nag_crap() { + printf "${RED}%10s${NORMAL} - Crap changes not yet posted\n" $2 + printf "${RED}%10s${NORMAL} - Crap additions not yet posted\n" $3 + printf "${RED}%10s${NORMAL} - Crap deletions not yet posted\n" $4 + printf "${RED}%10s${NORMAL} - %% of crap code\n" $(perl -e 'printf("%.4f", 100 * '$2' / '$1');') +} + +nagometer() { + CHANGES=0 + + ORIG_CODE=$2 + ADD=$(grep -Hc ^+ $1/*.patch| awk -F":" 'BEGIN {sum=0} {sum += $2} END { print sum}') + DEL=$(grep -Hc ^- $1/*.patch| awk -F":" 'BEGIN {sum=0} {sum += $2} END { print sum}') + # Total code is irrelevant unless you take into account each part, + # easier to just compare against the original code. + # let TOTAL_CODE=$ORIG_CODE+$ADD-$DEL + + let CHANGES=$ADD+$DEL + + case $1 in + "patches") + brag_backport $ORIG_CODE $CHANGES $ADD $DEL + ;; + "pending-stable") + nag_pending_stable $ORIG_CODE $CHANGES $ADD $DEL + ;; + "linux-next-cherry-picks") + nag_next_cherry_pick $ORIG_CODE $CHANGES $ADD $DEL + ;; + "linux-next-pending") + nag_pending $ORIG_CODE $CHANGES $ADD $DEL + ;; + "crap") + nag_crap $ORIG_CODE $CHANGES $ADD $DEL + ;; + *) + ;; + esac + +} + +EXTRA_PATCHES="patches" +REFRESH="n" +GET_STABLE_PENDING="n" +POSTFIX_RELEASE_TAG="" +if [ $# -ge 1 ]; then + if [ $# -gt 4 ]; then + usage $0 + exit + fi + if [[ $1 = "-h" || $1 = "--help" ]]; then + usage $0 + exit + fi + while [ $# -ne 0 ]; do + if [[ "$1" = "-s" ]]; then + GET_STABLE_PENDING="y" + EXTRA_PATCHES="${EXTRA_PATCHES} pending-stable" + EXTRA_PATCHES="${EXTRA_PATCHES} pending-stable/backports/" + POSTFIX_RELEASE_TAG="${POSTFIX_RELEASE_TAG}s" + shift; continue; + fi + if [[ "$1" = "-n" ]]; then + EXTRA_PATCHES="${EXTRA_PATCHES} linux-next-cherry-picks" + POSTFIX_RELEASE_TAG="${POSTFIX_RELEASE_TAG}n" + shift; continue; + fi + if [[ "$1" = "-p" ]]; then + EXTRA_PATCHES="${EXTRA_PATCHES} linux-next-pending" + POSTFIX_RELEASE_TAG="${POSTFIX_RELEASE_TAG}p" + shift; continue; + fi + if [[ "$1" = "-c" ]]; then + EXTRA_PATCHES="${EXTRA_PATCHES} crap" + POSTFIX_RELEASE_TAG="${POSTFIX_RELEASE_TAG}c" + shift; continue; + fi + if [[ "$1" = "refresh" ]]; then + REFRESH="y" + shift; continue; + fi + + echo "Unexpected argument passed: $1" + usage $0 + exit + done + +fi + +# User exported this variable +if [ -z $GIT_TREE ]; then + GIT_TREE="/home/$USER/linux-next/" + if [ ! -d $GIT_TREE ]; then + echo "Please tell me where your linux-next git tree is." + echo "You can do this by exporting its location as follows:" + echo + echo " export GIT_TREE=/home/$USER/linux-next/" + echo + echo "If you do not have one you can clone the repository:" + echo " git clone $GIT_URL" + exit 1 + fi +else + echo "You said to use git tree at: $GIT_TREE for linux-next" +fi + +# if [ -z $GIT_COMPAT_TREE ]; then +# GIT_COMPAT_TREE="/home/$USER/compat/" +# if [ ! -d $GIT_COMPAT_TREE ]; then +# echo "Please tell me where your compat git tree is." +# echo "You can do this by exporting its location as follows:" +# echo +# echo " export GIT_COMPAT_TREE=/home/$USER/compat/" +# echo +# echo "If you do not have one you can clone the repository:" +# echo " git clone $GIT_COMPAT_URL" +# exit 1 +# fi +# else +# echo "You said to use git tree at: $GIT_COMPAT_TREE for compat" +# fi + +# Drivers that have their own directory + +# Staging drivers +STAGING_DRIVERS="" + + +/bin/rm -rf $SRC/`cat $FILES | awk -F '/' '{print$1}' | sort -u` + + +while read line +do + ex mkdir -p $SRC/$(dirname $line) + ex cp -a $GIT_TREE/$line $SRC/$(dirname $line) +done < $FILES + +if [ $SRC != '.' ]; then + ex cp -a [mM]akefile $SRC + ex cp -a configure $SRC +fi + +# Compat stuff +COMPAT="compat" +mkdir -p $COMPAT include/{linux,net,scsi} +### echo "Copying $GIT_COMPAT_TREE/ files..." +### cp $GIT_COMPAT_TREE/compat/*.c $COMPAT/ +### cp $GIT_COMPAT_TREE/compat/Makefile $COMPAT/ +### cp -a $GIT_COMPAT_TREE/udev/ . +### cp -a $GIT_COMPAT_TREE/scripts/ $COMPAT/ +### cp -a $GIT_COMPAT_TREE/include/linux/* include/linux/ +### cp -a $GIT_COMPAT_TREE/include/net/* include/net/ +### cp -a $GIT_COMPAT_TREE/include/scsi/* include/scsi/ +### rm -f $COMPAT/*.mod.c +cp -a $COMPAT/include/linux/* include/linux/ +cp -a $COMPAT/include/net/* include/net/ +cp -a $COMPAT/include/scsi/* include/scsi/ + +# Stable pending, if -n was passed +if [[ "$GET_STABLE_PENDING" = y ]]; then + + if [ -z $NEXT_TREE ]; then + NEXT_TREE="/home/$USER/linux-next/" + if [ ! -d $NEXT_TREE ]; then + echo "Please tell me where your linux-next git tree is." + echo "You can do this by exporting its location as follows:" + echo + echo " export NEXT_TREE=/home/$USER/linux-next/" + echo + echo "If you do not have one you can clone the repository:" + echo " git clone git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git" + exit 1 + fi + else + echo "You said to use git tree at: $NEXT_TREE for linux-next" + fi + + LAST_DIR=$PWD + cd $GIT_TREE + if [ -f localversion* ]; then + echo -e "You should be using a stable tree to use the -s option" + exit 1 + fi + + # we now assume you are using a stable tree + cd $GIT_TREE + LAST_STABLE_UPDATE=$(git describe --abbrev=0) + cd $NEXT_TREE + PENDING_STABLE_DIR="pending-stable/" + + rm -rf $PENDING_STABLE_DIR + + git tag -l | grep $LAST_STABLE_UPDATE 2>&1 > /dev/null + if [[ $? -ne 0 ]]; then + echo -e "${BLUE}Tag $LAST_STABLE_UPDATE not found on $NEXT_TREE tree: bailing out${NORMAL}" + exit 1 + fi + echo -e "${GREEN}Generating stable cherry picks... ${NORMAL}" + echo -e "\nUsing command on directory $PWD:" + echo -e "\ngit format-patch --grep=\"stable@kernel.org\" -o $PENDING_STABLE_DIR ${LAST_STABLE_UPDATE}.. $WSTABLE" + git format-patch --grep="stable@kernel.org" -o $PENDING_STABLE_DIR ${LAST_STABLE_UPDATE}.. $WSTABLE + if [ ! -d ${LAST_DIR}/${PENDING_STABLE_DIR} ]; then + echo -e "Assumption that ${LAST_DIR}/${PENDING_STABLE_DIR} directory exists failed" + exit 1 + fi + echo -e "${GREEN}Purging old stable cherry picks... ${NORMAL}" + rm -f ${LAST_DIR}/${PENDING_STABLE_DIR}/*.patch + cp ${PENDING_STABLE_DIR}/*.patch ${LAST_DIR}/${PENDING_STABLE_DIR}/ + if [ -f ${LAST_DIR}/${PENDING_STABLE_DIR}/.ignore ]; then + for i in $(cat ${LAST_DIR}/${PENDING_STABLE_DIR}/.ignore) ; do + echo -e "Skipping $i from generated stable patches..." + rm -f ${LAST_DIR}/${PENDING_STABLE_DIR}/*$i* + done + fi + echo -e "${GREEN}Updated stable cherry picks, review with git diff and update hunks with ./scripts/admin-update.sh -s refresh${NORMAL}" + cd $LAST_DIR +fi + +# Refresh patches using quilt +patchRefresh() { + if [ -d patches.orig ] ; then + rm -rf .pc patches/series + else + mkdir patches.orig + fi + + export QUILT_PATCHES=$1 + + mv -u $1/* patches.orig/ + + for i in patches.orig/*.patch; do + if [ ! -f "$i" ]; then + echo -e "${RED}No patches found in $1${NORMAL}" + break; + fi + echo -e "${GREEN}Refresh backport patch${NORMAL}: ${BLUE}$i${NORMAL}" + quilt import $i + quilt push -f + RET=$? + if [[ $RET -ne 0 ]]; then + echo -e "${RED}Refreshing $i failed${NORMAL}, update it" + echo -e "use ${CYAN}quilt edit [filename]${NORMAL} to apply the failed part manually" + echo -e "use ${CYAN}quilt refresh${NORMAL} after the files are corrected and rerun this script" + cp patches.orig/README $1/README + exit $RET + fi + QUILT_DIFF_OPTS="-p" quilt refresh -p ab --no-index --no-timestamp + done + quilt pop -a + + cp patches.orig/README $1/README + rm -rf patches.orig .pc $1/series +} + +cd $SRC + +ORIG_CODE=$(find ./ -type f -name \*.[ch] | + egrep -v "^./compat/|include/linux/compat" | + xargs wc -l | tail -1 | awk '{print $1}') +printf "\n${CYAN}compat-rdma code metrics${NORMAL}\n\n" > $CODE_METRICS +printf "${PURPLE}%10s${NORMAL} - Total upstream lines of code being pulled\n" $ORIG_CODE >> $CODE_METRICS + +for dir in $EXTRA_PATCHES; do + LAST_ELEM=$dir +done + +for dir in $EXTRA_PATCHES; do + if [[ ! -d $dir ]]; then + echo -e "${RED}Patches: $dir empty, skipping...${NORMAL}\n" + continue + fi + if [[ $LAST_ELEM = $dir && "$REFRESH" = y ]]; then + patchRefresh $dir + fi + + FOUND=$(find $dir/ -maxdepth 1 -name \*.patch | wc -l) + if [ $FOUND -eq 0 ]; then + continue + fi + for i in $dir/*.patch; do + echo -e "${GREEN}Applying backport patch${NORMAL}: ${BLUE}$i${NORMAL}" + patch -p1 -N -t < $i + RET=$? + if [[ $RET -ne 0 ]]; then + echo -e "${RED}Patching $i failed${NORMAL}, update it" + exit $RET + fi + done + nagometer $dir $ORIG_CODE >> $CODE_METRICS +done + +DIR="$PWD" +cd $GIT_TREE +GIT_DESCRIBE=$(git describe) +GIT_BRANCH=$(git branch --no-color |sed -n 's/^\* //p') +GIT_BRANCH=${GIT_BRANCH:-master} +GIT_REMOTE=$(git config branch.${GIT_BRANCH}.remote) +GIT_REMOTE=${GIT_REMOTE:-origin} +GIT_REMOTE_URL=$(git config remote.${GIT_REMOTE}.url) +GIT_REMOTE_URL=${GIT_REMOTE_URL:-unknown} +echo -e "${GREEN}Updated${NORMAL} from local tree: ${BLUE}${GIT_TREE}${NORMAL}" +echo -e "Origin remote URL: ${CYAN}${GIT_REMOTE_URL}${NORMAL}" +cd $DIR +if [ -d ./.git ]; then + if [[ ${POSTFIX_RELEASE_TAG} != "" ]]; then + echo -e "$(git describe)-${POSTFIX_RELEASE_TAG}" > compat_version + else + echo -e "$(git describe)" > compat_version + fi + + cd $GIT_TREE + TREE_NAME=${GIT_REMOTE_URL##*/} + + echo $TREE_NAME > $DIR/compat_base_tree + echo $GIT_DESCRIBE > $DIR/compat_base_tree_version + + case $TREE_NAME in + "linux-next.git") # The linux-next integration testing tree + MASTER_TAG=$(git tag -l| grep next | tail -1) + echo $MASTER_TAG > $DIR/master-tag + echo -e "This is a ${RED}bleeding edge${NORMAL} compat-rdma release" + ;; + "linux-2.6-allstable.git") # HPA's all stable tree + echo -e "This is a ${GREEN}stable${NORMAL} compat-rdma release" + ;; + "linux-2.6.git") # Linus' 2.6 tree + echo -e "This is a ${GREEN}stable${NORMAL} compat-rdma release" + ;; + *) + ;; + esac + + cd $DIR + echo -e "\nBase tree: ${GREEN}$(cat compat_base_tree)${NORMAL}" >> $CODE_METRICS + echo -e "Base tree version: ${PURPLE}$(cat compat_base_tree_version)${NORMAL}" >> $CODE_METRICS + echo -e "compat-rdma release: ${YELLOW}$(cat compat_version)${NORMAL}" >> $CODE_METRICS + + cat $CODE_METRICS +fi -- 2.41.0