From patchwork Thu Sep 12 13:12:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Liu X-Patchwork-Id: 828470 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) (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 167BB1AD245 for ; Thu, 12 Sep 2024 13:13:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.13 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726146785; cv=none; b=C4w6rOcAdPwV+cuzrqVFBWr+QODTKBQHVdGbwpzAEUF1uDz0vY7K1r4MpPinNPP9j0McIDTmDZME2P9VsAQIEsnDyMfvIcnm4s5NwlzcedYgYdOzbaJgNczvHcC2FuPBmVhFA/8QS+jf6dwDcYwGcQz5Kg/sXOeFjllrdGkbHE8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726146785; c=relaxed/simple; bh=UydP3oWotS2A/rEb6+v3Q5F0uUnR5jQlhPJMtyyfOHE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JMpM7M9OPNBYcjKYUtLAvOzM7hOISL+vti0yy5iKhAvn9szeTmFqYiaXQGcScIKz+1tsJudwsYytRCVR/Z67v69NgtrsefnOYcbSAa1dPEb8ux9/1DBaoifWUsxR1Ez414skRm5QZF9yuHuCostnqi2L6RO4ISUSuGaxdEXoj/Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=oIgcTQOn; arc=none smtp.client-ip=192.198.163.13 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="oIgcTQOn" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1726146784; x=1757682784; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=UydP3oWotS2A/rEb6+v3Q5F0uUnR5jQlhPJMtyyfOHE=; b=oIgcTQOn5fp7tufzTg0JTwAqRr3/vdrFY9YryrKuqh4zq5ikv3J+XoeV lQ8w3XI8JwGsfZ78XwMCtxZ28h9lqtHkUhOmidfWn30VvDxOoBgi94tdn GE+k9bzXgWTk/+GGt10hWK9nXJHioJf7mGdmj1mHl0ZLYiE4O+Ju0PcBS iXBrG8AJJ/Y8/bfArk886yGghW+v3Y5Isp3I0ROz5OHlRn7BR/DAj8yeI ITSa680UKvvrSglzbAios6IcwTT8822snD3pTGH/y6R2/pfcHf8AaKgA2 ook/lOVKP/68bQ/xE5jbHVAVdCjTpePpE+9jP+R20tDQFysyFvV4Npesy A==; X-CSE-ConnectionGUID: gEqwldPJSfe0O9q9ViKTQQ== X-CSE-MsgGUID: 91hcW4BaSe+u6afxKWnugQ== X-IronPort-AV: E=McAfee;i="6700,10204,11192"; a="27911251" X-IronPort-AV: E=Sophos;i="6.10,223,1719903600"; d="scan'208";a="27911251" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2024 06:13:01 -0700 X-CSE-ConnectionGUID: y6oefvj5RDeGXt/v9i80GA== X-CSE-MsgGUID: 95qHivi6TdCceP5f8nHxZw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,223,1719903600"; d="scan'208";a="67996576" Received: from 984fee00a4c6.jf.intel.com ([10.165.58.231]) by orviesa006.jf.intel.com with ESMTP; 12 Sep 2024 06:13:01 -0700 From: Yi Liu To: joro@8bytes.org, jgg@nvidia.com, kevin.tian@intel.com, baolu.lu@linux.intel.com Cc: alex.williamson@redhat.com, eric.auger@redhat.com, nicolinc@nvidia.com, chao.p.peng@linux.intel.com, yi.l.liu@intel.com, iommu@lists.linux.dev, zhenzhong.duan@intel.com, linux-kselftest@vger.kernel.org, vasant.hegde@amd.com Subject: [PATCH v4 08/10] iommufd/selftest: Add a helper to get test device Date: Thu, 12 Sep 2024 06:12:53 -0700 Message-Id: <20240912131255.13305-9-yi.l.liu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240912131255.13305-1-yi.l.liu@intel.com> References: <20240912131255.13305-1-yi.l.liu@intel.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 There is need to get the selftest device (sobj->type == TYPE_IDEV) in multiple places, so have a helper to for it. Signed-off-by: Yi Liu --- drivers/iommu/iommufd/selftest.c | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/drivers/iommu/iommufd/selftest.c b/drivers/iommu/iommufd/selftest.c index 7fd8dc5a667f..b7e0cbb46f9f 100644 --- a/drivers/iommu/iommufd/selftest.c +++ b/drivers/iommu/iommufd/selftest.c @@ -831,29 +831,39 @@ static int iommufd_test_mock_domain(struct iommufd_ucmd *ucmd, return rc; } -/* Replace the mock domain with a manually allocated hw_pagetable */ -static int iommufd_test_mock_domain_replace(struct iommufd_ucmd *ucmd, - unsigned int device_id, u32 pt_id, - struct iommu_test_cmd *cmd) +static struct selftest_obj * +iommufd_test_get_self_test_device(struct iommufd_ctx *ictx, u32 id) { struct iommufd_object *dev_obj; struct selftest_obj *sobj; - int rc; /* * Prefer to use the OBJ_SELFTEST because the destroy_rwsem will ensure * it doesn't race with detach, which is not allowed. */ - dev_obj = - iommufd_get_object(ucmd->ictx, device_id, IOMMUFD_OBJ_SELFTEST); + dev_obj = iommufd_get_object(ictx, id, IOMMUFD_OBJ_SELFTEST); if (IS_ERR(dev_obj)) - return PTR_ERR(dev_obj); + return ERR_CAST(dev_obj); sobj = container_of(dev_obj, struct selftest_obj, obj); if (sobj->type != TYPE_IDEV) { - rc = -EINVAL; - goto out_dev_obj; + iommufd_put_object(ictx, dev_obj); + return ERR_PTR(-EINVAL); } + return sobj; +} + +/* Replace the mock domain with a manually allocated hw_pagetable */ +static int iommufd_test_mock_domain_replace(struct iommufd_ucmd *ucmd, + unsigned int device_id, u32 pt_id, + struct iommu_test_cmd *cmd) +{ + struct selftest_obj *sobj; + int rc; + + sobj = iommufd_test_get_self_test_device(ucmd->ictx, device_id); + if (IS_ERR(sobj)) + return PTR_ERR(sobj); rc = iommufd_device_replace(sobj->idev.idev, &pt_id); if (rc) @@ -863,7 +873,7 @@ static int iommufd_test_mock_domain_replace(struct iommufd_ucmd *ucmd, rc = iommufd_ucmd_respond(ucmd, sizeof(*cmd)); out_dev_obj: - iommufd_put_object(ucmd->ictx, dev_obj); + iommufd_put_object(ucmd->ictx, &sobj->obj); return rc; }