From patchwork Tue Jul 5 10:27:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yishai Hadas X-Patchwork-Id: 12906335 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DEBC6C433EF for ; Tue, 5 Jul 2022 10:29:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232204AbiGEK3q (ORCPT ); Tue, 5 Jul 2022 06:29:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53476 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232172AbiGEK3Q (ORCPT ); Tue, 5 Jul 2022 06:29:16 -0400 Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2040.outbound.protection.outlook.com [40.107.95.40]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA6A115724; Tue, 5 Jul 2022 03:29:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O7iMIQWuAsYTkyiIysA0LdTMX/OMoueo0QzA3Kf6PACHzVd/1ZOGWQ62naO7MYVEuyM2/j/AMLtvKlgUQrdPm8oxMorT31V/Z3uehn7hmc6qTsnzUnQ+b2NmrzGsTi7CHef4DwlKbx/uYubM6zgk6YDd3Y0Kzi0TncwB3qSAh5iozms5coA484Rz5urUpLehwIFJoIedh/bEEkwP4V10mLxHrcVPYUFlNqw3AV1R7N554iPF7tIwXXM0xO08nzQYyncokE8ewMTDLM5uHZAAhhBK+i/QljeixAUhUmXEyWYZI6qUzE+WZk9lAACLG1YdCirPf6PBtzBx/ZHH4BoFpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Wb5B38pz2fgEyssjvA29VUF1xQ36PldquXyFPWiE7LQ=; b=lHMPNx9QhBWlmHSDkq4QIOYPhwBPmbZ4Kkya8dn/0OebwVQy2zq6qjA6xEL3wQ0fWD58vWHOKy5TujdE7Y2jib6qagbWTLMHKWt3rWpUagG/gsSE9DLSITzHvKVL+D3qG6Qsc2Z6vPT4K2uqzUN9Ym2idM+JCIDrrLip9U/kyYouyL61SDbpbUzT52ZzRqtu/EDgJ41InmDV5Q6oSw1dCN7QEnhY2JaJvQI/Tmmj1VjjeCgkQACeTg9VSfWiEaXspAcz7m6yFZOlIVd362htaj4OhW/AdVSylQelc2TPvRFzYGeF5xY/JCD3hsFfBE+fpy8jmWvQFDxeqUxP5gHoLw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=temperror (sender ip is 12.22.5.235) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=temperror action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Wb5B38pz2fgEyssjvA29VUF1xQ36PldquXyFPWiE7LQ=; b=OtvdrrJYb45oskSmP0cMO7M58ppXYiZdY4pmpzPAKlKm1mPBuU4E72SD+xUNN7JmlOS8QavHN0f+yDecJvV9pPlGVgCMWCZi5P9v6bLyiYFJMgDuE6RDrqdg+9O9g0YNX098ucw0RrJ9Xyu+LH/BzNKC9dnXTcH/7DsugkqPlajABDvYBTQwLNR7CrAebbkVtvulFO8wFpJ7C25SfXO2zu7l6rF+w2hyvrcNWwkOWUk/s6hOxSFck6B8Y262o4sYoYh2Kc/lppSkc4qkLEPYoM/OQa8BAj1g7bF3rp8m08gJCE1Yx3u9GnSjwdqqyUhhCYUTqNBH+93jXZAuYC1oCg== Received: from CO1PR15CA0061.namprd15.prod.outlook.com (2603:10b6:101:1f::29) by DM4PR12MB6445.namprd12.prod.outlook.com (2603:10b6:8:bd::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.20; Tue, 5 Jul 2022 10:28:58 +0000 Received: from CO1NAM11FT037.eop-nam11.prod.protection.outlook.com (2603:10b6:101:1f:cafe::9f) by CO1PR15CA0061.outlook.office365.com (2603:10b6:101:1f::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.21 via Frontend Transport; Tue, 5 Jul 2022 10:28:58 +0000 X-MS-Exchange-Authentication-Results: spf=temperror (sender IP is 12.22.5.235) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=temperror action=none header.from=nvidia.com; Received-SPF: TempError (protection.outlook.com: error in processing during lookup of nvidia.com: DNS Timeout) Received: from mail.nvidia.com (12.22.5.235) by CO1NAM11FT037.mail.protection.outlook.com (10.13.174.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5395.14 via Frontend Transport; Tue, 5 Jul 2022 10:28:56 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) by DRHQMAIL107.nvidia.com (10.27.9.16) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Tue, 5 Jul 2022 10:28:56 +0000 Received: from drhqmail202.nvidia.com (10.126.190.181) by drhqmail201.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.26; Tue, 5 Jul 2022 03:28:54 -0700 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.181) with Microsoft SMTP Server id 15.2.986.26 via Frontend Transport; Tue, 5 Jul 2022 03:28:51 -0700 From: Yishai Hadas To: , CC: , , , , , , , , , Subject: [PATCH V1 vfio 10/11] vfio/mlx5: Manage error scenarios on tracker Date: Tue, 5 Jul 2022 13:27:39 +0300 Message-ID: <20220705102740.29337-11-yishaih@nvidia.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20220705102740.29337-1-yishaih@nvidia.com> References: <20220705102740.29337-1-yishaih@nvidia.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 34529f48-6fd4-4a97-9662-08da5e712ae9 X-MS-TrafficTypeDiagnostic: DM4PR12MB6445:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: I0seJXR+YfC2DgGEtjfZDzlLQcUAk/3FliN3W0M5PSdmmBzkn/HpZuAHXiBEpQVvs8orfWH5azr8gicSBRIlQ1DnlyUZkacz6fSnhLVS7gyz910EsdT0jcPzZpVhNPwiKY2IKUwe8dd9qptcq+eZ5zP4TVM1sE+bz9nefyGJz1Ar6miNRoMxhX75wbLK16PqG3Vae+huyMqsGa2UMjMm3vV/ixQ/MzEMjQHY8TOuUUqutfgPrhaCFBbppOF4Du7nRfKk54Mu458mSpKpHL0iSCy3vIWOhd4Ltkl+1x4Eoj9b9KcXwDdWLT2l36+tT4hQtw9SPeJFuBJ5/pFVESZ40fUP/2q3SVtbALphkRrmA2fHSgn23LPhFp+z6w2a2t11hfHNniz/3u5GV2Xf2M9YHe+AHOcMlSsjzBKKc2Z6RHyy4/P8FHP1J1r+W6jUm2Yl6mOhLe2LpEFbJeTo797pb8Dsl7NTKZOh529xhf/POC+UY+L2sqeWsPUuBTSQvd0CkHaXRGVvv6yBpJP3yPTQ8EGn2Enj1DfrbLZG1u26sgRGdIhNi6YXfuBGIX//VbsC6fOAAARKTVXH8wmujq75NSJyKZizc8JsJvLaCl82dSku4Ips25H7q4Dkum4d81WqjYXsT31PcJW+Vsqtp4ycmUx3BXEoxGMPFY7xmOi1rXev40lqPfUfNaJls383whEYSplW0sLq4uCViKqSWyHn3sfRb5vFSeM1tMGKJKaGlQ33BZS+QPQPkKLK7IwdcdMrB7afK0GSv2YuHSsod9OCycmC1LJk/l7a3adt5T+jiHbH7aedgtu8mmV6EEgrFpcuvUX0gY9LPK3BZkzBp7iDEkxvHnEC1ncheJssTZYtOXM= X-Forefront-Antispam-Report: CIP:12.22.5.235;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:InfoNoRecords;CAT:NONE;SFS:(13230016)(4636009)(396003)(136003)(346002)(39860400002)(376002)(36840700001)(40470700004)(46966006)(7696005)(86362001)(82310400005)(2906002)(6666004)(26005)(47076005)(40480700001)(8936002)(5660300002)(36756003)(356005)(40460700003)(110136005)(6636002)(36860700001)(478600001)(82740400003)(81166007)(54906003)(41300700001)(336012)(83380400001)(2616005)(4326008)(63370400001)(70586007)(63350400001)(8676002)(1076003)(186003)(316002)(426003)(70206006)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2022 10:28:56.9519 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 34529f48-6fd4-4a97-9662-08da5e712ae9 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[12.22.5.235];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT037.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6445 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Handle async error events and health/recovery flow to safely stop the tracker upon error scenarios. Signed-off-by: Yishai Hadas --- drivers/vfio/pci/mlx5/cmd.c | 61 +++++++++++++++++++++++++++++++++++-- drivers/vfio/pci/mlx5/cmd.h | 2 ++ 2 files changed, 61 insertions(+), 2 deletions(-) diff --git a/drivers/vfio/pci/mlx5/cmd.c b/drivers/vfio/pci/mlx5/cmd.c index fa9ddd926500..3e92b4d92be2 100644 --- a/drivers/vfio/pci/mlx5/cmd.c +++ b/drivers/vfio/pci/mlx5/cmd.c @@ -70,6 +70,13 @@ int mlx5vf_cmd_query_vhca_migration_state(struct mlx5vf_pci_core_device *mvdev, return 0; } +static void set_tracker_error(struct mlx5vf_pci_core_device *mvdev) +{ + /* Mark the tracker under an error and wake it up if it's running */ + mvdev->tracker.is_err = true; + complete(&mvdev->tracker_comp); +} + static int mlx5fv_vf_event(struct notifier_block *nb, unsigned long event, void *data) { @@ -100,6 +107,8 @@ void mlx5vf_cmd_close_migratable(struct mlx5vf_pci_core_device *mvdev) if (!mvdev->migrate_cap) return; + /* Must be done outside the lock to let it progress */ + set_tracker_error(mvdev); mutex_lock(&mvdev->state_mutex); mlx5vf_disable_fds(mvdev); _mlx5vf_free_page_tracker_resources(mvdev); @@ -619,6 +628,47 @@ static void mlx5vf_destroy_cq(struct mlx5_core_dev *mdev, mlx5_db_free(mdev, &cq->db); } +static void mlx5vf_cq_event(struct mlx5_core_cq *mcq, enum mlx5_event type) +{ + if (type != MLX5_EVENT_TYPE_CQ_ERROR) + return; + + set_tracker_error(container_of(mcq, struct mlx5vf_pci_core_device, + tracker.cq.mcq)); +} + +static int mlx5vf_event_notifier(struct notifier_block *nb, unsigned long type, + void *data) +{ + struct mlx5_vhca_page_tracker *tracker = + mlx5_nb_cof(nb, struct mlx5_vhca_page_tracker, nb); + struct mlx5vf_pci_core_device *mvdev = container_of( + tracker, struct mlx5vf_pci_core_device, tracker); + struct mlx5_eqe *eqe = data; + u8 event_type = (u8)type; + u8 queue_type; + int qp_num; + + switch (event_type) { + case MLX5_EVENT_TYPE_WQ_CATAS_ERROR: + case MLX5_EVENT_TYPE_WQ_ACCESS_ERROR: + case MLX5_EVENT_TYPE_WQ_INVAL_REQ_ERROR: + queue_type = eqe->data.qp_srq.type; + if (queue_type != MLX5_EVENT_QUEUE_TYPE_QP) + break; + qp_num = be32_to_cpu(eqe->data.qp_srq.qp_srq_n) & 0xffffff; + if (qp_num != tracker->host_qp->qpn && + qp_num != tracker->fw_qp->qpn) + break; + set_tracker_error(mvdev); + break; + default: + break; + } + + return NOTIFY_OK; +} + static void mlx5vf_cq_complete(struct mlx5_core_cq *mcq, struct mlx5_eqe *eqe) { @@ -680,6 +730,7 @@ static int mlx5vf_create_cq(struct mlx5_core_dev *mdev, pas = (__be64 *)MLX5_ADDR_OF(create_cq_in, in, pas); mlx5_fill_page_frag_array(&cq->buf.frag_buf, pas); cq->mcq.comp = mlx5vf_cq_complete; + cq->mcq.event = mlx5vf_cq_event; err = mlx5_core_create_cq(mdev, &cq->mcq, in, inlen, out, sizeof(out)); if (err) goto err_vec; @@ -1014,6 +1065,7 @@ _mlx5vf_free_page_tracker_resources(struct mlx5vf_pci_core_device *mvdev) WARN_ON(mvdev->mdev_detach); + mlx5_eq_notifier_unregister(mdev, &tracker->nb); mlx5vf_cmd_destroy_tracker(mdev, tracker->id); mlx5vf_destroy_qp(mdev, tracker->fw_qp); mlx5vf_free_qp_recv_resources(mdev, tracker->host_qp); @@ -1127,6 +1179,8 @@ int mlx5vf_start_page_tracker(struct vfio_device *vdev, if (err) goto err_activate; + MLX5_NB_INIT(&tracker->nb, mlx5vf_event_notifier, NOTIFY_ANY); + mlx5_eq_notifier_register(mdev, &tracker->nb); *page_size = host_qp->tracked_page_size; mvdev->log_active = true; mlx5vf_state_mutex_unlock(mvdev); @@ -1273,7 +1327,8 @@ int mlx5vf_tracker_read_and_clear(struct vfio_device *vdev, unsigned long iova, goto end; tracker->status = MLX5_PAGE_TRACK_STATE_REPORTING; - while (tracker->status == MLX5_PAGE_TRACK_STATE_REPORTING) { + while (tracker->status == MLX5_PAGE_TRACK_STATE_REPORTING && + !tracker->is_err) { poll_err = mlx5vf_cq_poll_one(cq, tracker->host_qp, dirty, &tracker->status); if (poll_err == CQ_EMPTY) { @@ -1294,8 +1349,10 @@ int mlx5vf_tracker_read_and_clear(struct vfio_device *vdev, unsigned long iova, } if (tracker->status == MLX5_PAGE_TRACK_STATE_ERROR) - err = -EIO; + tracker->is_err = true; + if (tracker->is_err) + err = -EIO; end: mlx5vf_state_mutex_unlock(mvdev); return err; diff --git a/drivers/vfio/pci/mlx5/cmd.h b/drivers/vfio/pci/mlx5/cmd.h index fa1f9ab4d3d0..8b0ae40c620c 100644 --- a/drivers/vfio/pci/mlx5/cmd.h +++ b/drivers/vfio/pci/mlx5/cmd.h @@ -82,10 +82,12 @@ struct mlx5_vhca_qp { struct mlx5_vhca_page_tracker { u32 id; u32 pdn; + u8 is_err:1; struct mlx5_uars_page *uar; struct mlx5_vhca_cq cq; struct mlx5_vhca_qp *host_qp; struct mlx5_vhca_qp *fw_qp; + struct mlx5_nb nb; int status; };