From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752156AbcHFUWW (ORCPT ); Sat, 6 Aug 2016 16:22:22 -0400 Received: from mail-co1nam03on0056.outbound.protection.outlook.com ([104.47.40.56]:5024 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751010AbcHFUWR (ORCPT ); Sat, 6 Aug 2016 16:22:17 -0400 Authentication-Results: spf=pass (sender IP is 63.163.107.21) smtp.mailfrom=sandisk.com; redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=bestguesspass action=none header.from=sandisk.com; X-AuditID: ac160c69-5f3ff70000000bcb-eb-57a51acdf87f Subject: [PATCH v2 2/3] sched: Introduce a local variable in abort_exclusive_wait() To: Ingo Molnar References: <908d9eda-4942-270c-7431-bf56f0a62681@sandisk.com> CC: Peter Zijlstra , Oleg Nesterov , "akpm@linux-foundation.org" , Johannes Weiner , Neil Brown , Michael Shaver , "linux-kernel@vger.kernel.org" From: Bart Van Assche Message-ID: <851823bf-b235-81de-8833-6b73318e8c82@sandisk.com> Date: Fri, 5 Aug 2016 16:09:25 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2 MIME-Version: 1.0 In-Reply-To: <908d9eda-4942-270c-7431-bf56f0a62681@sandisk.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprMIsWRmVeSWpSXmKPExsWyRoxnke5ZqaXhBk3njCzmrF/DZrF6k6/F mkkP2Swu75oD5P07xWixd34Di8XW/a2MFsd7DzA5cHgcfvOe2WPnrLvsHptXaHlsWtXJ5nFi xm8Wj/f7rrJ5bD5d7fF5k1wARxSXTUpqTmZZapG+XQJXxr2Hx1gKfnBVbH/7h7GBsYuzi5GT Q0LARGLq06mMXYxcHEICS5kk3sx5wwzhbGeUOLr6PAtM1flPV6ESSxkl1vR+ZQJJCAuESmy+ uosdxBYRUJJY/OUjmC0kYCdxc/MPJpAGZoGNTBLnb58Gm8QmYCTx7f1MMJsXqKhz0VJWEJtF QEXi9oRpbCC2qECYxLS7b9khagQlTs58AlbPKWAvcfnPI6B6DqChmhLrd+mDhJkF5CW2v50D dpyEwENWiaPL2lkhjlCXOLlkPtMERuFZSEbNQmifhaR9ASPzKkax3Myc4tz01AJDU73ixLyU zOJsveT83E2MkKjK3MF494n3IUYBDkYlHt4F65aEC7EmlhVX5h5ilOBgVhLhlZZcGi7Em5JY WZValB9fVJqTWnyIUZqDRUmc1+3elzAhgfTEktTs1NSC1CKYLBMHp1QDY9ahtXuO/L72f5rv GVaP2ac4Z/5I/aeem7SUv/hi0IS9jeyak2oSk5S2FtV91EtNrCqL/tEcaf5x8233NTq6FlaL bzrLvbrOcatn/iVFS11DLdnvP977vu83Upk9eVVHd9q9J9OvF+S85dzCs+Dtgz3mIctSJLaa 3lxxsEz9Xd9bMe6uba+XSCixFGckGmoxFxUnAgDQHDk2pgIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupiluLIzCtJLcpLzFFi42Lh2siRortcZmm4wYdOVYs569ewWaze5Gux ZtJDNovLu+YAef9OMVrsnd/AYrF1fyujxfHeA0wOHB6H37xn9tg56y67x+YVWh6bVnWyeZyY 8ZvF4/2+q2wem09Xe3zeJBfAEcVlk5Kak1mWWqRvl8CVce/hMZaCH1wV29/+YWxg7OLsYuTk kBAwkTj/6SpzFyMXh5DAYkaJeyeusoEkhAVCJTZf3cUOYosIKEks/vIRzBYSsJO4ufkHE0gD s8BGJokbc3+CJdgEjCS+vZ/JAmLzAhV1LlrKCmKzCKhI3J4wDWyoqECYxLS7b9khagQlTs58 AlbPKWAvcfnPI7B6ZgF1iT/zLjFD2PIS29/OYZ7AyDcLScssJGWzkJQtYGRexSiWm5lTnJue WWBopFecmJeSWZytl5yfu4kRHNqcUTsYr080P8TIxMEp1cBoYMUc+mXPJrVDFZv0bdbLWF31 9dtyJUnoUELmlE/mthITrspO0NUxfHN+iZvezViDy+uVvm/+k3Pfomzp6fCwvtk5bJ+zd0fZ 7DUJvj7Lrvl8fnjskvfHolwuTTR65LKZb5lG9KNI/W8eL/jqU4/XzXzXO+vmweXH47gW7UzO D5RYu3Ca7duzSizFGYmGWsxFxYkAcolyWx0CAAA= X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:63.163.107.21;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(7916002)(2980300002)(438002)(189002)(199003)(106466001)(8676002)(54356999)(76176999)(110136002)(356003)(4326007)(31696002)(65956001)(2270400002)(65806001)(50986999)(68736007)(97736004)(81156014)(4001350100001)(47776003)(86362001)(87936001)(83506001)(19580405001)(69596002)(33646002)(189998001)(81166006)(19580395003)(230700001)(2906002)(305945005)(23676002)(50466002)(77096005)(7846002)(229853001)(8936002)(7696003)(36756003)(92566002)(2950100001)(31686004)(53416004)(64126003)(586003)(65826006);DIR:OUT;SFP:1101;SCL:1;SRVR:DM5PR02MB2265;H:milsmgep15.sandisk.com;FPR:;SPF:Pass;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BN1BFFO11FD044;1:nfTyk3WXd5R/WmTuz7dy+fVFI/MhfgqcrpeZLy3uCoRdGE6f+MVDmDvJl9F1zBHd4Vobu81pMpGbcFUN3/wb7HWhGqxITFiPfi2sFv1wI29/WSLetJzgiCQMcCYswx02MIFDKfItHGdRHPnJkR8rcNBatEh4fH/D0Djpzm343Xc0S30PnBmDK1tCG5+rKmZp/cpU1oyL0Xye/wTjH0feEqFApQk4WGc0E/BmEJn11a7QsfipI5smNdB77ziU9M0VSEyAGteklNHIX+oNN9BlcupXTBveJ6tNzfa4njXypyhyDBoACCIIGoiRkboA9hmbGN7j2JOgzCNX9pQiZWdy2sQV+6Fsn1OE+8QYa33obJWsEHX86JPHVkAR8v9nzI0bSIdzQR3Usfoglj53Q1l8gRL7ZnO64jkzffUgClQHds183Kfka0a0A5Tccrk8bFn4KIEsPVGAInGt3ex4a7bFhg/CrfeJGQXEqHZ/8TokxvwrvkiVo/AlBWhJCjlrdK+ui9QJY39bAya8gasTeuLaYg== X-MS-Office365-Filtering-Correlation-Id: ab5312eb-3331-484c-5710-08d3bd858fb2 X-Microsoft-Exchange-Diagnostics: 1;DM5PR02MB2265;2:7JlpBh4UW9kyqY0+qgt3CKBbFqR0/OrOKNRcIgB+tiJ7rU2/6uKre0bVWbIh78ZAmwJ8jRE2QTqJTAQVDkEbadn57hRY7BWPlOQ3hRglrfcN7ARR4YO5AGjXZzvKAXGsaTw0eC9F9Ij6Sk0PSDc9oXJAalVVN5bv3SIht34MjFDOeX50wz3BjA+Yo4YhENq2;3:4ZgWoHOKIygxDX+pVezTuoZN4ZhKcbDpDDmZuQZfnmFGQqxVMVFXGpzVjjLTSIckl/eHi+ea8UvxQ+Ls+d8hFMmukF8t8WA03xI74Ymlx8lqzcFwHDLFAG3itXrZ94ZBjd7ZCRK836FGxXEnS7gF9Dgi4zEwOVqEdI5QiF1Tw04Tcb9hror4DLsHMtzCtz6v0Yivu1Q1J+no3vMdEyioP+cTF2pKC5p4W1NpItZwJ0LseRcPIBRh4Ehmi085AuznJN1rsT1EC4JMg4zLgOhufw== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(8251501002);SRVR:DM5PR02MB2265; X-Microsoft-Exchange-Diagnostics: 1;DM5PR02MB2265;25:uuIQ66l+rFizRBQM4CyIOKIdTld0JWhcIKoCmnkY1uS2ad7sk/CAxZXykRZoPgwrMt3FvW2kU9Pt72NN+N7eX+FgHd9cX0Fh2mkILCP+LXPejW9sCOHrBywe1hw6m6D24Mwu4sw1ys8jPLDUFkAdZvqKunntPObYw0aYMG/1xNDoFP4Inb7NWkxxIIkIfpVAy02A/IACY6YyuaLpH7IUdHS9LnJYzn/mVqngHRBwSMuJyP1eBfcVdUoYz8vEtD3D04aWvUNtlhypBpvQarnWiwsyazZJYvqsrkU/cYgZ8/wlyBFerErWinoCMxG8IvQaYf6zqIueaaE5Nftu9E4Zgr8/2q/SVNpmJ5Qa/wl/9LkBhLVpX2MrY/PieeH1ibjqjoCop33dllopf77Ct/tw+URwlFSHDCqpvrfgkGbMstijtaIAs9fTyT12GM2HipIi0Rm5OFtzI326XqsF3fM4601na94W62HMt7GSATuM8VDj8D3I7bEc31QsITIKabDq81yeMeF8jo9hPxCWbF4Eby9mdNVbOGWczAoh3AN7SoU32M4p6wJKoAa5iUTGev7JMgayNOK9L2zqVZnCDZ2rzAeUMJoUVhmgSlfjWFNuwt847EfCs3e/GjYFLjQbc95Lf9dBn8+9GVJt86wHLwR4ZqeO6cfk29oVdfULRfWA5+S6ZAourrMQMzxbA55ADYyLZDdK9X3ZK5HiWAd/VIBViaQm7AQfzHmB2lXp9v/y8OZdKdjOq8ryGSUqJOeGXrIT X-Microsoft-Exchange-Diagnostics: 1;DM5PR02MB2265;31:MC0VXQfI0BkAw+xspbKecGgT7xVgIIETqU4Xm9L6vPSAnWhzWZ6gRqFQo9XQXP9Mc9SOlpCDWJAIrYPIMQgD4Aq466zy0afG8Vilqlh5YOIJaNxeu1quvJK52lbwo7tpfBxEHtdbLIUB4l9lSCp0M1D4X6naxc0y/X+FmJbmw87M/+TsNbU3+o9rAFne7CIyWgAnd0YMJtVUfltu21S47wY0S6N5hy7i/J0VivHnAps=;20:w7oS3afLxlOX9XPcDHk3oWnGA5U3O/19p4OLr+Vc6uYzZamCQfSd2fTxtBsDsOie/q2ONdiVZX/BIEkqRqKgJfVR0Ixso6elnidvkEzl25YlKBXH9bpuRjV1taAQ31uBDjeUppSVrRqcz2oHDnuuXbDd/7hsmSPLUzHFh8ryuTWvBzqbxd3KW/wGz1fSTQtzy9rY2egnCX3lFB1cRwpZxsDiupWo5f+7ji7ZFSeMym/Fw/9wd7nSFp14yLrLX6XpodaBNwbYgQggAIaIonSPnd9ZSgDvR3I+uG2OIcc7K/mHswFgYcwUi1Wz+cdNcYzVCjQ9Z0KwVLdZX5eitgXcTowfBkVgUq0+wjTYelpP1jb66Jfch8e2EBoe3BzkWuAteVbrK4BRLIN5xphywV6BpjofyKGH9IjvcCV8Jr3BWxjuQPTwWVQ+YzF5CqgKPzO5Jphf5mYBqK7YXPl2awO6VgPirh7TMebhNnD2yig1iY1opT8YrnaoSApUYaoOEGyi X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(42932892334569); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(13016025)(5005006)(13018025)(8121501046)(3002001)(10201501046)(6055026);SRVR:DM5PR02MB2265;BCL:0;PCL:0;RULEID:;SRVR:DM5PR02MB2265; X-Microsoft-Exchange-Diagnostics: 1;DM5PR02MB2265;4:J2nwpg6MgRrO14gbaoQ53IjqD2AT4I/Klu6a9bwd8tRhB1y966KLViNkBgfC6x5pjwSErQrxI2klH5mMU9E0RJKJWt6Yn3aj58SHC713VArwvI5dZcN/yWfJLn1KKwYthjXSvacmn9V7vR/NgD15I1TxHH2orMrAcGvnZpIN+GuqcRvDKLAEDwTqLwF1q+43dipwsl41eBmvLzk8U1rEbh4X/+4Adnzq2qZ3CBJEXM4dut4etaUG1vjVRUhQ13LqBABk+hL7fG6E+EGZVnOCeX2pJ4lagzKexK/UOiRRHizOa/HD9TZN5aAe+dXZzd9HEXFEHAJ5h701XtFprsI5aUVPz4QoRUyQA9gn4HELvt1kBpVXsrniHEdKdjN6M8Y9O25ERYsdoDHpLBnGDzFMJQq3qQ/J3uRnx0EBBxn2Pkd8usqgD7DbnAJzfE3b8C+qQKbfSJOFXYP09f9auaHf4XeEJeZtG/+E7EeyIrl/c+Q= X-Forefront-PRVS: 0025434D2D X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtETTVQUjAyTUIyMjY1OzIzOkVIcnhsR0FVTEF2MWM1Vit0cjlVQ2pkTkxh?= =?utf-8?B?OFVQd2JuMVkzdm5Zd2pUWXA4VkdjTGpLeU12QW9Tb3hEV1IzSlRGWGNwNDBt?= =?utf-8?B?bE45NVFhUzUrT1pYbnh0WERWQ3NtZHVMeUpsbkoraS8xRXIwSkxkaW5IdFZo?= =?utf-8?B?TC94Y05LUEZ0bFN6V1ZTYmxNQUg2dVQ0LzRQckJ4Z2w4Rm5jQXQ0ZjliaWlm?= =?utf-8?B?c1o0dERoeGRUWllpMVFuM0t2Q3VMczBoVnhLaktEck5tOFZnRWxRWUdZS2ww?= =?utf-8?B?Z1ZiOTdXVmZLTDZNVllLSFFGM0xBQW15cGY2R01kNlg3SXpvUENxa3dOTEg2?= =?utf-8?B?SFVvWlZGTEhkbmpUK1FUZTlDUitjSTBJNSt5S3VDT0l6dzAxM1VCT1BCdTJD?= =?utf-8?B?b1MyTjMwNmhBblZOL25YOGQzNkp0a0hOdlJ0QTdrNEw1Wkwrb3lxRUs1RFNl?= =?utf-8?B?clBEOWdkczltcjhFUG1ER3k2R3lJaXdFWjA1NzBvUlZCYWdhSHNhUU9uWTJW?= =?utf-8?B?RnhNa000OWIrd3F5aVhxVGhRekR4amdCSlhKNUZUMzY3ZjJUZ2p2U041TFZB?= =?utf-8?B?b0ZPcGZSZkZGMmFKQ1M5TmF0ZDhFRUdBdVJDV2c0TEdGajRzWEtVMzhJVDQ1?= =?utf-8?B?QXBSSWp3L0drM3dKNEFPdTZleEthK2g4SFkvN2F1cUFXQjBrZlVBbHFxSHNn?= =?utf-8?B?MUlhaHdDTllWZVJmMDdqY3gxYXBDYUlIYXpVMmRBMno1Vko2WER5cExMeVVs?= =?utf-8?B?Y0dtdDhrcHNSN3g2VUpaK1kybXJGNytXclhxSXdpWGxYSjllSTNwYTNYTUwz?= =?utf-8?B?ekpOdXN4dUFRRS9jUC9na3JPcFVzN2VuckwvQWJIU1VIWTE3Z05rNWs3YUoy?= =?utf-8?B?SUVnUU5raDVKNlJaMHVvRGx0bUZlVlFUcHZaMGcrYkxrSFdRVlc4dTM5ODFN?= =?utf-8?B?bEVjS3Z1WjhKc2d2VUd3bFhrdVJXNVE0cFB5aEptZkxGdFJQRVJjYUQ1K2Fh?= =?utf-8?B?b09YL3Yya2Y4TVp3RXE1L1IwR09hcEtGb2hkeDMxaitoTGRWQ1Z5RmJHZ0Fz?= =?utf-8?B?S3lYWCtGWlA0V25zeFMwRWdVdkdXdGp0T0ZFdmxUN2FYUjhGVjM3REFwMGw4?= =?utf-8?B?TG42RGFVa1JVYUljcGJuRkpha0pIK3NYNHVrVmRaWDhjN09aYTZMZG5SbGtr?= =?utf-8?B?b0JLZGd0cG0xekd2WkFLeThXTE9yM0JWcFdhNXU4UVNPdWExTzIrOERoWDFJ?= =?utf-8?B?emFBRkY1WFROcDhjTHdoZ2VTbUFPcmcvUEgwT05OMXlQNDFzbzkzZmdKNEcz?= =?utf-8?B?WDhXOW1sV3lUbGkzaDlOZklSNVlhdnFxRjFGNXh2WTRlS1BuNkQrMjlLczdu?= =?utf-8?B?RzNMZ1E4NjA3QXVBTTlZNUQxKzdTeUZ6WlJ1VGZVZnppOXp3aEl2ZXhKRDNP?= =?utf-8?B?S1B5UG1lN2JabUxHcjBGVVo2anVVQXI2eFRXRFdRSHRpQ09RSHF3SGNCSWdC?= =?utf-8?B?NXdmTm43SXhrajdWTXBYQ2dJeW5MbHpCRjBnOWRmVDdnT2ZLQlVnRnRRZlNL?= =?utf-8?B?Rkg1N3BsWGljWGZNeTBlb29qaGpvZjN3SG84YlZkZG5MN1N4TXk2MmdGR1ln?= =?utf-8?Q?eFgHyOFuWJSoT0EqSg8h?= X-Microsoft-Exchange-Diagnostics: 1;DM5PR02MB2265;6:7zYAlS2xel9KqAqpsNXosWPDFYzK2B6KTEJpvLZXx63GwxHn9LJZBsYcL/2/wGXbtHGBkh2fRRvJ7ZyBRPsJlhBVk9zq9rrHUpRYmHj2an0AzCO7hGrnY8N2VRpHLnyh8UF9gGmIpRlDI3H/ilLzno7rZPfvzW3WPiVBgroRhu1S3Oly/MCKd8nHRNlmkJsTaVUj/JkP/F6MPa0P92TRkQhE/Dee1qAwCDjCUOK16Nj9WKcudUeNZcCTBZ7cxoIJ8Q0+h0LyaLbIVlkIz1G28Z7zWslNECokzPlUKPjS2SDEZfVcxP6naqz4ulXpmIV1ouVa0LU8VHBmiNpO8c+V3g==;5:7PDCRo6u/KD9qtyDAg2IV4b0lAgbVZfuN+qLH5KIgBTafTfbJz+ACDsCHCvNsOPUJKjOoeDMmSw5OKgu8+qxLvOzYqeFSNYmUQp1rta0RyCz/7oF1SN1cNL3+cw3xD6nx/HUGA9+fRbU3W2S4w50yg==;24:sJiXh5DYCE/zfNJrrhKeB0r5WitXmUWNi5otPnhLbWpPQKTW+RrpwHN5LwvzK4b8yEFvVLbh5CfZGTDryBVvadv0DuBe0ZXh4NLl0gYSOB8=;7:7DJ25E5ScZdCQXb+15RYPCJhbXhZSSgYVpCDxkAwGevFNpll46WY024pPiKJZffi/h1fm4a+fs/G30qMSLeG/dgcwuIXLyYhLf51zMQjDcmB91Bjo+XDFKXZ4ABhOq7jf/8ftKqzdvfNTUlVNSZmVjFjaVvBljkSicE+lHrBuyeAv6msGfN/h6oJm8GQQZSsCbXwamUHXVX9HR6mhKZxiRRCUngwoI8EJM8OjX3sEFgn3pIXO5aMPs68l1cfbw6W SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;DM5PR02MB2265;20:iMjL9a0RpjAIcA/nwaifqZ1rbyT/RDME0+NDbJU7gM4qZQ3I4Gvc6r17llcdDNc5a+m0DXW4OROt7kdOBcdhNjsmebgjJUI6jqm7qjGcKWlXikUGwtEFAD58h5UvYmCevbypAqJhBbNJXTs4syeJX8BJovJLkZGMOJ143PT7C3Mu5DaC/q0EVxNjYTarEx2VtiDqv7EW5UQB2lBzj0glUuP/JI4fU5BCIvHqWpDGi0622tYpXANqj1yy58VseO/R X-OriginatorOrg: sandisk.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Aug 2016 23:09:29.3245 (UTC) X-MS-Exchange-CrossTenant-Id: fcd9ea9c-ae8c-460c-ab3c-3db42d7ac64d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=fcd9ea9c-ae8c-460c-ab3c-3db42d7ac64d;Ip=[63.163.107.21];Helo=[milsmgep15.sandisk.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR02MB2265 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch does not change any functionality. Signed-off-by: Bart Van Assche Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Oleg Nesterov Cc: Andrew Morton Cc: Johannes Weiner Cc: Neil Brown Cc: Michael Shaver --- kernel/sched/wait.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/kernel/sched/wait.c b/kernel/sched/wait.c index fa12939..dcc7693 100644 --- a/kernel/sched/wait.c +++ b/kernel/sched/wait.c @@ -429,18 +429,20 @@ int __sched __wait_on_bit_lock(wait_queue_head_t *wq, struct wait_bit_queue *q, wait_bit_action_f *action, unsigned mode) { + struct wait_bit_key *const key = &q->key; + do { int ret; prepare_to_wait_exclusive(wq, &q->wait, mode); - if (!test_bit(q->key.bit_nr, q->key.flags)) + if (!test_bit(key->bit_nr, key->flags)) continue; - ret = action(&q->key, mode); + ret = action(key, mode); if (!ret) continue; - abort_exclusive_wait(wq, &q->wait, mode, &q->key); + abort_exclusive_wait(wq, &q->wait, mode, key); return ret; - } while (test_and_set_bit(q->key.bit_nr, q->key.flags)); + } while (test_and_set_bit(key->bit_nr, key->flags)); finish_wait(wq, &q->wait); return 0; } -- 2.9.2