From patchwork Fri Feb 3 22:40:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 9555231 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 8DECC602B7 for ; Fri, 3 Feb 2017 22:42:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7598828135 for ; Fri, 3 Feb 2017 22:42:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 68DA92816B; Fri, 3 Feb 2017 22:42:10 +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=unavailable 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 9386228135 for ; Fri, 3 Feb 2017 22:42:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753044AbdBCWmB (ORCPT ); Fri, 3 Feb 2017 17:42:01 -0500 Received: from mail-bl2nam02on0068.outbound.protection.outlook.com ([104.47.38.68]:17952 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753004AbdBCWlr (ORCPT ); Fri, 3 Feb 2017 17:41:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=72lPUM0QZrQ4ldzEzMK/XJnmUT3/mWv2PjU7MYV0Ork=; b=IchaMElTqp4XcPOFx3NnrfaYwqJxyQR1wifLy3iUOnwilizYzBLqQ5dhK2jsJ5KNg6TQLfngevgw7tVm1N2vsqhKF7dhHm0MN6K7hU8Gc6QbuUToNlF1i/ioTcFPrCoSyamFuPMTXNlJTh8JUWITh2FH6ofcy1SvNeYCpoTOIxw= Received: from BN6PR07CA0017.namprd07.prod.outlook.com (10.173.33.155) by CY1PR0701MB2091.namprd07.prod.outlook.com (10.163.142.153) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.860.13; Fri, 3 Feb 2017 22:41:39 +0000 Received: from BN1BFFO11FD023.protection.gbl (2a01:111:f400:7c10::1:128) by BN6PR07CA0017.outlook.office365.com (2603:10b6:404:3a::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.888.16 via Frontend Transport; Fri, 3 Feb 2017 22:41:38 +0000 Authentication-Results: spf=none (sender IP is 50.232.66.26) smtp.mailfrom=cavium.com; linux-iscsi.org; dkim=none (message not signed) header.d=none; linux-iscsi.org; dmarc=none action=none header.from=cavium.com; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) Received: from CAEXCH02.caveonetworks.com (50.232.66.26) by BN1BFFO11FD023.mail.protection.outlook.com (10.58.144.86) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.888.7 via Frontend Transport; Fri, 3 Feb 2017 22:41:37 +0000 Received: from dut1171.mv.qlogic.com (172.29.51.171) by CAEXCH02.caveonetworks.com (10.17.4.29) with Microsoft SMTP Server id 14.2.309.2; Fri, 3 Feb 2017 14:41:25 -0800 Received: from dut1171.mv.qlogic.com (localhost [127.0.0.1]) by dut1171.mv.qlogic.com (8.14.7/8.14.7) with ESMTP id v13MfBXh002360; Fri, 3 Feb 2017 14:41:11 -0800 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id v13MfBlo002359; Fri, 3 Feb 2017 14:41:11 -0800 From: Himanshu Madhani To: , , , CC: , , Subject: [PATCH v2 06/14] qla2xxx: Improve T10-DIF/PI handling in driver. Date: Fri, 3 Feb 2017 14:40:47 -0800 Message-ID: <1486161655-2307-7-git-send-email-himanshu.madhani@cavium.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1486161655-2307-1-git-send-email-himanshu.madhani@cavium.com> References: <1486161655-2307-1-git-send-email-himanshu.madhani@cavium.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:50.232.66.26; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(39450400003)(2980300002)(428002)(199003)(189002)(4001430100002)(38730400001)(54906002)(53946003)(8676002)(8936002)(5001770100001)(81166006)(81156014)(50986999)(76176999)(626004)(5003940100001)(50466002)(4326007)(48376002)(8656002)(305945005)(2906002)(105586002)(47776003)(106466001)(36756003)(50226002)(101416001)(356003)(107886002)(1691005)(33646002)(5660300001)(2201001)(86362001)(575784001)(92566002)(80596001)(42186005)(2950100002)(6666003)(4720700003)(69596002)(189998001)(87636001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0701MB2091; H:CAEXCH02.caveonetworks.com; FPR:; SPF:None; PTR:50-232-66-26-static.hfc.comcastbusiness.net; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD023; 1:ysRWGYd9mlPvzxt6dnTmXfzTucfX6wAfpbFBOH0+kxnDOJyHsZd9W61r/Mqmu8+lryzIlFkOCM79X1y9/0b0yrOmU0bmUB78bSOlO1w5iPC2wAC1ACXwQ7oXRfh1XL8BuxfWXNX6W5qCy1Qs4nUScmTnz/YUJrVfUNHqSCeGjgZKvb8vK2KT6b0UvN85bpHR48FWWwa5lSLfxtUaXxoYf83bsdkJThDcEWb4mrs1YCYsdH+kia8BCVhtg5h0u8qwDwxwawrWiaxGKRxHpVMFxOhEnVyoNGzmFA66qZOrqrjBzNh7H4UimGTIZdAt9zA9r9eqOYWsOJ66l5qA5YrckjCXbXYxhyKZ59IvyAm2F8KVNG/UoR8e0MS4DH87rmB1rjlu5+2oFhXplSAEwcfUfaWHCrFkh/vORrxrQlDGDo3y7iagKEGOVEUNoOJN3HdZwCCZ3cX2WUkOppVHZxXAKaQ1h4OUIE+AR96wHzz6Je6cJRLDsYtpwRFY3wgcMnkYDIqleFAejJk7TfYe1ZqmmMVjehAUgAVt2ER/VHWtdiU= X-MS-Office365-Filtering-Correlation-Id: 2e9267fa-c17e-406a-a0a6-08d44c85d090 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:CY1PR0701MB2091; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB2091; 3:9oUgj+1VCcG0QlmLESqWO0qzVuYSh9P+3eyr7gu8NLtZ3OGAkTd3aeibXDcfAY9cSM4dow1XKNX1tZbFcjZgz/4cC2nRk76cCWR6pxqwx9yMjTwbnFXHgVF/ti4JGcyWtzWJ+Vnsvlycl3paYl2Ea6773a3X6KlN4dr9w6rJlWGdcQEDaL7M4L5/pCVORoZjB8OEYSnJMnVnU5TEpRLb0YPteucVhcUfMvH2WLf6VZXLLjzuHQ4CDWACxfHl1Q7ktQxBNYOahoRHVCH/hiPXLlS9KKGmmb/jzImQAnj+DrwRKRf14Z0Bn4wIBiUsKrOY8UL+CY9Kl6D1Dm0kIzVbF/y4yUpEdbPyC0MNYDIov1fhCl4VwvQP5c2PG8IXiCMU; 25:CgbSqir99Sz2pbEvVk7LyjLdFtuUwWuWRx5scyNn3snRu0hpZgChCJLNhqpAxFJn+Fw01+qWbJhE8kfviDzzF/115xXyPKk+aSw6bCtOn9Z2RnSomCFDwS+ARxauxLcxEhI5byw0vTrRdlqfxfhgou0E0lv8q3XOlMu5zMENi57tVn13QZP7v37K1vah34ji8e4k+OR9eYR/TW1vmQTdFh95QeJWtlD/FUDs06UIxs/UubuTGavTKQ9+dy+0DrfCZLBE9sG1ByqCMAm4iDpOL9/Do9Lw+4Wy1eRH+UThqGELJsziAcwNUSx8GZz+H7GeyU/4DiOOZvoBycIMc2Axi00Hnd1SlL/V43bltakY2kjSmn/1tAlzApI/Zx4JdQh0byf1rBz4Am9oRkVAJjFcSHl9LnUOnirpKPcqTAUVJqRuqABDToQW50pvQjsRnqYWCYTEmsiYvrjZvAXahaCXVw== X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB2091; 31:7sb/kpfgdjAJ+gTIHCk5ELtaeQ2/JyQzAZ9XJjVvad9nq8O1ECP5CkN8eKub5J+hu2qYVva9sovwBTl8KjwMf0Uu3FOoMpgot00+GpTxm/LvL5FMItjCVbTmz2gXRvrl4EGntqQmlhcAaspHpDHAoEVJGcoyJWKGF2bucuoizS2O7EdyiyLKtvpLs/bWw9Hpp+UC0QckxVCm4GkXsXSb1sFeWRlNPnfXm5Oqrgzrtan1thkwHkQYvrkBJYFAdvADjS6R8F7UUU3KbpICAgNGkk43dSicBEfjhFU1FK3qBXxTbatd1EtwkWnkIS6oi7ZU; 20:sInXKkS27wR1KnvtlJO3L28vwAs1Gml3OwDd1UPPCsKcGBd/9ToHYcgGOpYLF9Mxk2i2/nHejRVqXUEtg6AsoRv9HcXQcGsJi7tnR53iYKxgjY3MxgZzkNrVuMUpn4RycybVC1u6wzUvVisp1dCBFBqHoqXEdL+bx4BZerp+pvx/G4Yvk5aDNVASSUjXfXcyFXwfoII1+lCW3I5gne/ebGsZvNv2D6TPDNjVK8+/scZcjmI9S0n7QgI30TZkJHwxAry0vCpUK+AkZDtgPjArSLfwgjuiaxxkq2WzOZBakqV4gFmoEWfjXmcwv0gMTJ9Bi9kuHdwhxQS5r97nzDctfHufV9VKKowNnFbOKlxqpzW0AnQt7zodYv7AiAXFJa4sJxBw7QzEPyChCB3iNr4rGO95LqeK5ckrZqRYOlPeUmI2yatiK0aToWathODZnRxMOLE1G3xaeJuk9S9kuBgIJpSdFfa8/we79PL4kcdQT0rkIKE4UtLuFkzuY1dzTNDv X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(13024025)(8121501046)(13017025)(13023025)(13015025)(13018025)(5005006)(10201501046)(3002001)(6041248)(20161123562025)(20161123564025)(20161123555025)(20161123560025)(20161123558025)(6072148); SRVR:CY1PR0701MB2091; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0701MB2091; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB2091; 4:yJhNcXrk9N6ucOqiQ9hvKtOWC0KJZHgxj5z3qRllLf/hvoEbCUlFAuRZcoTL5TQd8RtzUOABBEp74Gf9VkRSid9CGD+veB836LbU5YZYyHrndCfO4MIh9IBXhoSaxYajLHhG5rHBVHYe5XiMBB0BP1qYSm3VM5gvF1p/npfUZ8D2VdHu8UokuiBvU/DIP8clyf4qnTcB3hUXyyOXHsUPQ28fjbGe+8TRjqGt2Q2vihhKqdafmKub/7K1FjnVI4GgNdKTuxNFLB0WJRVoNHP7L7iCZIJHKJ4IY3aPWbjynQJ4DP1GyVHRi0dL7Mnm8vvLRWQN8v5hS+1nQXLk3FMLWLXudC1/KKolDR7ZnGMBpdGpvvc4C/I85iyd3l5FICFBRqGCLeIcXrz0ms3MBGdR85GHDHJgFaRelWypP7cJMJ/HpaCW1sFx1Z2qArhcnZna/3OLVDgplZx1x5/oXfP28paa0wRESAc3prLxzCJ8MAXkXDxpBndniT3PMYOOZ80ZyDb3eAzWLYb4E6FqUQjTvsywfRXma21u2k5gIEYq0CxqBfmB/ZaiNgpLW8Azgtizu/2SuE9NWxKFciv/HM0n49IXCXmBZ902+IhbHb1WdpK6lvSIV1zpj9AzBO01HR80pQF1GIo0bkO4o2YF2lX4k4t2fOp/8PZICiaHBlUwt1/B/v0DDlo/R05H0yPP4gXQpBlY9tKyCJ4hrGBjGdOkcg== X-Forefront-PRVS: 02070414A1 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0701MB2091; 23:IUCtyBDfxQybXgrILjoItJnZmRizQcVsbpOvxr/?= =?us-ascii?Q?kfICZPqAQibCYGfmApxC9leW0ulAXLVYFkvV8YGxlkhRAbkdHnlo61ZbIbMW?= =?us-ascii?Q?dv98ELlIjvPMj10pnXtE4KFo5//MxqVN0nxmmYaNuad3FkBiY6W918i2hTy0?= =?us-ascii?Q?IMBGrpQHjhJQca6oyVvQN319ERINZZwFzXp0ZWyTy6buEC7RwqFk4eMd8Cq1?= =?us-ascii?Q?WrTn3syCTLkyb7ltG2NWvZ0pDc55p30G/GZOaCSrxFxow6Dlna6siCtPAMS8?= =?us-ascii?Q?ogXcF8bg6jTVIUpA46cpBfO6SMuiZXhZeh3TfcacHMsvK1TocEGk9K+pHeW2?= =?us-ascii?Q?FJDLzhHnE8D1ZJHsyaSDyn9nC6Ds6thZXIoXexGzjmpeKZHgBXt3jiO0HaWL?= =?us-ascii?Q?5t0TxyeXRiE6sKiN4xhiuHz/bLx+s/v0wQhL0w98HX14KOCM4CnaJWyuAaQ3?= =?us-ascii?Q?m2MGePRAi3sU7r3/4G/X2K4nuG5EVI8zJuAQAsvqeE/NCIVf/ZZYgTg+v4H3?= =?us-ascii?Q?M3GcUhK1MEB6y+KSUNGzkT/HPRP3tHrplor63ON+a+cHo8SK3p0YlP/fJhuf?= =?us-ascii?Q?yMnfX3XfI/YhkvUCxGIfydGsNb3Ip50CbnCdp2dqu1tiH6jvQcICrAiuBWX4?= =?us-ascii?Q?gW4WL53JcxFdm7GEtXeHpvNMggCtZZG3DONlKig925IyUJ+oQZg5EjKtW3ym?= =?us-ascii?Q?79LZdYBV9Wv7VRHUwRzFJj2Tkme4ttJzq9itA8PnIatc2wuzfY+4IFpPUX3P?= =?us-ascii?Q?DEW8zkDz8YiE/+qXem0aArIrzF9osTtMwhsQQgsSpWQ9jtZ50OM0QsRsaRQn?= =?us-ascii?Q?WQIxLFoO5ldPBVx6+Cx4rsNOI0sAriM1mFuEcB/LFcEURAKDhyZZBZSRPZXZ?= =?us-ascii?Q?mA1Xjs7BfCnPrq8Ty1t5yoPBXSeZoQhH9Z+OyxCTu84Te4MbcD6vWJyM70ip?= =?us-ascii?Q?PjSkbqbi5JMS/iFWwMSoIQQ7Ky9H/Yd1Q+sGZRyVVpNFSDcnvSpgiH8AfO6f?= =?us-ascii?Q?Hw1E5/fphaqr00Ks9Qg+inKh5RzH92Q/9tHMjnButx0lQXYnB57/8JOA9WVE?= =?us-ascii?Q?Qa1EX+EaQutfhiteAK0OjkzTRuGlE0M1jL83MY8HTTC7NyQzjo00OBy/6BrK?= =?us-ascii?Q?V41QOOdPUAkh1FDHBI+9NGJ4lAKXgqMQFNNoDnwGu3nBOpCEGBXotSpMnjso?= =?us-ascii?Q?xViL0i/dSzcARCsr7SFIcXtYd8UNumGuxDxkn?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB2091; 6:MjX/HoyNDTNp8x9piYVysp0O0+BmPuLrZc9mOZy6cbDEsjlttnZ4kbtKnmxuemQagtRzy2+7NvTrDgnMpxWRByczVedmcPg5ZPBlrlLD97PN/QRJdgaakRhnnCdk3TeKlUM9WFqo0nFszmpmpxs/sHyP7DYasO95F2AV4hUGUWp2HrI7XZ/AFp+8ZwCeskO7Riem4zioZye9CdR14iVa2ZTkHWh+/h9tydiHcsuQxItXuZ/srGjRvL0hf1Vvo3HnE3SCHhdGyHwRCI9qMQb5XDBVJSIVOeI6tV1kQ8iRzviQGL5ljbG1irpi6nxmwohO2ReK4uP/tFcfZysYF0nGhAP57EIiMMlHf1Qh3fqtI+u+QmQqrtfryn1hlj88yuOG7+pa+/2Incu8nd1nDngPAQ==; 5:DtiFf74t1z7IMh6hppuU0kKGCNHeXERzfrUvzdpU+ulW2lOqZV3YxhnRy2lY6/n/O3FiVjBRpGoHjDlAIty0w/bpl/G92goR6NSxzvAnbPM4NmCxxqKB6yFXS6UZsYOEZ/JICZJ+akiRgahm11onYJu+kHB6rxZii0t55f2WZAw=; 24:vVF3MOZUovINswaexBt2fFMUew7xHUSE2ZGNhPnWVHiezVPKXr+sjJVeLAgsA0kiSlFlSlMBJHct3zTrJVeE2XNkJ/Y1Z+j2D3A9X/iibus= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB2091; 7:xad99K3EXHPAZa8UBzXasQPZ/kxk/0eBI4o/k5O9VysuT6PRzyLNzBbVJGx1o+ycTVZl7a3gK1gUA3WtFEsh+aYh0sMNrKhf3iLhMsdhUGvnr9FqhefTC9i1RFBANGIRQYHX0TNsIoITtuoYXBUlWax+uyaV0VB7wSPhHb2W4MpxY6B6nNPP8AG1zvJNgPcOw9p9WmrwZoE235c8+f++z2jR1V+9jkk5J6/xHg9giEEp/Nv6HJ223Z6YCkaz/qPW8t7TvOO+nTKxEOf2XqEoMnl2mlMU5Bcm0VieDRMJjQvjjhe2mvKArkfmeif7bhaJkzR++UKiOp0ree21+mVGMSDVL9QMzIjolQb61Xf6OIytD56Kmg4wIrzIO6qachYh6niAS2K0CtQcN13pp9dlQMqAiND4WcM6Wl/gII47TN2UMjyqOt970PaI1Mc41BH2TjZhMM0yED7c2BFm565NJHl4X45c0rcmiFcmiqwFdTmsRQPkPt/yfn31NlBwv1yhyPgIFD4Jc2M8+oIIkiiCYw== X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Feb 2017 22:41:37.5995 (UTC) X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=711e4ccf-2e9b-4bcf-a551-4094005b6194; Ip=[50.232.66.26]; Helo=[CAEXCH02.caveonetworks.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0701MB2091 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 From: Quinn Tran Add routines to support T10 DIF tag. Signed-off-by: Quinn Tran Signed-off-by: Anil Gurumurthy Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_dbg.h | 1 + drivers/scsi/qla2xxx/qla_def.h | 17 ++ drivers/scsi/qla2xxx/qla_target.c | 598 +++++++++++++++++++++---------------- drivers/scsi/qla2xxx/qla_target.h | 37 ++- drivers/scsi/qla2xxx/tcm_qla2xxx.c | 84 +++++- 5 files changed, 465 insertions(+), 272 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_dbg.h b/drivers/scsi/qla2xxx/qla_dbg.h index e1fc4e6..c6bffe9 100644 --- a/drivers/scsi/qla2xxx/qla_dbg.h +++ b/drivers/scsi/qla2xxx/qla_dbg.h @@ -348,6 +348,7 @@ void __attribute__((format (printf, 4, 5))) #define ql_dbg_tgt 0x00004000 /* Target mode */ #define ql_dbg_tgt_mgt 0x00002000 /* Target mode management */ #define ql_dbg_tgt_tmr 0x00001000 /* Target mode task management */ +#define ql_dbg_tgt_dif 0x00000800 /* Target mode dif */ extern int qla27xx_dump_mpi_ram(struct qla_hw_data *, uint32_t, uint32_t *, uint32_t, void **); diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h index 8bc1111..d6436fc 100644 --- a/drivers/scsi/qla2xxx/qla_def.h +++ b/drivers/scsi/qla2xxx/qla_def.h @@ -2189,6 +2189,23 @@ struct qlt_plogi_ack_t { void *fcport; }; +enum qla_tgt_prot_op { + QLA_PROT_NORMAL = 0, + QLA_PROT_DIN_INSERT, + QLA_PROT_DOUT_INSERT, + QLA_PROT_DIN_STRIP, + QLA_PROT_DOUT_STRIP, + QLA_PROT_DIN_PASS, + QLA_PROT_DOUT_PASS, +}; + +enum qla_tgt_prot_type { + QLA_TGT_PROT_TYPE0, + QLA_TGT_PROT_TYPE1, + QLA_TGT_PROT_TYPE2, + QLA_TGT_PROT_TYPE3, +}; + struct ct_sns_desc { struct ct_sns_pkt *ct_sns; dma_addr_t ct_sns_dma; diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c index a4cc14b..a36258d 100644 --- a/drivers/scsi/qla2xxx/qla_target.c +++ b/drivers/scsi/qla2xxx/qla_target.c @@ -36,8 +36,6 @@ #include #include #include -#include -#include #include "qla_def.h" #include "qla_target.h" @@ -140,6 +138,20 @@ static struct fc_port *qlt_create_sess(struct scsi_qla_host *vha, static DEFINE_MUTEX(qla_tgt_mutex); static LIST_HEAD(qla_tgt_glist); +static char *prot_op_str(u32 prot_op) +{ + switch (prot_op) { + case QLA_PROT_NORMAL: return "NORMAL"; + case QLA_PROT_DIN_INSERT: return "DIN_INSERT"; + case QLA_PROT_DOUT_INSERT: return "DOUT_INSERT"; + case QLA_PROT_DIN_STRIP: return "DIN_STRIP"; + case QLA_PROT_DOUT_STRIP: return "DOUT_STRIP"; + case QLA_PROT_DIN_PASS: return "DIN_PASS"; + case QLA_PROT_DOUT_PASS: return "DOUT_PASS"; + default: return "UNKNOWN"; + } +} + /* This API intentionally takes dest as a parameter, rather than returning * int value to avoid caller forgetting to issue wmb() after the store */ void qlt_do_generation_tick(struct scsi_qla_host *vha, int *dest) @@ -1997,6 +2009,68 @@ void qlt_free_mcmd(struct qla_tgt_mgmt_cmd *mcmd) } EXPORT_SYMBOL(qlt_free_mcmd); +/* + * ha->hardware_lock supposed to be held on entry. Might drop it, then + * reacquire + */ +void qlt_send_resp_ctio(scsi_qla_host_t *vha, struct qla_tgt_cmd *cmd, + uint8_t scsi_status, uint8_t sense_key, uint8_t asc, uint8_t ascq) +{ + struct atio_from_isp *atio = &cmd->atio; + struct ctio7_to_24xx *ctio; + uint16_t temp; + + ql_dbg(ql_dbg_tgt_dif, vha, 0x3066, + "Sending response CTIO7 (vha=%p, atio=%p, scsi_status=%02x, " + "sense_key=%02x, asc=%02x, ascq=%02x", + vha, atio, scsi_status, sense_key, asc, ascq); + + ctio = (struct ctio7_to_24xx *)qla2x00_alloc_iocbs(vha, NULL); + if (!ctio) { + ql_dbg(ql_dbg_async, vha, 0x3067, + "qla2x00t(%ld): %s failed: unable to allocate request packet", + vha->host_no, __func__); + goto out; + } + + ctio->entry_type = CTIO_TYPE7; + ctio->entry_count = 1; + ctio->handle = QLA_TGT_SKIP_HANDLE; + ctio->nport_handle = cmd->sess->loop_id; + ctio->timeout = cpu_to_le16(QLA_TGT_TIMEOUT); + ctio->vp_index = vha->vp_idx; + ctio->initiator_id[0] = atio->u.isp24.fcp_hdr.s_id[2]; + ctio->initiator_id[1] = atio->u.isp24.fcp_hdr.s_id[1]; + ctio->initiator_id[2] = atio->u.isp24.fcp_hdr.s_id[0]; + ctio->exchange_addr = atio->u.isp24.exchange_addr; + ctio->u.status1.flags = (atio->u.isp24.attr << 9) | + cpu_to_le16(CTIO7_FLAGS_STATUS_MODE_1 | CTIO7_FLAGS_SEND_STATUS); + temp = be16_to_cpu(atio->u.isp24.fcp_hdr.ox_id); + ctio->u.status1.ox_id = cpu_to_le16(temp); + ctio->u.status1.scsi_status = + cpu_to_le16(SS_RESPONSE_INFO_LEN_VALID | scsi_status); + ctio->u.status1.response_len = cpu_to_le16(18); + ctio->u.status1.residual = cpu_to_le32(get_datalen_for_atio(atio)); + + if (ctio->u.status1.residual != 0) + ctio->u.status1.scsi_status |= + cpu_to_le16(SS_RESIDUAL_UNDER); + /* Response code and sense key */ + ((uint32_t *)ctio->u.status1.sense_data)[0] = + cpu_to_le32((0x70 << 24) | (sense_key << 8)); + /* Additional sense length */ + ((uint32_t *)ctio->u.status1.sense_data)[1] = cpu_to_le32(0x0a); + /* ASC and ASCQ */ + ((uint32_t *)ctio->u.status1.sense_data)[3] = + cpu_to_le32((asc << 24) | (ascq << 16)); + + /* Memory Barrier */ + wmb(); + qla2x00_start_iocbs(vha, vha->req); +out: + return; +} + /* callback from target fabric module code */ void qlt_xmit_tm_rsp(struct qla_tgt_mgmt_cmd *mcmd) { @@ -2076,7 +2150,7 @@ static int qlt_pci_map_calc_cnt(struct qla_tgt_prm *prm) prm->cmd->sg_mapped = 1; - if (cmd->se_cmd.prot_op == TARGET_PROT_NORMAL) { + if (cmd->prot_op == QLA_PROT_NORMAL) { /* * If greater than four sg entries then we need to allocate * the continuation entries @@ -2087,8 +2161,8 @@ static int qlt_pci_map_calc_cnt(struct qla_tgt_prm *prm) prm->tgt->datasegs_per_cont); } else { /* DIF */ - if ((cmd->se_cmd.prot_op == TARGET_PROT_DIN_INSERT) || - (cmd->se_cmd.prot_op == TARGET_PROT_DOUT_STRIP)) { + if ((cmd->prot_op == QLA_PROT_DIN_INSERT) || + (cmd->prot_op == QLA_PROT_DOUT_STRIP)) { prm->seg_cnt = DIV_ROUND_UP(cmd->bufflen, cmd->blk_sz); prm->tot_dsds = prm->seg_cnt; } else @@ -2102,8 +2176,8 @@ static int qlt_pci_map_calc_cnt(struct qla_tgt_prm *prm) if (unlikely(prm->prot_seg_cnt == 0)) goto out_err; - if ((cmd->se_cmd.prot_op == TARGET_PROT_DIN_INSERT) || - (cmd->se_cmd.prot_op == TARGET_PROT_DOUT_STRIP)) { + if ((cmd->prot_op == QLA_PROT_DIN_INSERT) || + (cmd->prot_op == QLA_PROT_DOUT_STRIP)) { /* Dif Bundling not support here */ prm->prot_seg_cnt = DIV_ROUND_UP(cmd->bufflen, cmd->blk_sz); @@ -2247,7 +2321,7 @@ static int qlt_24xx_build_ctio_pkt(struct qla_tgt_prm *prm, } else ha->tgt.cmds[h-1] = prm->cmd; - pkt->handle = h | CTIO_COMPLETION_HANDLE_MARK; + pkt->handle = CTIO_COMPLETION_HANDLE_MARK; pkt->nport_handle = prm->cmd->loop_id; pkt->timeout = cpu_to_le16(QLA_TGT_TIMEOUT); pkt->initiator_id[0] = atio->u.isp24.fcp_hdr.s_id[2]; @@ -2375,6 +2449,50 @@ static inline int qlt_has_data(struct qla_tgt_cmd *cmd) return cmd->bufflen > 0; } +static void qlt_print_dif_err(struct qla_tgt_prm *prm) +{ + struct qla_tgt_cmd *cmd; + struct scsi_qla_host *vha; + + /* asc 0x10=dif error */ + if (prm->sense_buffer && (prm->sense_buffer[12] == 0x10)) { + cmd = prm->cmd; + vha = cmd->vha; + /* ASCQ */ + switch (prm->sense_buffer[13]) { + case 1: + ql_dbg(ql_dbg_tgt_dif, vha, 0xffff, + "BE detected Guard TAG ERR: lba[0x%llx|%lld] len[0x%x] " + "se_cmd=%p tag[%x]", + cmd->lba, cmd->lba, cmd->num_blks, &cmd->se_cmd, + cmd->atio.u.isp24.exchange_addr); + break; + case 2: + ql_dbg(ql_dbg_tgt_dif, vha, 0xffff, + "BE detected APP TAG ERR: lba[0x%llx|%lld] len[0x%x] " + "se_cmd=%p tag[%x]", + cmd->lba, cmd->lba, cmd->num_blks, &cmd->se_cmd, + cmd->atio.u.isp24.exchange_addr); + break; + case 3: + ql_dbg(ql_dbg_tgt_dif, vha, 0xffff, + "BE detected REF TAG ERR: lba[0x%llx|%lld] len[0x%x] " + "se_cmd=%p tag[%x]", + cmd->lba, cmd->lba, cmd->num_blks, &cmd->se_cmd, + cmd->atio.u.isp24.exchange_addr); + break; + default: + ql_dbg(ql_dbg_tgt_dif, vha, 0xffff, + "BE detected Dif ERR: lba[%llx|%lld] len[%x] " + "se_cmd=%p tag[%x]", + cmd->lba, cmd->lba, cmd->num_blks, &cmd->se_cmd, + cmd->atio.u.isp24.exchange_addr); + break; + } + ql_dump_buffer(ql_dbg_tgt_dif, vha, 0xffff, cmd->cdb, 16); + } +} + /* * Called without ha->hardware_lock held */ @@ -2496,18 +2614,9 @@ static void qlt_24xx_init_ctio_to_isp(struct ctio7_to_24xx *ctio, for (i = 0; i < prm->sense_buffer_len/4; i++) ((uint32_t *)ctio->u.status1.sense_data)[i] = cpu_to_be32(((uint32_t *)prm->sense_buffer)[i]); -#if 0 - if (unlikely((prm->sense_buffer_len % 4) != 0)) { - static int q; - if (q < 10) { - ql_dbg(ql_dbg_tgt, vha, 0xe04f, - "qla_target(%d): %d bytes of sense " - "lost", prm->tgt->ha->vp_idx, - prm->sense_buffer_len % 4); - q++; - } - } -#endif + + qlt_print_dif_err(prm); + } else { ctio->u.status1.flags &= ~cpu_to_le16(CTIO7_FLAGS_STATUS_MODE_0); @@ -2521,32 +2630,22 @@ static void qlt_24xx_init_ctio_to_isp(struct ctio7_to_24xx *ctio, /* Sense with len > 24, is it possible ??? */ } - - -/* diff */ static inline int -qlt_hba_err_chk_enabled(struct se_cmd *se_cmd) +qlt_hba_err_chk_enabled(struct qla_tgt_cmd *cmd) { - /* - * Uncomment when corresponding SCSI changes are done. - * - if (!sp->cmd->prot_chk) - return 0; - * - */ - switch (se_cmd->prot_op) { - case TARGET_PROT_DOUT_INSERT: - case TARGET_PROT_DIN_STRIP: + switch (cmd->prot_op) { + case QLA_PROT_DOUT_INSERT: + case QLA_PROT_DIN_STRIP: if (ql2xenablehba_err_chk >= 1) return 1; break; - case TARGET_PROT_DOUT_PASS: - case TARGET_PROT_DIN_PASS: + case QLA_PROT_DOUT_PASS: + case QLA_PROT_DIN_PASS: if (ql2xenablehba_err_chk >= 2) return 1; break; - case TARGET_PROT_DIN_INSERT: - case TARGET_PROT_DOUT_STRIP: + case QLA_PROT_DIN_INSERT: + case QLA_PROT_DOUT_STRIP: return 1; default: break; @@ -2554,16 +2653,39 @@ static void qlt_24xx_init_ctio_to_isp(struct ctio7_to_24xx *ctio, return 0; } +static inline int +qla_tgt_ref_mask_check(struct qla_tgt_cmd *cmd) +{ + switch (cmd->prot_op) { + case QLA_PROT_DIN_INSERT: + case QLA_PROT_DOUT_INSERT: + case QLA_PROT_DIN_STRIP: + case QLA_PROT_DOUT_STRIP: + case QLA_PROT_DIN_PASS: + case QLA_PROT_DOUT_PASS: + return 1; + default: + return 0; + } + + return 0; +} + /* - * qla24xx_set_t10dif_tags_from_cmd - Extract Ref and App tags from SCSI command - * + * qla_tgt_set_dif_tags - Extract Ref and App tags from SCSI command */ -static inline void -qlt_set_t10dif_tags(struct se_cmd *se_cmd, struct crc_context *ctx) +static void +qla_tgt_set_dif_tags(struct qla_tgt_cmd *cmd, struct crc_context *ctx, + uint16_t *pfw_prot_opts) { + struct se_cmd *se_cmd = &cmd->se_cmd; uint32_t lba = 0xffffffff & se_cmd->t_task_lba; + scsi_qla_host_t *vha = cmd->tgt->vha; + struct qla_hw_data *ha = vha->hw; + uint32_t t32 = 0; - /* wait til Mode Sense/Select cmd, modepage Ah, subpage 2 + /* + * wait til Mode Sense/Select cmd, modepage Ah, subpage 2 * have been immplemented by TCM, before AppTag is avail. * Look for modesense_handlers[] */ @@ -2571,65 +2693,73 @@ static void qlt_24xx_init_ctio_to_isp(struct ctio7_to_24xx *ctio, ctx->app_tag_mask[0] = 0x0; ctx->app_tag_mask[1] = 0x0; - switch (se_cmd->prot_type) { - case TARGET_DIF_TYPE0_PROT: - /* - * No check for ql2xenablehba_err_chk, as it would be an - * I/O error if hba tag generation is not done. - */ - ctx->ref_tag = cpu_to_le32(lba); - - if (!qlt_hba_err_chk_enabled(se_cmd)) - break; - - /* enable ALL bytes of the ref tag */ - ctx->ref_tag_mask[0] = 0xff; - ctx->ref_tag_mask[1] = 0xff; - ctx->ref_tag_mask[2] = 0xff; - ctx->ref_tag_mask[3] = 0xff; - break; - /* - * For TYpe 1 protection: 16 bit GUARD tag, 32 bit REF tag, and - * 16 bit app tag. - */ - case TARGET_DIF_TYPE1_PROT: - ctx->ref_tag = cpu_to_le32(lba); + if (IS_PI_UNINIT_CAPABLE(ha)) { + if ((cmd->prot_type == QLA_TGT_PROT_TYPE1) || + (cmd->prot_type == QLA_TGT_PROT_TYPE2)) + *pfw_prot_opts |= PO_DIS_VALD_APP_ESC; + else if (cmd->prot_type == QLA_TGT_PROT_TYPE3) + *pfw_prot_opts |= PO_DIS_VALD_APP_REF_ESC; + } - if (!qlt_hba_err_chk_enabled(se_cmd)) - break; + t32 = ha->tgt.tgt_ops->get_dif_tags(cmd, pfw_prot_opts); - /* enable ALL bytes of the ref tag */ - ctx->ref_tag_mask[0] = 0xff; - ctx->ref_tag_mask[1] = 0xff; - ctx->ref_tag_mask[2] = 0xff; - ctx->ref_tag_mask[3] = 0xff; - break; - /* - * For TYPE 2 protection: 16 bit GUARD + 32 bit REF tag has to - * match LBA in CDB + N - */ - case TARGET_DIF_TYPE2_PROT: + switch (cmd->prot_type) { + case QLA_TGT_PROT_TYPE0: + /* + * No check for ql2xenablehba_err_chk, as it + * would be an I/O error if hba tag generation + * is not done. + */ ctx->ref_tag = cpu_to_le32(lba); - - if (!qlt_hba_err_chk_enabled(se_cmd)) - break; - /* enable ALL bytes of the ref tag */ ctx->ref_tag_mask[0] = 0xff; ctx->ref_tag_mask[1] = 0xff; ctx->ref_tag_mask[2] = 0xff; ctx->ref_tag_mask[3] = 0xff; break; - - /* For Type 3 protection: 16 bit GUARD only */ - case TARGET_DIF_TYPE3_PROT: - ctx->ref_tag_mask[0] = ctx->ref_tag_mask[1] = - ctx->ref_tag_mask[2] = ctx->ref_tag_mask[3] = 0x00; - break; + case QLA_TGT_PROT_TYPE1: + /* + * For TYPE 1 protection: 16 bit GUARD tag, 32 bit + * REF tag, and 16 bit app tag. + */ + ctx->ref_tag = cpu_to_le32(lba); + if (!qla_tgt_ref_mask_check(cmd) || + !(ha->tgt.tgt_ops->chk_dif_tags(t32))) { + *pfw_prot_opts |= PO_DIS_REF_TAG_VALD; + break; + } + /* enable ALL bytes of the ref tag */ + ctx->ref_tag_mask[0] = 0xff; + ctx->ref_tag_mask[1] = 0xff; + ctx->ref_tag_mask[2] = 0xff; + ctx->ref_tag_mask[3] = 0xff; + break; + case QLA_TGT_PROT_TYPE2: + /* + * For TYPE 2 protection: 16 bit GUARD + 32 bit REF + * tag has to match LBA in CDB + N + */ + ctx->ref_tag = cpu_to_le32(lba); + if (!qla_tgt_ref_mask_check(cmd) || + !(ha->tgt.tgt_ops->chk_dif_tags(t32))) { + *pfw_prot_opts |= PO_DIS_REF_TAG_VALD; + break; + } + /* enable ALL bytes of the ref tag */ + ctx->ref_tag_mask[0] = 0xff; + ctx->ref_tag_mask[1] = 0xff; + ctx->ref_tag_mask[2] = 0xff; + ctx->ref_tag_mask[3] = 0xff; + break; + case QLA_TGT_PROT_TYPE3: + /* For TYPE 3 protection: 16 bit GUARD only */ + *pfw_prot_opts |= PO_DIS_REF_TAG_VALD; + ctx->ref_tag_mask[0] = ctx->ref_tag_mask[1] = + ctx->ref_tag_mask[2] = ctx->ref_tag_mask[3] = 0x00; + break; } } - static inline int qlt_build_ctio_crc2_pkt(struct qla_tgt_prm *prm, scsi_qla_host_t *vha) { @@ -2658,28 +2788,28 @@ static void qlt_24xx_init_ctio_to_isp(struct ctio7_to_24xx *ctio, ql_dbg(ql_dbg_tgt, vha, 0xe071, "qla_target(%d):%s: se_cmd[%p] CRC2 prot_op[0x%x] cmd prot sg:cnt[%p:%x] lba[%llu]\n", - vha->vp_idx, __func__, se_cmd, se_cmd->prot_op, + vha->vp_idx, __func__, se_cmd, cmd->prot_op, prm->prot_sg, prm->prot_seg_cnt, se_cmd->t_task_lba); - if ((se_cmd->prot_op == TARGET_PROT_DIN_INSERT) || - (se_cmd->prot_op == TARGET_PROT_DOUT_STRIP)) + if ((cmd->prot_op == QLA_PROT_DIN_INSERT) || + (cmd->prot_op == QLA_PROT_DOUT_STRIP)) bundling = 0; /* Compute dif len and adjust data len to incude protection */ data_bytes = cmd->bufflen; dif_bytes = (data_bytes / cmd->blk_sz) * 8; - switch (se_cmd->prot_op) { - case TARGET_PROT_DIN_INSERT: - case TARGET_PROT_DOUT_STRIP: + switch (cmd->prot_op) { + case QLA_PROT_DIN_INSERT: + case QLA_PROT_DOUT_STRIP: transfer_length = data_bytes; data_bytes += dif_bytes; break; - case TARGET_PROT_DIN_STRIP: - case TARGET_PROT_DOUT_INSERT: - case TARGET_PROT_DIN_PASS: - case TARGET_PROT_DOUT_PASS: + case QLA_PROT_DIN_STRIP: + case QLA_PROT_DOUT_INSERT: + case QLA_PROT_DIN_PASS: + case QLA_PROT_DOUT_PASS: transfer_length = data_bytes + dif_bytes; break; @@ -2688,28 +2818,28 @@ static void qlt_24xx_init_ctio_to_isp(struct ctio7_to_24xx *ctio, break; } - if (!qlt_hba_err_chk_enabled(se_cmd)) + if (!qlt_hba_err_chk_enabled(cmd)) fw_prot_opts |= 0x10; /* Disable Guard tag checking */ /* HBA error checking enabled */ else if (IS_PI_UNINIT_CAPABLE(ha)) { - if ((se_cmd->prot_type == TARGET_DIF_TYPE1_PROT) || - (se_cmd->prot_type == TARGET_DIF_TYPE2_PROT)) + if ((cmd->prot_type == QLA_TGT_PROT_TYPE1) || + (cmd->prot_type == QLA_TGT_PROT_TYPE2)) fw_prot_opts |= PO_DIS_VALD_APP_ESC; - else if (se_cmd->prot_type == TARGET_DIF_TYPE3_PROT) + else if (cmd->prot_type == QLA_TGT_PROT_TYPE3) fw_prot_opts |= PO_DIS_VALD_APP_REF_ESC; } - switch (se_cmd->prot_op) { - case TARGET_PROT_DIN_INSERT: - case TARGET_PROT_DOUT_INSERT: + switch (cmd->prot_op) { + case QLA_PROT_DIN_INSERT: + case QLA_PROT_DOUT_INSERT: fw_prot_opts |= PO_MODE_DIF_INSERT; break; - case TARGET_PROT_DIN_STRIP: - case TARGET_PROT_DOUT_STRIP: + case QLA_PROT_DIN_STRIP: + case QLA_PROT_DOUT_STRIP: fw_prot_opts |= PO_MODE_DIF_REMOVE; break; - case TARGET_PROT_DIN_PASS: - case TARGET_PROT_DOUT_PASS: + case QLA_PROT_DIN_PASS: + case QLA_PROT_DOUT_PASS: fw_prot_opts |= PO_MODE_DIF_PASS; /* FUTURE: does tcm require T10CRC<->IPCKSUM conversion? */ break; @@ -2784,7 +2914,7 @@ static void qlt_24xx_init_ctio_to_isp(struct ctio7_to_24xx *ctio, /* Set handle */ crc_ctx_pkt->handle = pkt->handle; - qlt_set_t10dif_tags(se_cmd, crc_ctx_pkt); + qla_tgt_set_dif_tags(cmd, crc_ctx_pkt, &fw_prot_opts); pkt->crc_context_address[0] = cpu_to_le32(LSD(crc_ctx_dma)); pkt->crc_context_address[1] = cpu_to_le32(MSD(crc_ctx_dma)); @@ -2910,7 +3040,7 @@ int qlt_xmit_response(struct qla_tgt_cmd *cmd, int xmit_type, if (unlikely(res)) goto out_unmap_unlock; - if (cmd->se_cmd.prot_op && (xmit_type & QLA_TGT_XMIT_DATA)) + if (cmd->prot_op && (xmit_type & QLA_TGT_XMIT_DATA)) res = qlt_build_ctio_crc2_pkt(&prm, vha); else res = qlt_24xx_build_ctio_pkt(&prm, vha); @@ -2926,7 +3056,7 @@ int qlt_xmit_response(struct qla_tgt_cmd *cmd, int xmit_type, cpu_to_le16(CTIO7_FLAGS_DATA_IN | CTIO7_FLAGS_STATUS_MODE_0); - if (cmd->se_cmd.prot_op == TARGET_PROT_NORMAL) + if (cmd->prot_op == QLA_PROT_NORMAL) qlt_load_data_segments(&prm, vha); if (prm.add_status_pkt == 0) { @@ -3051,7 +3181,7 @@ int qlt_rdy_to_xfer(struct qla_tgt_cmd *cmd) res = qlt_check_reserve_free_req(vha, prm.req_cnt); if (res != 0) goto out_unlock_free_unmap; - if (cmd->se_cmd.prot_op) + if (cmd->prot_op) res = qlt_build_ctio_crc2_pkt(&prm, vha); else res = qlt_24xx_build_ctio_pkt(&prm, vha); @@ -3065,7 +3195,7 @@ int qlt_rdy_to_xfer(struct qla_tgt_cmd *cmd) pkt->u.status0.flags |= cpu_to_le16(CTIO7_FLAGS_DATA_OUT | CTIO7_FLAGS_STATUS_MODE_0); - if (cmd->se_cmd.prot_op == TARGET_PROT_NORMAL) + if (cmd->prot_op == QLA_PROT_NORMAL) qlt_load_data_segments(&prm, vha); cmd->state = QLA_TGT_STATE_NEED_DATA; @@ -3088,139 +3218,113 @@ int qlt_rdy_to_xfer(struct qla_tgt_cmd *cmd) /* - * Checks the guard or meta-data for the type of error - * detected by the HBA. + * it is assumed either hardware_lock or qpair lock is held. */ -static inline int +static void qlt_handle_dif_error(struct scsi_qla_host *vha, struct qla_tgt_cmd *cmd, - struct ctio_crc_from_fw *sts) + struct ctio_crc_from_fw *sts) { uint8_t *ap = &sts->actual_dif[0]; uint8_t *ep = &sts->expected_dif[0]; - uint32_t e_ref_tag, a_ref_tag; - uint16_t e_app_tag, a_app_tag; - uint16_t e_guard, a_guard; uint64_t lba = cmd->se_cmd.t_task_lba; + uint8_t scsi_status, sense_key, asc, ascq; + unsigned long flags; - a_guard = be16_to_cpu(*(uint16_t *)(ap + 0)); - a_app_tag = be16_to_cpu(*(uint16_t *)(ap + 2)); - a_ref_tag = be32_to_cpu(*(uint32_t *)(ap + 4)); - - e_guard = be16_to_cpu(*(uint16_t *)(ep + 0)); - e_app_tag = be16_to_cpu(*(uint16_t *)(ep + 2)); - e_ref_tag = be32_to_cpu(*(uint32_t *)(ep + 4)); - - ql_dbg(ql_dbg_tgt, vha, 0xe075, - "iocb(s) %p Returned STATUS.\n", sts); - - ql_dbg(ql_dbg_tgt, vha, 0xf075, - "dif check TGT cdb 0x%x lba 0x%llx: [Actual|Expected] Ref Tag[0x%x|0x%x], App Tag [0x%x|0x%x], Guard [0x%x|0x%x]\n", - cmd->atio.u.isp24.fcp_cmnd.cdb[0], lba, - a_ref_tag, e_ref_tag, a_app_tag, e_app_tag, a_guard, e_guard); - - /* - * Ignore sector if: - * For type 3: ref & app tag is all 'f's - * For type 0,1,2: app tag is all 'f's - */ - if ((a_app_tag == 0xffff) && - ((cmd->se_cmd.prot_type != TARGET_DIF_TYPE3_PROT) || - (a_ref_tag == 0xffffffff))) { - uint32_t blocks_done; - - /* 2TB boundary case covered automatically with this */ - blocks_done = e_ref_tag - (uint32_t)lba + 1; - cmd->se_cmd.bad_sector = e_ref_tag; - cmd->se_cmd.pi_err = 0; - ql_dbg(ql_dbg_tgt, vha, 0xf074, - "need to return scsi good\n"); - - /* Update protection tag */ - if (cmd->prot_sg_cnt) { - uint32_t i, k = 0, num_ent; - struct scatterlist *sg, *sgl; - - - sgl = cmd->prot_sg; - - /* Patch the corresponding protection tags */ - for_each_sg(sgl, sg, cmd->prot_sg_cnt, i) { - num_ent = sg_dma_len(sg) / 8; - if (k + num_ent < blocks_done) { - k += num_ent; - continue; - } - k = blocks_done; - break; - } + cmd->trc_flags |= TRC_DIF_ERR; - if (k != blocks_done) { - ql_log(ql_log_warn, vha, 0xf076, - "unexpected tag values tag:lba=%u:%llu)\n", - e_ref_tag, (unsigned long long)lba); - goto out; - } + cmd->a_guard = be16_to_cpu(*(uint16_t *)(ap + 0)); + cmd->a_app_tag = be16_to_cpu(*(uint16_t *)(ap + 2)); + cmd->a_ref_tag = be32_to_cpu(*(uint32_t *)(ap + 4)); -#if 0 - struct sd_dif_tuple *spt; - /* TODO: - * This section came from initiator. Is it valid here? - * should ulp be override with actual val??? - */ - spt = page_address(sg_page(sg)) + sg->offset; - spt += j; + cmd->e_guard = be16_to_cpu(*(uint16_t *)(ep + 0)); + cmd->e_app_tag = be16_to_cpu(*(uint16_t *)(ep + 2)); + cmd->e_ref_tag = be32_to_cpu(*(uint32_t *)(ep + 4)); - spt->app_tag = 0xffff; - if (cmd->se_cmd.prot_type == SCSI_PROT_DIF_TYPE3) - spt->ref_tag = 0xffffffff; -#endif - } + ql_dbg(ql_dbg_tgt_dif, vha, 0xf075, + "%s: aborted %d state %d\n", __func__, cmd->aborted, cmd->state); - return 0; - } + scsi_status = sense_key = asc = ascq = 0; - /* check guard */ - if (e_guard != a_guard) { - cmd->se_cmd.pi_err = TCM_LOGICAL_BLOCK_GUARD_CHECK_FAILED; - cmd->se_cmd.bad_sector = cmd->se_cmd.t_task_lba; - - ql_log(ql_log_warn, vha, 0xe076, - "Guard ERR: cdb 0x%x lba 0x%llx: [Actual|Expected] Ref Tag[0x%x|0x%x], App Tag [0x%x|0x%x], Guard [0x%x|0x%x] cmd=%p\n", - cmd->atio.u.isp24.fcp_cmnd.cdb[0], lba, - a_ref_tag, e_ref_tag, a_app_tag, e_app_tag, - a_guard, e_guard, cmd); - goto out; + /* check appl tag */ + if (cmd->e_app_tag != cmd->a_app_tag) { + ql_dbg(ql_dbg_tgt_dif, vha, 0xffff, + "App Tag ERR: cdb[%x] lba[%llx %llx] blks[%x] [Actual|Expected] " + "Ref[%x|%x], App[%x|%x], " + "Guard [%x|%x] cmd=%p ox_id[%04x]", + cmd->cdb[0], lba, (lba+cmd->num_blks), cmd->num_blks, + cmd->a_ref_tag, cmd->e_ref_tag, + cmd->a_app_tag, cmd->e_app_tag, + cmd->a_guard, cmd->e_guard, + cmd, cmd->atio.u.isp24.fcp_hdr.ox_id); + + cmd->dif_err_code = DIF_ERR_APP; + scsi_status = SAM_STAT_CHECK_CONDITION; + sense_key = ABORTED_COMMAND; + asc = 0x10; + ascq = 0x2; } /* check ref tag */ - if (e_ref_tag != a_ref_tag) { - cmd->se_cmd.pi_err = TCM_LOGICAL_BLOCK_REF_TAG_CHECK_FAILED; - cmd->se_cmd.bad_sector = e_ref_tag; - - ql_log(ql_log_warn, vha, 0xe077, - "Ref Tag ERR: cdb 0x%x lba 0x%llx: [Actual|Expected] Ref Tag[0x%x|0x%x], App Tag [0x%x|0x%x], Guard [0x%x|0x%x] cmd=%p\n", - cmd->atio.u.isp24.fcp_cmnd.cdb[0], lba, - a_ref_tag, e_ref_tag, a_app_tag, e_app_tag, - a_guard, e_guard, cmd); + if (cmd->e_ref_tag != cmd->a_ref_tag) { + ql_dbg(ql_dbg_tgt_dif, vha, 0xffff, + "Ref Tag ERR: cdb[%x] lba[%llx %llx] blks[%x] [Actual|Expected] " + "Ref[%x|%x], App[%x|%x], " + "Guard[%x|%x] cmd=%p ox_id[%04x] ", + cmd->cdb[0], lba, (lba+cmd->num_blks), cmd->num_blks, + cmd->a_ref_tag, cmd->e_ref_tag, + cmd->a_app_tag, cmd->e_app_tag, + cmd->a_guard, cmd->e_guard, + cmd, cmd->atio.u.isp24.fcp_hdr.ox_id); + + cmd->dif_err_code = DIF_ERR_REF; + scsi_status = SAM_STAT_CHECK_CONDITION; + sense_key = ABORTED_COMMAND; + asc = 0x10; + ascq = 0x3; goto out; } - /* check appl tag */ - if (e_app_tag != a_app_tag) { - cmd->se_cmd.pi_err = TCM_LOGICAL_BLOCK_APP_TAG_CHECK_FAILED; - cmd->se_cmd.bad_sector = cmd->se_cmd.t_task_lba; - - ql_log(ql_log_warn, vha, 0xe078, - "App Tag ERR: cdb 0x%x lba 0x%llx: [Actual|Expected] Ref Tag[0x%x|0x%x], App Tag [0x%x|0x%x], Guard [0x%x|0x%x] cmd=%p\n", - cmd->atio.u.isp24.fcp_cmnd.cdb[0], lba, - a_ref_tag, e_ref_tag, a_app_tag, e_app_tag, - a_guard, e_guard, cmd); - goto out; + /* check guard */ + if (cmd->e_guard != cmd->a_guard) { + ql_dbg(ql_dbg_tgt_dif, vha, 0xffff, + "Guard ERR: cdb[%x] lba[%llx %llx] blks[%x] [Actual|Expected] " + "Ref[%x|%x], App[%x|%x], " + "Guard [%x|%x] cmd=%p ox_id[%04x]", + cmd->cdb[0], lba, (lba+cmd->num_blks), cmd->num_blks, + cmd->a_ref_tag, cmd->e_ref_tag, + cmd->a_app_tag, cmd->e_app_tag, + cmd->a_guard, cmd->e_guard, + cmd, cmd->atio.u.isp24.fcp_hdr.ox_id); + cmd->dif_err_code = DIF_ERR_GRD; + scsi_status = SAM_STAT_CHECK_CONDITION; + sense_key = ABORTED_COMMAND; + asc = 0x10; + ascq = 0x1; } out: - return 1; -} + switch (cmd->state) { + case QLA_TGT_STATE_NEED_DATA: + /* handle_data will load DIF error code */ + cmd->state = QLA_TGT_STATE_DATA_IN; + vha->hw->tgt.tgt_ops->handle_data(cmd); + break; + default: + spin_lock_irqsave(&cmd->cmd_lock, flags); + if (cmd->aborted) { + spin_unlock_irqrestore(&cmd->cmd_lock, flags); + vha->hw->tgt.tgt_ops->free_cmd(cmd); + break; + } + spin_unlock_irqrestore(&cmd->cmd_lock, flags); + qlt_send_resp_ctio(vha, cmd, scsi_status, sense_key, asc, ascq); + /* assume scsi status gets out on the wire. + * Will not wait for completion. + */ + vha->hw->tgt.tgt_ops->free_cmd(cmd); + break; + } +} /* If hardware_lock held on entry, might drop it, then reaquire */ /* This function sends the appropriate CTIO to ISP 2xxx or 24xx */ @@ -3527,6 +3631,16 @@ static int qlt_term_ctio_exchange(struct scsi_qla_host *vha, void *ctio, { int term = 0; + if (cmd->prot_op) + ql_dbg(ql_dbg_tgt_dif, vha, 0xffff, + "Term DIF cmd: lba[0x%llx|%lld] len[0x%x] " + "se_cmd=%p tag[%x] op %#x/%s", + cmd->lba, cmd->lba, + cmd->num_blks, &cmd->se_cmd, + cmd->atio.u.isp24.exchange_addr, + cmd->prot_op, + prot_op_str(cmd->prot_op)); + if (ctio != NULL) { struct ctio7_from_24xx *c = (struct ctio7_from_24xx *)ctio; term = !(c->flags & @@ -3744,32 +3858,15 @@ static void qlt_do_ctio_completion(struct scsi_qla_host *vha, uint32_t handle, struct ctio_crc_from_fw *crc = (struct ctio_crc_from_fw *)ctio; ql_dbg(ql_dbg_tgt_mgt, vha, 0xf073, - "qla_target(%d): CTIO with DIF_ERROR status %x received (state %x, se_cmd %p) actual_dif[0x%llx] expect_dif[0x%llx]\n", + "qla_target(%d): CTIO with DIF_ERROR status %x " + "received (state %x, ulp_cmd %p) actual_dif[0x%llx] " + "expect_dif[0x%llx]\n", vha->vp_idx, status, cmd->state, se_cmd, *((u64 *)&crc->actual_dif[0]), *((u64 *)&crc->expected_dif[0])); - if (qlt_handle_dif_error(vha, cmd, ctio)) { - if (cmd->state == QLA_TGT_STATE_NEED_DATA) { - /* scsi Write/xfer rdy complete */ - goto skip_term; - } else { - /* scsi read/xmit respond complete - * call handle dif to send scsi status - * rather than terminate exchange. - */ - cmd->state = QLA_TGT_STATE_PROCESSED; - ha->tgt.tgt_ops->handle_dif_err(cmd); - return; - } - } else { - /* Need to generate a SCSI good completion. - * because FW did not send scsi status. - */ - status = 0; - goto skip_term; - } - break; + qlt_handle_dif_error(vha, cmd, ctio); + return; } default: ql_dbg(ql_dbg_tgt_mgt, vha, 0xf05b, @@ -3792,7 +3889,6 @@ static void qlt_do_ctio_completion(struct scsi_qla_host *vha, uint32_t handle, return; } } -skip_term: if (cmd->state == QLA_TGT_STATE_PROCESSED) { cmd->trc_flags |= TRC_CTIO_DONE; diff --git a/drivers/scsi/qla2xxx/qla_target.h b/drivers/scsi/qla2xxx/qla_target.h index bc9468f..82d53f3 100644 --- a/drivers/scsi/qla2xxx/qla_target.h +++ b/drivers/scsi/qla2xxx/qla_target.h @@ -378,6 +378,14 @@ static inline void adjust_corrupted_atio(struct atio_from_isp *atio) atio->u.isp24.fcp_cmnd.add_cdb_len = 0; } +static inline int get_datalen_for_atio(struct atio_from_isp *atio) +{ + int len = atio->u.isp24.fcp_cmnd.add_cdb_len; + + return (be32_to_cpu(get_unaligned((uint32_t *) + &atio->u.isp24.fcp_cmnd.add_cdb[len * 4]))); +} + #define CTIO_TYPE7 0x12 /* Continue target I/O entry (for 24xx) */ /* @@ -667,7 +675,6 @@ struct qla_tgt_func_tmpl { int (*handle_cmd)(struct scsi_qla_host *, struct qla_tgt_cmd *, unsigned char *, uint32_t, int, int, int); void (*handle_data)(struct qla_tgt_cmd *); - void (*handle_dif_err)(struct qla_tgt_cmd *); int (*handle_tmr)(struct qla_tgt_mgmt_cmd *, uint32_t, uint16_t, uint32_t, bool); void (*free_cmd)(struct qla_tgt_cmd *); @@ -684,6 +691,8 @@ struct qla_tgt_func_tmpl { void (*clear_nacl_from_fcport_map)(struct fc_port *); void (*put_sess)(struct fc_port *); void (*shutdown_sess)(struct fc_port *); + int (*get_dif_tags)(struct qla_tgt_cmd *cmd, uint16_t *pfw_prot_opts); + int (*chk_dif_tags)(uint32_t tag); }; int qla2x00_wait_for_hba_online(struct scsi_qla_host *); @@ -720,8 +729,8 @@ struct qla_tgt_func_tmpl { #define QLA_TGT_ABORT_ALL 0xFFFE #define QLA_TGT_NEXUS_LOSS_SESS 0xFFFD #define QLA_TGT_NEXUS_LOSS 0xFFFC -#define QLA_TGT_ABTS 0xFFFB -#define QLA_TGT_2G_ABORT_TASK 0xFFFA +#define QLA_TGT_ABTS 0xFFFB +#define QLA_TGT_2G_ABORT_TASK 0xFFFA /* Notify Acknowledge flags */ #define NOTIFY_ACK_RES_COUNT BIT_8 @@ -845,6 +854,7 @@ enum trace_flags { TRC_CMD_FREE = BIT_17, TRC_DATA_IN = BIT_18, TRC_ABORT = BIT_19, + TRC_DIF_ERR = BIT_20, }; struct qla_tgt_cmd { @@ -885,11 +895,25 @@ struct qla_tgt_cmd { struct list_head cmd_list; struct atio_from_isp atio; - /* t10dif */ + + /* T10-DIF */ +#define DIF_ERR_NONE 0 +#define DIF_ERR_GRD 1 +#define DIF_ERR_REF 2 +#define DIF_ERR_APP 3 + int8_t dif_err_code; struct scatterlist *prot_sg; uint32_t prot_sg_cnt; - uint32_t blk_sz; + uint32_t blk_sz, num_blks; + uint8_t scsi_status, sense_key, asc, ascq; + struct crc_context *ctx; + uint32_t prot_op; + uint32_t prot_type; + uint8_t *cdb; + uint64_t lba; + uint16_t a_guard, e_guard, a_app_tag, e_app_tag; + uint32_t a_ref_tag, e_ref_tag; uint64_t jiffies_at_alloc; uint64_t jiffies_at_free; @@ -1053,4 +1077,7 @@ extern void qlt_modify_vp_config(struct scsi_qla_host *, extern void qlt_logo_completion_handler(fc_port_t *, int); extern void qlt_do_generation_tick(struct scsi_qla_host *, int *); +void qlt_send_resp_ctio(scsi_qla_host_t *, struct qla_tgt_cmd *, uint8_t, + uint8_t, uint8_t, uint8_t); + #endif /* __QLA_TARGET_H */ diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.c b/drivers/scsi/qla2xxx/tcm_qla2xxx.c index 9a188b5..3618056 100644 --- a/drivers/scsi/qla2xxx/tcm_qla2xxx.c +++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.c @@ -376,6 +376,38 @@ static u32 tcm_qla2xxx_sess_get_index(struct se_session *se_sess) return 0; } +static void tcm_qla2xxx_prot_op(struct qla_tgt_cmd *cmd) +{ + switch (cmd->se_cmd.prot_op) { + case TARGET_PROT_NORMAL: + cmd->prot_op = QLA_PROT_NORMAL; + break; + case TARGET_PROT_DIN_INSERT: + cmd->prot_op = QLA_PROT_DIN_INSERT; + break; + case TARGET_PROT_DOUT_INSERT: + cmd->prot_op = QLA_PROT_DOUT_INSERT; + break; + case TARGET_PROT_DIN_STRIP: + cmd->prot_op = QLA_PROT_DIN_STRIP; + break; + case TARGET_PROT_DOUT_STRIP: + cmd->prot_op = QLA_PROT_DOUT_STRIP; + break; + case TARGET_PROT_DIN_PASS: + cmd->prot_op = QLA_PROT_DIN_PASS; + break; + case TARGET_PROT_DOUT_PASS: + cmd->prot_op = QLA_PROT_DOUT_PASS; + break; + } +} + +static void tcm_qla2xxx_prot_type(struct qla_tgt_cmd *cmd) +{ + cmd->prot_type = cmd->se_cmd.prot_type; +} + static int tcm_qla2xxx_write_pending(struct se_cmd *se_cmd) { struct qla_tgt_cmd *cmd = container_of(se_cmd, @@ -405,6 +437,8 @@ static int tcm_qla2xxx_write_pending(struct se_cmd *se_cmd) cmd->prot_sg = se_cmd->t_prot_sg; cmd->blk_sz = se_cmd->se_dev->dev_attrib.block_size; se_cmd->pi_err = 0; + tcm_qla2xxx_prot_op(cmd); + tcm_qla2xxx_prot_type(cmd); /* * qla_target.c:qlt_rdy_to_xfer() will call pci_map_sg() to setup @@ -505,6 +539,24 @@ static void tcm_qla2xxx_handle_data_work(struct work_struct *work) if (cmd->se_cmd.transport_state & CMD_T_ABORTED) return; + switch (cmd->dif_err_code) { + case DIF_ERR_GRD: + cmd->se_cmd.pi_err = + TCM_LOGICAL_BLOCK_GUARD_CHECK_FAILED; + break; + case DIF_ERR_REF: + cmd->se_cmd.pi_err = + TCM_LOGICAL_BLOCK_REF_TAG_CHECK_FAILED; + break; + case DIF_ERR_APP: + cmd->se_cmd.pi_err = + TCM_LOGICAL_BLOCK_APP_TAG_CHECK_FAILED; + break; + case DIF_ERR_NONE: + default: + break; + } + if (cmd->se_cmd.pi_err) transport_generic_request_failure(&cmd->se_cmd, cmd->se_cmd.pi_err); @@ -529,25 +581,23 @@ static void tcm_qla2xxx_handle_data(struct qla_tgt_cmd *cmd) queue_work_on(smp_processor_id(), tcm_qla2xxx_free_wq, &cmd->work); } -static void tcm_qla2xxx_handle_dif_work(struct work_struct *work) +static int tcm_qla2xxx_chk_dif_tags(uint32_t tag) { - struct qla_tgt_cmd *cmd = container_of(work, struct qla_tgt_cmd, work); - - /* take an extra kref to prevent cmd free too early. - * need to wait for SCSI status/check condition to - * finish responding generate by transport_generic_request_failure. - */ - kref_get(&cmd->se_cmd.cmd_kref); - transport_generic_request_failure(&cmd->se_cmd, cmd->se_cmd.pi_err); + return 0; } -/* - * Called from qla_target.c:qlt_do_ctio_completion() - */ -static void tcm_qla2xxx_handle_dif_err(struct qla_tgt_cmd *cmd) +static int tcm_qla2xxx_dif_tags(struct qla_tgt_cmd *cmd, + uint16_t *pfw_prot_opts) { - INIT_WORK(&cmd->work, tcm_qla2xxx_handle_dif_work); - queue_work(tcm_qla2xxx_free_wq, &cmd->work); + struct se_cmd *se_cmd = &cmd->se_cmd; + + if (!(se_cmd->prot_checks & TARGET_DIF_CHECK_GUARD)) + *pfw_prot_opts |= PO_DISABLE_GUARD_CHECK; + + if (!(se_cmd->prot_checks & TARGET_DIF_CHECK_APPTAG)) + *pfw_prot_opts |= PO_DIS_APP_TAG_VALD; + + return 0; } /* @@ -634,6 +684,7 @@ static int tcm_qla2xxx_queue_data_in(struct se_cmd *se_cmd) cmd->prot_sg = se_cmd->t_prot_sg; cmd->blk_sz = se_cmd->se_dev->dev_attrib.block_size; se_cmd->pi_err = 0; + tcm_qla2xxx_prot_op(cmd); /* * Now queue completed DATA_IN the qla2xxx LLD and response ring @@ -1588,7 +1639,6 @@ static void tcm_qla2xxx_update_sess(struct fc_port *sess, port_id_t s_id, static struct qla_tgt_func_tmpl tcm_qla2xxx_template = { .handle_cmd = tcm_qla2xxx_handle_cmd, .handle_data = tcm_qla2xxx_handle_data, - .handle_dif_err = tcm_qla2xxx_handle_dif_err, .handle_tmr = tcm_qla2xxx_handle_tmr, .free_cmd = tcm_qla2xxx_free_cmd, .free_mcmd = tcm_qla2xxx_free_mcmd, @@ -1600,6 +1650,8 @@ static void tcm_qla2xxx_update_sess(struct fc_port *sess, port_id_t s_id, .clear_nacl_from_fcport_map = tcm_qla2xxx_clear_nacl_from_fcport_map, .put_sess = tcm_qla2xxx_put_sess, .shutdown_sess = tcm_qla2xxx_shutdown_sess, + .get_dif_tags = tcm_qla2xxx_dif_tags, + .chk_dif_tags = tcm_qla2xxx_chk_dif_tags, }; static int tcm_qla2xxx_init_lport(struct tcm_qla2xxx_lport *lport)