From patchwork Tue Aug 8 09:15:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 132672 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp2308324vqr; Tue, 8 Aug 2023 11:17:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG9vW8pKL8uMZt1/dRoukZDH82353koXGoBITw7dKVF2LXFw50YF9KdFZ/u185jPXfvOTNG X-Received: by 2002:a05:6a20:938c:b0:138:64d4:b055 with SMTP id x12-20020a056a20938c00b0013864d4b055mr336035pzh.55.1691518620607; Tue, 08 Aug 2023 11:17:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691518620; cv=none; d=google.com; s=arc-20160816; b=YcGRoOXkQ5hJqs+1V1T9B3n4sQEwJhUYM8np/yHnucf0ucpM+2chtrNcEXpgkYe8+y UZ8h6qjsDyFoI+20zBpU4RRVR49xdWQj516zTElyGbJbyAGM+ljyYkmUp7gAtNx55Bww zA3iW2Z/MrF770eEnpVCHpAZlnA+beK7TU/kW+fnxHUvwBlTa0nUFfM/FBpwXihNDgb6 0X69h51JXBlpw9rYqyXGD+lCUyhL0BBw8zel0uIbLgss5X+G6OZXfcKo3YVh00VSB+F1 6Yl5HrH78oiao6AiZj19XVQViMntN7H/KHL+u3s9Il0KQCZ5vx4CdQPe3B83guN40ju+ FXSg== 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=r5CubQ06DF17SP19o2KqtTV6qavDw18WzWzWwx8ram4XMvMY5wo468sgh41Q1dYUcH cxtAN5vQ27xFBLad/RW1vlwuZ8yFWKL/28WCtUPQ3uMerKvzpXku+5Ddn9FWCt4MhYP+ eahfO4hRmn0UlgQOo99VKd5qnQHm7p9yiG366tVD48yMNqE/FM94P10jumVsHFVw/Vcg +Yo9kIftMpOHLzc8hqS8ep2LVjVOD3W5+SZHEPJaxMEO82n0BZtpLyLpMpDUAVY3VIO9 mu2+DSX92K1NaO5MYhL9l0KpUD/J7VXGgXtX8yh8vLem8yMplPnBxdKwjsYtRGVaUrNo i4Jw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b="snqUzZ/B"; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=A2nzBfaK; 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 d8-20020a655888000000b0056383a7ddc2si7402450pgu.400.2023.08.08.11.16.47; Tue, 08 Aug 2023 11:17:00 -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="snqUzZ/B"; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=A2nzBfaK; 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 S235089AbjHHRv2 (ORCPT + 99 others); Tue, 8 Aug 2023 13:51:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34658 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229991AbjHHRvF (ORCPT ); Tue, 8 Aug 2023 13:51:05 -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 A047527575 for ; Tue, 8 Aug 2023 09:22:50 -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 33CFF2247B; Tue, 8 Aug 2023 09:15:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1691486155; 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=snqUzZ/B6zgsf/a2M2yhOjHmsHNeE9mHSaQedd9HVD8zCfvICExE8fF8i2wK6Mxfya9hLZ 2/YPrWwNzvAADwz9fiEJCcm5eGVH4DwVehewaNCgTRA4QOA24R82BZ5h8KzZzAsfuMyASc 7NNIIhFghv9O3Yq9DX7O1mnhEB4tgtw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1691486155; 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=A2nzBfaKm1XJcZKFQiPgvBxqO4IyAZZq1GHglpbsmBy2zo0jaP1RAVWN0z6khC9NMN40dY wK+XojC5yp1xewAA== 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 256AB13451; Tue, 8 Aug 2023 09:15:55 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id pT4SCcsH0mRCEwAAMHmgww (envelope-from ); Tue, 08 Aug 2023 09:15:55 +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 v3 1/2] fabrics: Read the supported options lazy Date: Tue, 8 Aug 2023 11:15:49 +0200 Message-ID: <20230808091550.25349-2-dwagner@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230808091550.25349-1-dwagner@suse.de> References: <20230808091550.25349-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: 1773685829083167920 X-GMAIL-MSGID: 1773685829083167920 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 09:15:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 132675 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp2308912vqr; Tue, 8 Aug 2023 11:17:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE20zxB2VtR9aGwJNy785jRLOrOAhJCkYWs4XVLOXrXt1pnkrK1PZIXAcbkcu9ltrqPiqRN X-Received: by 2002:a9d:6c4c:0:b0:6b4:5ed3:8246 with SMTP id g12-20020a9d6c4c000000b006b45ed38246mr471186otq.2.1691518675269; Tue, 08 Aug 2023 11:17:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691518675; cv=none; d=google.com; s=arc-20160816; b=T36ItYg8ah7FqGDIJJQ+fuekiY0iO+49t3CSECrvAh139d0cx85Yoyga+c1l/espe9 VxVk9rJz2DQhxO4CZGiw92hOwnOiUDgzaKOBzYbxplklLNbWdVTdl0lK3V72ZW9otWBY s5c02lpYKy75FwwedvrPO6yPQuvq+AE6pr9kCZDdZpxokoGPRtMvZ79WJuxN4DyNKFGa dxt7x9ST1V4hKsLJEKLItvkEGBrM3yrdN3BvxrypQFoy13V7aAy5YwJV3/iT/pbGdxA4 rvGz+iadTq9TMOqENQehkCKnXebt0ZkQqRcXsZmUMdh6yzsyVFxSHgyxcYAAf9PnPjFM Z6Mg== 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=iRtgBAku4257SBCPX9EvO+HL6e6liwMpsxDBOvqZyE8=; fh=m0SXguoZOlId+vXza3k05csFzKE/FEfC5yKwj3DLHLU=; b=DLyMX85p57Cjfs7Ow+/nTDP0JJ0/g+G5p0vG8nhAptdO6UaVCaVZsQ86vuliwBh3bS cxvdirxrzezeXs/HNI789AQJFakc9wfhggV2DCGlNYUANTWv5RPCLNErqvjn6CjRkmFS 5WSPuDWacdP4DFGg2qbubghSRxU35acilLDWXoChC8jvbu3XpacL+sfUSlH0VPiwaQY4 0GtpXT4r5lDyrnICqlhsotXDQ66+XAtKfERQCL7mFj+QJFelsXS6Z5BEP+IMuIkW/npX UEKuwHtRtFyDE+e6k5auLRSfMBFHwKeWNLt4MUl60JyfAeg34g30TC/0WUk1B03HDYBX oRjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=ger7pBuT; 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 c37-20020a631c65000000b0055c868268f9si7539894pgm.462.2023.08.08.11.17.42; Tue, 08 Aug 2023 11:17:55 -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=ger7pBuT; 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 S234519AbjHHRzS (ORCPT + 99 others); Tue, 8 Aug 2023 13:55:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50888 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233604AbjHHRyx (ORCPT ); Tue, 8 Aug 2023 13:54:53 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 74EC229459 for ; Tue, 8 Aug 2023 09:24:42 -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-out2.suse.de (Postfix) with ESMTPS id C2EC420018; Tue, 8 Aug 2023 09:15:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1691486155; 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=iRtgBAku4257SBCPX9EvO+HL6e6liwMpsxDBOvqZyE8=; b=ger7pBuTrwZ1HKfT8z3sjooEkTpJe3raGS/n3xoYQLq0YXFOHoeHwbeOG6Bj+fsq/6zX54 E1NP09owVZGoBvJeH64xMMrenfzb0bzQiygBaUWOhWaAINnsLapt19zbZUkeg0wBX+Qq+I j8LrLs0n9TeihtMldqsK9LaAO/bydwc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1691486155; 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=iRtgBAku4257SBCPX9EvO+HL6e6liwMpsxDBOvqZyE8=; b=y8Vlt3iowHtcCUjxibL0cRrP6Ih1Ml60GjqxgTHt1Yc1NMC+MzeOs2fm8IkUJeY+N/r/h1 l43pwJ9arV5cIGBw== 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 B4FED13451; Tue, 8 Aug 2023 09:15:55 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 5zvcK8sH0mRFEwAAMHmgww (envelope-from ); Tue, 08 Aug 2023 09:15:55 +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 v3 2/2] fabrics: Do not pass disable_sqflow if not supported Date: Tue, 8 Aug 2023 11:15:50 +0200 Message-ID: <20230808091550.25349-3-dwagner@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230808091550.25349-1-dwagner@suse.de> References: <20230808091550.25349-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: 1773685886309835014 X-GMAIL-MSGID: 1773685886309835014 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 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/nvme/fabrics.c b/src/nvme/fabrics.c index 9725eeb3cda8..11d99580072a 100644 --- a/src/nvme/fabrics.c +++ b/src/nvme/fabrics.c @@ -1031,8 +1031,11 @@ nvme_ctrl_t nvmf_connect_disc_entry(nvme_host_t h, return NULL; } - if (e->treq & NVMF_TREQ_DISABLE_SQFLOW) + if (e->treq & NVMF_TREQ_DISABLE_SQFLOW && + nvmf_check_option(h->r, disable_sqflow)) c->cfg.disable_sqflow = true; + else + c->cfg.disable_sqflow = false; if (e->trtype == NVMF_TRTYPE_TCP && (e->treq & NVMF_TREQ_REQUIRED ||