Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34;
Date:   Mon, 25 Sep 2023 10:45:06 -0300
From:   Jason Gunthorpe <jgg@nvidia.com>
To:     Cindy Lu <lulu@redhat.com>
Cc:     jasowang@redhat.com, mst@redhat.com, yi.l.liu@intel.com,
        linux-kernel@vger.kernel.org,
        virtualization@lists.linux-foundation.org, netdev@vger.kernel.org
Subject: Re: [RFC 4/7] vdpa: change the map/unmap process to support iommufd
Message-ID: <20230925134506.GB13733@nvidia.com>
References: <20230923170540.1447301-1-lulu@redhat.com>
 <20230923170540.1447301-5-lulu@redhat.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20230923170540.1447301-5-lulu@redhat.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/UlSPqBbn/curdEhKKgsc9wIaChh3/7sZEMKE9HCg9zGxTDSafMwrW43/Sxo?=
 =?us-ascii?Q?3KEDNw7OqyJsISf0n1HuM++JA7hYQ3yby2mKbbc8OK+5khwPalIPkE6qSFXd?=
 =?us-ascii?Q?wpJJHaKZwHN6Qj2zHYdyECz/8tci2O06l0w8tqC8ZHBmTsdeiqfmQ8TRfd3C?=
 =?us-ascii?Q?m+ZWd6bPdVpw6cHMttSdczcBYB4jYkgWOqh67JEhnEsEKR+XQ7agT2gRhgXA?=
 =?us-ascii?Q?sBPpg7LVjas0sl7sJ2kV+z/fchowkIJvQN0xFt2p5KmDY7eThyrsXimVnZd2?=
 =?us-ascii?Q?mJLuGYOV76OKIV1k/w6oNxr8rYeqva3dlWpvOEMvNwkkMUyvjDGC+th6EUwe?=
 =?us-ascii?Q?uKuQbnaEJsJuXvPVO2o78EjSQ+PEI5hTPwZUSXVqXczu+yfkhV43fsq4/cNs?=
 =?us-ascii?Q?4g1piJvnhGp2JCa3TrBXf3rSeZx+edxI8PbK6q0EH+NaJs7eFvydk1CSNRs0?=
 =?us-ascii?Q?dd36FouVvcJV1PPxkk0zXApNftjO0EV4TZ2gkpI81TC+9V+PM0sJoRBvNwdf?=
 =?us-ascii?Q?oWsG0HoLepRsEVxxkOTxvXOHrJ6G9MmyPalgcMXqK5GWJBe3IxNfpIBfS16p?=
 =?us-ascii?Q?m7AywV4g1WFnzydjC3pD5QtO2CUPvcRPZ+RZNINQrgq83GAfcojBviHg26wB?=
 =?us-ascii?Q?OksBrmavHLdkwdwOM3dyWy8SbAILsBjPOZg8z5I3jskgNd2NsXfhHxl+7rmW?=
 =?us-ascii?Q?xvfJ0rzNGPNqkhR7a4QWx0+qYYR5j90vUswAzuoFvXxtOeDn4RFzEY7GAKmS?=
 =?us-ascii?Q?+RV2oLlPuWgEf05oUBBRUeecEOcSRU0DNCtbU52SxTr1ef8BNlDAI20IW3RV?=
 =?us-ascii?Q?ohLemLZZs1y7b36OTQGz1iAjg1n4JPdCx+N6flcN1nHCdRDA35sAOC5uWDdw?=
 =?us-ascii?Q?icc1mJiRy4eQn+f7V9b4mVfhGck5EXfk3Ku2BqOt4e6JRHLKvi/0n7+vABAx?=
 =?us-ascii?Q?M74Wgrpn0+uBLB1xXpKoGq1y9n2upK7hSi2g/3hhXLJ9QcnK96tDqnngRRVn?=
 =?us-ascii?Q?pBc/ziCQ3BJPDXM+Yf37sSrvJs+yvnmB67rVtinuVcJd9xhKQRpLbfNtm8EI?=
 =?us-ascii?Q?ujwjLjmvcHvzU8S4yD9vNro73l9meSJkgUU5Gw2wlgPC3q+l3qI/SQM8xFOG?=
 =?us-ascii?Q?cVE/k58SsoNagExtF0NYvD1zhVrTsjmQXpvrQW/+Cg7A7lZ8psE00C2nGB5x?=
 =?us-ascii?Q?sReUDjbcz3jrxOkJbv58t3lgQEL247pEwGVKrnmpvLZzSYYXaxeyO7f98OEP?=
 =?us-ascii?Q?UcirzZli/mI4kN8T5M7jXeCIZsz7J4oeWSqLFcNiZudAfFsst1KSf+shFvy4?=
 =?us-ascii?Q?azti0u/Hgk3Lmae6HAATqa25wDl5BP6bmj0m5yx45vc0vjm1BSwkgIZmZxOg?=
 =?us-ascii?Q?ehM801RW35SRUseQ53+yloTrz6Fh5djqEpOF2l100JUFc3gIv+2Jlx1myWSW?=
 =?us-ascii?Q?WZ5J3lhQCmV+I5do5JiTr6qjDczPDxm3W0d3lc5bRk0C6FUj3H3IZpYoKDeY?=
 =?us-ascii?Q?JMN565d4z0eUNohEhmKkq4IBDEltXawhixy0MswmiOIW18xQ3AdnY8qtYFkn?=
 =?us-ascii?Q?Y4xVP5+UYSV6wmdnpz8x0deoozsr9ElLCqqz9uLj?=
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: cc512647-686b-4073-6728-08dbbdcda150
X-MS-Exchange-CrossTenant-AuthSource: LV2PR12MB5869.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Sep 2023 13:45:07.7263
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Kz6m9ZWLoS6LXBLL6qkFgOzJce6FzIJwYuXQX8tzuLUPcirn90/lGHD5ZGNOnAXB
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW6PR12MB7086
X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,
        RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE
        autolearn=no autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Mon, 25 Sep 2023 06:45:18 -0700 (PDT)

On Sun, Sep 24, 2023 at 01:05:37AM +0800, Cindy Lu wrote:
> Add the check for iommufd_ictx,If vdpa don't have the iommufd_ictx
> then will use the Legacy iommu domain pathway
> 
> Signed-off-by: Cindy Lu <lulu@redhat.com>
> ---
>  drivers/vhost/vdpa.c | 10 ++++++++++
>  1 file changed, 10 insertions(+)
> 
> diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c
> index 91da012084e9..8d1ad89d4671 100644
> --- a/drivers/vhost/vdpa.c
> +++ b/drivers/vhost/vdpa.c
> @@ -981,6 +981,10 @@ static int vhost_vdpa_map(struct vhost_vdpa *v, struct vhost_iotlb *iotlb,
>  	} else if (ops->set_map) {
>  		if (!v->in_batch)
>  			r = ops->set_map(vdpa, asid, iotlb);
> +	} else if (!vdpa->iommufd_ictx) {
> +		/* Legacy iommu domain pathway without IOMMUFD */
> +		r = iommu_map(v->domain, iova, pa, size,
> +			      perm_to_iommu_flags(perm));
>  	} else {
>  		r = iommu_map(v->domain, iova, pa, size,
>  			      perm_to_iommu_flags(perm));

Um, why is the 2nd else the same as the new one?

Jason