Received: by 2002:a05:7412:798b:b0:fc:a2b0:25d7 with SMTP id fb11csp186316rdb; Wed, 21 Feb 2024 23:49:28 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWYi0ZSmbPz68n4VfH9pUq69+l/4WRZ8MjwUs5Me+x7rzS/AYfJCngMQUunwVv/mN+lPrLi+1b0WayNV0+NO3ZxG4YlWUWZ425iisfsgg== X-Google-Smtp-Source: AGHT+IGluZvVcstmJ0kGoO/LB3+escc2/tw+F9q7Q1uNRkOmxkHXNJuQMCGKw6Qth/pi5WKa92X+ X-Received: by 2002:a05:622a:1996:b0:42e:1911:93fc with SMTP id u22-20020a05622a199600b0042e191193fcmr12052286qtc.55.1708588168020; Wed, 21 Feb 2024 23:49:28 -0800 (PST) Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id 17-20020ac85911000000b0042da77e7098si14049451qty.404.2024.02.21.23.49.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Feb 2024 23:49:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-76026-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@collabora.com header.s=mail header.b=bEvS0puG; arc=fail (body hash mismatch); spf=pass (google.com: domain of linux-kernel+bounces-76026-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-76026-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id C2C141C22F54 for ; Thu, 22 Feb 2024 07:49:27 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7BCC3179AA; Thu, 22 Feb 2024 07:49:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="bEvS0puG" Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (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 90956F4E7; Thu, 22 Feb 2024 07:49:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.227.194 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708588162; cv=none; b=tIQsxyxxTvR73DWiZrGY9N1IgMPlNL1z4N8ha5qYgiVvPO/Ls4SXoIsjMWfangRTSmyUs/AOat3wSqAb+2u0hieaqSHS939UYdtIpvuZZkQJZtBa+U5Qvf1jnR9t8Lk2xpdNq74XkSeeLZy4LccPkBE40YruxUTRo1n+PiMWZMU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708588162; c=relaxed/simple; bh=vBc4/x2wQFPFFwAbmQ8acN+qW4Povt5PrHZ0s3wsjbE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=eIAgQuP137/SkbGLuHyeKEHm4fIjVUPHK3Leu4nJZs8ldTO/IjQrUtb7h57VMlHdo4rKCpZvSSXMgZd0+YRx5jauuof82i6f5xO0NoQV3iv4gJkuS5ZqkLfVfgRokWxrzTDMrP9s9w9PXGet89CrwVOjyRT72G8seFzl3uYL1Wo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=bEvS0puG; arc=none smtp.client-ip=46.235.227.194 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1708588158; bh=vBc4/x2wQFPFFwAbmQ8acN+qW4Povt5PrHZ0s3wsjbE=; h=From:To:Cc:Subject:Date:From; b=bEvS0puG8WpfSE1cw42dQrqia0mh4GN4bXlMR5kk1uWq3HuHaD1APfIOyq+UTkbG0 ed4yJXZT1l+458fOA5hUo+2kgIMSgVtzE/vvqg3Bu/voTKYL7k9e63Ps26VJJKQIRL WgHIzDRgVpHyW6O6duL1J8FfkzVWyNiCpltEksYHTw1uhoCpVf3TIz/lxpznWgc/LA Mw8zaJWPASIoDoOHpHQMWkYZK7y6jqsNWMHhTZH3hScQcN5xHVuP56vxOfpGFU5iSC l29kAJ6VhYE1KKWT3E/b2gQ0zSPOaPv6NOOrAUZts6FyN7b/bFDsq8s7GD7ZP8NUu+ U1Z/XnH8k4cbQ== Received: from localhost.localdomain (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: usama.anjum) by madrid.collaboradmins.com (Postfix) with ESMTPSA id CDB43378042B; Thu, 22 Feb 2024 07:49:15 +0000 (UTC) From: Muhammad Usama Anjum To: Jason Gunthorpe , Kevin Tian , Shuah Khan , Yi Liu , Nicolin Chen Cc: Muhammad Usama Anjum , kernel@collabora.com, iommu@lists.linux.dev, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] selftests/iommu: fix the config fragment Date: Thu, 22 Feb 2024 12:49:33 +0500 Message-ID: <20240222074934.71380-1-usama.anjum@collabora.com> X-Mailer: git-send-email 2.42.0 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: 8bit The config fragment doesn't follow the correct format to enable those config options which make the config options getting missed while merging with other configs. ➜ merge_config.sh -m .config tools/testing/selftests/iommu/config Using .config as base Merging tools/testing/selftests/iommu/config ➜ make olddefconfig config:5295:warning: unexpected data: CONFIG_IOMMUFD config:5296:warning: unexpected data: CONFIG_IOMMUFD_TEST While at it, add CONFIG_FAULT_INJECTION as well which is needed for CONFIG_IOMMUFD_TEST. If CONFIG_FAULT_INJECTION isn't present in base config (such as x86 defconfig), CONFIG_IOMMUFD_TEST doesn't get enabled. Fixes: 57f0988706fe ("iommufd: Add a selftest") Signed-off-by: Muhammad Usama Anjum --- tools/testing/selftests/iommu/config | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/iommu/config b/tools/testing/selftests/iommu/config index 6c4f901d6fed3..110d73917615d 100644 --- a/tools/testing/selftests/iommu/config +++ b/tools/testing/selftests/iommu/config @@ -1,2 +1,3 @@ -CONFIG_IOMMUFD -CONFIG_IOMMUFD_TEST +CONFIG_IOMMUFD=y +CONFIG_FAULT_INJECTION=y +CONFIG_IOMMUFD_TEST=y -- 2.42.0