From nobody Thu Sep 11 21:26:39 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 E198AC001B0 for ; Tue, 8 Aug 2023 18:43:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230313AbjHHSnx (ORCPT ); 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 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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; } =20 +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 =3D __add_bool_argument(argstr, \ stringify(tok), \ arg); \ @@ -376,7 +384,7 @@ static int __add_argument(char **argstr, const char *to= k, 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 =3D __add_int_argument(argstr, \ stringify(tok), \ arg, \ @@ -393,7 +401,7 @@ static int __add_argument(char **argstr, const char *to= k, 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 =3D __add_int_or_minus_one_argument(argstr, \ stringify(tok), \ arg); \ @@ -409,7 +417,7 @@ static int __add_argument(char **argstr, const char *to= k, const char *arg) #define add_argument(r, argstr, tok, arg) \ ({ \ int ret; \ - if (r->options->tok) { \ + if (nvmf_check_option(r, tok)) { \ ret =3D __add_argument(argstr, \ stringify(tok), \ arg); \ @@ -913,9 +921,6 @@ int nvmf_add_ctrl(nvme_host_t h, nvme_ctrl_t c, free(traddr); } =20 - ret =3D __nvmf_supported_options(h->r); - if (ret) - return ret; ret =3D build_options(h, c, &argstr); if (ret) return ret; --=20 2.41.0 From nobody Thu Sep 11 21:26:39 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 EC234C001B0 for ; Tue, 8 Aug 2023 19:15:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235087AbjHHTP5 (ORCPT ); Tue, 8 Aug 2023 15:15:57 -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 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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; =20 - if (errno =3D=3D EINVAL && c->cfg.disable_sqflow) { + if (errno =3D=3D EINVAL && c->cfg.disable_sqflow && + nvmf_check_option(h->r, disable_sqflow)) { errno =3D 0; /* disable_sqflow is unrecognized option on older kernels */ nvme_msg(h->r, LOG_INFO, "failed to connect controller, " --=20 2.41.0