Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3090990ybt; Mon, 29 Jun 2020 15:07:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyfmOpAto1ITJqbuZ8k/2nN2sfDnO/QyFvDPMAOUrjHuCL/1gJPggcyHtafW2WapCEXOxoH X-Received: by 2002:a17:906:191a:: with SMTP id a26mr16456593eje.315.1593468437361; Mon, 29 Jun 2020 15:07:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593468437; cv=none; d=google.com; s=arc-20160816; b=pvdSWmIuSrQw2ap9bcTRTyU0+xj9oJAUc55Qr9VhgYyPAksQeZKUo6FvilLpVus1HD Wksm9yK5+j6bHYnkr9b7Di6VS8s7OVVBzoco60M1i61wa7SKrMf5f8WqGsGRmUjQsfew Vb8uaxDDlzyDI/wxMH6ahVcQgx6YVMUFq1X998+ZBCrT0QYGUqDAFT2ofboTK/8ws1Wn cQ18OnQ/7X7NsCt38htSJ1vuNzBz+GohYj5fbpJvRMVceePaSBip9rdGC+VUlMrUNn5I c9HJek2gqZ30XsmK5s6I9WoCvv6nWQS6In8u3/yMvr0Zwc6VxGTMvegmb54EMgfz0Imv ktow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=fAWO3qnPSwvJBcT03CDkUPQHy0l9L824a/xJwVu4hQQ=; b=QtpnJrtjjB5xEdbOrUUOzmqvb5vr7GwWZ/uQn9ic/ykJVoXqzmZnLh8vEbP96E/Bfr cODXxzTZTxtR6jPDXSsaizwP8FIAAtYSPNpz5hziCBqrG5MGO8S/3WD2+8/nN1WaUuBv UjWadhsHv/9DsvFPIUpSB7warN+oEECAG1hEjcPOopcMJ5/WqlotXNMvNVhuibQlrjun qRQp7MPOJaU9bHKlqu6lE2uft0+fEXWJkTbpvKfuzWxT62UlImTDmmKkXCs4azgtXPPQ V4FQwXW16aIVVSDkdzb4fjP/2fvqEPCX6iUHj3bA8th7/MvZ8N4992bhQOo+EBh87dsq G87Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ScN9nS2g; 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=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u11si475142edy.592.2020.06.29.15.06.53; Mon, 29 Jun 2020 15:07:17 -0700 (PDT) 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=@kernel.org header.s=default header.b=ScN9nS2g; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391885AbgF2WFv (ORCPT + 99 others); Mon, 29 Jun 2020 18:05:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:56792 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726147AbgF2SfT (ORCPT ); Mon, 29 Jun 2020 14:35:19 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 164FE24183; Mon, 29 Jun 2020 15:19:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593443951; bh=whibX4Vflp6erw83MqLTzhDyklQNqGev6/SpT2TzU44=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ScN9nS2gpbRLfAEB3eeRDGZ/Xr8rkuzmDVRphy37gB7K+QShYrjDDaOXpm+c/HiZw d9ikYFS1Qx7VEfvLxgp6+W877F6I7oCroqrcwJDZ3A0M2cEuRh7XfrBMmRYl/dXKBv Lx3Gu4OSDaoimUwLY/FexuMkwmni07t7NA0+UD5U= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: David Milburn , Christoph Hellwig , Yi Zhang , Christoph Hellwig , Sasha Levin Subject: [PATCH 5.7 053/265] nvmet: cleanups the loop in nvmet_async_events_process Date: Mon, 29 Jun 2020 11:14:46 -0400 Message-Id: <20200629151818.2493727-54-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629151818.2493727-1-sashal@kernel.org> References: <20200629151818.2493727-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.7.7-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.7.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.7.7-rc1 X-KernelTest-Deadline: 2020-07-01T15:14+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: David Milburn [ Upstream commit 1cdf9f7670a7d74e27177d5c390c2f8b3b9ba338 ] Based-on-a-patch-by: Christoph Hellwig Tested-by: Yi Zhang Signed-off-by: David Milburn Signed-off-by: Christoph Hellwig Signed-off-by: Sasha Levin --- drivers/nvme/target/core.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/nvme/target/core.c b/drivers/nvme/target/core.c index aa5ca222c6f59..ac7ae031ce78d 100644 --- a/drivers/nvme/target/core.c +++ b/drivers/nvme/target/core.c @@ -134,15 +134,10 @@ static void nvmet_async_events_process(struct nvmet_ctrl *ctrl, u16 status) struct nvmet_async_event *aen; struct nvmet_req *req; - while (1) { - mutex_lock(&ctrl->lock); - aen = list_first_entry_or_null(&ctrl->async_events, - struct nvmet_async_event, entry); - if (!aen || !ctrl->nr_async_event_cmds) { - mutex_unlock(&ctrl->lock); - break; - } - + mutex_lock(&ctrl->lock); + while (ctrl->nr_async_event_cmds && !list_empty(&ctrl->async_events)) { + aen = list_first_entry(&ctrl->async_events, + struct nvmet_async_event, entry); req = ctrl->async_event_cmds[--ctrl->nr_async_event_cmds]; if (status == 0) nvmet_set_result(req, nvmet_async_event_result(aen)); @@ -152,7 +147,9 @@ static void nvmet_async_events_process(struct nvmet_ctrl *ctrl, u16 status) mutex_unlock(&ctrl->lock); nvmet_req_complete(req, status); + mutex_lock(&ctrl->lock); } + mutex_unlock(&ctrl->lock); } static void nvmet_async_events_free(struct nvmet_ctrl *ctrl) -- 2.25.1