LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Pierre Morel <pmorel@linux.ibm.com>
To: sebott@linux.vnet.ibm.com
Cc: gerald.schaefer@de.ibm.com, pasic@linux.vnet.ibm.com,
borntraeger@de.ibm.com, walling@linux.ibm.com,
linux-s390@vger.kernel.org, iommu@lists.linux-foundation.org,
joro@8bytes.org, linux-kernel@vger.kernel.org,
alex.williamson@redhat.com, kvm@vger.kernel.org,
schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com
Subject: [PATCH 3/4] s390: iommu: Adding get attributes for s390_iommu
Date: Fri, 10 May 2019 10:22:34 +0200 [thread overview]
Message-ID: <1557476555-20256-4-git-send-email-pmorel@linux.ibm.com> (raw)
In-Reply-To: <1557476555-20256-1-git-send-email-pmorel@linux.ibm.com>
We add "get attributes" to the S390 iommu operations to retrieve the S390
specific attributes through the call of zPCI dedicated CLP functions.
Signed-off-by: Pierre Morel <pmorel@linux.ibm.com>
---
drivers/iommu/s390-iommu.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++
include/linux/iommu.h | 4 +++
2 files changed, 81 insertions(+)
diff --git a/drivers/iommu/s390-iommu.c b/drivers/iommu/s390-iommu.c
index 22d4db3..98082f0 100644
--- a/drivers/iommu/s390-iommu.c
+++ b/drivers/iommu/s390-iommu.c
@@ -363,6 +363,82 @@ void zpci_destroy_iommu(struct zpci_dev *zdev)
iommu_device_sysfs_remove(&zdev->iommu_dev);
}
+struct zpci_dev *get_zpci(struct s390_domain *s390_domain)
+{
+ struct s390_domain_device *domain_device;
+
+ domain_device = list_first_entry(&s390_domain->devices,
+ struct s390_domain_device, list);
+ if (!domain_device)
+ return NULL;
+ return domain_device->zdev;
+}
+
+static int s390_domain_get_fn(struct iommu_domain *domain, void *data)
+{
+ struct zpci_dev *zdev;
+ struct clp_req_rsp_query_pci *rrb;
+ int rc;
+
+ zdev = get_zpci(to_s390_domain(domain));
+ if (!zdev)
+ return -ENODEV;
+ rrb = (struct clp_req_rsp_query_pci *)
+ __get_free_pages(GFP_KERNEL, get_order(CLP_BLK_SIZE));
+ if (!rrb)
+ return -ENOMEM;
+ rc = zdev_query_pci_fn(zdev, rrb);
+
+ if (!rc && rrb->response.hdr.rsp == CLP_RC_OK)
+ memcpy(data, &rrb->response, sizeof(struct clp_rsp_query_pci));
+ else
+ rc = -EIO;
+ free_pages((unsigned long) rrb, get_order(CLP_BLK_SIZE));
+ return rc;
+}
+
+static int s390_domain_get_grp(struct iommu_domain *domain, void *data)
+{
+ struct zpci_dev *zdev;
+ struct clp_req_rsp_query_pci_grp *rrb;
+ int rc;
+
+ zdev = get_zpci(to_s390_domain(domain));
+ if (!zdev)
+ return -ENODEV;
+ rrb = (struct clp_req_rsp_query_pci_grp *)
+ __get_free_pages(GFP_KERNEL, get_order(CLP_BLK_SIZE));
+ if (!rrb)
+ return -ENOMEM;
+
+ rc = zdev_query_pci_fngrp(zdev, rrb);
+ if (!rc && rrb->response.hdr.rsp == CLP_RC_OK)
+ memcpy(data, &rrb->response,
+ sizeof(struct clp_rsp_query_pci_grp));
+ else
+ rc = -EIO;
+
+ free_pages((unsigned long) rrb, get_order(CLP_BLK_SIZE));
+ return rc;
+}
+
+static int s390_domain_get_attr(struct iommu_domain *domain,
+ enum iommu_attr attr, void *data)
+{
+ switch (attr) {
+ case DOMAIN_ATTR_ZPCI_FN_SIZE:
+ return sizeof(struct clp_rsp_query_pci);
+ case DOMAIN_ATTR_ZPCI_GRP_SIZE:
+ return sizeof(struct clp_rsp_query_pci_grp);
+ case DOMAIN_ATTR_ZPCI_FN:
+ return s390_domain_get_fn(domain, data);
+ case DOMAIN_ATTR_ZPCI_GRP:
+ return s390_domain_get_grp(domain, data);
+ default:
+ return -ENODEV;
+ }
+}
+
static const struct iommu_ops s390_iommu_ops = {
.capable = s390_iommu_capable,
.domain_alloc = s390_domain_alloc,
@@ -376,6 +452,7 @@ static const struct iommu_ops s390_iommu_ops = {
.remove_device = s390_iommu_remove_device,
.device_group = generic_device_group,
.pgsize_bitmap = S390_IOMMU_PGSIZES,
+ .domain_get_attr = s390_domain_get_attr,
};
static int __init s390_iommu_init(void)
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index ffbbc7e..ebdcac4 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -125,6 +125,10 @@ enum iommu_attr {
DOMAIN_ATTR_FSL_PAMUV1,
DOMAIN_ATTR_NESTING, /* two stages of translation */
DOMAIN_ATTR_DMA_USE_FLUSH_QUEUE,
+ DOMAIN_ATTR_ZPCI_FN_SIZE,
+ DOMAIN_ATTR_ZPCI_GRP_SIZE,
+ DOMAIN_ATTR_ZPCI_FN,
+ DOMAIN_ATTR_ZPCI_GRP,
DOMAIN_ATTR_MAX,
};
--
2.7.4
next prev parent reply other threads:[~2019-05-10 8:23 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-10 8:22 [PATCH 0/4] Retrieving zPCI specific info with VFIO Pierre Morel
2019-05-10 8:22 ` [PATCH 1/4] s390: pci: Exporting access to CLP PCI function and PCI group Pierre Morel
2019-05-10 10:21 ` Robin Murphy
2019-05-10 14:45 ` Pierre Morel
2019-05-10 8:22 ` [PATCH 2/4] vfio: vfio_iommu_type1: Define VFIO_IOMMU_INFO_CAPABILITIES Pierre Morel
2019-05-16 14:57 ` Christian Borntraeger
2019-05-16 18:54 ` Alex Williamson
2019-05-16 18:31 ` Alex Williamson
2019-05-17 8:18 ` Pierre Morel
2019-05-10 8:22 ` Pierre Morel [this message]
2019-05-10 8:22 ` [PATCH 4/4] vfio: vfio_iommu_type1: implement VFIO_IOMMU_INFO_CAPABILITIES Pierre Morel
2019-05-16 18:40 ` Alex Williamson
2019-05-17 8:17 ` Pierre Morel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1557476555-20256-4-git-send-email-pmorel@linux.ibm.com \
--to=pmorel@linux.ibm.com \
--cc=alex.williamson@redhat.com \
--cc=borntraeger@de.ibm.com \
--cc=gerald.schaefer@de.ibm.com \
--cc=heiko.carstens@de.ibm.com \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=pasic@linux.vnet.ibm.com \
--cc=schwidefsky@de.ibm.com \
--cc=sebott@linux.vnet.ibm.com \
--cc=walling@linux.ibm.com \
--subject='Re: [PATCH 3/4] s390: iommu: Adding get attributes for s390_iommu' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).