From patchwork Tue Apr 29 22:41: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: 886839 Received: from mail-qv1-f98.google.com (mail-qv1-f98.google.com [209.85.219.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 D029527602B for ; Tue, 29 Apr 2025 22:41:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.98 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745966472; cv=none; b=jIlO2oNWhf+vjMRbjNjtjRdFNAqW82I33Q1dTPFWCAb4C/n9GtbIwlV+gy0b4zq2Uprbwjrnf05POsJx6YoZnLl9FMIPCJhSgf0oFYo/Ks/a0cKaALuKHoIwyTM8+aGJfvjgXtWU4quVa3lD2EoZinaNWUxU48uzx4m8BIMGlaQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745966472; c=relaxed/simple; bh=EVZKMNvHicJPbJJ+yeVyQMnNcU1DnEd0UGXD+q/p5UI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Pl5HqQXJFk9/tsHZawh7te9WqwC+MHlqRsAJ57J02j+1nIflZmteCkWnZfE31g4/37a6dsNoODsqhp9Q2TD61xE/WRJDSP0KCDRkMauza6ukGDGdC3MYYzK7iPRqzvdU5mTL6U/+NvrmP3L3yRVagrUSOugB1g1OQl/nkplZ+ic= 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=PzLQSNvr; arc=none smtp.client-ip=209.85.219.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="PzLQSNvr" Received: by mail-qv1-f98.google.com with SMTP id 6a1803df08f44-6f0ad74483fso74523806d6.1 for ; Tue, 29 Apr 2025 15:41:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1745966470; x=1746571270; 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=XJN4BA+fMMi5a/WeaDyJHm35TLpFGbEwKhPCZI9p8q0=; b=PzLQSNvrms3oriDMKBvT8UI5L6FTGu4HZox3IJEvB0VnL/ZelQ9UgkJToKvSu8EDLM K9x/LxmK7GQCyUa4OU60wejXudtb37yV5YOwRUkggvzrviDF9u06g961+RzoeYzvfY4M uo+dLRT2ZUOGA+lvVCahPXWhb2uOc94s0UL1sFY29JL8VS1pcE0LkkHDXMcf5PdJuxK1 ZYfrQKvQTYhn0wQBCXVbYiBJWomn1nYnvaEksxqESTtH5jgFqQeCKb1nVjwTCNPe5T7U gEQmdruv8y2ZFAi/7D81p6zlp1qwQU7YJQxs2abHZSwV/bdwTDVZTd9HlbVP238cMzEU 4kSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745966470; x=1746571270; 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=XJN4BA+fMMi5a/WeaDyJHm35TLpFGbEwKhPCZI9p8q0=; b=VQOd9BULWBukLPZOpB8xyZkCFX0sUaICxFrCla7vCauOedrc3p3GaFKu5WbQtfhv0Y j9CMHW8IY4GsKhX98koZxE2HNopkjiEfsVkKEyWFJKhW3O90Iuulpo8dGHdK6zGkDb0R LXn8K8AKIaQGUYokWi2KFxO0k1fgGwt4cFKsnEC/WuS1dkOE5cLZMJwC5GknhCd4Y9he /9nrLuUwWlXIa7gEBr9toP6Z1ehLkhE2BvEGNOUjb75ZctM/bhuuDyYdMrUxecU+kl4/ 0RKkVXK7zK1CJN2IdBmpVlfZEyEDcM77hH8IvSPTCPbH1pQi/CrW3z9lwZVgwg2fDcPz WTGQ== X-Forwarded-Encrypted: i=1; AJvYcCUqtlpoUbyz/Y6OZA0/O5fQkhuBU3AVuQx3DENSw6ZUm6W+knH9t073L5HB1awBMf6tKbCIQGEeNMt4i8e6Dhg=@vger.kernel.org X-Gm-Message-State: AOJu0Yy1A+KWBju7BF5Shj5MrfFo6RDA1j77jj8YO7ywwxbbptBMajvk XfiGSNPIYNIWdMWXh2svUBxGUSg9cX0wVbqXtjQYZbkmstsz9weIQDw3jpC6RtwsRTFXWn/QJdP uo49o3zcPfH+iUBJtFSvBqhMx3jSn2Qf7jBf4bFNDD8laltpX X-Gm-Gg: ASbGncu48WU4fsMGiEuGkLTZDUTGESTfeBt8kCNPtvGxCW/2B32NmcCmk5X8sC1xUi7 +/nRTHiE1XYoZp5TJV+rvyULhmo69Dh5x9NpZ8Ytg555oRxkzCa4ycoQdABprs0svRYCLBuKiU9 Zem4ObXnhM1WPrtQCWfQalsRUFhmmX+QTJcmYHXnm5uZFSwTuOHGR+Ql2CBbsauxcsb6hk9jebA mTO3Ixk4BZNro0L0kZoI8wvbpN7IyU03DNj9YULxNDuCwSCQT64ONwi+BjwPsBM7lhc9PxyrQJ8 J9D+iZm/WkBg/mwQ8XGPH6nlE714Icg= X-Google-Smtp-Source: AGHT+IHx5pKBNfEP8GO2QbCkLxtckJoqsomQ7OcV39RPZuItnaXv8KVoALbXjsU0BbOjgfoJVSlyWwOn84oC X-Received: by 2002:a05:6214:488:b0:6f4:cbcf:5cea with SMTP id 6a1803df08f44-6f4fcf6e44fmr18344266d6.44.1745966469654; Tue, 29 Apr 2025 15:41:09 -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-6f4fe6a84fesm96856d6.4.2025.04.29.15.41.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Apr 2025 15:41:09 -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 F374A340304; Tue, 29 Apr 2025 16:41:08 -0600 (MDT) Received: by dev-ushankar.dev.purestorage.com (Postfix, from userid 1557716368) id E3E55E404E6; Tue, 29 Apr 2025 16:41:08 -0600 (MDT) From: Uday Shankar Date: Tue, 29 Apr 2025 16:41:03 -0600 Subject: [PATCH v2 1/3] selftests: ublk: kublk: build with -Werror iff WERROR!=0 Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250429-ublk_selftests-v2-1-e970b6d9e4f4@purestorage.com> References: <20250429-ublk_selftests-v2-0-e970b6d9e4f4@purestorage.com> In-Reply-To: <20250429-ublk_selftests-v2-0-e970b6d9e4f4@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 Compiler warnings can catch bugs at compile time; thus, heeding them is usually a good idea. Turn warnings into errors by default for the kublk build so that anyone making changes is forced to heed them. Compiler warnings can also sometimes produce annoying false positives, so provide a flag WERROR that the developer can use as follows to have the build and selftests run go through even if there are warnings: make WERROR=0 TARGETS=ublk kselftest Signed-off-by: Uday Shankar --- tools/testing/selftests/ublk/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/testing/selftests/ublk/Makefile b/tools/testing/selftests/ublk/Makefile index ec4624a283bce2ebeed80509be6573c1b7a3623d..529ab98a2633a2278bc0df8b26500905d60d2bec 100644 --- a/tools/testing/selftests/ublk/Makefile +++ b/tools/testing/selftests/ublk/Makefile @@ -1,6 +1,10 @@ # SPDX-License-Identifier: GPL-2.0 CFLAGS += -O3 -Wl,-no-as-needed -Wall -I $(top_srcdir) +ifneq ($(WERROR),0) + CFLAGS += -Werror +endif + LDLIBS += -lpthread -lm -luring TEST_PROGS := test_generic_01.sh From patchwork Tue Apr 29 22:41:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uday Shankar X-Patchwork-Id: 886838 Received: from mail-pl1-f227.google.com (mail-pl1-f227.google.com [209.85.214.227]) (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 96D95275867 for ; Tue, 29 Apr 2025 22:41:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.227 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745966473; cv=none; b=f+4MxUhaIaV/mL4IGvj8VnCy2CPDoUuOfMJ+ozRBJUunAIwKtokbmLESlqGpvjNUSCR4mSdPI4PN79mPbpvdg0VAzGrlXVWeqdmUsjtZX5v+0DDoBmss6VRUD6WLlEPKRLxxtQKct4Od5T/DcK18B9DDHZEVqufx8YCn7lNcaps= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745966473; c=relaxed/simple; bh=yLjCvoCe6VXMT5MsUjHgKpFFAFBbBtQRcr91r8jHk+A=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=QvrRdKhINQX+6Xwiix7gZ5qKgzs7rYMo3Sch+kJXcVcB+uvupr+vUOhGqtB6yvTZoDwmnheeliSYkTh5yvVwEMyhNo2qherlAqy+KOMlwHG/IoRBgomyoW33w6gATauMTDP0MPSsDSnQMapdeMUcEeUsEYIAtwNBhQ9pwclQn4Y= 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=LwqKwcsW; arc=none smtp.client-ip=209.85.214.227 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="LwqKwcsW" Received: by mail-pl1-f227.google.com with SMTP id d9443c01a7336-224171d6826so97698115ad.3 for ; Tue, 29 Apr 2025 15:41:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1745966470; x=1746571270; 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=FFNtS618ufyKJDtfH/r/PyGi4nE5aM2nCuyHf6tRb3Y=; b=LwqKwcsWiHCt0Ma4fVElW3asrerOszOKpN0s0hzAvtiMJPqCAoFGGvNNRgXDX9Cf7S ZYYWkvnueOR5YH6AXoBwp0ywutmIfIL3iSN8+Teu8N6RDD3EWiY3Ct8gx7dVdnZEMVZp Wf6c1/JNeztMCGffl7q1cMvUUBiLKdMGDg2aJdDNpqlYr/67Xsi0VqjgqIHeWotNTtgp dj5oVroce5AkxbB4/g0K13X/nGEXXOANwqaGmtE2vylF3hHmcWvBK0NlKV+kX61Nq66m b5dMFMF8yeUIP5we4+t9qiZA/D1ApZ/o/DQD564ytiq/CECJq+z9Nx4m7LeFo5bVfUZI EjvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745966470; x=1746571270; 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=FFNtS618ufyKJDtfH/r/PyGi4nE5aM2nCuyHf6tRb3Y=; b=qvAZJ0QQEHIPRE+No3un4e0eR+QA/OxCjhRzB627gb7SdMhmYukwE7qdwp5gjE/jnp Yjh+U6Ln3ICrlYpzJAKbtASlYpT04mHOwp8akomEr5CLQ40LfErHKTiIABrLllUA8PJd hnq/VrG7kLXkLhOv4RZeSxNLfrnjtSOEW5MUCJhSJNNIqxpF9EHVMdPIltzCgUNXRNw6 7GvRfMScA2HPZduYhK1USNjDM6YEh4cQKO1X5yjgT4RIEA9yXHAX24u+R8UODkctTOSG XiybHf7ujiRXLgXFXWpORKTuDqHN/8YYi2ZqRWCAe3AmKaP5cSeBxszyYi68nvBMvH/y QZRw== X-Forwarded-Encrypted: i=1; AJvYcCVJvCRoD+8CC/X0Fo+QYJuGNFczvFOvEkMfhS6LRpgtf4CENZHj4mp3bNhq5TS1QCdzbaVHvqEmUbgr1niBWFY=@vger.kernel.org X-Gm-Message-State: AOJu0YyeAMYNedyFcuKV13G4Zmi+ArAjmY0uZyQGRM5G5bIIl4sq1JTN uPUZYUme5cvXt/irdbIf+5we7duT0G49wQUEVZ2CXcyD6b1QInac5tFZjABffWaYI3maux/4CTM tbFR0e8suA9ytxjYJw9A9NTm+88JK5ItRfW9+IsyJHTlRQTqB X-Gm-Gg: ASbGncsQi6QN9UOEjisLH4WP5h9a3hS8PIPW0p7sLKVP/KuZ93RX12RCsfyB9f8DmnS UrgaCZcwyADsqv9rvhUSRcquHx64xvYJLBCI1gQ/pER5+7Mo2N1RUEUaBXobapeJb8fXc54e4Lz jEHTmoZ+Q4c/oDCPzMTrZX/lAeD+uyx/OIF2kjgO+CzXLZgABlWNlNLxrVU4290BF02x2DEv9j3 xdYor6dTIfzJlAxKwj1Rg0c4Ut+BKJaqCjor6xa66wG/YsvFazhN4MDTsgGP8G8RCfMGRKxT+pq LKspoSXrBJ/PbYxAallF7KrhQSysbs0= X-Google-Smtp-Source: AGHT+IGBZ7D6TEnAUN4d7huIcnUzTzs2CYiqo4tm38ieihvVaysSOYFpmF+9wSpzUkmmpxVwAfixH06NtvV6 X-Received: by 2002:a17:903:3c66:b0:21f:1202:f2f5 with SMTP id d9443c01a7336-22df57638e7mr2895685ad.8.1745966469787; Tue, 29 Apr 2025 15:41:09 -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 41be03b00d2f7-b15f7ec226dsm809653a12.1.2025.04.29.15.41.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Apr 2025 15:41:09 -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 0055634034F; Tue, 29 Apr 2025 16:41:08 -0600 (MDT) Received: by dev-ushankar.dev.purestorage.com (Postfix, from userid 1557716368) id E501DE40EC9; Tue, 29 Apr 2025 16:41:08 -0600 (MDT) From: Uday Shankar Date: Tue, 29 Apr 2025 16:41:04 -0600 Subject: [PATCH v2 2/3] selftests: ublk: make test_generic_06 silent on success Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250429-ublk_selftests-v2-2-e970b6d9e4f4@purestorage.com> References: <20250429-ublk_selftests-v2-0-e970b6d9e4f4@purestorage.com> In-Reply-To: <20250429-ublk_selftests-v2-0-e970b6d9e4f4@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 Convention dictates that tests should not log anything on success. Make test_generic_06 follow this convention. Signed-off-by: Uday Shankar Reviewed-by: Ming Lei --- tools/testing/selftests/ublk/test_generic_06.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/ublk/test_generic_06.sh b/tools/testing/selftests/ublk/test_generic_06.sh index b67230c42c847c71b0bbe82ad9de1a737ea3cb75..fd42062b7b76b0b3dfae95a39aba6ae28facc185 100755 --- a/tools/testing/selftests/ublk/test_generic_06.sh +++ b/tools/testing/selftests/ublk/test_generic_06.sh @@ -17,7 +17,7 @@ STARTTIME=${SECONDS} dd if=/dev/urandom of=/dev/ublkb${dev_id} oflag=direct bs=4k count=1 status=none > /dev/null 2>&1 & dd_pid=$! -__ublk_kill_daemon ${dev_id} "DEAD" +__ublk_kill_daemon ${dev_id} "DEAD" >/dev/null wait $dd_pid dd_exitcode=$? From patchwork Tue Apr 29 22:41:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uday Shankar X-Patchwork-Id: 885934 Received: from mail-yw1-f228.google.com (mail-yw1-f228.google.com [209.85.128.228]) (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 705E827703B for ; Tue, 29 Apr 2025 22:41:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.228 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745966474; cv=none; b=lBgCJXT8g1mTGjCfZZ1TV/qyZnq/9m6eLQZFR2Ky4XEcAoNjhX7W3AqxfbApxrOrQpBKxz5KoimggRTfCqwEUZaX1vLgT6hiTwISh07NSTCJbG4bdLYnnt5pWUWABeLajbnzBu4Ylh22hgIhePKi3C2SIAsn3Wkf/E3St3sZJJE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745966474; c=relaxed/simple; bh=ObuAsSl4WZHTMvFnPb6US5OeBMXHiIWBUHv3E4P+6ZE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SYE79cKVs57likwHYPt4YmBRpN+QWmvnNO/AF59wdvrAKPEmrq1UWiIVLoGroGXMKKof49YIBlriHadKZtUmJdOnd7ZJL37HecdzvFhAXV7uJU0FVE+W8EhRYazmjWNkeRyZx4E8pmrks9UmI3xuIkaSvq7o0dVj7Vdlo4b/UYw= 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=N2NuSz6v; arc=none smtp.client-ip=209.85.128.228 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="N2NuSz6v" Received: by mail-yw1-f228.google.com with SMTP id 00721157ae682-70821dba48eso51856757b3.0 for ; Tue, 29 Apr 2025 15:41:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1745966470; x=1746571270; 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=J5UBAAEMQRo7Cyw0R0b1FnwG+WPDkBuKLP1lc95VWmM=; b=N2NuSz6vDYXkot94vhK1O3n+L19mDGc0v7HKxKKWZrTpg/tAdQZnbIzn8RV1CxA24j WuQ6cbeKk0ROUFBxL3JyD6qARmTZ5n5DcZbHIaq3kdiM8JVNfrHafuRjWfgEVMG088Jz NYgaTEOCnMpqyP4znQz3lIuSKWglDu0N9pfM8cGvFLPihrQHknyYDma2INDwUHuMVUiX DYbNQ6TYvVrE9B+diMnlYYawe35uEKsPwryApNOwjoHBJsi+hui8XlbmuZ/t9Gwnne71 xsOV+dirjfnykUK1Mt0Cwhf3skdEleiAEKyd3mQFbns3Sj9FinWd2WRoi2nRHwduZECB 65hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745966470; x=1746571270; 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=J5UBAAEMQRo7Cyw0R0b1FnwG+WPDkBuKLP1lc95VWmM=; b=b47q+fJCwkRxdT/Tp7/Fq1X6WTGqJp5YOxNmComdfdlNm1oAulpp9g+c/CPlKr6d+v FLV1SDce0Y36G0/BvNYZqzj4VZDv3k2QeniAC7h62+FaQWA6mn+EN4pibUX/jHvTqsxa +EOzcb2+PAInk2W0Uj3HtyYO3ggEFpT0diMIHvJmENylSDCCkLJ+1lacLryAgliC0W6s h2Tit/EoM2fEZ+jyWZpi286XPAO5UBweUbco1VTsymYkumP35ucbxqVy2buO01LGGUbr Lf4JDAew6wz2emYcFmW3Tv2G4dzq00mHs9r2mauOgZjznCcLTSauCikiOF6HCpmOlPWb V5UQ== X-Forwarded-Encrypted: i=1; AJvYcCVhZaQs8shhWBN5xl77VmbM4UxNNKJ7kuWEYF5Qx1Y9sj9rGQSQGcCE6rVlHVSqh+gScqGDHF1+oKWBeh1sAE8=@vger.kernel.org X-Gm-Message-State: AOJu0Yx4yJDi4Wal7gfwT9H67odtw0oA0YbJwnzkHAjrZVuuwu29I0El CmQ36HWLWt7XLj2rYGHnnsIe46BJSWdpHn/G/+GdKr/cRjax5/oMa8+YQ/gbad8buNLP45FRmNt gJxZRv/d+Ni63p6UhlWpffoOZL+8W4Lxi X-Gm-Gg: ASbGnctlhxogUFp8qYcuzhULd1WhooZqbO35EIuOdKuu8XhlpFgseYDQI5DBKR4FK3l y3c8Roqc+qisOVuBJrVU+B0g4Cg5L4RbCuO0hv+2E1oUXI7RFwlD/KmWjEOJAcWQTkQvTIEkAqL UaKCUfJ3QumNDAP4833+0Zm3ico+aTvu7JOiztS+szSEa29POfm8uauV6oS9PC4/hssOYWoBJRp Dh3AuRj/JTKxndO6IlnxeKxtxNdDv78ljmsl70zg4BhTiObPSrgwom0e1FuCbrvB0E1K3rbfGwv x4SruuBYlw7MYvfLIYXNgK4joYmIt25O61FExatBZ5sDsw== X-Google-Smtp-Source: AGHT+IF0yMWC+jrX3o7QqODqh/qL4kwwrsmmLtw5gv1rlU/mBGIQgXBbEeZPRzdVsm0dUCh6BJkRhAghKdmH X-Received: by 2002:a05:690c:6c0c:b0:708:a686:7f04 with SMTP id 00721157ae682-708ad5c00d5mr9177577b3.2.1745966470249; Tue, 29 Apr 2025 15:41:10 -0700 (PDT) Received: from c7-smtp-2023.dev.purestorage.com ([208.88.159.128]) by smtp-relay.gmail.com with ESMTPS id 00721157ae682-708ae0694a5sm75197b3.40.2025.04.29.15.41.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Apr 2025 15:41: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 030583403AE; Tue, 29 Apr 2025 16:41:09 -0600 (MDT) Received: by dev-ushankar.dev.purestorage.com (Postfix, from userid 1557716368) id EAB40E40ED5; Tue, 29 Apr 2025 16:41:08 -0600 (MDT) From: Uday Shankar Date: Tue, 29 Apr 2025 16:41:05 -0600 Subject: [PATCH v2 3/3] selftests: ublk: kublk: fix include path Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250429-ublk_selftests-v2-3-e970b6d9e4f4@purestorage.com> References: <20250429-ublk_selftests-v2-0-e970b6d9e4f4@purestorage.com> In-Reply-To: <20250429-ublk_selftests-v2-0-e970b6d9e4f4@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 , Caleb Sander Mateos X-Mailer: b4 0.14.2 Building kublk currently fails (with a "could not find linux/ublk_cmd.h" error message) if kernel headers are not installed in a system-global location (i.e. somewhere in the compiler's default include search path). This failure is unnecessary, as make kselftest installs kernel headers in the build tree - kublk's build just isn't looking for them properly. There is an include path in kublk's CFLAGS which is probably intended to find the kernel headers installed in the build tree; fix it so that it can actually find them. This introduces some macro redefinition issues between glibc-provided headers and kernel headers; fix those by eliminating one include in kublk. Signed-off-by: Uday Shankar Reviewed-by: Caleb Sander Mateos Reviewed-by: Ming Lei --- tools/testing/selftests/ublk/Makefile | 2 +- tools/testing/selftests/ublk/kublk.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/testing/selftests/ublk/Makefile b/tools/testing/selftests/ublk/Makefile index 529ab98a2633a2278bc0df8b26500905d60d2bec..aaf011520040d3e96912c876bf74e488e774e473 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 -I $(top_srcdir)/usr/include ifneq ($(WERROR),0) CFLAGS += -Werror endif diff --git a/tools/testing/selftests/ublk/kublk.h b/tools/testing/selftests/ublk/kublk.h index 918db5cd633fc1041e1e0805142f00e7e4f28bf7..4b943e57a890e5f14fa11dd19d67c4c8684c4417 100644 --- a/tools/testing/selftests/ublk/kublk.h +++ b/tools/testing/selftests/ublk/kublk.h @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include