From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web11.18.1573788507149802417 for ; Thu, 14 Nov 2019 19:28:27 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: ray.ni@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Nov 2019 19:28:26 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,306,1569308400"; d="scan'208";a="199064413" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by orsmga008.jf.intel.com with ESMTP; 14 Nov 2019 19:28:25 -0800 Received: from fmsmsx113.amr.corp.intel.com (10.18.116.7) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 14 Nov 2019 19:28:23 -0800 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by FMSMSX113.amr.corp.intel.com (10.18.116.7) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 14 Nov 2019 19:28:23 -0800 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.127]) by SHSMSX103.ccr.corp.intel.com ([169.254.4.60]) with mapi id 14.03.0439.000; Fri, 15 Nov 2019 11:28:21 +0800 From: "Ni, Ray" To: "Wu, Hao A" , "devel@edk2.groups.io" CC: Sean Brogan , "Wang, Jian J" Subject: Re: [PATCH v1] MdeModulePkg/NvmExpressDxe: Fix wrong queue size for async IO queues Thread-Topic: [PATCH v1] MdeModulePkg/NvmExpressDxe: Fix wrong queue size for async IO queues Thread-Index: AQHVmqiiRTR5of+KiEms5vD/aH05eqeLk8EQ Date: Fri, 15 Nov 2019 03:28:21 +0000 Message-ID: <734D49CCEBEEF84792F5B80ED585239D5C35F832@SHSMSX104.ccr.corp.intel.com> References: <20191114050141.18352-1-hao.a.wu@intel.com> In-Reply-To: <20191114050141.18352-1-hao.a.wu@intel.com> Accept-Language: en-US, zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: ray.ni@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Acked-by: Ray Ni > -----Original Message----- > From: Wu, Hao A > Sent: Thursday, November 14, 2019 1:02 PM > To: devel@edk2.groups.io > Cc: Sean Brogan ; Wang, Jian J > ; Ni, Ray ; Wu, Hao A > > Subject: [PATCH v1] MdeModulePkg/NvmExpressDxe: Fix wrong queue size > for async IO queues >=20 > From: Sean Brogan >=20 > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D2118 >=20 > When a packet is queued/completed for the asynchronous IO queue, the > logic > to roll over to the front of the queue doesn't account for actual size of > the IO Submission/Completion queue. >=20 > This causes a device to hang due to doorbell being outside of visible > queue. An example would be if an NVMe drive only supported a queue size > of > 128 while the driver supports 256. >=20 > Cc: Jian J Wang > Cc: Ray Ni > Signed-off-by: Sean Brogan > Signed-off-by: Hao A Wu > --- > MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpress.c | 2 +- > MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressPassthru.c | 6 ++++-- > 2 files changed, 5 insertions(+), 3 deletions(-) >=20 > diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpress.c > b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpress.c > index 3bde96bc95..62886d5c91 100644 > --- a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpress.c > +++ b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpress.c > @@ -672,7 +672,7 @@ ProcessAsyncTaskList ( > } >=20 > Private->CqHdbl[QueueId].Cqh++; > - if (Private->CqHdbl[QueueId].Cqh > NVME_ASYNC_CCQ_SIZE) { > + if (Private->CqHdbl[QueueId].Cqh > MIN (NVME_ASYNC_CCQ_SIZE, > Private->Cap.Mqes)) { > Private->CqHdbl[QueueId].Cqh =3D 0; > Private->Pt[QueueId] ^=3D 1; > } > diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressPassthru.c > b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressPassthru.c > index 8e72137946..e9357b1239 100644 > --- a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressPassthru.c > +++ b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressPassthru.c > @@ -452,6 +452,7 @@ NvmExpressPassThru ( > NVME_SQ *Sq; > NVME_CQ *Cq; > UINT16 QueueId; > + UINT16 QueueSize; > UINT32 Bytes; > UINT16 Offset; > EFI_EVENT TimerEvent; > @@ -540,6 +541,7 @@ NvmExpressPassThru ( > Prp =3D NULL; > TimerEvent =3D NULL; > Status =3D EFI_SUCCESS; > + QueueSize =3D MIN (NVME_ASYNC_CSQ_SIZE, Private->Cap.Mqes) + 1; >=20 > if (Packet->QueueType =3D=3D NVME_ADMIN_QUEUE) { > QueueId =3D 0; > @@ -552,7 +554,7 @@ NvmExpressPassThru ( > // > // Submission queue full check. > // > - if ((Private->SqTdbl[QueueId].Sqt + 1) % (NVME_ASYNC_CSQ_SIZE + 1) > =3D=3D > + if ((Private->SqTdbl[QueueId].Sqt + 1) % QueueSize =3D=3D > Private->AsyncSqHead) { > return EFI_NOT_READY; > } > @@ -701,7 +703,7 @@ NvmExpressPassThru ( > // > if ((Event !=3D NULL) && (QueueId !=3D 0)) { > Private->SqTdbl[QueueId].Sqt =3D > - (Private->SqTdbl[QueueId].Sqt + 1) % (NVME_ASYNC_CSQ_SIZE + 1); > + (Private->SqTdbl[QueueId].Sqt + 1) % QueueSize; > } else { > Private->SqTdbl[QueueId].Sqt ^=3D 1; > } > -- > 2.12.0.windows.1