From patchwork Wed Apr 23 21:29:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uday Shankar X-Patchwork-Id: 883654 Received: from mail-pl1-f226.google.com (mail-pl1-f226.google.com [209.85.214.226]) (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 85AFB242D75 for ; Wed, 23 Apr 2025 21:29:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.226 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745443747; cv=none; b=LOK+npnNH8uuCd8uWVjECPAlT6+PzK8XUUqFsos4BI+B4jaFsBUnCNPuVo1Q7YsvQpVBdFtvJJj75BGfZCK83Wk8gL2kewU16RhVgruIjnXXDTpTlDWrphBuYF/LOHRT3gn1kagS6p4ug4k1Uq4iH41w48y/7IfNDTAhEfBzopM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745443747; c=relaxed/simple; bh=D9ftuTBIipMMMb+INoV/N9oBXuVjGGG57prHPs3PuGM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=IlQtpkP+PUdQaSa8ufPWw9xAtE1561xzRW1bQPnrW0/S9iJimto0Cji/rsrNGc7DXoVw+n3NhSDd2CKPJWDF+UKTvYaLXrLJQMtlrd2U6uXbnoglgrcVuKw8sNUe1T2nefV86zWhN8Jvh/v/2ak9FnyzOHot/B9WqQCcEiNO+WY= 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=fR++VZPQ; arc=none smtp.client-ip=209.85.214.226 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="fR++VZPQ" Received: by mail-pl1-f226.google.com with SMTP id d9443c01a7336-224171d6826so4243175ad.3 for ; Wed, 23 Apr 2025 14:29:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1745443745; x=1746048545; 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=6FfkdId7QoskoICSJ3Xv6KLiuYz8Ht/aFE5W2Si3esE=; b=fR++VZPQK2WtODPxiZttcKwzUqpd92FEr/+qEtOTiKZkS6E37yiQMW0q7glp+0nHAF NcwA8GlP9r6Zr9YY2yDqRLGHV2TownrkvlRVn1+vGqeteT73s+V0jWZPCz0/tSz9O4wv myMYUSkMuE0jnH66Fzn/KVYEa6u5+e0a44rOAiB1P+0ZF02al48O6fv9+FDTHV9qaEMe Gi5rQars3hPUd54q/massO9V78dN+26ZRYcwb49p3scAacK8FFcAhHHahhdbi3MrRcZM J8ldIFvyxvR9K8G0bd80SqXzXdf6udzKgMUcdtjvxLsjxSpLC916njdiEdS5BX8MIsdW JDeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745443745; x=1746048545; 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=6FfkdId7QoskoICSJ3Xv6KLiuYz8Ht/aFE5W2Si3esE=; b=e8VmDIQCtjllPIQsx9Z0fuLP+XzUNmtgCCI5L0HcoONpBlaAI5odLzZw8Mb46Zab5n 9kX00hDIziCs9MXVbLmrtdxdpGETyIfwqT2HKkPNq8baoZM1anO74GiacW6KjaJ/E2T2 SCpcDWx0insFiHXMwyNvWTYTnlY6/uRdVb6kWP4YcL4G9c/sv9PNiY4zhTce/HVHnX5a D1SPGSK6qdu489F37AhIPEpLqjPHUy3XqpBPyABY4jP+1RHUKGjda8kJ8SAF4gf7btDo peJBQYpFtSyVcTcCdENl5WBYbT4yDuWrfhtnXGyfaaN2xVhRjm8jQSDhl0GTibsmDXb1 Wwiw== X-Forwarded-Encrypted: i=1; AJvYcCXMHxSfxUAp4FIA3KY2YuOyZbpJRWG7R7wruCzQj3dev1w22+4tWOluNXLXaawjn8sFQW7cRUkZd5w/FUskPLY=@vger.kernel.org X-Gm-Message-State: AOJu0YyMEo00WByPDWYrW2MhCIk3k1g+tmmY9tGVTr/60p5oMbIkRFxw dgWZl+PId0D1/7vVOr+jRvwtjdRAUytA2dS8eSoC2aCIEX+m4O5jEG+/GIZssNCKPV05jIgo/Tl IzlGoHvsnBmYHF7oUWTEKtzd+TjeAdQATyvKCh3gsur3sri5e X-Gm-Gg: ASbGncsO5iM6STY/YeySgO9L+V3qBcykC8whth3XzYYp5ie1IT+wkm3VHS4RYDS5mDU nDVMPf/MZDgSJLOpgmrmtlFAXdvTP7ph5bWU3je50SHi45En4V8YsbPqiyxZM95jne0DRY3mFy/ A6oRa+Wufu28qS+T1+pKsU0ZC+VIrFikYbgd34nJK8/uFLc/w1Q0P3bT0ZhFAHc0ea+FJqftfCU 3QVw6L0QN101w2vMISgiGLBmPUmqts/yewpTz5bzQoCDA5u5/FUlTz2/PzBj6eLWlnLd08HoCCG 4FyBe4Idr8oQSfapr+YkaS/TXLBwEnQ= X-Google-Smtp-Source: AGHT+IGAMoZZFngPD9ZZ3v3uIDuQwCl93Fgjflm9tE0fW/Q3qQPIK/rfA5ej5yiEulIgWPS4pv9hVx43DNB+ X-Received: by 2002:a17:902:da8a:b0:224:191d:8a79 with SMTP id d9443c01a7336-22db3c0bf2amr834295ad.27.1745443744799; Wed, 23 Apr 2025 14:29:04 -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 d9443c01a7336-22c50d88a78sm6232705ad.100.2025.04.23.14.29.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Apr 2025 14:29:04 -0700 (PDT) X-Relaying-Domain: purestorage.com Received: from dev-ushankar.dev.purestorage.com (dev-ushankar.dev.purestorage.com [10.7.70.36]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id F22C134058D; Wed, 23 Apr 2025 15:29:03 -0600 (MDT) Received: by dev-ushankar.dev.purestorage.com (Postfix, from userid 1557716368) id E5B66E4031E; Wed, 23 Apr 2025 15:29:03 -0600 (MDT) From: Uday Shankar Date: Wed, 23 Apr 2025 15:29:02 -0600 Subject: [PATCH 1/2] selftests: ublk: kublk: build with -Werror Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250423-ublk_selftests-v1-1-7d060e260e76@purestorage.com> References: <20250423-ublk_selftests-v1-0-7d060e260e76@purestorage.com> In-Reply-To: <20250423-ublk_selftests-v1-0-7d060e260e76@purestorage.com> To: 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 Heeding compiler warnings is generally a good idea, and is easy to do for kublk since there is not much source code. Turn warnings into errors so that anyone making changes is forced to heed them. Signed-off-by: Uday Shankar --- tools/testing/selftests/ublk/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/ublk/Makefile b/tools/testing/selftests/ublk/Makefile index ec4624a283bce2ebeed80509be6573c1b7a3623d..57e580253a68bc497b4292d07ab94d21f4feafdd 100644 --- a/tools/testing/selftests/ublk/Makefile +++ b/tools/testing/selftests/ublk/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 -CFLAGS += -O3 -Wl,-no-as-needed -Wall -I $(top_srcdir) +CFLAGS += -O3 -Wl,-no-as-needed -Wall -Werror -I $(top_srcdir) LDLIBS += -lpthread -lm -luring TEST_PROGS := test_generic_01.sh From patchwork Wed Apr 23 21:29:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uday Shankar X-Patchwork-Id: 883653 Received: from mail-qv1-f99.google.com (mail-qv1-f99.google.com [209.85.219.99]) (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 B59A2244684 for ; Wed, 23 Apr 2025 21:29:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.99 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745443748; cv=none; b=fdPIGwwnekmtmOgB/MPqCSVcB2TiRPTNGdDAq7kaRIFIxh/Tnyz2zupg+3GqHl4eCwD+vQntBaWvwpbr4s9r+xNXXYGuERaDAdRGGp2OtBrV/6FblulBV5ccWoJkyuQLbYxBTOhc1Bfc6EKXugWH6Uxxhu9XOcsXfFZysQ2cqcY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745443748; c=relaxed/simple; bh=VQOLPE77VFynA3OuP+UbKKlDLBd4nZcwYEnXe3Z4ge0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bTglCEvC5gTQXjN0M+PcDDJCly9wxDcUoD9WBnY226dSViDDc2lIhW6sqs0NTh1Y5t+oX7UZIHM+EHH8Ll7xDhR6bNIMmYoyUUNFHQxmMCZn/tCtXfxmVP8g1Ief+hSbyxjCQshc7/mX7/MyQM2aWmqTM45T8YkuVtRjwF1WsAo= 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=R3bsEbHl; arc=none smtp.client-ip=209.85.219.99 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="R3bsEbHl" Received: by mail-qv1-f99.google.com with SMTP id 6a1803df08f44-6e8fd49b85eso5952266d6.0 for ; Wed, 23 Apr 2025 14:29:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1745443744; x=1746048544; 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=JCLEBLaRRQintuh2DWGEvr+93VgxR5KQlNFuF1s8elg=; b=R3bsEbHl9k2XqkAG7VrttB9h0tJ+LLbqMhDgYj68NVu0/IEuF54hp1SoZYxQ/LUdR8 itGUpTUfUBM01vhn7NqHG8qOiXuvIoNbLHusrvykp+OHvqVIQ4uxebZ/SsuudI/124C6 mJKupJqejpnQVmKPcmLItLAYF/RH+w3rnWLGVcoFCbndPZn2MAB/PlrePnCp6iko/LUy UN3Jbr0vV7LVlHt+5h35V/VfzAXtfFEyWT3x7NjuR687uEZjLtaRRv2BoimDGUxACFz9 cjLjq6aZPUf+B9DCg6qN8HZHMueuMC/0fDUHqNyc+nyeww1FxU0AjeEzcSnhTyI7Al6e MJew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745443744; x=1746048544; 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=JCLEBLaRRQintuh2DWGEvr+93VgxR5KQlNFuF1s8elg=; b=qLTHaE+lnCneEjPflHvvguCdmuOOE/uuMF8YbIr4zqhQ6M7ufCqIQF8kbT6bbvMMl+ 2ihuqTs/0GXWK7eb6SAv3B+yiw8xAwrQpm78DdVicDnV+SS1Mddnf9wgv5srPRx73hk3 R7+UwBWP9o8cMdbh6MfaSAtvGg79RzYwaHq1Ja6b+MQ9UUACrIlVWETXFSExS97bKgZB vl1XPypjbmRhpCxYoYCvZ5lolyNN0ew9/4LaYLry7pZRbaJSD23hSiAJScvLwvN4DjSC G+QYv7+dp7IpKVdH6mGjRAcwDAf0tpI9qjtDzRxQ0k3iTggQEJO16X6uGxSf+1gjtkyR J9Rw== X-Forwarded-Encrypted: i=1; AJvYcCWKlCcv8RNuYkFe2cCn5CV7Hlyv1ibSjDQoVBzaKXs0s/dGgFOA+qmdss8PXVcDTwADhkl6Q5gZgwxEgWXmPeo=@vger.kernel.org X-Gm-Message-State: AOJu0YyCDYTuoHc/th/hMUlY99qzNsbtY95yOj0PaEJGe39say0yToJ9 pI8nxX9l4a+5ASzL4aF+FVtVNL+xTtYcNQU0I6ab2yN/o0AnuTRg5UzCZ3440BtW7MkOX2+H3vS VEqKfl9Feha8JJ+WMXirPPj4NwvnnxVUAuyxKTpfqRInrUujm X-Gm-Gg: ASbGncuJiLRPFMNXR6KDX6jVrJj/pqwNqtwFYUiqedgepBsDzbQ1kSWEyRv4a5tBnaX lSCaAG/HtF84enCMfGxz4w4Z4wh3lcXcc4Y1rGh5W84uVCmkL4KGLncuIL4dI3QrNiJcuMpRelY OWk7f0kziiD7hX2Paz0+WHedkZyqLYCSpqDAFtpB6tojtOr1Y7PtZS06n3rlJFM2ZUWuOeCbzJ6 GdQEJwqGYdsneUjNvHExkhZshkAoamyeqK9qww6QVBAfbNsQhVXqFKSRDhAwypQlREYFFC9Gz2z q/Inls+Ie8zsVWbXbDSA3CMAQR7If8Y= X-Google-Smtp-Source: AGHT+IHnxwparxBZcK/VdcwSG32LkVIXSTRmpTrN+S3RXdjd04hZ9i9TCbHB9cDNMgycgsgCMiBSIn3HDpqA X-Received: by 2002:a05:6214:500d:b0:6ea:d629:f492 with SMTP id 6a1803df08f44-6f4bfc7a7d9mr3649076d6.29.1745443744638; Wed, 23 Apr 2025 14:29:04 -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 6a1803df08f44-6f2c2b1e111sm5267576d6.37.2025.04.23.14.29.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Apr 2025 14:29:04 -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 F2CA43409F5; Wed, 23 Apr 2025 15:29:03 -0600 (MDT) Received: by dev-ushankar.dev.purestorage.com (Postfix, from userid 1557716368) id EBDFBE40E4A; Wed, 23 Apr 2025 15:29:03 -0600 (MDT) From: Uday Shankar Date: Wed, 23 Apr 2025 15:29:03 -0600 Subject: [PATCH 2/2] selftests: ublk: common: fix _get_disk_dev_t for pre-9.0 coreutils Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250423-ublk_selftests-v1-2-7d060e260e76@purestorage.com> References: <20250423-ublk_selftests-v1-0-7d060e260e76@purestorage.com> In-Reply-To: <20250423-ublk_selftests-v1-0-7d060e260e76@purestorage.com> To: 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 Some distributions, such as centos stream 9, still have a version of coreutils which does not yet support the %Hr and %Lr formats for stat(1) [1, 2]. Running ublk selftests on these distributions results in the following error in tests that use the _get_disk_dev_t helper: line 23: ?r: syntax error: operand expected (error token is "?r") To better accommodate older distributions, rewrite _get_disk_dev_t to use the much older %t and %T formats for stat instead. [1] https://github.com/coreutils/coreutils/blob/v9.0/NEWS#L114 [2] https://pkgs.org/download/coreutils Signed-off-by: Uday Shankar --- tools/testing/selftests/ublk/test_common.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/ublk/test_common.sh b/tools/testing/selftests/ublk/test_common.sh index 9fc111f64576f91adb731d436c2d535f7dfe5c2e..a81210ca3e99d264f84260aab35827e0c00add01 100755 --- a/tools/testing/selftests/ublk/test_common.sh +++ b/tools/testing/selftests/ublk/test_common.sh @@ -17,8 +17,8 @@ _get_disk_dev_t() { local minor dev=/dev/ublkb"${dev_id}" - major=$(stat -c '%Hr' "$dev") - minor=$(stat -c '%Lr' "$dev") + major="0x"$(stat -c '%t' "$dev") + minor="0x"$(stat -c '%T' "$dev") echo $(( (major & 0xfff) << 20 | (minor & 0xfffff) )) }