From patchwork Tue Aug 8 07:09:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 132857 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp2378409vqr; Tue, 8 Aug 2023 13:31:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHyNqWfFEDZ7Toxpxk37Hl5ky0DAfNYhuICIegKWiB7RHL7l8q5jMJResvWWKTjEY5Qj1Yu X-Received: by 2002:a05:6830:1301:b0:6b8:82ed:ea2e with SMTP id p1-20020a056830130100b006b882edea2emr751754otq.4.1691526676936; Tue, 08 Aug 2023 13:31:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691526676; cv=none; d=google.com; s=arc-20160816; b=KeMoDva4w9DYtN4V0Ot9WjXJDoV8HTMOlfi9kKSe1ptaex/nyQ6qa+5CA8QRYcaGvX KJo5Bkt6CV5mtCKv98Sh2R0C/gY6Mv/VPmLittr3D37QEn4h0PXNMIcmRvhB1e1koya0 IZ9Sr4jsphPMIXHmjyE1uqkc8hQLvbg3lUig96wFzqWigRmPAufnwVz8Ca4qUy9kuTMA kQZ+bP03qCU+R015ll67GtgIa58a9yyMg67ARa6NBSRHfNWwBOgRsQwQaF+hwUQ//Kax zUUtViEuo1sjD9c7erE8/dygnQmfX0ID9aY2XwPEAgB44+ReJQqFAk+XMGYDDfmfEo8/ 74jA== 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 :dkim-signature:dkim-signature; bh=UqHXroF0EJl+GQpEdHdxmBrPdAQdE5qHCwe+sk9yKxY=; fh=m0SXguoZOlId+vXza3k05csFzKE/FEfC5yKwj3DLHLU=; b=OEC+FJwqDaVCCQJs+uZyKYWpZ5asOpzBU/1B/rMYb8qJJr0oa2KBgRoRB3ump1dLTx 3fgMVeMXZzRuXIISpFbZmdwtgDqO/DRMMY/exvYweOnMm/k1RAZoF5TqzdJtsOLW89Ok VigR2Bx8rSEDfxLR4GsXkZN4ngH1F3Q6ZuA2yzCVdNNX2q8WFD1A8JFup8hlQFXVEDaD Kux5+fxxl1m0MY1HoXbDRpT3mrAESlUaPR40clJbF9GtjeULU9M/SKvfC97dMFmXRAei yZKmGBRDBdI0BtT6MJf6/+IkSLc1d/OwO0+yecXVKA12WxG02DTvTKt0hPsz/l1tfnaW 3RZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=SPkzLMFo; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o15-20020a655bcf000000b005648b1d63fcsi7386950pgr.484.2023.08.08.13.31.02; Tue, 08 Aug 2023 13:31:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=SPkzLMFo; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229966AbjHHSnx (ORCPT + 99 others); Tue, 8 Aug 2023 14:43:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39628 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229735AbjHHSn2 (ORCPT ); Tue, 8 Aug 2023 14:43:28 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6FB91387D3 for ; Tue, 8 Aug 2023 09:37:51 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 4396C21B9D; Tue, 8 Aug 2023 07:09:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1691478554; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UqHXroF0EJl+GQpEdHdxmBrPdAQdE5qHCwe+sk9yKxY=; b=SPkzLMFoMYQVFRBS+m5ctBCNQBVnQaSth4BNFuJth9DzXG5o+wfOzK9riRinpOR2pqhq+T K7gKxpokIKcYk8z6u90kVMaz+TSTHuAt8f/bb2JA7evvy2x6wK7BwJl2gQWXXkedAOa3D0 88LL4iMmrcr7sQQ5amcddbEbAdswwAA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1691478554; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UqHXroF0EJl+GQpEdHdxmBrPdAQdE5qHCwe+sk9yKxY=; b=t2QEvqsRlxTYwQ8fhoFUVUtDzkBSp8XVSKi1f58iPWFKBDZwvrP847wpQwaYBQK8qOyNan bmiJnNbStw8lJpBQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 3590013451; Tue, 8 Aug 2023 07:09:14 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id EZbkDBrq0WRoVgAAMHmgww (envelope-from ); Tue, 08 Aug 2023 07:09:14 +0000 From: Daniel Wagner To: linux-nvme@lists.infradead.org Cc: linux-kernel@vger.kernel.org, Caleb Sander , Keith Busch , Sagi Grimberg , Daniel Wagner Subject: [PATCH libnvme v2 1/2] fabrics: Read the supported options lazy Date: Tue, 8 Aug 2023 09:09:06 +0200 Message-ID: <20230808070907.18834-2-dwagner@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230808070907.18834-1-dwagner@suse.de> References: <20230808070907.18834-1-dwagner@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773694276436371580 X-GMAIL-MSGID: 1773694276436371580 From: Sagi Grimberg Read the options in when we need the for the first time. Signed-off-by: Sagi Grimberg Signed-off-by: Daniel Wagner --- src/nvme/fabrics.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/nvme/fabrics.c b/src/nvme/fabrics.c index 800293e2a8e7..9725eeb3cda8 100644 --- a/src/nvme/fabrics.c +++ b/src/nvme/fabrics.c @@ -357,10 +357,18 @@ static int __add_argument(char **argstr, const char *tok, const char *arg) return 0; } +static int __nvmf_supported_options(nvme_root_t r); +#define nvmf_check_option(r, tok) \ +({ \ + if (!(r)->options) \ + __nvmf_supported_options(r); \ + (r)->options->tok; \ +}) + #define add_bool_argument(o, argstr, tok, arg) \ ({ \ int ret; \ - if (r->options->tok) { \ + if (nvmf_check_option(r, tok)) { \ ret = __add_bool_argument(argstr, \ stringify(tok), \ arg); \ @@ -376,7 +384,7 @@ static int __add_argument(char **argstr, const char *tok, const char *arg) #define add_int_argument(o, argstr, tok, arg, allow_zero) \ ({ \ int ret; \ - if (r->options->tok) { \ + if (nvmf_check_option(r, tok)) { \ ret = __add_int_argument(argstr, \ stringify(tok), \ arg, \ @@ -393,7 +401,7 @@ static int __add_argument(char **argstr, const char *tok, const char *arg) #define add_int_or_minus_one_argument(o, argstr, tok, arg) \ ({ \ int ret; \ - if (r->options->tok) { \ + if (nvmf_check_option(r, tok)) { \ ret = __add_int_or_minus_one_argument(argstr, \ stringify(tok), \ arg); \ @@ -409,7 +417,7 @@ static int __add_argument(char **argstr, const char *tok, const char *arg) #define add_argument(r, argstr, tok, arg) \ ({ \ int ret; \ - if (r->options->tok) { \ + if (nvmf_check_option(r, tok)) { \ ret = __add_argument(argstr, \ stringify(tok), \ arg); \ @@ -913,9 +921,6 @@ int nvmf_add_ctrl(nvme_host_t h, nvme_ctrl_t c, free(traddr); } - ret = __nvmf_supported_options(h->r); - if (ret) - return ret; ret = build_options(h, c, &argstr); if (ret) return ret; From patchwork Tue Aug 8 07:09:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 132799 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp2356982vqr; Tue, 8 Aug 2023 12:47:04 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHIGv3MgrbzSHyNr4zZtjR+DpZWI6HdAgwIUEOHFMIb8H+nqccktTlSfjUUWEO45VmsmO5V X-Received: by 2002:a05:6512:32cb:b0:4fd:d016:c2e8 with SMTP id f11-20020a05651232cb00b004fdd016c2e8mr374673lfg.43.1691524024126; Tue, 08 Aug 2023 12:47:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691524024; cv=none; d=google.com; s=arc-20160816; b=fokjvo+S+Dz4arOOEKZwpuK+WVhGYaMYNmz/3IVcVSMfkojt7c63Kr3jcqTivdMpI1 MKI0DPsvpO0hf66cQ3WJ8EREeSBPRc1u9ECqATLdRJ84W407OR97egPTZ5lFCB2xm2TM 4VhyPAF9CxYFv+Z0nDTPQWim5Vd/+EVOCEp5KxH82fDMh+fjigoZ7kW2Q8DQyNsAetJv wUSju6H+pCNzIF6iapR2rE1UDEX/s8W5VuNkQ8a4Qc01+VAYnnfi/JE4GI+eMIqbRj81 NrJ/t1v12AeGWC1yeyXQTIND1PEPC/hv0LS0OGzIfwbCqDbHAm+alYJw/abXnKiEx+z7 vSiQ== 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 :dkim-signature:dkim-signature; bh=H/YLVCeWbOC5zGBWs9MF5sPBcfnhYRaJ1x4BlOnFxS4=; fh=m0SXguoZOlId+vXza3k05csFzKE/FEfC5yKwj3DLHLU=; b=ehQnvswH3r08MpcVtqLuHECU8xcT4OKsivdca9FVoh5cGWavemJkJODqvpyVxKQ1mX 5+11A/t96N0rFDdf1IqfLGHxcl25f1aLr12qDuAPk+NcPyqd3vC8wzB1V3/HE8S2Tp6s 8YhjbM4l3ouL9H53/8HSushyuzwbp3nQKog/odTA1fuUGXpkctNwtH0Nxjplp+cvhYxK a9G1gFkDyoT6yCf2cUmhRXV0x/boZAjBVoDDe/zo/2l57Nxa83h13moezs7dHuFZTPiI MZI4iA2ZBQU4g928fip37FQW6EjN1cyK28z8IQk9oZKrW9QgDgdJuc/SIa0Re5gthCpA /mcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=H4NZ7Ltn; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=GfdwtYY+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u21-20020aa7d0d5000000b0052334df2190si4631067edo.169.2023.08.08.12.46.40; Tue, 08 Aug 2023 12:47:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=H4NZ7Ltn; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=GfdwtYY+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230248AbjHHTPz (ORCPT + 99 others); Tue, 8 Aug 2023 15:15:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33306 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235764AbjHHTPW (ORCPT ); Tue, 8 Aug 2023 15:15:22 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E574047ED for ; Tue, 8 Aug 2023 09:38:11 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id CD944223FF; Tue, 8 Aug 2023 07:09:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1691478554; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=H/YLVCeWbOC5zGBWs9MF5sPBcfnhYRaJ1x4BlOnFxS4=; b=H4NZ7LtnOgJiK5ddlmJrLoNZSVL7aFBE6PT6hVKwRTOyoH6kgjQW5PDRYhRhJKToFK2s+L BnlnH1QTgJWTcu6cG2tA+VO6ErhNTRlpC2u7VuqtjGrEiu6JmXnGoNey7Hhfy06UxpOvcB Zvy9Jd6pTYvaG88JNLGMFxNz625jtQs= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1691478554; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=H/YLVCeWbOC5zGBWs9MF5sPBcfnhYRaJ1x4BlOnFxS4=; b=GfdwtYY+4z9vNKfS4ZmQ3lWCstnHBH9VZ/RJrOH9ct/6oXyYz+c85qWgEKfkDR2Epl1KD3 moV1z0LeV++M7GBQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id BFDFE13451; Tue, 8 Aug 2023 07:09:14 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id FUWULhrq0WRvVgAAMHmgww (envelope-from ); Tue, 08 Aug 2023 07:09:14 +0000 From: Daniel Wagner To: linux-nvme@lists.infradead.org Cc: linux-kernel@vger.kernel.org, Caleb Sander , Keith Busch , Sagi Grimberg , Daniel Wagner Subject: [PATCH libnvme v2 2/2] fabrics: Do not pass disable_sqflow if not supported Date: Tue, 8 Aug 2023 09:09:07 +0200 Message-ID: <20230808070907.18834-3-dwagner@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230808070907.18834-1-dwagner@suse.de> References: <20230808070907.18834-1-dwagner@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773680591157657899 X-GMAIL-MSGID: 1773691495153729739 From: Sagi Grimberg Only retry a connect attempt with disable_sqflow if the kernel actually supports this option. Reported-by: Sagi Grimberg Signed-off-by: Daniel Wagner --- src/nvme/fabrics.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/nvme/fabrics.c b/src/nvme/fabrics.c index 9725eeb3cda8..f0e85d3b766d 100644 --- a/src/nvme/fabrics.c +++ b/src/nvme/fabrics.c @@ -1043,7 +1043,8 @@ nvme_ctrl_t nvmf_connect_disc_entry(nvme_host_t h, if (!ret) return c; - if (errno == EINVAL && c->cfg.disable_sqflow) { + if (errno == EINVAL && c->cfg.disable_sqflow && + nvmf_check_option(h->r, disable_sqflow)) { errno = 0; /* disable_sqflow is unrecognized option on older kernels */ nvme_msg(h->r, LOG_INFO, "failed to connect controller, "