From nobody Sun Dec 28 19:30:51 2025 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 372A2C4167B for ; Wed, 6 Dec 2023 08:12:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376990AbjLFIMs (ORCPT ); Wed, 6 Dec 2023 03:12:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229505AbjLFIMo (ORCPT ); Wed, 6 Dec 2023 03:12:44 -0500 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2a07:de40:b251:101:10:150:64:2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 46CEB18D for ; Wed, 6 Dec 2023 00:12:51 -0800 (PST) Received: from imap2.dmz-prg2.suse.org (imap2.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:98]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id A215A1FBF9; Wed, 6 Dec 2023 08:12:49 +0000 (UTC) Received: from imap2.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap2.dmz-prg2.suse.org (Postfix) with ESMTPS id 8E794133DD; Wed, 6 Dec 2023 08:12:49 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap2.dmz-prg2.suse.org with ESMTPSA id NcSnIQEtcGUTHgAAn2gu4w (envelope-from ); Wed, 06 Dec 2023 08:12:49 +0000 From: Daniel Wagner To: linux-nvme@lists.infradead.org Cc: linux-kernel@vger.kernel.org, Keith Busch , Christoph Hellwig , Sagi Grimberg , Hannes Reinecke , Daniel Wagner Subject: [PATCH v3 1/4] nvme: lookup ctrl from request instead from namespace Date: Wed, 6 Dec 2023 09:12:41 +0100 Message-ID: <20231206081244.32733-2-dwagner@suse.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231206081244.32733-1-dwagner@suse.de> References: <20231206081244.32733-1-dwagner@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: +++++++++++ Authentication-Results: smtp-out2.suse.de; dkim=none; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=suse.de (policy=none); spf=softfail (smtp-out2.suse.de: 2a07:de40:b281:104:10:150:64:98 is neither permitted nor denied by domain of dwagner@suse.de) smtp.mailfrom=dwagner@suse.de X-Rspamd-Server: rspamd2 X-Spamd-Result: default: False [11.73 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:98:from]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_MISSING_CHARSET(2.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; NEURAL_SPAM_SHORT(2.94)[0.980]; BROKEN_CONTENT_TYPE(1.50)[]; R_SPF_SOFTFAIL(4.60)[~all:c]; RCVD_COUNT_THREE(0.00)[3]; MX_GOOD(-0.01)[]; RCPT_COUNT_SEVEN(0.00)[7]; MID_CONTAINS_FROM(1.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(2.20)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-3.00)[100.00%]; DMARC_POLICY_SOFTFAIL(0.10)[suse.de : No valid SPF, No valid DKIM,none] X-Rspamd-Queue-Id: A215A1FBF9 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In preparation to use struct nvme_ns_head pointers instead of a struct nvme_ns pointers, get the ctrl pointer from a request. The reason is that there is no easy and fast way to lookup the ctrl from struct nvme_ns_head. Reviewed-by: Christoph Hellwig Reviewed-by: Sagi Grimberg Signed-off-by: Daniel Wagner --- drivers/nvme/host/core.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index d699f0c8b13e..900c045fcae0 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -769,6 +769,7 @@ static blk_status_t nvme_setup_discard(struct nvme_ns *= ns, struct request *req, struct nvme_command *cmnd) { unsigned short segments =3D blk_rq_nr_discard_segments(req), n =3D 0; + struct nvme_ctrl *ctrl =3D nvme_req(req)->ctrl; struct nvme_dsm_range *range; struct bio *bio; =20 @@ -786,10 +787,10 @@ static blk_status_t nvme_setup_discard(struct nvme_ns= *ns, struct request *req, * discard page. If that's also busy, it's safe to return * busy, as we know we can make progress once that's freed. */ - if (test_and_set_bit_lock(0, &ns->ctrl->discard_page_busy)) + if (test_and_set_bit_lock(0, &ctrl->discard_page_busy)) return BLK_STS_RESOURCE; =20 - range =3D page_address(ns->ctrl->discard_page); + range =3D page_address(ctrl->discard_page); } =20 if (queue_max_discard_segments(req->q) =3D=3D 1) { @@ -815,8 +816,8 @@ static blk_status_t nvme_setup_discard(struct nvme_ns *= ns, struct request *req, } =20 if (WARN_ON_ONCE(n !=3D segments)) { - if (virt_to_page(range) =3D=3D ns->ctrl->discard_page) - clear_bit_unlock(0, &ns->ctrl->discard_page_busy); + if (virt_to_page(range) =3D=3D ctrl->discard_page) + clear_bit_unlock(0, &ctrl->discard_page_busy); else kfree(range); return BLK_STS_IOERR; @@ -861,9 +862,11 @@ static void nvme_set_ref_tag(struct nvme_ns *ns, struc= t nvme_command *cmnd, static inline blk_status_t nvme_setup_write_zeroes(struct nvme_ns *ns, struct request *req, struct nvme_command *cmnd) { + struct nvme_ctrl *ctrl =3D nvme_req(req)->ctrl; + memset(cmnd, 0, sizeof(*cmnd)); =20 - if (ns->ctrl->quirks & NVME_QUIRK_DEALLOCATE_ZEROES) + if (ctrl->quirks & NVME_QUIRK_DEALLOCATE_ZEROES) return nvme_setup_discard(ns, req, cmnd); =20 cmnd->write_zeroes.opcode =3D nvme_cmd_write_zeroes; --=20 2.43.0