From patchwork Thu Jun 6 03:51:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Zhijian X-Patchwork-Id: 13687796 Received: from esa11.hc1455-7.c3s2.iphmx.com (esa11.hc1455-7.c3s2.iphmx.com [207.54.90.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A1E831DA32 for ; Thu, 6 Jun 2024 03:52:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=207.54.90.137 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717645930; cv=none; b=PuoI02qIZpA4y1hgvZ1xIjmXOUcszAdtzTPQl7hwp4NZM/OMSyDSdc33RJ2iJ0LVOB22krRnCPBZj6xHH1QGwYfkWD5XbW2NDLxZkD+h4QB1kbAn5uIF9+1XpHFZJ1R08ubZR35bR01jsel0JOmEazDMq3nfbgoT8R0rAujremk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717645930; c=relaxed/simple; bh=hqdmokjTIO4MUs6Fhm4Qm6/CsaKSesyP+zgp2Iw9hS0=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=Ctpra14dTrld5vetB+jpwyh9CgQtMZeQ2sA6QqFEBAhlb3dKfF+8WHwwWwex5/+s2SdGWuiZWKAuYi8wjFML6tuLEp3UO1klxWX7uwKF2irNNTEdNwzFfyFDMLXCvT9Di8U2TqIdQnqGWh+KMOkaHWULodb883wpAB3Wj8Xqmb8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=fujitsu.com; spf=pass smtp.mailfrom=fujitsu.com; dkim=pass (2048-bit key) header.d=fujitsu.com header.i=@fujitsu.com header.b=JX85AgwQ; arc=none smtp.client-ip=207.54.90.137 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=fujitsu.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fujitsu.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fujitsu.com header.i=@fujitsu.com header.b="JX85AgwQ" DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=fujitsu.com; i=@fujitsu.com; q=dns/txt; s=fj2; t=1717645929; x=1749181929; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=hqdmokjTIO4MUs6Fhm4Qm6/CsaKSesyP+zgp2Iw9hS0=; b=JX85AgwQJkGu/7+GO9TkeSs67dJ+hPOadP/dF3E/ccNFtugaqYhYfGhE HzjRrj9bW7L03E+c47WCh8dHirgeZWgeUFupRtL1xRRoiEG/RNOfnvv56 yhMLQTaRkMCmaCW77xYIXgZK3LMT++cUWuvfuciCE0VZeRynLU7PP09Vm 00RaHA4k8S11xcU0EpNd4nVTe+6ozdVbTzShQKknOhKBYKh6AZvVtumRm 8kr87j008SrgmjGD2/HX4x4WNf7YK39v/mwb0FKOZ0gcNlqXaHCqsjAc6 WGFo0tit1xR1SxrTgfIkzd2F0qtLCA94LZkccXBGKqVnz36Nj1YnvTrX3 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,11094"; a="141554598" X-IronPort-AV: E=Sophos;i="6.08,218,1712588400"; d="scan'208";a="141554598" Received: from unknown (HELO yto-r1.gw.nic.fujitsu.com) ([218.44.52.217]) by esa11.hc1455-7.c3s2.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jun 2024 12:52:00 +0900 Received: from yto-m4.gw.nic.fujitsu.com (yto-nat-yto-m4.gw.nic.fujitsu.com [192.168.83.67]) by yto-r1.gw.nic.fujitsu.com (Postfix) with ESMTP id E8A17DAD2F for ; Thu, 6 Jun 2024 12:51:57 +0900 (JST) Received: from kws-ab4.gw.nic.fujitsu.com (kws-ab4.gw.nic.fujitsu.com [192.51.206.22]) by yto-m4.gw.nic.fujitsu.com (Postfix) with ESMTP id 29C47D3F03 for ; Thu, 6 Jun 2024 12:51:57 +0900 (JST) Received: from edo.cn.fujitsu.com (edo.cn.fujitsu.com [10.167.33.5]) by kws-ab4.gw.nic.fujitsu.com (Postfix) with ESMTP id A3AA9E2B25 for ; Thu, 6 Jun 2024 12:51:56 +0900 (JST) Received: from localhost.localdomain (unknown [10.167.226.45]) by edo.cn.fujitsu.com (Postfix) with ESMTP id A265F1A000A; Thu, 6 Jun 2024 11:51:55 +0800 (CST) From: Li Zhijian To: nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org Cc: Li Zhijian , Fan Ni , Vishal Verma , Dave Jiang Subject: [ndctl PATCH v3 1/2] daxctl: Fail create-device if extra parameters are present Date: Thu, 6 Jun 2024 11:51:48 +0800 Message-Id: <20240606035149.1030610-1-lizhijian@fujitsu.com> X-Mailer: git-send-email 2.31.1 Precedence: bulk X-Mailing-List: linux-cxl@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-TM-AS-Product-Ver: IMSS-9.1.0.1417-9.0.0.1002-28434.004 X-TM-AS-User-Approved-Sender: Yes X-TMASE-Version: IMSS-9.1.0.1417-9.0.1002-28434.004 X-TMASE-Result: 10--8.969300-10.000000 X-TMASE-MatchedRID: kr2EN9r3yrhQdboikf/uEBFbgtHjUWLyMrX+p1uNztBJEjJjpEhCn+Af SNitoKTvgcDogF3e9CwXWBETjFf6a8OiXRC56ox3KiJEqUFWRggEa8g1x8eqF3hh5KUdlgWipie YwslGH4lQHH8z5x0cCG9QOoI2Wy8o6k5u/mZf6RWdVNZaI2n6/3LhUU/qa4OGUV7F0kclfoLEGt fvqB5eVA1IdXW6IZteoYKkV3/WQ5qwQEC6hpSor3V7tdtvoibaQRPK6viU2M6bKItl61J/yZ+in TK0bC9eKrauXd3MZDUCbdlAfAbarhe7A+M+eX8rLGmfJoFGZYIEDgbVZ+wG+GE15In5LtBA X-TMASE-SNAP-Result: 1.821001.0001-0-1-22:0,33:0,34:0-0 Previously, an incorrect index(1) for create-device is causing the 1st extra parameter to be ignored, which is wrong. For example: $ daxctl create-device region0 [ { "chardev":"dax0.1", "size":268435456, "target_node":1, "align":2097152, "mode":"devdax" } ] created 1 device where above user would want to specify '-r region0'. Check extra parameters starting from index 0 to ensure no extra parameters are specified for create-device. Cc: Fan Ni Signed-off-by: Li Zhijian Reviewed-by: Vishal Verma Reviewed-by: Dave Jiang --- V3: - Fix commit message and move the 'i' setting near the usage # Alison - collect reviewed tags, no logical changes. V2: Remove the external link[0] in case it get disappeared in the future. [0] https://github.com/moking/moking.github.io/wiki/cxl%E2%80%90test%E2%80%90tool:-A-tool-to-ease-CXL-test-with-QEMU-setup%E2%80%90%E2%80%90Using-DCD-test-as-an-example#convert-dcd-memory-to-system-ram Signed-off-by: Li Zhijian --- daxctl/device.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/daxctl/device.c b/daxctl/device.c index 839134301409..6ea91eb45315 100644 --- a/daxctl/device.c +++ b/daxctl/device.c @@ -402,7 +402,10 @@ static const char *parse_device_options(int argc, const char **argv, action_string); rc = -EINVAL; } - for (i = 1; i < argc; i++) { + + /* ACTION_CREATE expects 0 parameters */ + i = action == ACTION_CREATE ? 0 : 1; + for (; i < argc; i++) { fprintf(stderr, "unknown extra parameter \"%s\"\n", argv[i]); rc = -EINVAL; } From patchwork Thu Jun 6 03:51:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Zhijian X-Patchwork-Id: 13687797 Received: from esa3.hc1455-7.c3s2.iphmx.com (esa3.hc1455-7.c3s2.iphmx.com [207.54.90.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BD2B21DA32 for ; Thu, 6 Jun 2024 03:53:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=207.54.90.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717645993; cv=none; b=liy0dFCMvI4EJ/JhySiBHXBN/lXdePXCJypqQjrnFwBLh5qVaBoeaf6D6n3D0k3jBd7nj0eqJZi8TY4qWjawJWp9Gys1ZGLvHaSB/t1lG4Lpjk3IzgBk6HMVv4xaE2BlrywM2qvl2Q8BMsSGDpcJRxqUu6u9epfLbEwc6xfJeIE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717645993; c=relaxed/simple; bh=pfwN24pMokjgAHOp1BB69eIt/t2Yel77P+50tad7Y+A=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=eT2tMxIMovFituDKpKcGJAnP6Dh0pW8XDo+IS3B+Pq5Z/r7BjF9E8fmOBAlbtAjvRi3BVCHTUvCwmgAyFsWBHbc2XaQVEy2pARN5hQXWbjIZ/WKI1eTnQbtnTmG74rEAweGz5VVFwHhxW5vFVV0cS3r0qafmhiZ0Arq0BOqCXvQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=fujitsu.com; spf=pass smtp.mailfrom=fujitsu.com; dkim=pass (2048-bit key) header.d=fujitsu.com header.i=@fujitsu.com header.b=XIgG5/Qj; arc=none smtp.client-ip=207.54.90.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=fujitsu.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fujitsu.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fujitsu.com header.i=@fujitsu.com header.b="XIgG5/Qj" DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=fujitsu.com; i=@fujitsu.com; q=dns/txt; s=fj2; t=1717645992; x=1749181992; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=pfwN24pMokjgAHOp1BB69eIt/t2Yel77P+50tad7Y+A=; b=XIgG5/QjrPEcbdNSod8vuX+Hp8xhnoD1suZjw3LTq02QfFQINn8NFJPW DPgMRRrsyNQTCU4/R+Vl5lOLNFPNIWuKyJaEIbo8Qip3X0EbdGNsOzI47 7t5/wYivKxI13fJ9g2eEOrD4VIx79SJTXn5nZlVP0ZPpLxnnrNvtpsXP6 4lz3lG6t9NSr3CpUtPA+H0DgfVPSG8RDx1MTieDM0xpTmaLOi4vTwaRcl 3HZRD+FvA3xmrt7H0aLR40GZJUo3YCIqPakvr9Hen7ZtG5UZmSDJ06JDc hpq65SdaVrZgoOQUVpgNbtGTYTv/3R8Jb2iAxztQuD2nNC3otSP+TverO A==; X-IronPort-AV: E=McAfee;i="6600,9927,11094"; a="162141539" X-IronPort-AV: E=Sophos;i="6.08,218,1712588400"; d="scan'208";a="162141539" Received: from unknown (HELO yto-r2.gw.nic.fujitsu.com) ([218.44.52.218]) by esa3.hc1455-7.c3s2.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jun 2024 12:52:00 +0900 Received: from yto-m1.gw.nic.fujitsu.com (yto-nat-yto-m1.gw.nic.fujitsu.com [192.168.83.64]) by yto-r2.gw.nic.fujitsu.com (Postfix) with ESMTP id 2CF08C68E5 for ; Thu, 6 Jun 2024 12:51:58 +0900 (JST) Received: from kws-ab3.gw.nic.fujitsu.com (kws-ab3.gw.nic.fujitsu.com [192.51.206.21]) by yto-m1.gw.nic.fujitsu.com (Postfix) with ESMTP id 78C44CFFA5 for ; Thu, 6 Jun 2024 12:51:57 +0900 (JST) Received: from edo.cn.fujitsu.com (edo.cn.fujitsu.com [10.167.33.5]) by kws-ab3.gw.nic.fujitsu.com (Postfix) with ESMTP id F230220081314 for ; Thu, 6 Jun 2024 12:51:56 +0900 (JST) Received: from localhost.localdomain (unknown [10.167.226.45]) by edo.cn.fujitsu.com (Postfix) with ESMTP id 7424E1A000C; Thu, 6 Jun 2024 11:51:56 +0800 (CST) From: Li Zhijian To: nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org Cc: Li Zhijian , Vishal Verma , Dave Jiang Subject: [ndctl PATCH v3 2/2] daxctl: Remove unused options in create-device usage message Date: Thu, 6 Jun 2024 11:51:49 +0800 Message-Id: <20240606035149.1030610-2-lizhijian@fujitsu.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240606035149.1030610-1-lizhijian@fujitsu.com> References: <20240606035149.1030610-1-lizhijian@fujitsu.com> Precedence: bulk X-Mailing-List: linux-cxl@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-TM-AS-Product-Ver: IMSS-9.1.0.1417-9.0.0.1002-28434.004 X-TM-AS-User-Approved-Sender: Yes X-TMASE-Version: IMSS-9.1.0.1417-9.0.1002-28434.004 X-TMASE-Result: 10-2.789500-10.000000 X-TMASE-MatchedRID: D7uj3L7FQ3IZHQl0dvECsQvBTB90+he+MVx/3ZYby78lTfGXXk+l8879 PlJmAmXDoKHWBVnoJHPmn3xyPJAJoh2P280ZiGmROWUWxTQJdI8mLcCO64Exkpsoi2XrUn/J8m+ hzBStansUGm4zriL0oQtuKBGekqUpnH7sbImOEBRFzth5Inra65DPQ/OWjuSi09eMkkde1DbbJi uAbwHBJyPzf07AeiJ8Q1mBwk8ucWczUbs4+5aCjfBsDwidnGiRczTonAH5/C2bDRBqS2n66yzP5 xAyz9Oenvkw4sh/+PcMX5CwH5DTUmgGZNLBHGNe X-TMASE-SNAP-Result: 1.821001.0001-0-1-22:0,33:0,34:0-0 RECONFIG_OPTIONS and ZONE_OPTIONS are not implemented for create-device and they will be ignored by create-device. Remove them so that the usage message is identical to the manual. Reviewed-by: Vishal Verma Reviewed-by: Dave Jiang Signed-off-by: Li Zhijian --- V3: Collect reviewed-by tags. update subject # Aliso V2: make the usage match the manual because the usage is wrong. --- daxctl/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/daxctl/device.c b/daxctl/device.c index 6ea91eb45315..dc166d593336 100644 --- a/daxctl/device.c +++ b/daxctl/device.c @@ -98,8 +98,6 @@ OPT_BOOLEAN('\0', "no-movable", ¶m.no_movable, \ static const struct option create_options[] = { BASE_OPTIONS(), CREATE_OPTIONS(), - RECONFIG_OPTIONS(), - ZONE_OPTIONS(), OPT_END(), };