From patchwork Wed May 10 20:37:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 9720649 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 916DC6035D for ; Wed, 10 May 2017 20:38:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A81F72862A for ; Wed, 10 May 2017 20:38:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9CE522862B; Wed, 10 May 2017 20:38:07 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, 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 7C9C628640 for ; Wed, 10 May 2017 20:38:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753794AbdEJUh7 (ORCPT ); Wed, 10 May 2017 16:37:59 -0400 Received: from esa5.hgst.iphmx.com ([216.71.153.144]:62781 "EHLO esa5.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753541AbdEJUhx (ORCPT ); Wed, 10 May 2017 16:37:53 -0400 X-IronPort-AV: E=Sophos;i="5.38,320,1491235200"; d="scan'208";a="16723152" Received: from mail-by2nam03lp0048.outbound.protection.outlook.com (HELO NAM03-BY2-obe.outbound.protection.outlook.com) ([216.32.180.48]) by ob1.hgst.iphmx.com with ESMTP; 11 May 2017 04:37:47 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-sharedspace-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=cs7qFP5+KcEMIen0w6cS8V3l2uyUNTOd4vwokopFkIc=; b=H0nkNbFjhkF/4mHerAMXBID6Ym4moMlip9havNTmnRsuaTKt3yDBYmFER95EcxXBgzsqVpSZPS0nOuiGgexrLgkkWYd9216casY7GWWD/8wHjJbv7iwQ6YfynG2ZAaH3cuG+FISsoPktODBg8MzmhRlUL93kp0o1eyEbpmShIp0= Received: from BLUPR0401CA0036.namprd04.prod.outlook.com (10.162.114.174) by BY1PR0401MB1547.namprd04.prod.outlook.com (10.162.109.157) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1075.11; Wed, 10 May 2017 20:37:45 +0000 Received: from BN3NAM04FT008.eop-NAM04.prod.protection.outlook.com (2a01:111:f400:7e4e::208) by BLUPR0401CA0036.outlook.office365.com (2a01:111:e400:525a::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1075.11 via Frontend Transport; Wed, 10 May 2017 20:37:45 +0000 Authentication-Results: spf=pass (sender IP is 63.163.107.21) smtp.mailfrom=sandisk.com; suse.com; dkim=none (message not signed) header.d=none;suse.com; dmarc=bestguesspass action=none header.from=sandisk.com; Received-SPF: Pass (protection.outlook.com: domain of sandisk.com designates 63.163.107.21 as permitted sender) receiver=protection.outlook.com; client-ip=63.163.107.21; helo=milsmgep15.sandisk.com; Received: from milsmgep15.sandisk.com (63.163.107.21) by BN3NAM04FT008.mail.protection.outlook.com (10.152.92.168) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.1047.9 via Frontend Transport; Wed, 10 May 2017 20:37:45 +0000 Received: from MILHUBIP04.sdcorp.global.sandisk.com (Unknown_Domain [10.201.67.162]) (using TLS with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by (Symantec Messaging Gateway) with SMTP id 55.18.29323.71A73195; Wed, 10 May 2017 13:37:43 -0700 (PDT) Received: from milsmgip12.sandisk.com (10.177.8.100) by MILHUBIP04.sdcorp.global.sandisk.com (10.177.9.97) with Microsoft SMTP Server id 14.3.319.2; Wed, 10 May 2017 13:37:40 -0700 X-AuditID: 0ac94369-548749800000728b-2a-59137a17ee7e Received: from exp-402881.sdcorp.global.sandisk.com ( [10.177.8.100]) by (Symantec Messaging Gateway) with SMTP id BE.3F.18148.31A73195; Wed, 10 May 2017 13:37:39 -0700 (PDT) From: Bart Van Assche To: Nicholas Bellinger CC: , Bart Van Assche , Hannes Reinecke , "Christoph Hellwig" , Andy Grover , David Disseldorp , Subject: [PATCH v2 5/6] target/iscsi: Fix a deadlock between the XCOPY code and session shutdown Date: Wed, 10 May 2017 13:37:35 -0700 Message-ID: <20170510203736.12462-6-bart.vanassche@sandisk.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170510203736.12462-1-bart.vanassche@sandisk.com> References: <20170510203736.12462-1-bart.vanassche@sandisk.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrHLMWRmVeSWpSXmKPExsXCddJ5ka54lXCkwaXb+hb7Zz1jsvj6fzqL xYI3e9ksVq4+ymTRtvoMo8WCjY8YLVqXvmVyYPe4v/0Ik8fumw1sHu/3XWXzWL/lKovH5tPV Hp83yQWwRXHZpKTmZJalFunbJXBlnHqlVXDSs2Lt/BtsDYxfbLsYOTkkBEwknvx8z9zFyMUh JLCUSeLs2jZGCGcHo8TsP0vYYaourDzFDpHYzCjxrqWRCSTBJmAk8e39TBYQW0RAR2LW3Rdg RcwCXxklGvf+BSsSFkiQ2HLvDFCCg4NFQFVi3jV5kDCvgL3E00Uv2SAWyEuc3bKTGcTmFHCQ uDpnBdhiIaCaG10vwC6SEFjGKrF9xkZ2iGZBiZMzn4AtZhaQkDj44gUzRIO6xMkl85kmMArN QlI2C0nZAkamVYxiuZk5xbnpqQWGpnrFiXkpmcXZesn5uZsYIbGQuYPx7hPvQ4wCHIxKPLwK XMKRQqyJZcWVuYcYJTiYlUR4kzKAQrwpiZVVqUX58UWlOanFhxilOViUxHnPyUyNEBJITyxJ zU5NLUgtgskycXBKNTBeFl3ZU7hs3uvlW7c8mzZlpfua2MDrCZJ2PbV/WjO3lZ+69MHv0CUG trLZNYKXrrGGV14suf90bfnGbzkKkX83Ttuu8vZzqsqM1bF2qQf23dY22DL5Sqb+s9sW3zlf sBYe1sl8vmB+fYHqER/PDrWrlU7/tnSUp1WnfE9ZzaKYck9v0YVrMW66SizFGYmGWsxFxYkA vmPn+4ECAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrDJMWRmVeSWpSXmKPExsXCtZEjRVe4SjjS4MM/XYv9s54xWRz82cZo 8fX/dBaLBW/2slmsXH2UyaJt9RlGiwUbHzFatC59y+TA4XF/+xEmj903G9g83u+7yuYxbc15 Jo/1W66yeGw+Xe3xeZNcAHsUl01Kak5mWWqRvl0CV8apV1oFJz0r1s6/wdbA+MW2i5GTQ0LA ROLCylPsILaQwEZGiUf/MkBsNgEjiW/vZ7KA2CICOhKz7r4AquHiYBb4zihxbd4eJpCEsECC xJZ7Z4ASHBwsAqoS867Jg4R5Bewl9nydxgwxX17i7JadYDangIPE1TkroHbZS9zoesE4gZF7 ASPDKkax3Myc4tz0zAJDI73ixLyUzOJsveT83E2M4PDhjNrBeH2i+SFGJg5OqQbGA5/D8jzO feUSj19W+PyQudej5G8m+6N4XZ+v1eubWdnwaaHcCanrlQGffix4e7KqofHYcYb9ccdaDbT3 yEm2L390KoKb71e+9du7DB2nd3xfV3J5xRS2lVtbH7C2ir3cJj3p28U0y6MS54S9tNsrT+/i cFW98jpIjOX36t/bXcKi1ddaPeAKUWIpzkg01GIuKk4EAA04yVLPAQAA MIME-Version: 1.0 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:(10019020)(6009001)(39840400002)(39850400002)(39410400002)(39860400002)(39400400002)(2980300002)(438002)(189002)(199003)(9170700003)(81166006)(5003940100001)(8676002)(6666003)(2950100002)(6916009)(189998001)(106466001)(356003)(5660300001)(50466002)(72206003)(48376002)(53936002)(2906002)(4326008)(305945005)(77096006)(86362001)(1076002)(54906002)(36756003)(8936002)(110136004)(38730400002)(50226002)(478600001)(50986999)(33646002)(76176999); DIR:OUT; SFP:1102; SCL:1; SRVR:BY1PR0401MB1547; H:milsmgep15.sandisk.com; FPR:; SPF:Pass; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN3NAM04FT008; 1:3dP0xXxIwmVHhXm5bONM2wm58jUuaKUZNUwbY1YAdqiJLaNdP89Bxq3oaPLsAyYv44Yqft8irff1GbBKMljC/T0kCwtlZu4USbzRTWzDdmTa19FJf9DOjP4lCMvLTWw58JQptqAGIj4+dk+SJY8SnSHK0DPY4uZPpf6S3n17tZDHQ7A7fJuIjwpELAyD3ECRlM9KY2ZNN8Zs43pNqWTouPeqJJlBNwPnNPUPRAY23htCBOBV9TgDL+wPLzt6nAVt0RJ78jepeQYCVqz24OHPbrX6TcF+pWjT5zmb/q0ABfdqEDCOQuoBOTi5n7VlIf2sIHikeQ40W9dghJBCc2pC/pIpxN2XFJvRUGTXov+zYt+Zkjt2Bj9UnANI+yonYIZnwHqkqli92FG0kqdI3UGFTz3PVZwfsUiz7aLpHgDnBeCvkI8YI/ZG0lNtQv5Tu0fTfkn/XEJSoQR0+Vb/nb1Va4uhrOfOCbQSSqps9lM7P5yJPEWu20s0OLxpfeiSdQidwi49r5IFVa7ePAAO72Hqfg7pqK2mSpx/tr+3olGweBk= X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6e647db2-e8b2-4f08-d8ca-08d497e46a3f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(2017030254075)(201703131423075)(201703031133081); SRVR:BY1PR0401MB1547; X-Microsoft-Exchange-Diagnostics: 1; BY1PR0401MB1547; 3:M0hFwKEmXLQQ6nZDF67UXa1y29sr+PUzxrJNOe/5SsWKz8/D2gCTwhSoueQgnCEpJRNAnY/iZOSUjZc3cY7Wum0qL1Q7Ql5bzJ77rggzLn99AUGNo0twyaZ6fkyj9UwDj5bM/wHMlkYzbFyn5rafCIoF0p5oE89qsq9A5tXTR2RKx6/5962yFktQHjaeCJdOyAy9ZVwnVLEl5XfxeyzCDjg7/cropcHBAZ6YaWSukI/BjYGlSRZnEN+yFBRkfZw8J1rZce2i7gVUAXBYYQ9gs22nqBhnPm4qBi4KDDEyCiDz8aPP2FDdBE4+lJBbdmmAdkKlfrviuFSc3jJ3Wgep+/b6/FY7YIzq3WCWc7riTN0gS/PBRhFm/gRUDd7zqfKOywgL8kU/k+8RcHl/9tTZaQm36ekWpTP1vR/lMS/hboebQQs8BwaUp6eWU9XuRC0w94KFpZkXXCYYQotMWZ5xgXPwMb/q9FyRRt/cPR0fR29BXc/2CPGqI+CI9qJF78dm X-Microsoft-Exchange-Diagnostics: 1; BY1PR0401MB1547; 25:71kH3ce6hDovVeJfchMhjSzvqv3CIA4YZtpmrPOkIQ1pHsEkPiD0gA8qIpDtuobdiMX0nTrgUzAGVfvt1ovu8qSRKP8mxZ5U9axQJvRQAd/4sizcLyAQMcVQTqlZHK+5yOVXYg6WcZeZDPcmXSbC76jo5nW4+nCp4iPeL7Rk5JAr/dLXAsorkKlGMtqB4uxrceBV8138bXrbhPngaxz7aFk+gzmxEa6GI5AwfMYYq9co96/mHh9/L1wg21TBXxTjfuD/GRXbjZO3GuXSVn9qtrb2gpskmy2HX6//Z7llt/wt/c3NkO0SrS73SPDQ8j8ozOofGLe9qxPp3YAAbrAK2bSSOBe23gko61xQSo8opXiB2atZ5d1qrbez/ybplyNxaLAiwUkEhZ2cEtjQ/SpBK5TnZxMep6hL1EpFk9HSDQfb3a49hl7lSBzoUeCaE8epDdK3nG6hG0L1oiyyFBWY/A6K8DD2QIV9gchPfIuCVgU=; 31:dQl6e6Cf3DjiTrFg2YmFHubY8if9o0w8zPTxe8u3UHl7N0Vqn7rrP2J4SW6r1o7WLJ6KScJqh22XwOg/W2aKJatq+QfZUMWkLoJ+RYS9DZl4eUZCysFUPtOvz/J1wMUZw35BWHmo3yDu8eFlHaefYjsWGIsLsLlX9PUliyjBYGs6XsR3Ee/zZc7AUCXqFsTa5P/qvjwj+G7lChSiMzJ1R8Z8I/LQmhwnmGKiOw2HEo1bKr6Qhmv8XFNu7R4pVVGzS1kZfpy7l1TwbYiNoMH8yIRJ0I+GqXUbRmNDL/3L3Qo= WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; BY1PR0401MB1547; 20:U4lraFFmTRSSixfb3R88xK0Y80PTYSTrgyC0+UbepqYbCJDJi6LjJtn9RZtG8JK/W2etFyTqFiZCglL96RWiORySJJOaOnb331Nc27jQs/dQHBWZxri9fNQD7va8va4b8R6wGGIBTlwPdVDoGI1RBsIKc8tClT89OF4070KVifoN6nJy+WgKa0crw18SDzKkQzy5CDX70K7d3g5IosRNJKumlSZ38VGLI9/nN25U2CPsjPC2sIrCcG7gQJK1jZW541nNu3Bz2c+/Ds8CJiBpB58HiwoZRtNkSk6smfrhLgziSF0lh5Q3ArMy667/HeHMLOg/vuqBY+ojG52NJOPPKGGM3MyHrCOd/D37fXGYALe6AIqNkqiO2LQGeXb4kEQ7fnAu036bOhVY4XYWMsHxEJZdyWNDFxbPGQocvJQNfIliPZeq9R8TCjq4d49aRHNtZC2jrHY2d4Pgz2+/1lusu4eMW97uW5Ql8KQcFQo735IZjaSR/x68gtPJDgJX1Q80 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(9452136761055)(42932892334569); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(5005006)(13016025)(8121501046)(13018025)(93006095)(93004095)(3002001)(10201501046)(6055026)(6041248)(20161123555025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123564025)(20161123562025)(6072148); SRVR:BY1PR0401MB1547; BCL:0; PCL:0; RULEID:; SRVR:BY1PR0401MB1547; X-Microsoft-Exchange-Diagnostics: 1; BY1PR0401MB1547; 4:T5mDIi5m+LYRvMsNUOILmWssAO4OMJA4LRkcH+OHPAr5WjXVWiLWJfobOuqMsDHwUYBFo6vOxNZ4SubKIzx5UIMJUvHJLv5ieexw+7qOfiDIt0j4QA8k+4Ucf63riMPwtTYtwEnN00u7xr20b4vE8aTJCbZ+j0vwtDPDTbSDzBV4IMqUVriSnFJHIgNfrzpxuQjbT4n7BNfLx4gCc//+FOcOVHJtPvg/HCrJORCmyt6NKPsIEe83hphmx9Hbq1eFunuFGaOln/J+wupLb4LBz+nMpXHxeitogSjpAMOV7YZAc3osb0sKHQwAtX9zzUULjZYuv4n41zzfCnpj7xSLf8/JkublAUDq02gqKUGxQ41zMzHJMOylhJ6D/BZJbgx1qXlgne6v5Ug4EUmjMqzej1s0NS4bXgREPKgmQiW6vik4fSYi6gzbiIy22gMicbuyfRW2NiEJkgWR7fqb99W2mfCs5B6sRnokHM0N+8w1I29I2qRu3HDaSGdvgONOiFIj5bm7vrNlAfOIY0S3NKD6/sa4VrK8kntr4kMKWuG17b7Y2StvfrXuklSMm8+MgiGDCpdd6OkS2c53SIBn6SseD/8dVcI0Bc22wEYJmMsQ53BrnNFhcvHSpI6IY4SMuK7b4OqLqGWz3QGGdiguZzj9OsyHcqHFsVh8gWlx2pPeotPADqxTjOS7V4KAMXeajks9CW3nc+qdp2Zb2dggm6AOt2C5CzgpERoS/JCDUV5bAbugN5uRbWBqu4hAnvp3+AnfLJJ8g+eHrMARlMCBiLoESbj2izvuJxou3b9C14xMoetVcTEJA4N5zOKGu72K65oFGr6pvkDZoil7bbkSA8J1X+1wM/u/EzoyUMUQ/iC/oJTJ0NcxqCpSTxakNBbCosP55vvxELkFyy29ZaNBU0d54LbSdkR5fU0nHeFsQOlW /7Q= X-Forefront-PRVS: 03030B9493 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY1PR0401MB1547; 23:Y1HMrjb61UPGFA8MPWYjdM7EeV3RRZIpxbWM9p1?= =?us-ascii?Q?C08nPzwUHNlIwxjj0KoVgCrumK68JkCFf5wyCtHWnrZQVPbOVfsbKyUnLtov?= =?us-ascii?Q?cbecjI683qwZchitOFnOQemcWWeBJ9CU4fP1QrlAs3JLBYD4PysW+DApgu+s?= =?us-ascii?Q?5RS3nF+jlacJXQTszuLBWDVq5gAelW4yspZiYWo8R9w3VbqCzqLqmvG1kY2v?= =?us-ascii?Q?XgbVEoA60/zqgCqjfAWLtC5pCeMqrdbbbTzbl3Q2J8azbcCWciLX3mn/vIQN?= =?us-ascii?Q?JQ1IDjoxIYoe8Jxj/wiGbmaoIyoiY6IERYYH4e6p8WXUQw1Xb4dZ+yOR+CHm?= =?us-ascii?Q?glxZFHWE/eQIYVZSDl+4810qr300/7paYxZGGABJt5nTULqfRjlvt2jZgmZ4?= =?us-ascii?Q?n0T/S1BwL7tBNfjN4rE6GGS9tRT5J70f64CxIU2It/b16B2S+8P0UXlnlLhI?= =?us-ascii?Q?BN7dup58AdYrMMW08REix5xF5AbQpYEgXEqJdfNsVmG2OmpVDEG/1YwBmxYA?= =?us-ascii?Q?kB6gPK+URjWOLA+w9KGnWykguvLivCQk2q5nDdi5FSVJDWjXOs5R14Pesns/?= =?us-ascii?Q?c2esFRU0h+Lg9+q/Rd6WSmIjBIi8TlyOdBg/+/cGcZD1HHkAkKU0RMKGNQLI?= =?us-ascii?Q?wQXlcF8auoVdfWiAqoUqsO+AV+/YVTtrhT3ZOIVUpBxRPqAfdsB9RIYChvwL?= =?us-ascii?Q?MjctSgWQju3MVXL1VkfKAHCrPMTQYTaK0FKcb+GVDZX8NzjH7E5XcntIZ0yr?= =?us-ascii?Q?ojmjbd7hbJdVd+ZN0Gj2yCQfMr/GWXWf4gBOl+ICBfiAG221YHFRUUFW9C/k?= =?us-ascii?Q?+tLXnAIVn45ZSfjXBrhLHn+CA+BgB77X8TttXGmlkJpuZYPyn2IlByJUaHq/?= =?us-ascii?Q?J6dH23PWrUJ7FGcwO7JlgiNy9UAg4Etc/y7sK+3azL3cxquonJUYggbBcSz5?= =?us-ascii?Q?lvkzLfOOaQyTJYojoCebK2k5/6D9t7vriHRZ9A4AFLkg1GQATVpYENnKsJ8g?= =?us-ascii?Q?fY5V1jXYQIissp5ZYDT2FxtLqha3nVtBVpJsVHxdpLz8ArA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY1PR0401MB1547; 6:0E/0MB/nlWUiUrEqDle4LVIiBHvPgj+w3t0leNiR+vy35rVGh+WG33vX542oqWn6pK98u96oKsy8rTQoi7KZ5/kLe9Nnv89jry5IWljuyEuWo2/CDOfIE9gC3J2VSNB1qkrU73tPxLMDmwhsS3hl12xYZ4cWqH+DqbijpLO8gAEqfS7CbISax4dYXFEdtTap8qAIcPzQP7Y0hqmFgJ1WfaWxrvjeAoaVj8cJ1FVm35K2WVEz1T3CNz7nECuh5YXiz5qrz2niVc13ZOqwT3iQjyicRIbHX5bhdTQ0LSDwgP6abkuH0hL1taHHYz08J7APUvKJFZ6DfdLHoEoqgJEyuGWneAz/K9YuDn2KiCzOy+XgmyDM8SvH0Xj7Lk2Gs7SQQ7QBcXe59M6NAWkmUs4COfs0PA6ceuggHcFIRrxI33EFX8BacchBmPWzG4CHjfr/za04B5Lp1iLeSTeDRRyMBnlsKcpudegZ16q6OBvE8iJ0KohlP5GtVYKu4/1OPExN3+p423V9GKNBUtgqw0+gGTZw2ifPnoAUnPK3JjWM+e0=; 5:WifvfEuNho1w2P3jlzj5saxKnf46EUAFsdKXH8txlqp4oCSQg+nyynv+H55fP+gw4E8mwsWSXchx/1NsJbWpsp0YLNU9LI5AVEji3+5fmaDrQjTz6eYJEUcdeWowB8NV6YD/YIuLI1jIK61LcG2Tuw==; 24:tCrW9cPaMX7d4cZ/3jWO71o/7y1SLjQ1oHwz3NR5coY4iQJiCJU4T5lrYEIVT1VD/qiZ/uXrah5Z/iydokwu05oVWG42oADUdxVNgX/yOA0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY1PR0401MB1547; 7:CrB1CNNnDghtgpS3dJt2bDkKbuDJYA2xLe8KHhTq/FMB2JVmY2Mm7062SnA69J9VBMOj1TIFGAI8mWTqcS7m7zVy3i0LIHmebiZ06ssa/qwUPu+PpfPNb1knmPWMi0kI1NTjrHmc/gJJuUQbSvOBOa76GaXrhgvrzO7doG5wBOMeD3mlD00VDXJRFjZwzYJdXJflcO7fG6sJfIR6Ks4+edZR6E3VobSYK9OkUG4tMbMXamkSJBGTQShd81wdy1SAq2csTkaof4CI+9OtOeFUGYs0Nsz00YGvl29mdsanoXHt5PDZQDq1QVD6ILs1UTx0i46QwWlg42D8918y7rXjoQ==; 20:IVimVSbGYxIfvZfhn5FLm98G3LyagaNxiOPcriULB/JTZwKlso1x3jRAnoguVe8VB88Zyqqr3XAwYzjPxIrKnSkPlfG125meEPFtcIDDsEcFpaX8NTa18BkglxI99DcJVjqCQ92ekxqqYjC7kbwbKWUNf8bND7twB+57fNsSdlY= X-OriginatorOrg: sandisk.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2017 20:37:45.0114 (UTC) X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=b61c8803-16f3-4c35-9b17-6f65f441df86; Ip=[63.163.107.21]; Helo=[milsmgep15.sandisk.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR0401MB1547 Sender: target-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: target-devel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Move the code for parsing an XCOPY command from the context of the iSCSI receiver thread to the context of the XCOPY workqueue. Keep the simple XCOPY checks in the context of the iSCSI receiver thread. Move the code for allocating and freeing struct xcopy_op from the code that parses an XCOPY command to its caller. This patch fixes the following deadlock: ====================================================== [ INFO: possible circular locking dependency detected ] 4.10.0-rc7-dbg+ #1 Not tainted ------------------------------------------------------- rmdir/13321 is trying to acquire lock: (&sess->cmdsn_mutex){+.+.+.}, at: [] iscsit_free_all_ooo_cmdsns+0x2d/0xb0 [iscsi_target_mod] but task is already holding lock: (&sb->s_type->i_mutex_key#14){++++++}, at: [] vfs_rmdir+0x50/0x140 which lock already depends on the new lock. the existing dependency chain (in reverse order) is: -> #1 (&sb->s_type->i_mutex_key#14){++++++}: lock_acquire+0x71/0x90 down_write+0x3f/0x70 configfs_depend_item+0x3a/0xb0 [configfs] target_depend_item+0x13/0x20 [target_core_mod] target_xcopy_locate_se_dev_e4+0xdd/0x1a0 [target_core_mod] target_do_xcopy+0x34b/0x970 [target_core_mod] __target_execute_cmd+0x22/0xa0 [target_core_mod] target_execute_cmd+0x233/0x2c0 [target_core_mod] iscsit_execute_cmd+0x208/0x270 [iscsi_target_mod] iscsit_sequence_cmd+0x10b/0x190 [iscsi_target_mod] iscsit_get_rx_pdu+0x37d/0xcd0 [iscsi_target_mod] iscsi_target_rx_thread+0x6e/0xa0 [iscsi_target_mod] kthread+0x102/0x140 ret_from_fork+0x31/0x40 -> #0 (&sess->cmdsn_mutex){+.+.+.}: __lock_acquire+0x10e6/0x1260 lock_acquire+0x71/0x90 mutex_lock_nested+0x5f/0x670 iscsit_free_all_ooo_cmdsns+0x2d/0xb0 [iscsi_target_mod] iscsit_close_session+0xac/0x200 [iscsi_target_mod] lio_tpg_close_session+0x9f/0xb0 [iscsi_target_mod] target_shutdown_sessions+0xc3/0xd0 [target_core_mod] core_tpg_del_initiator_node_acl+0x91/0x140 [target_core_mod] target_fabric_nacl_base_release+0x20/0x30 [target_core_mod] config_item_release+0x5a/0xc0 [configfs] config_item_put+0x1d/0x1f [configfs] configfs_rmdir+0x1a6/0x300 [configfs] vfs_rmdir+0xb7/0x140 do_rmdir+0x1f4/0x200 SyS_rmdir+0x11/0x20 entry_SYSCALL_64_fastpath+0x23/0xc6 other info that might help us debug this: Possible unsafe locking scenario: CPU0 CPU1 ---- ---- lock(&sb->s_type->i_mutex_key#14); lock(&sess->cmdsn_mutex); lock(&sb->s_type->i_mutex_key#14); lock(&sess->cmdsn_mutex); *** DEADLOCK *** 3 locks held by rmdir/13321: #0: (sb_writers#10){.+.+.+}, at: [] mnt_want_write+0x1f/0x50 #1: (&default_group_class[depth - 1]#2/1){+.+.+.}, at: [] do_rmdir+0x15e/0x200 #2: (&sb->s_type->i_mutex_key#14){++++++}, at: [] vfs_rmdir+0x50/0x140 stack backtrace: CPU: 2 PID: 13321 Comm: rmdir Not tainted 4.10.0-rc7-dbg+ #1 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.0.0-prebuilt.qemu-project.org 04/01/2014 Call Trace: dump_stack+0x86/0xc3 print_circular_bug+0x1c7/0x220 __lock_acquire+0x10e6/0x1260 lock_acquire+0x71/0x90 mutex_lock_nested+0x5f/0x670 iscsit_free_all_ooo_cmdsns+0x2d/0xb0 [iscsi_target_mod] iscsit_close_session+0xac/0x200 [iscsi_target_mod] lio_tpg_close_session+0x9f/0xb0 [iscsi_target_mod] target_shutdown_sessions+0xc3/0xd0 [target_core_mod] core_tpg_del_initiator_node_acl+0x91/0x140 [target_core_mod] target_fabric_nacl_base_release+0x20/0x30 [target_core_mod] config_item_release+0x5a/0xc0 [configfs] config_item_put+0x1d/0x1f [configfs] configfs_rmdir+0x1a6/0x300 [configfs] vfs_rmdir+0xb7/0x140 do_rmdir+0x1f4/0x200 SyS_rmdir+0x11/0x20 entry_SYSCALL_64_fastpath+0x23/0xc6 Signed-off-by: Bart Van Assche Cc: Hannes Reinecke Cc: Christoph Hellwig Cc: Andy Grover Cc: David Disseldorp Cc: --- drivers/target/target_core_xcopy.c | 110 +++++++++++++++++++++++-------------- 1 file changed, 69 insertions(+), 41 deletions(-) diff --git a/drivers/target/target_core_xcopy.c b/drivers/target/target_core_xcopy.c index cac5a20a4de0..aecb36d955f0 100644 --- a/drivers/target/target_core_xcopy.c +++ b/drivers/target/target_core_xcopy.c @@ -40,6 +40,8 @@ static struct workqueue_struct *xcopy_wq = NULL; +static sense_reason_t target_parse_xcopy_cmd(struct xcopy_op *xop); + static int target_xcopy_gen_naa_ieee(struct se_device *dev, unsigned char *buf) { int off = 0; @@ -781,13 +783,24 @@ static int target_xcopy_write_destination( static void target_xcopy_do_work(struct work_struct *work) { struct xcopy_op *xop = container_of(work, struct xcopy_op, xop_work); - struct se_device *src_dev = xop->src_dev, *dst_dev = xop->dst_dev; struct se_cmd *ec_cmd = xop->xop_se_cmd; - sector_t src_lba = xop->src_lba, dst_lba = xop->dst_lba, end_lba; + struct se_device *src_dev, *dst_dev; + sector_t src_lba, dst_lba, end_lba; unsigned int max_sectors; - int rc; - unsigned short nolb = xop->nolb, cur_nolb, max_nolb, copied_nolb = 0; + int rc = 0; + unsigned short nolb, cur_nolb, max_nolb, copied_nolb = 0; + + if (target_parse_xcopy_cmd(xop) != TCM_NO_SENSE) + goto err_free; + if (WARN_ON_ONCE(!xop->src_dev) || WARN_ON_ONCE(!xop->dst_dev)) + goto err_free; + + src_dev = xop->src_dev; + dst_dev = xop->dst_dev; + src_lba = xop->src_lba; + dst_lba = xop->dst_lba; + nolb = xop->nolb; end_lba = src_lba + nolb; /* * Break up XCOPY I/O into hw_max_sectors sized I/O based on the @@ -855,6 +868,8 @@ static void target_xcopy_do_work(struct work_struct *work) out: xcopy_pt_undepend_remotedev(xop); + +err_free: kfree(xop); /* * Don't override an error scsi status if it has already been set @@ -867,48 +882,22 @@ static void target_xcopy_do_work(struct work_struct *work) target_complete_cmd(ec_cmd, ec_cmd->scsi_status); } -sense_reason_t target_do_xcopy(struct se_cmd *se_cmd) +/* + * Returns TCM_NO_SENSE upon success or a sense code != TCM_NO_SENSE if parsing + * fails. + */ +sense_reason_t target_parse_xcopy_cmd(struct xcopy_op *xop) { - struct se_device *dev = se_cmd->se_dev; - struct xcopy_op *xop = NULL; + struct se_cmd *se_cmd = xop->xop_se_cmd; unsigned char *p = NULL, *seg_desc; - unsigned int list_id, list_id_usage, sdll, inline_dl, sa; + unsigned int list_id, list_id_usage, sdll, inline_dl; sense_reason_t ret = TCM_INVALID_PARAMETER_LIST; int rc; unsigned short tdll; - if (!dev->dev_attrib.emulate_3pc) { - pr_err("EXTENDED_COPY operation explicitly disabled\n"); - return TCM_UNSUPPORTED_SCSI_OPCODE; - } - - sa = se_cmd->t_task_cdb[1] & 0x1f; - if (sa != 0x00) { - pr_err("EXTENDED_COPY(LID4) not supported\n"); - return TCM_UNSUPPORTED_SCSI_OPCODE; - } - - if (se_cmd->data_length == 0) { - target_complete_cmd(se_cmd, SAM_STAT_GOOD); - return TCM_NO_SENSE; - } - if (se_cmd->data_length < XCOPY_HDR_LEN) { - pr_err("XCOPY parameter truncation: length %u < hdr_len %u\n", - se_cmd->data_length, XCOPY_HDR_LEN); - return TCM_PARAMETER_LIST_LENGTH_ERROR; - } - - xop = kzalloc(sizeof(struct xcopy_op), GFP_KERNEL); - if (!xop) { - pr_err("Unable to allocate xcopy_op\n"); - return TCM_OUT_OF_RESOURCES; - } - xop->xop_se_cmd = se_cmd; - p = transport_kmap_data_sg(se_cmd); if (!p) { pr_err("transport_kmap_data_sg() failed in target_do_xcopy\n"); - kfree(xop); return TCM_OUT_OF_RESOURCES; } @@ -977,18 +966,57 @@ sense_reason_t target_do_xcopy(struct se_cmd *se_cmd) pr_debug("XCOPY: Processed %d target descriptors, length: %u\n", rc, rc * XCOPY_TARGET_DESC_LEN); transport_kunmap_data_sg(se_cmd); - - INIT_WORK(&xop->xop_work, target_xcopy_do_work); - queue_work(xcopy_wq, &xop->xop_work); return TCM_NO_SENSE; out: if (p) transport_kunmap_data_sg(se_cmd); - kfree(xop); return ret; } +sense_reason_t target_do_xcopy(struct se_cmd *se_cmd) +{ + struct se_device *dev = se_cmd->se_dev; + struct xcopy_op *xop; + unsigned int sa; + + if (!dev->dev_attrib.emulate_3pc) { + pr_err("EXTENDED_COPY operation explicitly disabled\n"); + return TCM_UNSUPPORTED_SCSI_OPCODE; + } + + sa = se_cmd->t_task_cdb[1] & 0x1f; + if (sa != 0x00) { + pr_err("EXTENDED_COPY(LID4) not supported\n"); + return TCM_UNSUPPORTED_SCSI_OPCODE; + } + + if (se_cmd->data_length == 0) { + target_complete_cmd(se_cmd, SAM_STAT_GOOD); + return TCM_NO_SENSE; + } + if (se_cmd->data_length < XCOPY_HDR_LEN) { + pr_err("XCOPY parameter truncation: length %u < hdr_len %u\n", + se_cmd->data_length, XCOPY_HDR_LEN); + return TCM_PARAMETER_LIST_LENGTH_ERROR; + } + + xop = kzalloc(sizeof(struct xcopy_op), GFP_KERNEL); + if (!xop) + goto err; + xop->xop_se_cmd = se_cmd; + INIT_WORK(&xop->xop_work, target_xcopy_do_work); + if (WARN_ON_ONCE(!queue_work(xcopy_wq, &xop->xop_work))) + goto free; + return TCM_NO_SENSE; + +free: + kfree(xop); + +err: + return TCM_OUT_OF_RESOURCES; +} + static sense_reason_t target_rcr_operating_parameters(struct se_cmd *se_cmd) { unsigned char *p;