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=-6.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS 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 1C96DC433DF for ; Fri, 26 Jun 2020 07:47:57 +0000 (UTC) Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (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 E223620775 for ; Fri, 26 Jun 2020 07:47:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="wNRHexa5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E223620775 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=iommu-bounces@lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id A549786BC4; Fri, 26 Jun 2020 07:47:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qS6notUWMZpf; Fri, 26 Jun 2020 07:47:55 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by fraxinus.osuosl.org (Postfix) with ESMTP id E0C768698F; Fri, 26 Jun 2020 07:47:55 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id CCFD9C088C; Fri, 26 Jun 2020 07:47:55 +0000 (UTC) Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id B41E8C016F for ; Fri, 26 Jun 2020 07:47:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id B0FEA86A27 for ; Fri, 26 Jun 2020 07:47:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gjTk2GG0m-_Y for ; Fri, 26 Jun 2020 07:47:52 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ej1-f68.google.com (mail-ej1-f68.google.com [209.85.218.68]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 5288F8698F for ; Fri, 26 Jun 2020 07:47:52 +0000 (UTC) Received: by mail-ej1-f68.google.com with SMTP id w6so8438438ejq.6 for ; Fri, 26 Jun 2020 00:47:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=uilk6pA4v6KKUsLLMKY6bcWg9QtWqaF5/DWx18U/CC0=; b=wNRHexa5s1zJiUOQyWtpLRXSG5ABe3ivQzpVwdwmn8o/tEZ3m+fyj4FO67sPTR7iGi DpNfp1sF5xQI6z+w34Q0nCrcdbvULmc0+e1I8AwkbPv/n7tBvK9hQWB5afKP87qjKW06 AKTO4Ic3DR6pc55MzBsi6SUhapT0eVSocXd+lW+19x5PYMm8xySVNbEGipLDiYUeTeVV cK+kzpFrFU3vZ6pjqQRkZj4aeFNbOMZ6nFAAh/Mr4AEKLD+UxIHEOX3PSGfZ1VYrpPSl C+jhxyMXPeiK8p3tM4y8nLAf39PmbenImLBlqlgNyJa2RI/2nWh4gggsgzCCsz1g3Flx Wr3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=uilk6pA4v6KKUsLLMKY6bcWg9QtWqaF5/DWx18U/CC0=; b=Lj15n/zu7MckskQC+Dkz0f1KWHmIYt+8yluKLc1kFO6k7bXDABNtKBirws+SmCtptz LDxStpBoC3cF99l3DHmMWD+dEKP1XoFxlg4pwlu1QmZjwIbSQf54MMRs7rpxpZVEpiUA zEeYdLui0TeNRC2v4gkRXKDRNmUx233VcrV4LLg8sliC0XE4FePwDNHfbO3TO4BqC6CF 8NYLVynFtNyDDYnS4ykg3JVQ5RchKtqXMesN/3kdEPIK0dKXLHVfiCs3iFarRwDQ/JGT omt9J1lC1dIpBggP7vdznkdlDjEZt09eazB8+07TsOpYuoID+sIrwp1kYdoMKaNlOkh0 N4Qw== X-Gm-Message-State: AOAM533yW7CHo7ICYSijE+C8+au6hDifbfO0xd0FpaR39702xM3OjIbc abWKdfBXeaKz6WzvE0sNPiXZBQ== X-Google-Smtp-Source: ABdhPJz95Ad9tZXwAAZZfpGTo9871UG/cCB3/qufTsd1aPfFz2/WXFO57hB5+K4dVtoXfNQLW+GeCg== X-Received: by 2002:a17:906:c14f:: with SMTP id dp15mr1444508ejc.454.1593157670667; Fri, 26 Jun 2020 00:47:50 -0700 (PDT) Received: from myrica ([2001:1715:4e26:a7e0:116c:c27a:3e7f:5eaf]) by smtp.gmail.com with ESMTPSA id be2sm8717486edb.92.2020.06.26.00.47.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 00:47:50 -0700 (PDT) Date: Fri, 26 Jun 2020 09:47:38 +0200 From: Jean-Philippe Brucker To: Liu Yi L Subject: Re: [PATCH v3 02/14] iommu: Report domain nesting info Message-ID: <20200626074738.GA2107508@myrica> References: <1592988927-48009-1-git-send-email-yi.l.liu@intel.com> <1592988927-48009-3-git-send-email-yi.l.liu@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1592988927-48009-3-git-send-email-yi.l.liu@intel.com> Cc: kevin.tian@intel.com, ashok.raj@intel.com, kvm@vger.kernel.org, Robin Murphy , yi.y.sun@intel.com, linux-kernel@vger.kernel.org, alex.williamson@redhat.com, iommu@lists.linux-foundation.org, hao.wu@intel.com, Will Deacon , jun.j.tian@intel.com 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: iommu-bounces@lists.linux-foundation.org Sender: "iommu" On Wed, Jun 24, 2020 at 01:55:15AM -0700, Liu Yi L wrote: > IOMMUs that support nesting translation needs report the capability info > to userspace, e.g. the format of first level/stage paging structures. > > This patch reports nesting info by DOMAIN_ATTR_NESTING. Caller can get > nesting info after setting DOMAIN_ATTR_NESTING. > > v2 -> v3: > *) remvoe cap/ecap_mask in iommu_nesting_info. > *) reuse DOMAIN_ATTR_NESTING to get nesting info. > *) return an empty iommu_nesting_info for SMMU drivers per Jean' > suggestion. > > Cc: Kevin Tian > CC: Jacob Pan > Cc: Alex Williamson > Cc: Eric Auger > Cc: Jean-Philippe Brucker > Cc: Joerg Roedel > Cc: Lu Baolu > Signed-off-by: Liu Yi L > Signed-off-by: Jacob Pan > --- > drivers/iommu/arm-smmu-v3.c | 29 ++++++++++++++++++++-- > drivers/iommu/arm-smmu.c | 29 ++++++++++++++++++++-- Looks reasonable to me. Please move the SMMU changes to a separate patch and Cc the SMMU maintainers: Cc: Will Deacon Cc: Robin Murphy Thanks, Jean > include/uapi/linux/iommu.h | 59 +++++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 113 insertions(+), 4 deletions(-) > > diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c > index f578677..0c45d4d 100644 > --- a/drivers/iommu/arm-smmu-v3.c > +++ b/drivers/iommu/arm-smmu-v3.c > @@ -3019,6 +3019,32 @@ static struct iommu_group *arm_smmu_device_group(struct device *dev) > return group; > } > > +static int arm_smmu_domain_nesting_info(struct arm_smmu_domain *smmu_domain, > + void *data) > +{ > + struct iommu_nesting_info *info = (struct iommu_nesting_info *) data; > + u32 size; > + > + if (!info || smmu_domain->stage != ARM_SMMU_DOMAIN_NESTED) > + return -ENODEV; > + > + size = sizeof(struct iommu_nesting_info); > + > + /* > + * if provided buffer size is not equal to the size, should > + * return 0 and also the expected buffer size to caller. > + */ > + if (info->size != size) { > + info->size = size; > + return 0; > + } > + > + /* report an empty iommu_nesting_info for now */ > + memset(info, 0x0, size); > + info->size = size; > + return 0; > +} > + > static int arm_smmu_domain_get_attr(struct iommu_domain *domain, > enum iommu_attr attr, void *data) > { > @@ -3028,8 +3054,7 @@ static int arm_smmu_domain_get_attr(struct iommu_domain *domain, > case IOMMU_DOMAIN_UNMANAGED: > switch (attr) { > case DOMAIN_ATTR_NESTING: > - *(int *)data = (smmu_domain->stage == ARM_SMMU_DOMAIN_NESTED); > - return 0; > + return arm_smmu_domain_nesting_info(smmu_domain, data); > default: > return -ENODEV; > } > diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c > index 243bc4c..908607d 100644 > --- a/drivers/iommu/arm-smmu.c > +++ b/drivers/iommu/arm-smmu.c > @@ -1506,6 +1506,32 @@ static struct iommu_group *arm_smmu_device_group(struct device *dev) > return group; > } > > +static int arm_smmu_domain_nesting_info(struct arm_smmu_domain *smmu_domain, > + void *data) > +{ > + struct iommu_nesting_info *info = (struct iommu_nesting_info *) data; > + u32 size; > + > + if (!info || smmu_domain->stage != ARM_SMMU_DOMAIN_NESTED) > + return -ENODEV; > + > + size = sizeof(struct iommu_nesting_info); > + > + /* > + * if provided buffer size is not equal to the size, should > + * return 0 and also the expected buffer size to caller. > + */ > + if (info->size != size) { > + info->size = size; > + return 0; > + } > + > + /* report an empty iommu_nesting_info for now */ > + memset(info, 0x0, size); > + info->size = size; > + return 0; > +} > + > static int arm_smmu_domain_get_attr(struct iommu_domain *domain, > enum iommu_attr attr, void *data) > { > @@ -1515,8 +1541,7 @@ static int arm_smmu_domain_get_attr(struct iommu_domain *domain, > case IOMMU_DOMAIN_UNMANAGED: > switch (attr) { > case DOMAIN_ATTR_NESTING: > - *(int *)data = (smmu_domain->stage == ARM_SMMU_DOMAIN_NESTED); > - return 0; > + return arm_smmu_domain_nesting_info(smmu_domain, data); > default: > return -ENODEV; > } > diff --git a/include/uapi/linux/iommu.h b/include/uapi/linux/iommu.h > index 1afc661..898c99a 100644 > --- a/include/uapi/linux/iommu.h > +++ b/include/uapi/linux/iommu.h > @@ -332,4 +332,63 @@ struct iommu_gpasid_bind_data { > } vendor; > }; > > +/* > + * struct iommu_nesting_info - Information for nesting-capable IOMMU. > + * user space should check it before using > + * nesting capability. > + * > + * @size: size of the whole structure > + * @format: PASID table entry format, the same definition with > + * @format of struct iommu_gpasid_bind_data. > + * @features: supported nesting features. > + * @flags: currently reserved for future extension. > + * @data: vendor specific cap info. > + * > + * +---------------+----------------------------------------------------+ > + * | feature | Notes | > + * +===============+====================================================+ > + * | SYSWIDE_PASID | Kernel manages PASID in system wide, PASIDs used | > + * | | in the system should be allocated by host kernel | > + * +---------------+----------------------------------------------------+ > + * | BIND_PGTBL | bind page tables to host PASID, the PASID could | > + * | | either be a host PASID passed in bind request or | > + * | | default PASIDs (e.g. default PASID of aux-domain) | > + * +---------------+----------------------------------------------------+ > + * | CACHE_INVLD | mandatory feature for nesting capable IOMMU | > + * +---------------+----------------------------------------------------+ > + * > + */ > +struct iommu_nesting_info { > + __u32 size; > + __u32 format; > + __u32 features; > +#define IOMMU_NESTING_FEAT_SYSWIDE_PASID (1 << 0) > +#define IOMMU_NESTING_FEAT_BIND_PGTBL (1 << 1) > +#define IOMMU_NESTING_FEAT_CACHE_INVLD (1 << 2) > + __u32 flags; > + __u8 data[]; > +}; > + > +/* > + * struct iommu_nesting_info_vtd - Intel VT-d specific nesting info > + * > + * > + * @flags: VT-d specific flags. Currently reserved for future > + * extension. > + * @addr_width: The output addr width of first level/stage translation > + * @pasid_bits: Maximum supported PASID bits, 0 represents no PASID > + * support. > + * @cap_reg: Describe basic capabilities as defined in VT-d capability > + * register. > + * @ecap_reg: Describe the extended capabilities as defined in VT-d > + * extended capability register. > + */ > +struct iommu_nesting_info_vtd { > + __u32 flags; > + __u16 addr_width; > + __u16 pasid_bits; > + __u64 cap_reg; > + __u64 ecap_reg; > +}; > + > #endif /* _UAPI_IOMMU_H */ > -- > 2.7.4 > _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu