From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759467AbdAILca (ORCPT ); Mon, 9 Jan 2017 06:32:30 -0500 Received: from mail-by2nam01on0080.outbound.protection.outlook.com ([104.47.34.80]:55072 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751034AbdAILcY (ORCPT ); Mon, 9 Jan 2017 06:32:24 -0500 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Yuri.Norov@caviumnetworks.com; From: Yury Norov To: , , , "linux-arch @ vger . kernel . org Arnd Bergmann" , Catalin Marinas CC: Yury Norov , Andrew Pinski , Andrew Pinski , Adam Borowski , Chris Metcalf , Steve Ellcey , Maxim Kuvyrkov , Ramana Radhakrishnan , Florian Weimer , Bamvor Zhangjian , Andreas Schwab , Chris Metcalf , Heiko Carstens , , , Joseph Myers , , , , , , , , , , , , Subject: [PATCH 08/20] thread: move thread bits accessors to separated file Date: Mon, 9 Jan 2017 16:59:45 +0530 Message-ID: <1483961397-8599-9-git-send-email-ynorov@caviumnetworks.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1483961397-8599-1-git-send-email-ynorov@caviumnetworks.com> References: <1483961397-8599-1-git-send-email-ynorov@caviumnetworks.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [103.78.20.242] X-ClientProxiedBy: AM4PR02CA0004.eurprd02.prod.outlook.com (10.165.239.142) To BN4PR07MB2241.namprd07.prod.outlook.com (10.164.63.147) X-MS-Office365-Filtering-Correlation-Id: c97ad8f9-1246-4662-0b3a-08d438832c41 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:BN4PR07MB2241; X-Microsoft-Exchange-Diagnostics: 1;BN4PR07MB2241;3:GeE918V9Kisz9CqSVxd6zbCTrLoA5C6zQkO/7TpyKfMM39G21DTMfJ9QkFEaxlORveHOAtY6iC+scRtrEwmxhN1h6HR4jl05QNIKGbWGHTfORZVubMkz4jNTgDy+AlmCigT4asW2/hgvQ5k4bU3p0sa9rmpE4TJpRlMBPzl3OZKrPEkpnvZ0ARpRWpA+IpHvyBhvTYFjlaLXcx8/t2vvp5Wje1ZNFGCTevIxi+5g1T7YpNGw9Va6ZUng25sTN9IuTXdjs3VnNc5/ugOURjDIqA== X-Microsoft-Exchange-Diagnostics: 1;BN4PR07MB2241;25:N7OOkJZJdbdGLQKbV4u32tBxD/V7LMcNV/VmHWKJf7EKlZ8zpLQzv2hdgC1CY7wbQ/J7pF7i9drS3neeKZd1JUwx8rtvabg1D8ZNcyuxFmAOjvhb34q8XI08K6kdW17eXLT4KufXpipN4xHK3rK8J+cC7CZw8rd1gOgFouN2HYsfXcZLt1duiFwcxsqcxjHrCn9azTlvHFfERl2LG7LFdNan/kb8F3YukhdL8DpUN8qSRhdhZgiHR8o+GGujL0v4W0XXTiHpgcvNeiq/BjbsDdLZacjBzjQB4+AMiyAUPbgwA1Zf31OUDflVlR3K7RI8WcsSouJeqIU+zfIzBo4WuHn9GS08GXWfElIOqAAEN0aLcbZQRdn5x4fcUC5gCEhnJWkPzilUD1XkdB1TowUN2KRvPwmUV0/ZHJdi+Nmjv/2sLbA16MensgpR3LXQmx9W917pBsU/GIC6QjHAAXl6PN83b606Tc9gfU7KLtqs3Dd+Pwb9IHK/onDXnbRjZ0a10fM5XT9s55VXU7osPBVNmIy2YUyNH+avxEty+KtmN+7fF4CDjgyADYyklKO7St2JJoVK0JtGSw1QwI3j63I7GrLL0bWQhhDMYY0pBeYIg9s6OdyX9b3HTO8vrsgk2czGUDBm+S0aLcgHa59i7EaDtg6wHoJSXmhif+e/H+RbG0f+MhimNmnqAcgA6YCrkoxiJ/ZUHdv4c4z6bEogsZe6Rmqg7XKR6DWekJ8pkj/vWhuSW73Ykh0J/UuIRTUc6fyOwLL6GOLBrwPRcVuMjc/RLY9uz86/aOtwrJ9EHOue1dI= X-Microsoft-Exchange-Diagnostics: 1;BN4PR07MB2241;31:zlv2nc4snCOJy1y0QliZeLLPCaOxrb3C+xg0uCfcJqHDEZGqtvBRBm5EUcpmp0kAotMqYzo1JCQFpEvPgm6EVVvUnDfOBzD+ITTU26yk6lRecrT41t4AcbbjcVNzfhrZbsCgkiwBSWJfF3MG2ko5B8j3iEjXmfxfBtfQMzxr5pXKhh5aYsztkJG19pFWY4iOPjnxv+U6V1GKqdVbqzSDun0n0V/Q5H2QjSq3gnMpEPls5oADXp5KbT9xL0SD5HHM;20:G+5ldrUIg/i70SjIeuJZG06Ll2AeUQkwwy7npdxvM39bhRTW+Mlrmv8vChhtcY4FK46UbCGWiMrH/UP2Mlb17HisCWlNRAuUfqT81Nu25uttolKjlx1KAXd7Bd9oCoh0A0StsNn2AwaT8qJTYaVmykTJFRuftPbnSS4Bj5ATslTUHwoOTapXbq7Q1mc43bUMTrHXvvi+UUzYgcXGQamouk+NHg9LcBfqwyg9Qe/wkCGRmjef0aD6Nnw/6gM29VUQ7qVw7q+OmWPYCxmddh+U8vPuMKO2YI4tPFfPm0mBLZPSj7Cfni8RvUGdfdthEkQEPTEVVDNPx6dsj8vml4HDy/kiUaAUkKaP9AgayvBXgF2xI1m9gVIRKYWj8Tv/eCPjJAH50F/Vm79vlisFuZm/Nlwih0RsiddfeaPgPHDF8bbVZIRXq0WchGwXrVljAgz58j7z9WQ+I2ihQg2NQrDHaUw3i7ES7BMYiFCuEkw0R5gknZoSewoB6kkv2ifyp6UyTtMa8mreLo0P00I36DnHR7IOCUoBBi+qqMfnLusahIRCZjus8wNdciaGDTBwQ6dpZYxEmGU4ADF7trBJwFsDk1PacGs4AxU3S5R3naFZx1w= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040375)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6041248)(20161123562025)(20161123555025)(20161123564025)(20161123560025)(6072148);SRVR:BN4PR07MB2241;BCL:0;PCL:0;RULEID:;SRVR:BN4PR07MB2241; X-Microsoft-Exchange-Diagnostics: 1;BN4PR07MB2241;4:BQ5lJ7+Bgm0/E4pSfCDrrNPp1g16TcqKIEczYCvPZVTSeva9Dn8vFNQLOXGFB0iuevia+9udEgX/BuR2PY/MYpftgOrjJw+k1wdV7opvlDW3ayfCA8NrJvQTxO+/ibOcK9lybSYeQxCEJ1b8hPL/kD6tR/2Kw2gilsh5afNQBOCeQ2DYZGq1MGHV5bPOFuJtoapjyaB693Ou2lsRa6XW5qCE5KzDxrbplAdz2qcfwOyWzdCr9pl6XM7OSvjPAmB6p1wDis5TLEBy5utLj/M9y5PDk/b7vWQd6TIYR7Q1veaBrVj0NlrGdS//vgcH+43/EaG/exQ+vvF963MkC7+hnPb6qdwntHkXYMNKumm08WVbdMkF6Ta1gtbQ11pRk/MrjCcq7VGmo7x9JHo5pZUZt4D4Kpvyy14Q4pp0OjAvRYW73TYA6NafaNknW4tlWE7CYTwEPdSmwlDh96hJyc8EZEAMpwuGO3MDDZHiD/oeTVaQ5tdZde+Bycx2uZW2qseLQ09Obj3d1Sso90w3ZWiA9D7qFAg6mc8v2mspLjCYktqKUMMGtsBqVVRBTgpoOBvG X-Forefront-PRVS: 0182DBBB05 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6069001)(6009001)(7916002)(39450400003)(199003)(189002)(42186005)(48376002)(101416001)(105586002)(76176999)(106356001)(50466002)(50986999)(47776003)(66066001)(36756003)(5001770100001)(97736004)(76506005)(92566002)(8676002)(7416002)(81166006)(81156014)(50226002)(5003940100001)(189998001)(4326007)(33646002)(68736007)(305945005)(2906002)(7736002)(2950100002)(6496003)(6486002)(6666003)(39060400001)(38730400001)(3846002)(5660300001)(6116002)(25786008)(2201001)(54906002)(2101003);DIR:OUT;SFP:1101;SCL:1;SRVR:BN4PR07MB2241;H:localhost;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BN4PR07MB2241;23:vfJHsgDRPj+A2aq4ss9f12u3ECjZAoXLQHJYplXIu?= =?us-ascii?Q?sySx6dlPE4chKgpBEk3bRujY+eY7RTTcuylkncjeiJmmtneOmWti5Aq2kx5q?= =?us-ascii?Q?mrRBqPdFE+MdqUXb0r5VpgHBdPird8X7h3cvPj0RrAiSUMfkHAM9qmnpWMYV?= =?us-ascii?Q?clzTNDeoHXym6ocPluL1PKq7j/vjIskwqTMZsULqGPv/EmEdf/W9htDUD8b1?= =?us-ascii?Q?mw/xPJZhncu8lKg425xIPuL6kGwndPTHnDMVYNIytSMtK+cA3gxmbkx4LKXx?= =?us-ascii?Q?Nf0Qv9m38v0L8NcQTuqBs1DC5a8yo04fHNXzdibSTLloNpG8UNdR582yQvwS?= =?us-ascii?Q?FCC/3M3GticNLtl75ZDzJtaMIGxzglDytn2NixjFCF0OiDM1NujXBjL5tQBr?= =?us-ascii?Q?UZxCbOLM/p2B4+zD0NAwtXWD6kAz1wEn+yNkvdck8PK81Q1cBUvbnQbez0m7?= =?us-ascii?Q?K5cAomUARPCImcg32aWtImlSwXdoNKt/oabBGpp2vzRUBJDed/vloP6EVMLZ?= =?us-ascii?Q?0k1PnGu8trVGDLN7UGmDj9Ye52Ib8qVggiw1bkebTi49zWV0L5D1e0wZkXTh?= =?us-ascii?Q?bvHYZSiFM4zZR31bp32BhwB4e9Gx82j3ik+pHWvWAkXEnwhu5FxRCn5+6Ak1?= =?us-ascii?Q?cjPpV+MlvnOMQ/NT0dF1pYdmRtSnz8soZM8aKDH59EGwWNqLYNfOZrqhd9cQ?= =?us-ascii?Q?t7Q01RrkPKztgvxc+K8LznOYPA5Kr0dLtN0FeTGYNM61eu0fqn40zjxWW9M/?= =?us-ascii?Q?HMQR8TD1ds+HQrA01GNdlCHgDWHn2jJKHA8uOoD6CwVwA19M1iE5RJtXaRXg?= =?us-ascii?Q?yC8XU03/pkYKouzPHsbqoXQeWI/XKgrkWLzL9yXeKTsVftmw5z0yuEgSECsZ?= =?us-ascii?Q?0uZjAPNgP3f3d9Q1HIwKvvwIh2aRaRnqXpr2GwXXu1W45iZCV7WbPu7iHIyw?= =?us-ascii?Q?simErFo4K2pfN3COqiQtA+/kRH5MDD5fRlLMbNPc8nrmrC8NqqMTV9rJd+zN?= =?us-ascii?Q?H6hfrxc2RJ31nrnj2nJVvjF1fV806SWQpZ057jb6SfYCtVrQ3v2LUHjMRXp8?= =?us-ascii?Q?FUQgOYPQbf9xRhZnqdhuDjER7O0ecphkl/LAGaBEnTuxKTsBS6Nlfnpj/5er?= =?us-ascii?Q?OTHA01Fom+JB6YnPxh8uHEnhIg8BL5L5lILFj7oDI4ly+nipv9xyg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;BN4PR07MB2241;6:0ywKMU462s4w0/rrSpceiGXVUFika5W2BsGYgB2il1DDzj0vZQgGHbsohw5PHJZSjZr+Ni/cKTxd1PbdIsvdtin3dbpuvcncGCwjv6GBtzbPAyDdc+s2DWJkE/sGYAaGTmLLZBOvpJKUeTr3bQadrMsZnEJ0o4Y80w5t6fmH67sEaQ4684bHpcJ2upYK9/xysoofLJpC+Jyh89FghzB2bukbZU30mkO4sK1XTbIolMlkzDWV9xOeo55FjCtp8ROVpw8jCbncwBaMHfmwJ0X4w6Ai31TC7F3GsmIACi3EPw2uF7qh536jS8eho7l3ldpUWsix07k92TeTNCY/K04gAbD5ONubgxLbsFBbe9FAUbkNll7lP/I4qJcC3awjgNtxhy23SoneqPZcw4Oyi0BV308RuKcyaMcOm2f43fN4pYY=;5:/g3qu+xXtVSg+zczgfdCm/AiNMPfhkBylhvhi/hUOycf8JpCccdxj1XvEOEhWo/dHYrXYXMaZg5wuZeILQBzofmyy0Ap/bl76/AmLNKqRp7aBbQTJb+O0+MsU5N8NK7Z4ouyd5kXDFSJ4sDypQjp3A==;24:OuIcgKGqpt99EvfETC6gqc+CqQdLYVD1jHx7GIWu3RXBjXY2/G4CLUVk/ssXpuIFNfh/kC3lS3M8v4Ir38xOE/JErvIETmnG5xAqRmIes7o= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;BN4PR07MB2241;7:iop2ozBQrKtEvVo1QnVLXgBFJt+kbnvseeIQeUbRlSaejAqxZRjalzij5RlLgUtaS2Tw0hSMWd+mcpoltYAzGYOx+yp+PNTlAdO/G6vyED+XC1nruaQenP5tFef8GaG2Mw6qSAZ/GmLG2413KeVKZZT8HlC4a1x3mbvrD/XHYeL+Zeq1r19RL+bEAnAJx8Eb9T2ZxgtAmXDUsIQcSwrwGXeBuIXHI2DQ4sBb3VkhtDSEf1o5v6lRe6bFuFWvxNqZ1pgkxTpjovcpsx5/91K5+k+/Ndpa0+33LpKIQHAK955Ef43KjTjSHwN3Z+HdN3oMeEu2m4ScLRq6Sx5AfhAvrjHVbBwmkc2OvVyP6i1e17m8Q/OhyXwLl1E4EL23qp7Img+6HoqqXtHhSuP5hd+8jzU3kh6jBlgbRElpi2pqdqj0bKYxyzFLQvp7xD9aELiuUinSxp961beIUsskVloBsA== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jan 2017 11:32:19.1867 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN4PR07MB2241 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org They may be accessed from low-level code, so isolating is a measure to avoid circular dependencies in header files. The exact reason for circular dependency is WARN_ON() macro added in patch edd63a27 "set_restore_sigmask() is never called without SIGPENDING (and never should be)" Signed-off-by: Yury Norov --- include/linux/thread_bits.h | 63 +++++++++++++++++++++++++++++++++++++++++++++ include/linux/thread_info.h | 54 +------------------------------------- 2 files changed, 64 insertions(+), 53 deletions(-) create mode 100644 include/linux/thread_bits.h diff --git a/include/linux/thread_bits.h b/include/linux/thread_bits.h new file mode 100644 index 0000000..8735433 --- /dev/null +++ b/include/linux/thread_bits.h @@ -0,0 +1,63 @@ +/* thread_bits.h: common low-level thread bits accessors */ + +#ifndef _LINUX_THREAD_BITS_H +#define _LINUX_THREAD_BITS_H + +#ifndef __ASSEMBLY__ + +#include +#include + +#ifdef CONFIG_THREAD_INFO_IN_TASK +/* + * For CONFIG_THREAD_INFO_IN_TASK kernels we need for the + * definition of current, but for !CONFIG_THREAD_INFO_IN_TASK kernels, + * including can cause a circular dependency on some platforms. + */ +#include +#define current_thread_info() ((struct thread_info *)current) +#endif + +/* + * flag set/clear/test wrappers + * - pass TIF_xxxx constants to these functions + */ + +static inline void set_ti_thread_flag(struct thread_info *ti, int flag) +{ + set_bit(flag, (unsigned long *)&ti->flags); +} + +static inline void clear_ti_thread_flag(struct thread_info *ti, int flag) +{ + clear_bit(flag, (unsigned long *)&ti->flags); +} + +static inline int test_and_set_ti_thread_flag(struct thread_info *ti, int flag) +{ + return test_and_set_bit(flag, (unsigned long *)&ti->flags); +} + +static inline int test_and_clear_ti_thread_flag(struct thread_info *ti, int flag) +{ + return test_and_clear_bit(flag, (unsigned long *)&ti->flags); +} + +static inline int test_ti_thread_flag(struct thread_info *ti, int flag) +{ + return test_bit(flag, (unsigned long *)&ti->flags); +} + +#define set_thread_flag(flag) \ + set_ti_thread_flag(current_thread_info(), flag) +#define clear_thread_flag(flag) \ + clear_ti_thread_flag(current_thread_info(), flag) +#define test_and_set_thread_flag(flag) \ + test_and_set_ti_thread_flag(current_thread_info(), flag) +#define test_and_clear_thread_flag(flag) \ + test_and_clear_ti_thread_flag(current_thread_info(), flag) +#define test_thread_flag(flag) \ + test_ti_thread_flag(current_thread_info(), flag) + +#endif /* !__ASSEMBLY__ */ +#endif /* _LINUX_THREAD_BITS_H */ diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h index 5837387..a325deb 100644 --- a/include/linux/thread_info.h +++ b/include/linux/thread_info.h @@ -11,18 +11,7 @@ #include #include -#ifdef CONFIG_THREAD_INFO_IN_TASK -/* - * For CONFIG_THREAD_INFO_IN_TASK kernels we need for the - * definition of current, but for !CONFIG_THREAD_INFO_IN_TASK kernels, - * including can cause a circular dependency on some platforms. - */ -#include -#define current_thread_info() ((struct thread_info *)current) -#endif - -#include -#include +#include #ifdef __KERNEL__ @@ -33,47 +22,6 @@ # define THREADINFO_GFP (GFP_KERNEL_ACCOUNT | __GFP_NOTRACK) #endif -/* - * flag set/clear/test wrappers - * - pass TIF_xxxx constants to these functions - */ - -static inline void set_ti_thread_flag(struct thread_info *ti, int flag) -{ - set_bit(flag, (unsigned long *)&ti->flags); -} - -static inline void clear_ti_thread_flag(struct thread_info *ti, int flag) -{ - clear_bit(flag, (unsigned long *)&ti->flags); -} - -static inline int test_and_set_ti_thread_flag(struct thread_info *ti, int flag) -{ - return test_and_set_bit(flag, (unsigned long *)&ti->flags); -} - -static inline int test_and_clear_ti_thread_flag(struct thread_info *ti, int flag) -{ - return test_and_clear_bit(flag, (unsigned long *)&ti->flags); -} - -static inline int test_ti_thread_flag(struct thread_info *ti, int flag) -{ - return test_bit(flag, (unsigned long *)&ti->flags); -} - -#define set_thread_flag(flag) \ - set_ti_thread_flag(current_thread_info(), flag) -#define clear_thread_flag(flag) \ - clear_ti_thread_flag(current_thread_info(), flag) -#define test_and_set_thread_flag(flag) \ - test_and_set_ti_thread_flag(current_thread_info(), flag) -#define test_and_clear_thread_flag(flag) \ - test_and_clear_ti_thread_flag(current_thread_info(), flag) -#define test_thread_flag(flag) \ - test_ti_thread_flag(current_thread_info(), flag) - #define tif_need_resched() test_thread_flag(TIF_NEED_RESCHED) #ifndef CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES -- 2.7.4