From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 800F4C4167B for ; Mon, 11 Dec 2023 14:04:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344207AbjLKOEX (ORCPT ); Mon, 11 Dec 2023 09:04:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43782 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343825AbjLKODn (ORCPT ); Mon, 11 Dec 2023 09:03:43 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 22B2C1BD7 for ; Mon, 11 Dec 2023 06:01:58 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D4521C433CC; Mon, 11 Dec 2023 14:01:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1702303317; bh=4k1SaVBa0z2pNpULLs2GouEoUDKokyLPmJyx01TWH5I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a3j+s0Z/FO583b1b91UdG4K2MAExZZJPpvriW9sfff/oyGyzaMUckqyGIxzThTztA FevWkHIszcw6w/MVBRzDYOMG+4Oc+/U6boj46N5O/4oa5xshyjdsFxJEWFYnZsJoFi RxpPn1q/qXQneltHHUCAHMeVju1wtowyNTMpiVmI2jaXIWSRGuSE9/UuLm5DW8MICF LCubDSQGVJSS262ggVSRm0f+C44iMUHD/TzL/zj1Kl88PpM/qwGSSzNXL+z9QvCYLy KEYMF4/Us0Z3AhJX+HddEI69O4MIRiWaC9BAT2oFiYQpW/ykyRA5bDYGbrEPEC0pTO 11XoxFNBBXwLQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Keith Busch , Sagi Grimberg , Sasha Levin , linux-nvme@lists.infradead.org Subject: [PATCH AUTOSEL 5.10 13/16] nvme: introduce helper function to get ctrl state Date: Mon, 11 Dec 2023 09:00:37 -0500 Message-ID: <20231211140116.391986-13-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231211140116.391986-1-sashal@kernel.org> References: <20231211140116.391986-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.10.203 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Keith Busch [ Upstream commit 5c687c287c46fadb14644091823298875a5216aa ] The controller state is typically written by another CPU, so reading it should ensure no optimizations are taken. This is a repeated pattern in the driver, so start with adding a convenience function that returns the controller state with READ_ONCE(). Reviewed-by: Sagi Grimberg Signed-off-by: Keith Busch Signed-off-by: Sasha Levin --- drivers/nvme/host/nvme.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h index c3e4d9b6f9c0d..1e56fe8e8157c 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -354,6 +354,11 @@ struct nvme_ctrl { struct nvme_fault_inject fault_inject; }; +static inline enum nvme_ctrl_state nvme_ctrl_state(struct nvme_ctrl *ctrl) +{ + return READ_ONCE(ctrl->state); +} + enum nvme_iopolicy { NVME_IOPOLICY_NUMA, NVME_IOPOLICY_RR, -- 2.42.0