From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.5 required=3.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 534BCC433DF for ; Sat, 22 Aug 2020 07:09:35 +0000 (UTC) Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0E66F20724 for ; Sat, 22 Aug 2020 07:09:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="R03yistd" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0E66F20724 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=iommu-bounces@lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id DB245880C2; Sat, 22 Aug 2020 07:09:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id B8Jd5F2WuwqD; Sat, 22 Aug 2020 07:09:33 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by whitealder.osuosl.org (Postfix) with ESMTP id 6263F878DB; Sat, 22 Aug 2020 07:09:33 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 421E8C089F; Sat, 22 Aug 2020 07:09:33 +0000 (UTC) Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id AC38CC0051 for ; Sat, 22 Aug 2020 04:28:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 9B63A887B7 for ; Sat, 22 Aug 2020 04:28:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id elS5aAIKT9z0 for ; Sat, 22 Aug 2020 04:28:26 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by hemlock.osuosl.org (Postfix) with ESMTPS id 01DA1886D4 for ; Sat, 22 Aug 2020 04:28:25 +0000 (UTC) Received: by mail-pl1-f193.google.com with SMTP id y6so1783194plk.10 for ; Fri, 21 Aug 2020 21:28:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3fh4Vbi5cH80+HY7hf3937mL7qFSKmxlG0sv3RflODQ=; b=R03yistdQyNLISMlwTUY7gU6KE6eUyrZKmDgLTzR5kSo8m6T+rNJbYdP80vXZeHFZ5 psCZaOfOX5+2LU3X1rSIdkYKFI1qYDMyxPz69JkzzYMbq03h1nz/LUCgz7QDCs6ZTKfn Yt1eSHTAMC02EnycmqnLZSPGAKIsQ1c6P73VvEgw4uEQLQJ6UjeiS/41FL6c8sXVDnqj GfI2ZOCxlmlTwNfdGWqzWhnRGplumW87ABzdEhfvqwobb8FM+1Jxfy4YTdmEDJQBbMaG K+5ignIQkhdoc9ARItnEYAwvb4ZrJl5f79CnDx/P62eqJuPKTM1/s36SNq7NT1t2nfaH b6cQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=3fh4Vbi5cH80+HY7hf3937mL7qFSKmxlG0sv3RflODQ=; b=p8jxnKI7DKhN+ifSaxZ1rEDpquwTbaMnJcvVc15si10G9kJN0kQf3PYaJnyFXvABFM 9V0YFcIGFgsDZgXdV6AUNqyvAnVemy0MYZBeMqftj8bgfn5u9prkpOnPG+LI+Bd+FRIu jFoKMy8/sGmY1gxGb3xR41TQ3jWxEHkOD/CNrOExAk9EenrOIGnY35CgIdfrXzsk62ma qPrvvfv0+V6b782+cSe5/AbZwKfCKwClaihXel0JJa+T/UPvRUtZL+fKhBrw0TkenR0R GwgP2WcXjnaUxpixYpVuJp6cYUXQta3VFzFR61JBGdjG1jL7sLQ1LlbdsKAxWJ1UlIMw 5llw== X-Gm-Message-State: AOAM530q2k0Vf6qU24ZbR0k0/MWNGtU1Wly3ukzuuLAniQYWR8dyEWNK h7WQamhWXzrOONdncPCqyNApf6GLg3UgUWq1 X-Google-Smtp-Source: ABdhPJzl4iBtdCTA2qkci3IfQHYdcR2m84Dvv37E+iCzNVUExRPh2FFSv0F9UGr0AkkiTndRac6mmg== X-Received: by 2002:a17:90b:4b0c:: with SMTP id lx12mr5267974pjb.117.1598070505303; Fri, 21 Aug 2020 21:28:25 -0700 (PDT) Received: from jacob-builder.jf.intel.com ([192.55.55.43]) by smtp.gmail.com with ESMTPSA id q5sm3341582pgi.31.2020.08.21.21.28.23 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Aug 2020 21:28:24 -0700 (PDT) From: Jacob Pan X-Google-Original-From: Jacob Pan To: iommu@lists.linux-foundation.org, LKML , Jean-Philippe Brucker , "Lu Baolu" , Joerg Roedel , David Woodhouse Subject: [PATCH v2 2/9] iommu/ioasid: Rename ioasid_set_data() Date: Fri, 21 Aug 2020 21:35:11 -0700 Message-Id: <1598070918-21321-3-git-send-email-jacob.jun.pan@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1598070918-21321-1-git-send-email-jacob.jun.pan@linux.intel.com> References: <1598070918-21321-1-git-send-email-jacob.jun.pan@linux.intel.com> X-Mailman-Approved-At: Sat, 22 Aug 2020 07:09:31 +0000 Cc: "Tian, Kevin" , Raj Ashok , Wu Hao X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: iommu-bounces@lists.linux-foundation.org Sender: "iommu" Rename ioasid_set_data() to ioasid_attach_data() to avoid confusion with struct ioasid_set. ioasid_set is a group of IOASIDs that share a common token. Signed-off-by: Jacob Pan --- drivers/iommu/intel/svm.c | 6 +++--- drivers/iommu/ioasid.c | 6 +++--- include/linux/ioasid.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/iommu/intel/svm.c b/drivers/iommu/intel/svm.c index b6972dca2ae0..37a9beabc0ca 100644 --- a/drivers/iommu/intel/svm.c +++ b/drivers/iommu/intel/svm.c @@ -342,7 +342,7 @@ int intel_svm_bind_gpasid(struct iommu_domain *domain, struct device *dev, svm->gpasid = data->gpasid; svm->flags |= SVM_FLAG_GUEST_PASID; } - ioasid_set_data(data->hpasid, svm); + ioasid_attach_data(data->hpasid, svm); INIT_LIST_HEAD_RCU(&svm->devs); mmput(svm->mm); } @@ -394,7 +394,7 @@ int intel_svm_bind_gpasid(struct iommu_domain *domain, struct device *dev, list_add_rcu(&sdev->list, &svm->devs); out: if (!IS_ERR_OR_NULL(svm) && list_empty(&svm->devs)) { - ioasid_set_data(data->hpasid, NULL); + ioasid_attach_data(data->hpasid, NULL); kfree(svm); } @@ -437,7 +437,7 @@ int intel_svm_unbind_gpasid(struct device *dev, int pasid) * the unbind, IOMMU driver will get notified * and perform cleanup. */ - ioasid_set_data(pasid, NULL); + ioasid_attach_data(pasid, NULL); kfree(svm); } } diff --git a/drivers/iommu/ioasid.c b/drivers/iommu/ioasid.c index 0f8dd377aada..5f63af07acd5 100644 --- a/drivers/iommu/ioasid.c +++ b/drivers/iommu/ioasid.c @@ -258,14 +258,14 @@ void ioasid_unregister_allocator(struct ioasid_allocator_ops *ops) EXPORT_SYMBOL_GPL(ioasid_unregister_allocator); /** - * ioasid_set_data - Set private data for an allocated ioasid + * ioasid_attach_data - Set private data for an allocated ioasid * @ioasid: the ID to set data * @data: the private data * * For IOASID that is already allocated, private data can be set * via this API. Future lookup can be done via ioasid_find. */ -int ioasid_set_data(ioasid_t ioasid, void *data) +int ioasid_attach_data(ioasid_t ioasid, void *data) { struct ioasid_data *ioasid_data; int ret = 0; @@ -287,7 +287,7 @@ int ioasid_set_data(ioasid_t ioasid, void *data) return ret; } -EXPORT_SYMBOL_GPL(ioasid_set_data); +EXPORT_SYMBOL_GPL(ioasid_attach_data); /** * ioasid_alloc - Allocate an IOASID diff --git a/include/linux/ioasid.h b/include/linux/ioasid.h index 6f000d7a0ddc..9c44947a68c8 100644 --- a/include/linux/ioasid.h +++ b/include/linux/ioasid.h @@ -39,7 +39,7 @@ void *ioasid_find(struct ioasid_set *set, ioasid_t ioasid, bool (*getter)(void *)); int ioasid_register_allocator(struct ioasid_allocator_ops *allocator); void ioasid_unregister_allocator(struct ioasid_allocator_ops *allocator); -int ioasid_set_data(ioasid_t ioasid, void *data); +int ioasid_attach_data(ioasid_t ioasid, void *data); #else /* !CONFIG_IOASID */ static inline ioasid_t ioasid_alloc(struct ioasid_set *set, ioasid_t min, @@ -67,7 +67,7 @@ static inline void ioasid_unregister_allocator(struct ioasid_allocator_ops *allo { } -static inline int ioasid_set_data(ioasid_t ioasid, void *data) +static inline int ioasid_attach_data(ioasid_t ioasid, void *data) { return -ENOTSUPP; } -- 2.7.4 _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu