From patchwork Wed Dec 6 08:12:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 174402 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp3955814vqy; Wed, 6 Dec 2023 00:13:01 -0800 (PST) X-Google-Smtp-Source: AGHT+IEHsS5L0hp1Rbxwk4vwcnrJqfnMSiQ7Uf9y7pfA+v6lE0BfBynMDYo3Zu7jjW0l1FbuvHMd X-Received: by 2002:a05:6a20:a123:b0:187:7590:7f11 with SMTP id q35-20020a056a20a12300b0018775907f11mr375135pzk.43.1701850381188; Wed, 06 Dec 2023 00:13:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701850381; cv=none; d=google.com; s=arc-20160816; b=Dul2gGCeBScsuVMENzmqvBZVChjPJLbPGqKD2B04DAwhQxVqw6syoIyKsPmk0wRvmJ kQlQqvsGZdtrS3o2Tq5T2EDD+IA9vHP73JWcoNVSIr8ntkDCs4vmnHdkiPwHwIDprFMe +NZjw3hwGvh+3xNOuInEfT5BFe21JFdxDJB/Qn0gq2WRuOAgOxAg5ShEQ8B0uFkEHPUI JaxbhObkMVhvv3IHNFHgI5UoIOcRMCXjT4/dVUqHfjftm6SjVQyehFkbai6/wnK+ypFZ cQ7owL/zpX9neQDSIUxTNXVkiYr6iN/y3AZd0eRGkTtEtdTcFGm1xjJgAhkT73VSkM9g 4aZQ== 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; bh=+emmShTJyvnUVTi/2ARu+Yu1a3i2XcRwX4j6orpqykM=; fh=DJbT8ne4Efjik5M2lT8AzCh46QRFyMX3tPkPd3UGLh8=; b=FsHkuXP14kNhT2H4GYCf+vvgna7mAkYUGK/urowMApOAO1IGVEWmw7RKPDLBCITfZt E8vTVSx8vLduIhfCv0osLd8kwOuxVJoudlbZSY/c/XSvx/pmeQynwgIb/qes7x6O1uTr ZZ28pY9IRfyPLvqb+JaVo3QMr7aWhRFLJtY0Ve2jS+13gC+Sxz8rPeTXkL4/bZn4AroI Gk8aOuu3l/AzhvG2yYOsliLWXnT9gE1h8dNArd4CdcJwuiWD0e7OK/WFcEguPtzcfEzY T8wg1atGwCk05l2uI8aYKIUPlgYjYp48tb0pUdbiSZaoYnd5tR2BNwloAk/wpW98/aHN XQjg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id bf9-20020a170902b90900b001bc162f3318si10567649plb.640.2023.12.06.00.13.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Dec 2023 00:13:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 33D6A803EE0F; Wed, 6 Dec 2023 00:12:57 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231991AbjLFIMr (ORCPT + 99 others); Wed, 6 Dec 2023 03:12:47 -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 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-Spam-Score: 11.73 X-Rspamd-Queue-Id: A215A1FBF9 X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Wed, 06 Dec 2023 00:12:57 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784519465235439197 X-GMAIL-MSGID: 1784519465235439197 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 = blk_rq_nr_discard_segments(req), n = 0; + struct nvme_ctrl *ctrl = nvme_req(req)->ctrl; struct nvme_dsm_range *range; struct bio *bio; @@ -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; - range = page_address(ns->ctrl->discard_page); + range = page_address(ctrl->discard_page); } if (queue_max_discard_segments(req->q) == 1) { @@ -815,8 +816,8 @@ static blk_status_t nvme_setup_discard(struct nvme_ns *ns, struct request *req, } if (WARN_ON_ONCE(n != segments)) { - if (virt_to_page(range) == ns->ctrl->discard_page) - clear_bit_unlock(0, &ns->ctrl->discard_page_busy); + if (virt_to_page(range) == 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, struct 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 = nvme_req(req)->ctrl; + memset(cmnd, 0, sizeof(*cmnd)); - if (ns->ctrl->quirks & NVME_QUIRK_DEALLOCATE_ZEROES) + if (ctrl->quirks & NVME_QUIRK_DEALLOCATE_ZEROES) return nvme_setup_discard(ns, req, cmnd); cmnd->write_zeroes.opcode = nvme_cmd_write_zeroes;