From nobody Thu Oct 2 13:07:19 2025 Received: from mail-vs1-f98.google.com (mail-vs1-f98.google.com [209.85.217.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 84809285C95 for ; Tue, 16 Sep 2025 22:06:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.217.98 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758060373; cv=none; b=jB7sn3WqLYfsBC8a7cWQm2f6MHywHyJ3+O4rB8hUCc0W5TOs9EBJLLaQbVrF/YUjRwJqDfiH1kEZb67+p3hmk+FPkGrs2o3xFV+f1aJOLxwr5/OQqRphXAEt00By/6Gj2yFrBaY1l65jsyVPbIZ20StfGgkK1VI9oleVTRq8ayY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758060373; c=relaxed/simple; bh=SIKkpUuN+UMf7521jvtEXvNWyyT5bVbD3qrrehDOkvQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=sOPKVA5uwGylDhmmI0ygmwCWtS7Wcso5KHaIfF38yvp9FdZSXaJgPrplpn0u/nCXNEn+2N3eQyWEZlFVtA7vmgang5pDl0V4xmcyafatT8dZPpkBeKXjlj4HRLPn08ttsgvw99dUEVh8v7tN1S3tQ59JG2J1XrbIR/sYAD6o6UU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com; spf=fail smtp.mailfrom=purestorage.com; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b=Qa/OtKv4; arc=none smtp.client-ip=209.85.217.98 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=purestorage.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b="Qa/OtKv4" Received: by mail-vs1-f98.google.com with SMTP id ada2fe7eead31-55716f2d3b9so3586502137.1 for ; Tue, 16 Sep 2025 15:06:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1758060370; x=1758665170; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=N4wsBOfcY7SP6UfIj6tlKK4cAsDmDK/TmLfUs8mNZfw=; b=Qa/OtKv4I0T6S6fGPCaPaJZFvWytzOoXDnT7Q3nH11SuoW9lBlrccns3LRDVfTsrGE yCzfJ+pmIyh1dItShechWM4zUJ2UT5yJQcIsbDg289Gvj5+hDNQ3MGmr4RVcnMrPkKoJ +SN8oHTstQMYL5xHsKPkPr9bqAKrTEBygsxzzUXzy+5hF827qwQtL6Ul8fDFNUg+eax6 FS5e5c+RJO6QQDMmJkTpJpXd7rJzPBVj+bfblBq1QiB9sTkk9rhkp5h7RoeR8mGIQLRw 8ThhbyLjDA4By8EfwTn78mFf4qSL5ndrG5GoWzJBcxlhmhs/h+9+sZy3mLRuPLP77Dip D5Aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758060370; x=1758665170; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=N4wsBOfcY7SP6UfIj6tlKK4cAsDmDK/TmLfUs8mNZfw=; b=ZJqgZ1uiE94ssTlxQ8BLR/Q+mbcT4dOtBq/ioqdJiKftXoxGWUndQhUg0MqEEdf6Hy EpyaUi3E/upiMyh2fjRnMe8yLHLYesM0g0igXyp06l3rURoMSDInEVsBBjYdB6XrbYzB b7spqSl4XMVprPuJ8QY/7XI1VCpDtjrfP2PNQaTIOYX9qqMmzlKl4Z2ALWexqo9IJVQ2 Btx6Pwck19x7hZ7QnVIwR1cqbWbTxUGSjT/DV6gLV8Un/sXIYqaSlwUwp9xlgbPBHguL CPSJSdG3sf4MCHCT2drb9dmzxaGIPHR/Fys2U25uXHa6igW2FqUawVnAUqo5hkpannjz fWNg== X-Forwarded-Encrypted: i=1; AJvYcCUw/+PdkuSp4C7clIBE8+mcdpaiMOAI9Va7dkM6WpFNeChjRQVoPzxaKL+Th0rdeiH5QTHsZwK/6IUP1Jw=@vger.kernel.org X-Gm-Message-State: AOJu0YyhCx82/LWx0nfwSY6W+lAmzbOe9xmZbb/RoQsiRR0ssi2iaT8P 4Qr05zSeOEGbmkjzMDIGpuuZH8AfffXL6RcodHwVUwg6iQM2CJETFZpUkdBm47U98kHHW0u9EK1 vDeBE4PFCxSQCEM8bqN0OcupGx1jFKYLAfL5mCdLoKUhmlJCV1v7W X-Gm-Gg: ASbGncu8PdvrSShTS6clzDymLw1rrSiXY82qWl7tNVmSavBrz7aHTOdUuXSlKz7c00d EpWPRY7kvcXJUUyA/7+S3NiX2fjaQBgFJQR5AxaMn+nTV8XbICRsGZ8hYdEy8t5a+IuGgMtBfLo a00ZnXVIKqRs5kyqp+fxnsbwITWDmKDl+dDhOXKv7jkdGMP5WyLj/TqUXv1JBwa36IHs+7tK0KO Iey5snjjez5NeJtdW7s/c5lQF9aR/CMQMgsAyZWtybbGGE5FN3iIfwGknIXQQHSZy8rJK9+z3v1 9fM0ej242TdI+eogIi63YLcmOLJO1zPVfxFJBewJZhCUzGcmomqgwDW//ms= X-Google-Smtp-Source: AGHT+IFugGzusLHKIrSZCStJj5Llvm4aQRrc73nKgf/iXkByRK+6zltAVsAANgINDHQF55kouKN5b5uW5P5c X-Received: by 2002:a05:6102:5a92:b0:526:1e74:9548 with SMTP id ada2fe7eead31-55608ea0285mr7126569137.1.1758060370249; Tue, 16 Sep 2025 15:06:10 -0700 (PDT) Received: from c7-smtp-2023.dev.purestorage.com ([2620:125:9017:12:36:3:5:0]) by smtp-relay.gmail.com with ESMTPS id ada2fe7eead31-557f9d4b892sm975973137.5.2025.09.16.15.06.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Sep 2025 15:06:10 -0700 (PDT) X-Relaying-Domain: purestorage.com Received: from dev-ushankar.dev.purestorage.com (dev-ushankar.dev.purestorage.com [IPv6:2620:125:9007:640:7:70:36:0]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id C7E57340A4D; Tue, 16 Sep 2025 16:06:08 -0600 (MDT) Received: by dev-ushankar.dev.purestorage.com (Postfix, from userid 1557716368) id C2794E40837; Tue, 16 Sep 2025 16:06:08 -0600 (MDT) From: Uday Shankar Date: Tue, 16 Sep 2025 16:05:55 -0600 Subject: [PATCH 1/3] selftests: ublk: kublk: simplify feat_map definition Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250916-ublk_features-v1-1-52014be9cde5@purestorage.com> References: <20250916-ublk_features-v1-0-52014be9cde5@purestorage.com> In-Reply-To: <20250916-ublk_features-v1-0-52014be9cde5@purestorage.com> To: Caleb Sander Mateos , Ming Lei , Shuah Khan Cc: linux-block@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Uday Shankar X-Mailer: b4 0.14.2 Simplify the definition of feat_map by introducing a helper macro FEAT_NAME to avoid having to type the feature name twice. As a side effect, this changes the names in the feature list to be the full macro name instead of the abbreviated names that were used before, but this is a good change for clarity. Using the full feature macro names ruins the alignment of the output, so change the output format to put each feature's hex value before its name, as this is easier to align nicely. The output now looks as follows: # ./kublk features ublk_drv features: 0x7fff 0x1 : UBLK_F_SUPPORT_ZERO_COPY 0x2 : UBLK_F_URING_CMD_COMP_IN_TASK 0x4 : UBLK_F_NEED_GET_DATA 0x8 : UBLK_F_USER_RECOVERY 0x10 : UBLK_F_USER_RECOVERY_REISSUE 0x20 : UBLK_F_UNPRIVILEGED_DEV 0x40 : UBLK_F_CMD_IOCTL_ENCODE 0x80 : UBLK_F_USER_COPY 0x100 : UBLK_F_ZONED 0x200 : UBLK_F_USER_RECOVERY_FAIL_IO 0x400 : UBLK_F_UPDATE_SIZE 0x800 : UBLK_F_AUTO_BUF_REG 0x1000 : UBLK_F_QUIESCE 0x2000 : UBLK_F_PER_IO_DAEMON 0x4000 : unknown Signed-off-by: Uday Shankar Reviewed-by: Ming Lei --- tools/testing/selftests/ublk/kublk.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/tools/testing/selftests/ublk/kublk.c b/tools/testing/selftests= /ublk/kublk.c index 6512dfbdbce3a82f1202de17319ea593337427e6..4e5d82f2a14a01d9e56d31126ea= e2e26ec718b6c 100644 --- a/tools/testing/selftests/ublk/kublk.c +++ b/tools/testing/selftests/ublk/kublk.c @@ -1363,21 +1363,22 @@ static int cmd_dev_list(struct dev_ctx *ctx) static int cmd_dev_get_features(void) { #define const_ilog2(x) (63 - __builtin_clzll(x)) +#define FEAT_NAME(f) [const_ilog2(f)] =3D #f static const char *feat_map[] =3D { - [const_ilog2(UBLK_F_SUPPORT_ZERO_COPY)] =3D "ZERO_COPY", - [const_ilog2(UBLK_F_URING_CMD_COMP_IN_TASK)] =3D "COMP_IN_TASK", - [const_ilog2(UBLK_F_NEED_GET_DATA)] =3D "GET_DATA", - [const_ilog2(UBLK_F_USER_RECOVERY)] =3D "USER_RECOVERY", - [const_ilog2(UBLK_F_USER_RECOVERY_REISSUE)] =3D "RECOVERY_REISSUE", - [const_ilog2(UBLK_F_UNPRIVILEGED_DEV)] =3D "UNPRIVILEGED_DEV", - [const_ilog2(UBLK_F_CMD_IOCTL_ENCODE)] =3D "CMD_IOCTL_ENCODE", - [const_ilog2(UBLK_F_USER_COPY)] =3D "USER_COPY", - [const_ilog2(UBLK_F_ZONED)] =3D "ZONED", - [const_ilog2(UBLK_F_USER_RECOVERY_FAIL_IO)] =3D "RECOVERY_FAIL_IO", - [const_ilog2(UBLK_F_UPDATE_SIZE)] =3D "UPDATE_SIZE", - [const_ilog2(UBLK_F_AUTO_BUF_REG)] =3D "AUTO_BUF_REG", - [const_ilog2(UBLK_F_QUIESCE)] =3D "QUIESCE", - [const_ilog2(UBLK_F_PER_IO_DAEMON)] =3D "PER_IO_DAEMON", + FEAT_NAME(UBLK_F_SUPPORT_ZERO_COPY), + FEAT_NAME(UBLK_F_URING_CMD_COMP_IN_TASK), + FEAT_NAME(UBLK_F_NEED_GET_DATA), + FEAT_NAME(UBLK_F_USER_RECOVERY), + FEAT_NAME(UBLK_F_USER_RECOVERY_REISSUE), + FEAT_NAME(UBLK_F_UNPRIVILEGED_DEV), + FEAT_NAME(UBLK_F_CMD_IOCTL_ENCODE), + FEAT_NAME(UBLK_F_USER_COPY), + FEAT_NAME(UBLK_F_ZONED), + FEAT_NAME(UBLK_F_USER_RECOVERY_FAIL_IO), + FEAT_NAME(UBLK_F_UPDATE_SIZE), + FEAT_NAME(UBLK_F_AUTO_BUF_REG), + FEAT_NAME(UBLK_F_QUIESCE), + FEAT_NAME(UBLK_F_PER_IO_DAEMON), }; struct ublk_dev *dev; __u64 features =3D 0; @@ -1404,7 +1405,7 @@ static int cmd_dev_get_features(void) feat =3D feat_map[i]; else feat =3D "unknown"; - printf("\t%-20s: 0x%llx\n", feat, 1ULL << i); + printf("0x%-16llx: %s\n", 1ULL << i, feat); } } =20 --=20 2.34.1