From patchwork Mon Sep 10 06:40:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Winnie Chang X-Patchwork-Id: 10593601 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A5F0514E5 for ; Mon, 10 Sep 2018 06:40:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 85EDE28DEB for ; Mon, 10 Sep 2018 06:40:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 75E1328DEF; Mon, 10 Sep 2018 06:40:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 36F0028DEB for ; Mon, 10 Sep 2018 06:40:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726405AbeIJLdP (ORCPT ); Mon, 10 Sep 2018 07:33:15 -0400 Received: from mail-eopbgr710097.outbound.protection.outlook.com ([40.107.71.97]:15360 "EHLO NAM05-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726148AbeIJLdP (ORCPT ); Mon, 10 Sep 2018 07:33:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cycorp.onmicrosoft.com; s=selector1-cypress-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+n1d/lGvksk3x6D9IFr9bvIAKJSNuZAV8zUiZ7OP1mA=; b=I1FPF7A55uRM0Zu1t19XrPcA8E6DHTDiLuxqeCecJ2QwdTgtpDipHmuTX/jhGcFG38wV4yg6/viX1bXrT/lB8RLNvr84iqYOXxQGJ9WznQwnmguJoWpx7AQi3EwzNjNuW35T/cwgtRgiZunK70Ipsr9klgdymvoJD29FthvHuqg= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Winnie.Chang@cypress.com; Received: from aremote01.aus.cypress.com (12.110.209.245) by DM6PR06MB4297.namprd06.prod.outlook.com (2603:10b6:5:24::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1101.13; Mon, 10 Sep 2018 06:40:41 +0000 Date: Mon, 10 Sep 2018 01:40:22 -0500 From: Winnie Chang To: backports@vger.kernel.org Cc: Chi-Hsien.Lin@cypress.com Subject: [PATCH] patches: update lib-bucket_locks.patch for v4.18-rc1 Message-ID: <20180910064001.GA112464@aremote01.aus.cypress.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-12-10) X-Originating-IP: [12.110.209.245] X-ClientProxiedBy: CWXP265CA0056.GBRP265.PROD.OUTLOOK.COM (2603:10a6:400:2c::20) To DM6PR06MB4297.namprd06.prod.outlook.com (2603:10b6:5:24::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 11490459-cf95-4405-f847-08d616e85488 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020);SRVR:DM6PR06MB4297; X-Microsoft-Exchange-Diagnostics: 1;DM6PR06MB4297;3:gxkPbZ+f/kKjcPNztXJHtJOfVswJLS7yXGJWkJPdmw+mAD0k/qJFUdBVLiPfvy+SLOKtsFoY/AkvW5I4GBuXX9S5y62MNUM3euPZ/CUvbZqO+Ih3goX7lx6+SyQ6mqo3ThlEKp+gP/xjVL1kFY4gUq7zxFGHqzybY21COH/m2DJe98vJxNwbrW/VmV50uEIvMVqfQuAwzx/rt2aN9/mWPS/UpcdFE05VVhN0MV1+JRic8w7AkECkfuPy8ywp3HjG;25:1Or6B93y430sx6sUHAP1Vc/AT2SKIpcrt0JJzBuh+BS04MmlLiJneXVOfvAq589B9TE5+FmAgSBQ+XCdwceWkzV9L/KBVbz323DADMX09T7G832BsxPEXqIpS9rCTIPMm3gLtSUNkSsGab1+9pne3x/Di7vTRWpASsi/eS+cLhnB2EScc+5i8563i8Qr0I9qpRVDo6mkV7GnuzoTud4lEALRzIZEesuZgCfsQwswrHw1ogqOpQDY5evh6Vw0oGoTOGg5TvXy3nYIsmpLu8rXnSP7aMDpKFih1YPwEP3aBrSn75yKjazjQgVQCHvoZbXR64bEnlEsfA1cuMT/kvUsNA==;31:ma7LaLLvCHC+gE+he8YxA0+LFRRdONnXA7w2HjLQrfKHlGaAaZTXseFWYobnID9qd8IWd8O70Hw1wjsHWFxnEEp9Ns6RYIPJiRbj+LO6v6q8nkBWy433pkBwd3WO86ZjMwSRVJZQeWBh+vzyix2BvCF799qGXlqdpCXDTlXdXjjxHjuYCHkGj+tDJQj1kG+0YO8LcHZB4NCPhkheBRXi3MJmYuWumVOTi0Pf+Z1AbBw= X-MS-TrafficTypeDiagnostic: DM6PR06MB4297: X-Microsoft-Exchange-Diagnostics: 1;DM6PR06MB4297;20:oVjO7hd3OsYuvUE0gGmy2ChL0rNYV105hJmPaPpMI+Qh3gpbQnUixD3oW8+cb8jqkaiMaVHsnxirBZgHw7DzyfsRUnsLBfzjTIheQprzQhcIZlNI9v2dOAOkXh0lZaPr2Sgx4Acc9uj68p1H+4QPzPVHisNuF3WwJAK5lmlRTQbJZil0SeBt0R2ddBcEpk3eii0Bi8m41f2NlcDxy4dsb7UF9pAVy/0pKgSiyVT20VEoml+buiE4RvGhn1xpmf8SiPS+VgOier+aEkThbnA7pprrh+oKaY+Ss/LjBnZHIOBCjZpaq7H9b45ZWrhJsUW7oQnWGBtdDaOSJ//Vg2IRwx7Q2ytaJXfV+7iQ0keqBRgYQpmVQqE4ICT76vRJ1poq0i5RLNkthSVChtON7PyeNrSsv4FjUnda3QKcQrYz4eK6YJepmpV5W8OuiO9Tiid/DZ4Xrw2HFVb1XRyLzyaNB+yOUPLqd4T28F/VKz2hwFfkY42iXYGm1+a3ZF09xRbT;4:INahTUtTUHDNPAJzx+wy2wtJG/e6Q8JpVRlbAKzLLYudlVJs9NGHgDQJguNhqM2XRk17fIqGAC6GLaZEvJ0jYRapP9/5uqm7giPBGTWZiQkE2/r6EOmMzDJTTOVS4KkSWGzqPkbzlTPlEyFzxOmXaD5w1Fzx6qodXB2CctpUQB3o2AxmoZsKMc/5ocSBTRvk4zbeYh8kpwPkG2qgxJ51E4wG+pADJ8TVRgyRGY1HOwEOKMyYdJT9mpKWk9lG1rjBIssCiCE7bDQHIVNKq35FdtRRR8Y1WoLhCSgiBs3jkNWGcFaw17XDdUa2vZOgdIdj X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(258095267146985); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(823301075)(3231311)(944501410)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123562045)(20161123558120)(20161123560045)(201708071742011)(7699050);SRVR:DM6PR06MB4297;BCL:0;PCL:0;RULEID:;SRVR:DM6PR06MB4297; X-Forefront-PRVS: 07915F544A X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(346002)(376002)(396003)(136003)(366004)(39860400002)(199004)(189003)(956004)(305945005)(3846002)(25786009)(86362001)(97736004)(47776003)(81156014)(81166006)(52116002)(8936002)(55016002)(66066001)(23726003)(7736002)(476003)(87496004)(186003)(1076002)(386003)(1857600001)(8676002)(50466002)(7696005)(68736007)(26005)(16526019)(486006)(478600001)(105586002)(106356001)(5660300001)(72206003)(6916009)(2361001)(316002)(33656002)(58126008)(16586007)(53936002)(44832011)(6666003)(2351001)(4326008)(107886003)(6116002)(2906002)(18370500001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM6PR06MB4297;H:aremote01.aus.cypress.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; Received-SPF: None (protection.outlook.com: cypress.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1;DM6PR06MB4297;23:Zi3ed1Qbq9xISoqFRv3eOc13im2NKfwo3doBqWJG3wAyzRBd8/kTmkjl45vVnfEbmmLCVnzeI6lV96Y1LyjjjWISz9LDdXDzanMV5RZgCiLsYpo20D2SBDzzfxZjYhtaeuxU1JhO4ZSX/vYg/8A8qRVUx+oGWkeut05U3oMrbIpmUzwTSM+dCpZdmlsw4fjBKjG+k3VUZhQSR424+EiAurWBoNR9nFPE5Ie6xM8xFCiavozMhYuA5L1uNRwRsD8mEfuAH8wISCKCowOcIjiPlcCv8YhH/bRXqR8lChs1EzSKkoDjAR/ZevvtpryfyAuYwcEPLWdz1blwWjw8gv1ZIm1IqTRrGkVJI2qeo3lK/loRgfu38jH+yJtQWD0HUpy8dOS666BQZpLl7dT8mvwp8qpQkiiVxnPsTTOnP44pOoUhOu23KiG+8NnPomC3ysG8zArAvgpQSU4GvOWsJ+ZgGPeOjF5jqmoQKXBsPdzq+rDDawg25h8jLadClw31cYdCBogS5A8avjpan/2wX86Hdc3pHODBtYIJndgamw7DB0Psd9YnmDPPB/GFxciGiA02Q9+2fl5zbgGslXh/PVCKATJxm9SNTe+OnjAQdHtN884xKcXjFuQ8CGpaevzMMciHvQYonEYZjnAXW9fSHM2mMCEybMLXMBX5IJaESJ83WirQfQr9OoSthDgiTTNQKp5vh55x+1CFpnqi6Tdph43/ULohAsvJvLA/HqUbGYG9Tfc5BWwntt9aTM+UHa8ZVBdF6IB2UtM/E8XjSed/ayHkJ3aobH2kETktS2IJkaBUqiJxgkVfbRx0hvQfYo6DFdX8gbJqrL7ANAdoVEVKniz8egwXAS2GEilGF9mkUKVayjWBUMzjQ/v2yB2+dl9cEaI9zbRjoWkiVw7Rd1deVlcWYa38c0w62XIn/3DtiK6ItK5V82tSfeXVhdSobK5ienW+x3iBQ4ob/qceCk+J7u7mH+ARJPCowoV7WV81VPoWEgCHMvRFsslLr8m4r3UwWl68ROBicgAIeF6heDtPytdBKJivbUsDgfXTUdEcrk2EEFHue1mNxZsextveVRRkQNHJl2eD9WphCxXBBfIHxuK0hBnWBBoG+IFD+HNlPKOVI7iDaJOHUHa3fyXQj48GJLHQmS30ifGDKuF9jwhezPjeqEtKqNEPCeci5jymZWQMpiYlSwKR3644UBkRCJbGP+LMoblbhLplNNWOQADyJIWxA7cbEDpyxk75hOV7U/JrvYc= X-Microsoft-Antispam-Message-Info: YBxwejJKlxrjtWipVq3plzB0UeYbbu5HfFhR2bxTgC6w7elaAmh/FN7d3dxrcK8kreoPZf9ZAjtX67JDo7yf07oXANhOz73kE/+SY7nUo5lhvrXY0rXCJv/1obRXXi39p7StTa6dEV+Qat5purRClK73gEVwOgUIpzAKL9v7z4vI8h/DG3CkSZJk74vfcgzdoWuqhuBA0I2kQVrNvftOlTE/tLrc5kUoN3VomqytG0CVjIISzWfEhMTWCy3gkLEh5f/bC45BtTI4DMlaNAc7M8FiJ2ckf+E3crRsZUE/BLaAzwyFAXF5mL3I15gFENYABVLL2z5bxyOMWBX5ZaFXm/XEar2fC1fHtPUq9j8ekm8= X-Microsoft-Exchange-Diagnostics: 1;DM6PR06MB4297;6:p8kCV22u8uyfZGiZc5TQA+m9G32eS2XvWtqQnU5BW3Eh8W6rpjBoDcUMx5Jh3DdI3/1dtuRhObusu3Ip7qxI47dknKb/wHkm5Uvojj/HpI37lrw/7xZY4O0eUlAo8CbH2uNGW9wuoYZZHpcTdkfW/JnsZWZcgv2G1zsjU6SiEfbHSqWnW2sae0bTTOhPLneflFkV6ueR0X2UmCbj8/0XMhc3RQI8BB2ybDugojqrb1EnxZscmvqCk3Smol5GH2G5vuIP/HhoJzxFbux+doHl0JjCktLg1LWHqg1Q6Ib/OmVugQZbp239vmQ8YbpnNgd8G3Z15TsO2R+CU7qM2vtc31i6T+Y5vqjXGGGum9ujhfdF+Vv/USbYx3PjkdMKhbUg1hzdmdlt9rItHgY+2S348LaaVphBYGF2tLVSQ8EoIW5aFbZdspqrJyGDlEDfTwEgc/9FchasEuIAcahPpcLKaQ==;5:IKiNp9DXKdbXkIZsVLiMDLBGG/FGVD+p+QIM1e4dg5iKZNSSOyeF2eXq9flsnHFgj+GLbaUYrnosi12ZqC8SU8UBJcgPkBgxGx1gZPdq/50lBz4BnVbwsffkRIgdb9FynUlch/Mg25RuQH2t4yXpTSA5P0bfLESt0uTpgkXg+Xo=;7:y6XcQM2y57lFB9tPosVQmw+FBS6sfqd1R45YFScq4aSGNCWZRqJjxhbL+GYeQNQJO1vbeL0WfQBSJGVMYNZposc12Ccy4xx93E9lEHxIGpn+XkzDCHNd8NhtP5ZEEcCtMiE6C43doldr1uZSi7N3jja/XlQI8q70q2RZxuDAIViqdEKJCOGTqcjskBn99bQeyxqsyqxZ9kXwXd9w+wRlDdh9XRPR250IPvyh6XikusxfsoyUt98MCZACIlTf1k2X SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cypress.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Sep 2018 06:40:41.5822 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 11490459-cf95-4405-f847-08d616e85488 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 011addfc-2c09-450d-8938-e0bbc2dd2376 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR06MB4297 Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch do not apply to source code in v4.18-rc1 due to commit ce91f6ee5b3b (mm: kvmalloc does not fallback to vmalloc for incompatible gfp flags) so updating it. Signed-off-by: Winnie Chang --- patches/lib-bucket_locks.patch | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/patches/lib-bucket_locks.patch b/patches/lib-bucket_locks.patch index 15eeda1..c20c9ce 100644 --- a/patches/lib-bucket_locks.patch +++ b/patches/lib-bucket_locks.patch @@ -1,8 +1,6 @@ -diff --git a/compat/lib-bucket_locks.c b/compat/lib-bucket_locks.c -index 266a97c5708b..405b52ca5708 100644 --- a/compat/lib-bucket_locks.c +++ b/compat/lib-bucket_locks.c -@@ -30,10 +30,24 @@ int alloc_bucket_spinlocks(spinlock_t ** +@@ -30,7 +30,21 @@ } if (sizeof(spinlock_t) != 0) { @@ -19,10 +17,7 @@ index 266a97c5708b..405b52ca5708 100644 + tlocks = kmalloc_array(size, sizeof(spinlock_t), + gfp); +#else - if (gfpflags_allow_blocking(gfp)) - tlocks = kvmalloc(size * sizeof(spinlock_t), gfp); - else - tlocks = kmalloc_array(size, sizeof(spinlock_t), gfp); + tlocks = kvmalloc_array(size, sizeof(spinlock_t), gfp); +#endif if (!tlocks) return -ENOMEM;