Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp209681pxu; Wed, 25 Nov 2020 17:51:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJy7gUp/FIjIctUHAHG66dev2LvNiBgo3ZAn10zL+aQNDjPT4HYyDejAALrlJke1j3pAp9IX X-Received: by 2002:aa7:cdd3:: with SMTP id h19mr473485edw.330.1606355498143; Wed, 25 Nov 2020 17:51:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606355498; cv=none; d=google.com; s=arc-20160816; b=gHrdopYYBcKKww519aQ+uaLOj7RrIb+mtPBgozMa4XR8ir2+ZsJoqXDKCreLtXsZSd d31gPNpbvn+RfH+OSILrW/D3MpTpiIvCffEgo8oEf1fsjAvZCPxdfO+6S5l2WyCbSjO9 kvYLowAxNWOHS3yfXQ7ZrF28ePvsCHZGRMPvvKxqz5GDUy0UOobXXp8c9C23QS5fBMay gX0FMpfSMAsHTve2KWQPaD2TmdD/kUygMQJ0cDzUfWe32nNM2jlDkID6IWvptwox3s6J 0qq613p9JPNqfOj5tBUl8FQM789khcOClxF6dleuv9Hvvq6Yysyz0gANSJKfWLjUEfJo MF1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=o/pGIYtwE4Sm4u8753zKSwRGWf78EVCdMHIKOHqbh/g=; b=JkLSJZcJYbWq9VGtdPDdquRxDz0T2ch0v6Zyw8tWHCckCdXOLPSBl/QmFlqENzIcWR eY06v83j4TKZqFVdedNH4hVUqLIEbwSL5kh11BdCsVcrQsL97bSs2GzeaGMw0kGP+2W2 jVq+3q1eHGTQ5o2jLt0xQtpaNTScTziJcd33MnRU+NVVKiG0k9VJPDbn/A8kHeWs1Cp0 /iSc8hdvjVun8ZgamZEb3oTnJUrN2LcCfZLiE0omxjTChqaRN0yd14Hcl/52lDWDpNGb GmJpJruJDFfTLRYOmG482LCTXlEuq7C622x1LuLslxXnFQwrczkYEe4A2Hbzy+B45XQF JvYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=hOrrh5Sd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id nq7si2304565ejb.109.2020.11.25.17.51.15; Wed, 25 Nov 2020 17:51:38 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=hOrrh5Sd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732378AbgKZBsv (ORCPT + 99 others); Wed, 25 Nov 2020 20:48:51 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:65440 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730060AbgKZBso (ORCPT ); Wed, 25 Nov 2020 20:48:44 -0500 Received: from pps.filterd (m0098414.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 0AQ1X1Ac049785; Wed, 25 Nov 2020 20:48:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=o/pGIYtwE4Sm4u8753zKSwRGWf78EVCdMHIKOHqbh/g=; b=hOrrh5SdM2Nm/+cWmJvmK+f9HTR93HwBKcT9jAf1ezjn221+ysO9t2NQ/IqaAxSk1Q+c idyqcLQ0Jd+yu/lZ566SE6f4OuZyky3B3Ae30mkvr9JbmTmFdq0hvU0GbVoq23j/Oaas TQPjskSL2VXumzOqtPrdSyC4v6W/om2BNHPs37+5VVRif/q8ywE2LHihdwKG+1Wo3NZr h8yZ+bJQD5504+unQSIJcVB4cyRcGik7UXUirlk/I/IuiwrjPEA5VEl9ig1GoGFv6/rV t740hJtvyz7KaD0mBoc/tAtADldvshSOtyeZZbz2tJjnGthdP1fv06vAIdl0Z6QqqYWa 4g== Received: from ppma03dal.us.ibm.com (b.bd.3ea9.ip4.static.sl-reverse.com [169.62.189.11]) by mx0b-001b2d01.pphosted.com with ESMTP id 3520xstewm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 25 Nov 2020 20:48:36 -0500 Received: from pps.filterd (ppma03dal.us.ibm.com [127.0.0.1]) by ppma03dal.us.ibm.com (8.16.0.42/8.16.0.42) with SMTP id 0AQ1mRcO028986; Thu, 26 Nov 2020 01:48:35 GMT Received: from b03cxnp08028.gho.boulder.ibm.com (b03cxnp08028.gho.boulder.ibm.com [9.17.130.20]) by ppma03dal.us.ibm.com with ESMTP id 34xth9vrqv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 26 Nov 2020 01:48:35 +0000 Received: from b03ledav001.gho.boulder.ibm.com (b03ledav001.gho.boulder.ibm.com [9.17.130.232]) by b03cxnp08028.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 0AQ1mX3r65929524 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 26 Nov 2020 01:48:33 GMT Received: from b03ledav001.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CBE826E054; Thu, 26 Nov 2020 01:48:33 +0000 (GMT) Received: from b03ledav001.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 80B366E052; Thu, 26 Nov 2020 01:48:33 +0000 (GMT) Received: from vios4361.aus.stglabs.ibm.com (unknown [9.3.43.61]) by b03ledav001.gho.boulder.ibm.com (Postfix) with ESMTP; Thu, 26 Nov 2020 01:48:33 +0000 (GMT) From: Tyrel Datwyler To: james.bottomley@hansenpartnership.com Cc: martin.petersen@oracle.com, linux-scsi@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, brking@linux.ibm.com, Tyrel Datwyler Subject: [PATCH 11/13] ibmvfc: set and track hw queue in ibmvfc_event struct Date: Wed, 25 Nov 2020 19:48:22 -0600 Message-Id: <20201126014824.123831-12-tyreld@linux.ibm.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201126014824.123831-1-tyreld@linux.ibm.com> References: <20201126014824.123831-1-tyreld@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.312,18.0.737 definitions=2020-11-25_14:2020-11-25,2020-11-25 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 mlxscore=0 malwarescore=0 priorityscore=1501 phishscore=0 lowpriorityscore=0 impostorscore=0 adultscore=0 clxscore=1015 spamscore=0 suspectscore=1 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2011260005 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Extract the hwq id from a SCSI command and store it in the ibmvfc_event structure to identify which Sub-CRQ to send the command down when channels are being utilized. Signed-off-by: Tyrel Datwyler --- drivers/scsi/ibmvscsi/ibmvfc.c | 5 +++++ drivers/scsi/ibmvscsi/ibmvfc.h | 1 + 2 files changed, 6 insertions(+) diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c index 55893d09f883..f686c2cb0de2 100644 --- a/drivers/scsi/ibmvscsi/ibmvfc.c +++ b/drivers/scsi/ibmvscsi/ibmvfc.c @@ -1387,6 +1387,7 @@ static void ibmvfc_init_event(struct ibmvfc_event *evt, evt->crq.format = format; evt->done = done; evt->eh_comp = NULL; + evt->hwq = 0; } /** @@ -1738,6 +1739,8 @@ static int ibmvfc_queuecommand_lck(struct scsi_cmnd *cmnd, struct ibmvfc_cmd *vfc_cmd; struct ibmvfc_fcp_cmd_iu *iu; struct ibmvfc_event *evt; + u32 tag_and_hwq = blk_mq_unique_tag(cmnd->request); + u16 hwq = blk_mq_unique_tag_to_hwq(tag_and_hwq); int rc; if (unlikely((rc = fc_remote_port_chkready(rport))) || @@ -1765,6 +1768,8 @@ static int ibmvfc_queuecommand_lck(struct scsi_cmnd *cmnd, } vfc_cmd->correlation = cpu_to_be64(evt); + if (vhost->using_channels) + evt->hwq = hwq % vhost->scsi_scrqs.active_queues; if (likely(!(rc = ibmvfc_map_sg_data(cmnd, evt, vfc_cmd, vhost->dev)))) return ibmvfc_send_event(evt, vhost, 0); diff --git a/drivers/scsi/ibmvscsi/ibmvfc.h b/drivers/scsi/ibmvscsi/ibmvfc.h index 04086ffbfca7..abda910ae33d 100644 --- a/drivers/scsi/ibmvscsi/ibmvfc.h +++ b/drivers/scsi/ibmvscsi/ibmvfc.h @@ -781,6 +781,7 @@ struct ibmvfc_event { struct completion comp; struct completion *eh_comp; struct timer_list timer; + u16 hwq; }; /* a pool of event structs for use */ -- 2.27.0