From patchwork Sun Dec 18 09:02:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 9479249 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 9193560237 for ; Sun, 18 Dec 2016 09:18:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7B222284A1 for ; Sun, 18 Dec 2016 09:18:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6C0D2284B6; Sun, 18 Dec 2016 09:18:57 +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 ABD7E284A1 for ; Sun, 18 Dec 2016 09:18:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757712AbcLRJSz (ORCPT ); Sun, 18 Dec 2016 04:18:55 -0500 Received: from mail-dm3nam03on0044.outbound.protection.outlook.com ([104.47.41.44]:7130 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756993AbcLRJSx (ORCPT ); Sun, 18 Dec 2016 04:18:53 -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=Ca6DM2K9LvgaiFL1sIEOWEt5ivLnJllvoWsSvIunUgk=; b=UYcguGDURhoMCVi2glKKF6n/o7ZBXggN19cd9idqMZffb9Jz4rcaKfeJrhwfqQXpvRroC+MwRcDWyorGPJpdGP92Amaa1+d3ljzIbNrVhmlWqTNoMvW7IxOTSFYAgNUvuLBZj8xDRHgch3y+LD57vddnZ+roPvl66ikqpeIhGgc= Received: from MWHPR07CA0038.namprd07.prod.outlook.com (10.169.230.24) by BY2PR07MB027.namprd07.prod.outlook.com (10.255.241.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.789.14; Sun, 18 Dec 2016 09:03:49 +0000 Received: from BN1BFFO11FD038.protection.gbl (2a01:111:f400:7c10::1:171) by MWHPR07CA0038.outlook.office365.com (2603:10b6:300:1c::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.789.14 via Frontend Transport; Sun, 18 Dec 2016 09:03:49 +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 BN1BFFO11FD038.mail.protection.outlook.com (10.58.144.101) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.789.10 via Frontend Transport; Sun, 18 Dec 2016 09:03:48 +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; Sun, 18 Dec 2016 01:03:19 -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 uBI935jT022998; Sun, 18 Dec 2016 01:03:05 -0800 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id uBI935Vx022997; Sun, 18 Dec 2016 01:03:05 -0800 From: Himanshu Madhani To: , , , CC: , , Subject: [PATCH 7/9] qla2xxx: Remove direct access to t_task_cdb/t_task_lba field Date: Sun, 18 Dec 2016 01:02:47 -0800 Message-ID: <1482051769-22941-8-git-send-email-himanshu.madhani@cavium.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1482051769-22941-1-git-send-email-himanshu.madhani@cavium.com> References: <1482051769-22941-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)(4326007)(38730400001)(92566002)(39060400001)(5003940100001)(626004)(80596001)(189998001)(107886002)(47776003)(5660300001)(69596002)(5001770100001)(2201001)(36756003)(50986999)(76176999)(101416001)(105586002)(8936002)(86362001)(2950100002)(6666003)(106466001)(4720700003)(81156014)(33646002)(8676002)(81166006)(48376002)(50226002)(305945005)(42186005)(50466002)(4001430100002)(2906002)(356003)(87636001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR07MB027; 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; BN1BFFO11FD038; 1:/K4q3DL4TkRh5XUUy74OmbIwVVravryIlAiaCCdOD1zqjyF/Bk+OmCpnd5m7UxXSGS799vcleRhA4AwRM0+r/X2AnqUVVXgS0+DlLiVrDyaeVVVg4sBTPsl5omeNpK6VOeUJMjsXDwyLEBNc3WrbuyBBTMBEQrVbwJHV/yhVzgTyLqOysP50i2dVSRweuh/xHapq/Nv3SN7UyHgNeAhSuZEOohHM/D/Tf9oKsG0qkvLCl5A+qYgVetzS0Kkddb6vGM65vyTV0HPzKWMLbyKkgyKD8PC2YOXktDwnm++5mT/UH+zusMeLSuahcNRKp6IowrySz1FaipiS+1vHJYApBeMOYQnGQYUxKA1qTLvFwY5s4pxzlneOLT7jmhEGNxaJy78hy2tzRRZjaA/kLIXzW/h6UczBIepLVUsWSbDiyktzwugKdB25zZYB8bIvvVrrAB49Ulf408cdkDRAZbrcYtqf3iss5NFufh9YV7v0RCf8fMf5moDvavn5VogzCqrFBNeZHe9bXhPSdlzpoFM9n5aUtofOXDFR8I6tpCqmuaQv4Ti1CHergPvWmn8Tp4/S X-MS-Office365-Filtering-Correlation-Id: 81ae512a-47fb-434e-fc1e-08d42724c7b2 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BY2PR07MB027; X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB027; 3:45vKzPLTnRzkQi1fSl622un1y8iD2Xb+8IA5B14TxFipS/RJPZ6HxVdl/YMdSK3DvUFleGgVhHJtFjhSwKQVM0AOSqFNu8EzwfvNM0+ZLmU5FaFkpjovSkbiqD5B5P1hX7/ivWb1fZL0VL3TQ8zQEZ0F8Ml5gZBRzO83YeN5P5hRAp6R2FGU+7wRZlJXv7optYHVHzlBPjsT/6kiM0hKy8l1708tDcnFQKwlDj7CMZ8hlhvU5641iIk7tDLyn/x4ngKMuhm/y6qpgBAjV++Gd8f/NI9t0vPCiyhF9XSsLWmiOp5O8xD8yz3nc3ytLbuW1K4qk6rxlnty2fgYnbmIArvqX8cqFqBYRnrCAXUgNW2fzyHD3YSAFFhcW6TTuiHO; 25:GoVrEl57j3Zx2hpf6M40H5Dlb2ngVW+6CFPNNvMRnTdIs/NDhQuj7FuyrJokmoSeTAH8pejIsqVeR7KdCqNdQx4gbB2PfzmdRZc0HKw5IgKKHlocONPVtDye++ENufR466kCXUaN27Yn2uC/Zhr43NES7uhjgkrkkkyrjt2KFKsAfaQyCmexqwGM6wqNsRdPYGngJ7/lkT6gh/yhJL8masSD1NaDPb6oaP5k/vdLjg21UD+TSckg7h7UBne9janSJdsw7DBJ21wcAvFXNlrq7uSzpGcYk4vd4NiOrV51D4GEvqUvbzkRtUPhQsYvgM6GHnJ5jtKLlVjYHpNyC5xuXKUFc7k8GGBmA/9htg8CR2MrcSE0R5JFPuI5HgI206huuOgSzps7F/Dzge+pzLtlMLSuPVzirfvjXwgYt8c/7EWdhUvJQcBt1jfyX9ROFHeOJoHEU5FCAwRUbyUrEhiMmQ== X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB027; 31:+u7zajDZrlXuRSgtJpfaKYGwLPYGj1SpurI947dL1tD6KjoNCEH4oGeMscYQq0vRl8DJbZ8v6g7kM0LdmQqI8ZX0mNT1aEjCRYlg7qX7gr6P7GQu+0R1RYBu5ARCJj7S9WuTINVtex3AZHuIOS6jYNIYNu5ab6IfiVu1affMGUiRfJSJMVHmhIYzP8SmirnUN8eIcw/lOiUCu0Pp30kYILZr3a2Bdpvlt+UT1e+6d/u2nCv8YI5DAWzlzN4U/5C6Ts+j2fyGXYg/U2wo7KcAmQH1zGfLc4RjsbdpEnDh4R8=; 20:vvCnwBjW7NXdD/BTneyTcLgbo8RCRHd6YJtfSekbuGrdCXY2Hnd0A/is8uz4C3CmISha7jAPbv6gnsDrLOia0fKAFeO3Scy3LYVCZ5h4m+rnTQ62rrY9rE/GMpTVqgVv+6FVzka9kyrxYJc2EoWheuGkdLYoF41Nl4/wbiU/Jm9LKt+yOF9rc5yOtpGItOWtcsQ7YccvdBwdP2YAy/A5rtdoYab4yTnO/giZ2ALuOmhIBFaUf/ZI9XK/7tCIvU5p1/6C/CxhQBEWTMfZIybYzJoZZW7OhJaqfXBYkTjf6TMFER+VT8y48ydcXPk3sTg4Vl5AO+Tcrgkc/BSu0j/6jz/GQzL3pzHZ95wwmGqUUu9AE1RY0eXbGirCP/gheKd7W0jZtEPNguo5PKEcD7nBtsuxKIJq+u7cXfirhDbMJzhA+9d9xsd2SOd83Ct9nmdmSqbUH8kivBxQGM4T3+PANbgRbCLNdQEtNd4bGbcx+ODQFshZ3Sw+Gsh9exkg+0PV X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(13015025)(13024025)(13023025)(13017025)(5005006)(8121501046)(13018025)(10201501046)(3002001)(6041248)(20161123560025)(20161123564025)(20161123562025)(20161123555025)(6072148); SRVR:BY2PR07MB027; BCL:0; PCL:0; RULEID:; SRVR:BY2PR07MB027; X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB027; 4:KSuENaYe6G0btSkUX5OwEI6w0adyKvZ5FtKUma7x6PGKZ0aCg5eHjpaVsIqCYM58iGdRvXVyzeHQMcoD6X3rr3lfscuZnOmHjIn5ms/Zs7moo+06+0+jxTha1azZx3myTNoq0sV+wJoHoPCbgscF64uxcXAmS58jEKS+Q9hjMcc3fdMZiFpfuRMvOmJdxlDgULY57+dshRbSjRZWPE1hx05dpMd6hgry1Ao+U3vljecwIiDv2GfjdUCTTZ+OcJzUev+yxZ9VeQV9DFU3A0Vu03+w7efGDxifIyUeek0odkW48yKvMKTj2P/mnf1DfnKWjb8Kyo2d6CAoGgfT7ox+6aG0Ysah+f19Bs2QMkyKQA6Fu/NuyocsEjv2Nffp1q0CjGOqE9mL0sg1hvaRprDDELu87pkA1b5ookGLkzUhu3YpJJrrJBxx0WkKUNFZkEJkW4JD2edOpOG8RfkvfG36fIexaKySImDxWH714gHcKvbL0urCBH9UsJE8R0d1KKsS8P+qNdCrFwyXWzpjDVOAoQiNmTyjVbiF0DGLbTP3Q6FVWHOkiaB+Qs6au++NT9tCSs7G5+t7XRHO4KzbNU/us3ZTkgTO6FaLC2OYmaYpVA8GpmTLF5Um/LeIjeL3vhl6yvkVpe5+y2NaDVrEhLgg8cZlSwVeTOwFdAnWebxaLyU= X-Forefront-PRVS: 01604FB62B X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR07MB027; 23:twkOaTGdw738n4jxI4rrh5SPF9xhn2g4GcDR3e9o1/?= =?us-ascii?Q?dt2QxPCIrX5pKTIlBKItaejsfIw2T2LLwoFvwNf+p+NOgfimRpBnqIjdmQui?= =?us-ascii?Q?x3kIvPSbTDFwep1abVDJT9LedjEiMGwzM4vOR/zhNuGgrXwSR5su6pqCVAt5?= =?us-ascii?Q?X2g8PqzmDNcLMcJFoIfYGFR0eq5dstTH8AHy5sjn5CQWjM26nkSv3bHP70GL?= =?us-ascii?Q?2TrS59dh9K2eFVPXLBNbYf68Lr9nXJRvfUnp3tF1wT/ZPCveUTQV2t12RRNL?= =?us-ascii?Q?V8sb273dlCfuF6n4aekoXQtrOkO1Ztual2/qOgZUBCBIU4rtx2SzDhaVeR5E?= =?us-ascii?Q?CLotpmCredmsz0CDLjB/u85PZ5dq6R/RW7qiZK4jtbUq0LHyAZQxAyqd4zyJ?= =?us-ascii?Q?JTt+srR78KDeTZsz9PwcqF0k2HETTwjHlfVYan44kZKczP4mFqJTzLqyTIcp?= =?us-ascii?Q?P4heRLc2oKjoAPK6HouLex621Nn6MYbvxQ97DevH/1fOn9bhtZm9EW0IKJfG?= =?us-ascii?Q?7Brj+QRvb8ZzBsfVqprDnrLmjS5AIi2ZLsXlpVF2va6fHBB1Y9xI9Z0ZnSVn?= =?us-ascii?Q?F2s+xM7uqS9XgHbr4SWAoudd/foBzZpH213N5yRJfdcDVNyrI2doSG4nL+2D?= =?us-ascii?Q?YjLAPCTitSbJLoiL/SdtRmCRF8Ur2RV5VliVzRTd57NzJ9P20yYBrqSm6AC7?= =?us-ascii?Q?c+8PbMcR/JgA1CNzkrvRBALBwiMxRAFazMRolchTJYD/mm/5+MdJzuZxr/6K?= =?us-ascii?Q?ZO+G2ft56yrr9CGnjyXwY+OEG+LHS3agre0lhpvT0shdTGBTNGvdOkTvmlut?= =?us-ascii?Q?BilwynLQDgZnmJg0d2b5wXNHmlL8+omh1iFE87N2B7bLhprxmaZqWMwWiXTj?= =?us-ascii?Q?Ih/lNW4sZ/esnb8dYBKATP5KunRJE5Sk4FRCiFTQdiWquwnT+LOuYHJbdluy?= =?us-ascii?Q?P9dfnCj1qsSNLO//PvZpMBw97tUAa5Taik0ua7j8vEzuS/DCqpTKITMkDOIx?= =?us-ascii?Q?jEo3An1JDbsOuEWwnW51sF1nQ90J3xpjMZNuAdzksGraSa9qn+p2V+YDFqho?= =?us-ascii?Q?cNR9ly+JAk/Swpn6HxNrKrLprDoZ0Jlk0VJiK4dbBSJkJ+nO7oWtTb1RqpdD?= =?us-ascii?Q?79JbNjBOg=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB027; 6:GH49vss+EELdChxQ3IjdFFFzuDLOzLUMp2Pn2fBHOu67sZo3jzp9eZfHEs2iQrxVBEy81d9dyh9+u04jQLnbswz0w8Dp7oeOJIlqDUg4W8Y2Z7Xbop+pYrA7GGgfytgymH1KH8q3cn5TDWEEtQjA1Gt0zHUHwHjqbFT18MrcjbcgXSi0x9Uy9H+RN0/DCCeojrVmK0nozxAjs+4jXB6xFR8aURKTExAqDx397YvlKlkLx96sbkPbmfVP4w+Y83dIWFi4so6TqRfkrjY3BjCR/DLxGe+ttquFC0QpvaJPyTmXOGKmqms2cAm6Qoj8rjeCTPKxqH/eLl/RGbp8f6bYy7fftC730VrUjP5MmlDTnru2OBSgxMHUyo7U1uAr4CjCYQD7Ky6bldTAM5GsUFe4D1MLZXkdYM4mEmzQEy0FVO8=; 5:2xAdc+YXvZIOMgEgVzZ2m+yOE7s6sZxQL4SFpmYHt+58Drh0ERYMOYjbDehIfOC7YoaTQiUWlpLjtBMc7yMCzugvumn5cKw1gX5jqSQDfJCjmPy+TaApLX3tAIs0ijbVJW5DQamxIpNFphkS/ZqrRg==; 24:riewfs25/0x7hOOcfE4u4N9bV1PADo2GevWyUcj5wvqOZ9rsROnVCXyeduRuoj5KMWEEe4VgR4PpGN49Iy7LMdWKyWLzp250fHJ11bnTiKc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB027; 7:Ow8wPkrPtQPcA+mokypmAAH5gKHCuxK+/TBfo5HTFd6lRng0VPngkag6jAsAXBIMBXd8SZ1ak1L3sWv5+AzLDFFMxKCreb+XQG0hFoIir9cs8LnqAx7/utegKrYry+LMfij+JBhRzZIiMAf59j98UYhnW0HmZOUEpEOsUQFV7CSFfU1RL6IBFiZPEBjOelE2G9QUKk5iqXPjfdIqjb2/KPR6G+b9ap5f7uwgzv6PkQSNXzf4QCjxhaguJupx2R0hNWjX6I4mk+mX1J8lLWRoy9lriuMxZQoxMF33gPvvlZZMqcoP6LiaL2TrmX1/G0GcoQcKazlaNmU3LHdqqnch2hm7FDTn4LEQpMYo8PZa3hEdqec/N2I4zn/xPjBlmQmYVntT2bgLF+8POt1jQ7byrHpEc8hqpRNtB321QG4Eqk/4bIwjreYc8L4mZ8Nbp9R+A8PWnL8pmykumeihwOaVhA== X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Dec 2016 09:03:48.5196 (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: BY2PR07MB027 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Quinn Tran qla2xxx currently access t_task_cdb/t_task_lba field in se_cmd struct. Remove access of TCM's private data struct. Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_target.c | 32 +++++++++++++++++--------------- drivers/scsi/qla2xxx/qla_target.h | 2 ++ drivers/scsi/qla2xxx/tcm_qla2xxx.c | 4 ++++ 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c index 1690794..14092472 100644 --- a/drivers/scsi/qla2xxx/qla_target.c +++ b/drivers/scsi/qla2xxx/qla_target.c @@ -2100,7 +2100,6 @@ static int qlt_pre_xmit_response(struct qla_tgt_cmd *cmd, struct qla_tgt *tgt = cmd->tgt; struct scsi_qla_host *vha = tgt->vha; struct qla_hw_data *ha = vha->hw; - struct se_cmd *se_cmd = &cmd->se_cmd; prm->cmd = cmd; prm->tgt = tgt; @@ -2126,17 +2125,18 @@ static int qlt_pre_xmit_response(struct qla_tgt_cmd *cmd, if (cmd->residual < 0) { prm->residual = -(cmd->residual); ql_dbg(ql_dbg_io + ql_dbg_verbose, vha, 0x305c, - "Residual underflow: %d (tag %lld, op %x, bufflen %d, rq_result %x)\n", - prm->residual, se_cmd->tag, - se_cmd->t_task_cdb ? se_cmd->t_task_cdb[0] : 0, - cmd->bufflen, prm->rq_result); + "Residual underflow: %d (tag %d, op %x, bufflen %d, rq_result %x)\n", + prm->residual, cmd->atio.u.isp24.exchange_addr, + cmd->cdb ? cmd->cdb[0] : 0, + cmd->bufflen, prm->rq_result); prm->rq_result |= SS_RESIDUAL_UNDER; } else if (cmd->residual > 0) { prm->residual = cmd->residual; ql_dbg(ql_dbg_io, vha, 0x305d, - "Residual overflow: %d (tag %lld, op %x, bufflen %d, rq_result %x)\n", - prm->residual, se_cmd->tag, se_cmd->t_task_cdb ? - se_cmd->t_task_cdb[0] : 0, cmd->bufflen, prm->rq_result); + "Residual overflow: %d (tag %d, op %x, bufflen %d, rq_result %x)\n", + prm->residual, cmd->atio.u.isp24.exchange_addr, + cmd->cdb ? cmd->cdb[0] : 0, + cmd->bufflen, prm->rq_result); prm->rq_result |= SS_RESIDUAL_OVER; } @@ -2463,7 +2463,7 @@ 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, - prm->prot_sg, prm->prot_seg_cnt, se_cmd->t_task_lba); + prm->prot_sg, prm->prot_seg_cnt, cmd->lba); if ((se_cmd->prot_op == TARGET_PROT_DIN_INSERT) || (se_cmd->prot_op == TARGET_PROT_DOUT_STRIP)) @@ -2905,7 +2905,7 @@ int qlt_rdy_to_xfer(struct qla_tgt_cmd *cmd) 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; + uint64_t lba = cmd->lba; a_guard = be16_to_cpu(*(uint16_t *)(ap + 0)); a_app_tag = be16_to_cpu(*(uint16_t *)(ap + 2)); @@ -2987,7 +2987,7 @@ int qlt_rdy_to_xfer(struct qla_tgt_cmd *cmd) /* 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; + cmd->se_cmd.bad_sector = cmd->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", @@ -3013,7 +3013,7 @@ int qlt_rdy_to_xfer(struct qla_tgt_cmd *cmd) /* 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; + cmd->se_cmd.bad_sector = cmd->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", @@ -4813,9 +4813,11 @@ static void qlt_handle_srr_work(struct work_struct *work) cmd->sg = se_cmd->t_data_sg; ql_dbg(ql_dbg_tgt_mgt, vha, 0xf02c, - "SRR cmd %p (se_cmd %p, tag %lld, op %x), sg_cnt=%d, offset=%d", - cmd, &cmd->se_cmd, se_cmd->tag, se_cmd->t_task_cdb ? - se_cmd->t_task_cdb[0] : 0, cmd->sg_cnt, cmd->offset); + "SRR cmd %p (se_cmd %p, tag %d, op %x), " + "sg_cnt=%d, offset=%d", + cmd, &cmd->se_cmd, cmd->atio.u.isp24.exchange_addr, + cmd->cdb ? cmd->cdb[0] : 0, + cmd->sg_cnt, cmd->offset); qlt_handle_srr(vha, sctio, imm); diff --git a/drivers/scsi/qla2xxx/qla_target.h b/drivers/scsi/qla2xxx/qla_target.h index 305b798..ea8be78 100644 --- a/drivers/scsi/qla2xxx/qla_target.h +++ b/drivers/scsi/qla2xxx/qla_target.h @@ -1020,6 +1020,8 @@ struct qla_tgt_cmd { uint32_t prot_sg_cnt; uint32_t blk_sz; struct crc_context *ctx; + uint8_t *cdb; + uint64_t lba; uint64_t jiffies_at_alloc; uint64_t jiffies_at_free; diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.c b/drivers/scsi/qla2xxx/tcm_qla2xxx.c index ecb4067..016a27c 100644 --- a/drivers/scsi/qla2xxx/tcm_qla2xxx.c +++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.c @@ -439,6 +439,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; + cmd->cdb = se_cmd->t_task_cdb; + cmd->lba = se_cmd->t_task_lba; /* * qla_target.c:qlt_rdy_to_xfer() will call pci_map_sg() to setup @@ -709,6 +711,8 @@ 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; + cmd->cdb = se_cmd->t_task_cdb; + cmd->lba = se_cmd->t_task_lba; tcm_qla2xxx_check_resid(se_cmd, cmd);