Message ID | 1488025215-27123-1-git-send-email-dmonakhov@openvz.org |
---|---|
State | New |
Series | "ext4: fix seek_data soft lookup on sparse files" |
Headers | show
Delivered-To: criupatchwork@gmail.com Received: from gmail-imap.l.google.com [74.125.199.109] by patchwork.criu.org with IMAP (fetchmail-6.3.26) for <root@localhost> (single-drop); Mon, 27 Feb 2017 12:59:11 +0100 (CET) Received: by 10.176.4.85 with SMTP id 79csp127716uav; Mon, 27 Feb 2017 03:59:09 -0800 (PST) X-Received: by 10.55.109.198 with SMTP id i189mr16137617qkc.242.1488196749286; Mon, 27 Feb 2017 03:59:09 -0800 (PST) Return-Path: <devel-bounces@openvz.org> Received: from mail.openvz.org (mail.openvz.org. [199.115.104.192]) by mx.google.com with ESMTPS id s62si11572911qka.288.2017.02.27.03.59.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Feb 2017 03:59:09 -0800 (PST) Received-SPF: pass (google.com: domain of devel-bounces@openvz.org designates 199.115.104.192 as permitted sender) client-ip=199.115.104.192; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: domain of devel-bounces@openvz.org designates 199.115.104.192 as permitted sender) smtp.mailfrom=devel-bounces@openvz.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=openvz.org Received: from mail.openvz.org (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id v1RButiG001447; Mon, 27 Feb 2017 03:56:55 -0800 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01lp0180.outbound.protection.outlook.com [213.199.154.180]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id v1RBuoKf001444; Mon, 27 Feb 2017 03:56:50 -0800 Received: from DB5PR08CA0062.eurprd08.prod.outlook.com (10.166.166.158) by HE1PR08MB0937.eurprd08.prod.outlook.com (10.166.125.13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.933.12; Sat, 25 Feb 2017 12:20:19 +0000 Received: from VE1EUR01FT046.eop-EUR01.prod.protection.outlook.com (2a01:111:f400:7e01::205) by DB5PR08CA0062.outlook.office365.com (2a01:111:e400:c576::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.933.12 via Frontend Transport; Sat, 25 Feb 2017 12:20:18 +0000 Authentication-Results: spf=pass (sender IP is 209.85.215.68) smtp.mailfrom=gmail.com; openvz.org; dkim=pass (signature was verified) header.d=gmail.com; openvz.org; dmarc=fail action=none header.from=openvz.org; Received-SPF: Pass (protection.outlook.com: domain of gmail.com designates 209.85.215.68 as permitted sender) receiver=protection.outlook.com; client-ip=209.85.215.68; helo=mail-lf0-f68.google.com; Received: from mail-lf0-f68.google.com (209.85.215.68) by VE1EUR01FT046.mail.protection.outlook.com (10.152.3.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.919.10 via Frontend Transport; Sat, 25 Feb 2017 12:20:18 +0000 Received: by mail-lf0-f68.google.com with SMTP id a198so478921lfb.1; Sat, 25 Feb 2017 04:20:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=+Kyoapx31xsb3P+8dl4lPPq2GuKPe4uN18wuSLKj6F0=; b=sj/ppYmui8bKecudzR9e4afcMvP98el8QnIK+qSfv57E+VDBO9fCcUjIDMZdkkivSu 6uK0ZNCxle8pXpMto2+8FcNnhpqmU8ZKD1ADWoSFZF0tWotbFhovQzgdWTVfNwVMzwRY rqXSvKyl4Kyau8p1CN8w2ZydMVdxfTETUXKi6qJN2G+55Yj74390nhsBISzuT1/U+7Vc vp4PdIP2fBlesMRwYYDc8R/iaw35jb6KVGyRB94nyOU7zzReojp1NIdeoQac6b6YjTbG djAsXqjZauZCOkg9OtYy/cec8ytqtON7h+ToTQixuSUGOInOT99/jYAgNA84TKlC7ZuX zWwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=+Kyoapx31xsb3P+8dl4lPPq2GuKPe4uN18wuSLKj6F0=; b=KZdK2N0HsCVo3u35ToR06YoXfYAq+lq8qvqh1IFJ8P4LVGfHd8HbednpAXpjYoVYF6 FQdZORpgVTl/3Y5nIrTsDhJvYjpbjNM0u6YQ2PgEuwE8x2pVWKkU9iqnNdGVnPEZaTkh pQ3iFh1ClTPfO0Cd9F/rjTP3h6jnFAi1XPXcWEj6MNoyztEzpgMYNbxwbwdrtyyWgbAT HIMa3s6yDlarJxeNP4U+0TeFFu/Sl2lMEaWPj0xVWfTakkprYfY2z+iXfPsYLbjAwt5i +XNZt9KSgxaEflgPgXeURxDLWmthmdx0wRy1Qf++SbLQPMNRoiJsUs56vMji+rUiU9iA wnlQ== X-Gm-Message-State: AMke39n9wULwSxhTNjKY2/nRa+jfAWseCgIVLbkFFufYhouedGmA3EBNAvjnDe3ghhsEhw== X-Received: by 10.25.195.16 with SMTP id t16mr255315lff.149.1488025217310; Sat, 25 Feb 2017 04:20:17 -0800 (PST) Received: from smtp.gmail.com (msk-vpn.virtuozzo.com. [195.214.232.6]) by smtp.gmail.com with ESMTPSA id x28sm9155907ljd.60.2017.02.25.04.20.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 25 Feb 2017 04:20:16 -0800 (PST) From: Dmitry Monakhov <dmonakhov@openvz.org> To: devel@openvz.org Date: Sat, 25 Feb 2017 16:20:15 +0400 Message-Id: <1488025215-27123-1-git-send-email-dmonakhov@openvz.org> X-Mailer: git-send-email 1.9.3 X-EOPAttributedMessage: 0 X-EOPTenantAttributedMessage: 0bc7f26d-0264-416e-a6fc-8352af79c58f:0 X-Forefront-Antispam-Report: CIP:209.85.215.68; IPV:NLI; CTRY:US; EFV:NLI; SFV:SKN; SFS:; DIR:INB; SFP:; SCL:-1; SRVR:HE1PR08MB0937; H:mail-lf0-f68.google.com; FPR:; SPF:None; LANG:en; ; SKIP:2; X-Microsoft-Exchange-Diagnostics: 1; VE1EUR01FT046; 1:BqmwRHZvIe9UQRfZuFK6uxq6zSWdWbE7Ch808p6B9RzVuQIBA33KVtp5yXlov9Ak28aO+sqtJKvZbAAJjdGBq+HIg4HIFNzi1ZTTbJgJyzq/ikeCxFN5M5QYasa2v67O93VnQl0Q0+ynAKFYEpvE4BYdmiJOzrK5ZzpRn5mLk5vKMoayCOQ2fl6Ecb5u1Ygp5NlAwZBqR8wkl5dGwJiEKbi+af/ZKzu5JfmHcZjvGh818YhZRcaALreRWANgRo7E+d+ORynQM+/ebDSHYc1ef2pfxvRyTm4/bZnDgP/QXqE6/DXgQcVyc0fum9aWMSWXw7zZr8E09mfNnc89fZ8NCclryrQamSFSkEQ29/GjKYDlD78IJfuzfPkPSf47sd99BAW2PG0k8naRxuMXKoUcVPhqQJye9xhY9ryxjnhCxPqjfNUOYSX7GJjjL98SG8diN6QyXZ1cUBq/XdZsmfZD6anbw5xEZP0uueBsfOkTADySGgtqXtNdH8Y5uFKgEczCGwOKmGY9qn/J25/Q7XBb7BASBbGNcxOCnjamcZcmb1qD/uLnbUU6CNkcYAEX8yUITiF17B7QakeaIMAiVw2Vdhh+fqwjcLqm/CDv0KdFAuZ8tAQbKqsIerk4LNOKYkrFcVu9/d9fWxRfnWj4ReICRA== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 03e1324a-75cb-4845-cfe9-08d45d78a968 X-DkimResult-Test: Passed X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(81800161)(3001016)(3010002)(71702078); SRVR:HE1PR08MB0937; X-Microsoft-Exchange-Diagnostics: 1; HE1PR08MB0937; 3:RhJDPhZeVIKqPg2EYzdGf7A0crwuyhvwTSfrn0LWPlylUk2UgyOr/zWrez3rcFMfo6IdHXCW4Z6z/LqN4yFM2gAryvXInNHT26qhfM6Cki+DSt2rouPUjsm/Zvjg4SZoaYjMHyVMZYdjYXigyN6fyMtJMxPgrvvfp7zvPxxbdM8i2+l7Rh3JTGNOecICNDHZKi+9FAM8L0f4ZN8GbDvh2N08JtrRhkGky+nCquF2MUt3G7+MUN612bzW0CuXOlsE9tdmCmkysCgY0orTY+YOe4kucwDlBVflHBvNSQQotoVE1wb2D6L6aT3SRa9dzkwsZNDEH2H8f1l53aASx0k3sW/l9RE/UeKYEDZJ3X0PG4re74Fo5+gE6ibcVbZ0MLqH6CTMM1wNaBn4iEwMASncC8wZfGzM4ZrSS/JZXmzHUZOv+7B3UK94wS5vQAnL23Gk; 25:BcC1Tai8yVHwVmZquEjoPu0U1R4Re1AWA1K4ZRpjgWWy8MapWkwiPNLB4sj1CcarlBTvMOe3uz67HPTsi+MmRpkQDLoEjzZtxOpxhgcQY6KiUv9CHzfB9/ZvCQ6laM2YtK0SJVE6T2o7fgxX0UKQeT800PpY2fPbFe831EfHkVvO4GLXtuS5KKU5rTxBtCKqsn+oJSCFAxsVU/VwMo4vmfz/V9uQ6CsJToRaMPvkSo/oUpvT6HKQeEG7VAP4303RowhHlWSG5VqJIGxrF0BSOQypQ5WYqsFcFQ7GoLT0Icy8+cD6OT2vxhLt6LWLUmc/HPeth97DH0h44dUO4mdCayojEcfxxVxFak2RDSreQnqA5M7A6FYj5E6quBkFqCPT7X+jpxw9Xo1cbJfZhVdXXe25va1O47CPoWav9zbBd200iWtV4wpiJ5qN1v9GQlOUGtBZUoFyDrRXtMzkuj/EzA== X-Microsoft-Exchange-Diagnostics: 1; HE1PR08MB0937; 31:Fpc5IfWMmo00nTPZ+Xv4XWbEF6MpKggU0VrSjts1IdPlwpGi/3yD69Hi0xWUREPYJHD5J4ne1Q3TNch++AJZ4XRTcmK5KTdDrDlqItVin1OQ8Rm455PHJP1M2A/TkZAbPEwfw6ya7eJj5KHrxPsUoSIXIUFJWNSgN09M6Z+/groyzcXNgxE4twCte8gFgQInqC5cOVhamZ8WsutS9ItFMCRkrd6FzBSDXTY+WoYOxjhfgscUTxQyeK2p1deG7oHVMyK9Z7Aq6HQ3s867x2hLAA==; 20:gvWIcdptnI4WtCRnbTtpGjAXziUpnDS1a+2KJfCovlGIVPtdpHJKO5zr3lQAc2ExyEg9y1mAHCRVocK2HhZ0ZXRql/XzwdJz/QvJsH40x6MxrEbOSHAhHrgDS8VZEUgi/lFPEb53smugX7dnstWcLGXBvEc0kJDmxeTqnZBcdyg2xPca3HAaRccfLRBfOhXDKL1cMK3hA7wgFbmdLK4GDZvBspadgjOhZQWuc8mHtKJOAqZZ+V4RVCVKtBH01U3AxDHBmV6UWsovludO8AmcDkiv94Ey0Qdl5WAPt5nqtzUsUIgO5B4fISvC8aqN0QxvJcCwDNWJv2JJjNVtayZVgOCu1aC7Lk4Mqu5eBoqUbpTPICRpZxSJsAarin/BxVysc3OLr692hYhdEAnqexn1scxkUb4gO7uhB9tcXGZ2aRLi7qCqhpgRNRTzecpkjwTwtzi1gq96y3oHp2UgP3sNzJDeibOcbqwzfUd2n6a90iorCRRfQNC4eosqPdBE+gv+MsHT1CnD7fan5D6xYBSvbA== X-Exchange-Antispam-Report-Test: UriScan:(215187933766430); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(9101531078)(9101523098)(601004)(2401047)(9101519026)(13016025)(13018025)(13023025)(13024025)(8121501046)(9101504095)(9101536074)(10201501046)(3002001); SRVR:HE1PR08MB0937; BCL:0; PCL:0; RULEID:; SRVR:HE1PR08MB0937; X-Microsoft-Exchange-Diagnostics: 1; HE1PR08MB0937; 4:MyStUEaMXnKqNm9P11QtX4YX/qs1DUabhx9HaCwEO590kQTul7Knop6KIZMjomAaqAoD84OmOklZ6jpqAMSei7PB1vcoxWxB9gsCFGAu/LsiKJe8ybDQN6QaC2Vwkhi+BkItQJA5Q8RoH+IiWzIOMdq6m15TdBNoqpBZtEfOne1CKJUjjPz+XTwpwkBk+5oVOnYpp2y1b/aalIoj6sVJob7dDTMEopzdc9t2fJMdVMsFm43gRAMMWXOrr1fh7uwCNpvRQsCiF1oq5ilcBbX4hjp0ikMXFasttsu+Kylb+zxxWzTOOodoxjQ85Y6SodKRFAnmR9WVti1aRcVxgG6N8ckqgqri2vjcdE6orpK5jy5rzGOXe6CYhIEnEz7qteknmUDNFU4XJRBceMpXYK574yGreVZPv9xfHClT0y3qq4e4umuJwI7i6u1np7IEHPhdtKMZOtG7nsp+EmG9PWlY1YQd0ca7Vi5AkbMcM1dGLTKTKEeBLC4xNqxr50r1A/T2tvtAe4E05acYAgyud8m8I+nt5zhlpcb7IzUy4zjGO0dk0tKY/0IcX/6C5rEU9bQd5DCaLzqOVfi35HyI5PmsKxjaPK/hY/22t3UeB9RB050=; 23:1dE0/BZeE0idU398H//WvYA7UKz/dXwXgA7pWTCXnrjJAruekbxIXNLD1NR0eexzvPHCKzy/ZCXJj+YxdlELuqq6PaVcTeXhb5a/JvdB4DnSKgKDTUdrYdiJvEG2rnKJrtHNh27DK8k7ULfq+NA/pk8/NCdjeR6KiK6l2zGE8WaCcHCzAQfw3HyLZrFrjT/3 X-Microsoft-Exchange-Diagnostics: 1; HE1PR08MB0937; 6:1/FLhn0PBqcy/lpwMqYB73NrhNDGcE8em2HyyWaxnmXmWUthF5fDxvAR3ckPmQQxEsIdhStKiUxRJBgOZv4wYBlyZajqT4NFg1Yi24qPTE9kKNeB20BVwNwtVJhMNqPslv+9Ne9hffWm5ENfMXJnrLsaK8Xhx2kHF4R2BrQN+rF9tISVcGUAcLgXtzmLbtbzkYF0bUTyibzC5KX8B7zsY3oTxs4VjviedteHHQR1ZXfUyN6LK2MjJwoqNBL40aVcLg0b7Srxb1rlQZWKKbhorcS4stgRnc+TjYRaRew3S++LOeEBnbmLR0I63VQQFhwB3VpiTIK8+ovLeArEbbFBgHB0E09R8Z1Bv15YzxAdPaWkMmFRlAdo2ssUMWngmaNZKdDJGkqnguiAajdA9d6K4jmMLc2bKHHArvzF6zOXBgM=; 5:bHpcCRnQv227WMKnd3/b6h/oqvLIMEgQ8sCAGDfL2Nk8Z+P+XLKIx/VA2eIzwTL0xW9WDu4MYc+92wmTbHqnA0abwovPJ9Q6Jjugff8SdEcA9t0BkSJarIq9u3tOPssxNmhAvf2ngbThzibhud9q/w==; 24:7DxgWjfYJXxytD1Yd6eLNUc+8NEtFc0cGDKRfBjD1S/2gHyNNPb2K36zehuT4IBxIBk9etUn40Y/rjfaHlUORahpbm45JwstQMAG9L98+Cs= SpamDiagnosticOutput: 1:2 SpamDiagnosticMetadata: 1c4176d43f5e42879c6ace3bf2a53a72 X-Microsoft-Exchange-Diagnostics: 1; HE1PR08MB0937; 7:EwA02scaDriRPRB8cwDPq8qGU/3FPs03KaqDDqee8ihHcsovxjatlqXjzQ2GnEFwrBhVjL/lafIlb5poif+9f6EJWgP+v0jDTygjjH38gvnXUEfv9KzcqBdiAmmJ2WtNtMkeOSoq50Uttr2tQxSeFB2/wR1jeUfbvK7H3ZB+v9uLD1p+81LW1y81uKCLcRRPwDr+i3ArLIHQP3wDeR1oyHxeHxxeaYFPUmoO6gAukh8JQ8dypEQdOMF3/k3q5BP4x9i3Iahw1tRpXejeRwBuK74vy5EmeiLjs7j0KJt8Rsnu9euPxYqyaLy7DP1q+kLDjC7W6WVq/VFXfnDCmHGmFz9kPviTCXERDUQ0jvaPcnA=; 20:c8CK+8yWU85S6dFAuwVNtY8FVZjkguv9i/ZChj65rwD5QOdFhUfVkTqKhyV0soFXca/8tZUeAMVgvNbc6KiT2Th87G1bE1oXIQcxQdYNqvDrCqnbPOvFyVvlGmLzJTTUObis9mP4yn1AgcbhmYDJ5G+K8C+iG1XIStVM1sWYMHU=; 23:fsknRkxVIv6Td0ksbQQ2htC16JL5Z1nV17j7brbcelmAfcw0iOpgDYOk3HYdqB1IvHLdn10oeFq3XNLo2Vi2f+fVn7fHle1mo7Kgsi9CbRpyRUCj/3Z9sJyx8JAb2sgGU7FuAqdHcx4K+hvbUJXFKi5h827XC3I7K9sDqzjmelLutoH9hRvhmQK1gJg3+XXE; 23:50rRRrd14vpFBRs4D74J0kdZJ2v8nA4wuGo3TdiEky1LaacN5EK45f64JdAuNCwB2b+UkLIxV4pS13nChYgArDxtlbJaEj6sMEt3S6+OI8A/0d3MkEmeVOVXG7zVJ+i4W5Ii3HBYaW2AI9b0SGvqNWf2P2B1cJkbID2Sxn0NMA+v9EiJehDZr/0nxMbcjHVL X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Feb 2017 12:20:18.2790 (UTC) X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR08MB0937 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 209.85.215.68 X-MS-Exchange-CrossPremises-AuthSource: VE1EUR01FT046.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossPremises-AuthAs: Anonymous X-MS-Exchange-CrossPremises-AVStamp-Service: 1.0 X-MS-Exchange-CrossPremises-SCL: -1 X-MS-Exchange-CrossPremises-Antispam-ScanContext: DIR:Incoming; SFV:SKN; SKIP:0; X-MS-Exchange-CrossPremises-Processed-By-Journaling: Journal Agent X-OrganizationHeadersPreserved: HE1PR08MB0937.eurprd08.prod.outlook.com X-OriginatorOrg: virtuozzo.com Cc: dmonakhov@openvz.org Subject: [Devel] [PATCH:vz7] ext4: fix seek_data soft lookup on sparse files X-BeenThere: devel@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: OpenVZ development <devel.openvz.org> List-Unsubscribe: <https://lists.openvz.org/mailman/options/devel>, <mailto:devel-request@openvz.org?subject=unsubscribe> List-Archive: <http://lists.openvz.org/pipermail/devel/> List-Post: <mailto:devel@openvz.org> List-Help: <mailto:devel-request@openvz.org?subject=help> List-Subscribe: <https://lists.openvz.org/mailman/listinfo/devel>, <mailto:devel-request@openvz.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: devel-bounces@openvz.org Errors-To: devel-bounces@openvz.org |
diff --git a/fs/ext4/file.c b/fs/ext4/file.c index c63d937..167e262 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c @@ -612,7 +612,17 @@ static loff_t ext4_seek_data(struct file *file, loff_t offset, loff_t maxsize) if (unwritten) break; } - + if (signal_pending(current)) { + mutex_unlock(&inode->i_mutex); + return -EINTR; + } + if (need_resched()) { + mutex_unlock(&inode->i_mutex); + cond_resched(); + mutex_lock(&inode->i_mutex); + isize = inode->i_size; + end = isize >> blkbits; + } last++; dataoff = (loff_t)last << blkbits; } while (last <= end);
Good fix requires optimal implementation of next_extent like it was done in 14516bb or 2d90c160, but this makes patch huge, let's just break the loop when necessery. https://jira.sw.ru/browse/PSBM-55818 Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org> --- fs/ext4/file.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)