Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <d6e8eb0a-1b45-0297-d84e-6629d8a9ea18@oracle.com>
Date:   Tue, 18 Oct 2022 12:52:29 -0700
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101
 Thunderbird/102.3.3
Subject: Re: [PATCH 3/4] vdpa/mlx5: Add debugfs subtree
Content-Language: en-US
To:     Eli Cohen <elic@nvidia.com>, mst@redhat.com, jasowang@redhat.com,
        linux-kernel@vger.kernel.org,
        virtualization@lists.linux-foundation.org
Cc:     eperezma@redhat.com, lulu@redhat.com
References: <20221018111232.4021-1-elic@nvidia.com>
 <20221018111232.4021-4-elic@nvidia.com>
From:   Si-Wei Liu <si-wei.liu@oracle.com>
Organization: Oracle Corporation
In-Reply-To: <20221018111232.4021-4-elic@nvidia.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dHUzREVsVFF6bnA4SUNrVHBPY3Y0eDF5ZVRHV3NvSllRV293QVpJK2UxaHJV?=
 =?utf-8?B?dUJ4bHU2aGREaVRmNFVGaXNnelBHSWhIeGlSck82ekQvT0pDWkV2eUN3TzdY?=
 =?utf-8?B?blQvMWdFWi9zNG1wK2hZRzdhbSsvaGNDOFo0MU5HeHk3ZjhBTEpVQnNkdXBF?=
 =?utf-8?B?aDc0MzFlTVozNkZuSzVNUmo1TytVSjByZlord3FUanVORzBTdjJqT29FczRP?=
 =?utf-8?B?QlZvZkZNRDJSQzJUVUJ5RlJ1Q2ZQQ2xFbVVLRWUrOWpkQk5hZ01raVh3M1lS?=
 =?utf-8?B?SVg3Rm9yRVMyRGR1M2xWK2tjcjdMNUJ2N3BrQkVHY1FURHd5dU5HU2R1Q1Bm?=
 =?utf-8?B?Mk44b0xreVRTTEdjWU5wZW9GT3E4VzlZTERaL0Y1SU0rajl1dVVvWmUvMXh5?=
 =?utf-8?B?cXl3elhoWmtxc0lBNjRiMzVLcmpYdjJGNHJ4Y1YzYnc2cnN5SlZmM3Rxd29K?=
 =?utf-8?B?WlZSYVFXUWhmbFNRQlllT1NRV1JmcDhhckNwYlI0WCt0VmtrWFNYTDlBZHNv?=
 =?utf-8?B?TEtCR1ZIRUlCWlhUekRXbmJpSUswa0JOMHZDTWQyUXBkcEh5V01QVmljcmdi?=
 =?utf-8?B?dFpBMk5EbG9ibFRpck0yZWZkbHJ3c3prSW14RGJ1TExiQ1lKeUw5M3dsZkFY?=
 =?utf-8?B?bXRxUjZoSDhFUzNEcEhyam9zRWZheFNrQ2t0bUgwcGNsK2NrY2dIU3pUOFU1?=
 =?utf-8?B?OGI0aktYK3g0UUhMWCtxQVpBSTZTc2dTM09ZNlRsU2tXUTd3Tk41RkkzWVdS?=
 =?utf-8?B?OUx1SlYyMDRoV1Q0bGcwdkphNHR5Y05CUmFPUGtZUkpHVzdJRkdkY1B6RTFE?=
 =?utf-8?B?NmRxZEJaZHVwbU91UldtTzFDSkVPZURwQW9KbXJ0ZlRFWFRTT2dDd0hYc3o0?=
 =?utf-8?B?VUI0cGdwMmEvN0FoTG85cmkxWnkzZlIrcnk0THhERkpRcWhkcCsrVjF6dXYr?=
 =?utf-8?B?ZXFZZTg3eWllclUyYmh3V2R4ZFVQNC95c3V4WjI0azA0eVA1ZUZMdFZ6bzNR?=
 =?utf-8?B?V0ExL0dvM1BnelJxam94c1pGY3dQWDN3T1ZQd0dTYjNDVStkYWhXY3dmaWti?=
 =?utf-8?B?RFFEdEZsYVFYQys1VkZOQ1YyaWM4N2RWWk5HQytvWml1Q0g0OWZVMU85MzlC?=
 =?utf-8?B?c3JaVjhaNXRlbUVEM29HZHorMHZjYjR2MTBsUjNhZnRkbEVUUTFMdDFwQmVa?=
 =?utf-8?B?aG8zZWdYcUVLNGowcit3bjNySE1WeFNtdSttMmo2QUptY1ExekhiWHRmSng4?=
 =?utf-8?B?bStKdEk4SVpIM2ZmeTNMdVNpZ0dLQWpMbmg1NE5EeFJHQ3pJQWJoNStOeGcy?=
 =?utf-8?B?aHJrek9xaXB0azdrR3lSMjNtSWV6MTNoaGpsNlk4Qk1odXFzY2VXc2lRdy95?=
 =?utf-8?B?N3BBeVh4S1E2RmM0UlNkbXhIK0RIR3lMTkpIOWV6a1FIcUswR1d4b0h0Ry8v?=
 =?utf-8?B?OGdaZHVhZ3NVWnNSUHZ2YWMwNFU3d3p6R2c2eEVXb3JWUjNTbEtUa1NRazFj?=
 =?utf-8?B?eHNvczYyRXZsZXFya1JnSFVKZFhVM252VkRJMjBpcmZvL0VsN2d3dlI0Y1Av?=
 =?utf-8?B?SlRad1NPZUhVUzRFa1F6NzNla0lScmxFK2IxWTFsbHk1Vk90ZU1sdmwwbEdu?=
 =?utf-8?B?cVE2S2g4bkpGOE9FbWtsV2xqQ2g2QmNVQmViQnV2YW82VEFXSklkRzdIWndI?=
 =?utf-8?B?RjdMM0xCb0NadWVTa1FFa0U2R2ZJSTBjamFtRUliTmlYYzdLUVZqanQ4Q0ls?=
 =?utf-8?B?R0ZoYkxOZFNrKzhQK3RPd1ByRktia0Q5ZzlBajdmL2ZaQmxUc0RxejJIajBu?=
 =?utf-8?B?NW5NVzRob2tsekFBbFVpb1IwSkhaNHcxK2l1QUFtSmNhc05KR0FBbG5EMjZx?=
 =?utf-8?B?RzdlMXdyYk1DQWZOQ1JXOU53NEtmQTk2MC8wVEZmNUIwcElVYlQ5cWZRVmts?=
 =?utf-8?B?VEwzMElQRGlBOXllOVVoZDJzU0FhZitTZjJrbE4rMHpPUVJ3d3B0eDdHTjVm?=
 =?utf-8?B?NHRIM04rNndaYzVQemhDLytJa1VMdzFRakN5VEdsUEtjZGxOZ2hwYm41emNk?=
 =?utf-8?B?akRtWmRONGphNVZmTWtKbUpSNFJpelRyUGdVWW95cEwxN2kwMFRTek42M1pS?=
 =?utf-8?Q?HtqAqUMIKLBXl/qUYe4MBKchN?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: b42dd405-1b2c-4e59-dc7d-08dab1424c1a
X-MS-Exchange-CrossTenant-AuthSource: MW4PR10MB6535.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2022 19:52:33.1007
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: CYNWhR6cu7rwwVY8pr7/KkBdSQ4k1DFj0lSrTKf1q1ij+RGFOxwLrCzc5JX0/EbPXnNYpAnoHxxKeJiwWKGt4A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB4336
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1
 definitions=2022-10-18_07,2022-10-18_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 mlxlogscore=999
 malwarescore=0 spamscore=0 suspectscore=0 phishscore=0 adultscore=0
 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2209130000 definitions=main-2210180112
X-Proofpoint-ORIG-GUID: n5PxUbXZ7pEl-5pry0cQmWINZpLW-6mh
X-Proofpoint-GUID: n5PxUbXZ7pEl-5pry0cQmWINZpLW-6mh
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham
        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


On 10/18/2022 4:12 AM, Eli Cohen wrote:
> Add debugfs subtree and expose flow table ID and TIR number. This
> information can be used by external tools to do extended
> troubleshooting.
>
> The information can be retrieved like so:
> $ cat /sys/kernel/debug/mlx5/mlx5_core.sf.1/vdpa-0/rx/table_id
> $ cat /sys/kernel/debug/mlx5/mlx5_core.sf.1/vdpa-0/rx/tirn
>
> Signed-off-by: Eli Cohen <elic@nvidia.com>
LGTM

Reviewed-by: Si-Wei Liu <si-wei.liu@oracle.com>
> ---
>   drivers/vdpa/mlx5/Makefile        |  2 +-
>   drivers/vdpa/mlx5/net/debug.c     | 66 +++++++++++++++++++++++++++++++
>   drivers/vdpa/mlx5/net/mlx5_vnet.c | 11 ++++++
>   drivers/vdpa/mlx5/net/mlx5_vnet.h |  9 +++++
>   4 files changed, 87 insertions(+), 1 deletion(-)
>   create mode 100644 drivers/vdpa/mlx5/net/debug.c
>
> diff --git a/drivers/vdpa/mlx5/Makefile b/drivers/vdpa/mlx5/Makefile
> index f717978c83bf..e791394c33e3 100644
> --- a/drivers/vdpa/mlx5/Makefile
> +++ b/drivers/vdpa/mlx5/Makefile
> @@ -1,4 +1,4 @@
>   subdir-ccflags-y += -I$(srctree)/drivers/vdpa/mlx5/core
>   
>   obj-$(CONFIG_MLX5_VDPA_NET) += mlx5_vdpa.o
> -mlx5_vdpa-$(CONFIG_MLX5_VDPA_NET) += net/mlx5_vnet.o core/resources.o core/mr.o
> +mlx5_vdpa-$(CONFIG_MLX5_VDPA_NET) += net/mlx5_vnet.o core/resources.o core/mr.o net/debug.o
> diff --git a/drivers/vdpa/mlx5/net/debug.c b/drivers/vdpa/mlx5/net/debug.c
> new file mode 100644
> index 000000000000..95e4801df211
> --- /dev/null
> +++ b/drivers/vdpa/mlx5/net/debug.c
> @@ -0,0 +1,66 @@
> +// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB
> +/* Copyright (c) 2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved. */
> +
> +#include <linux/debugfs.h>
> +#include <linux/mlx5/fs.h>
> +#include "mlx5_vnet.h"
> +
> +static int tirn_show(struct seq_file *file, void *priv)
> +{
> +	struct mlx5_vdpa_net *ndev = file->private;
> +
> +	seq_printf(file, "0x%x\n", ndev->res.tirn);
> +	return 0;
> +}
> +
> +DEFINE_SHOW_ATTRIBUTE(tirn);
> +
> +void mlx5_vdpa_remove_tirn(struct mlx5_vdpa_net *ndev)
> +{
> +	if (ndev->debugfs)
> +		debugfs_remove(ndev->res.tirn_dent);
> +}
> +
> +void mlx5_vdpa_add_tirn(struct mlx5_vdpa_net *ndev)
> +{
> +	ndev->res.tirn_dent = debugfs_create_file("tirn", 0444, ndev->rx_dent,
> +						  ndev, &tirn_fops);
> +}
> +
> +static int rx_flow_table_show(struct seq_file *file, void *priv)
> +{
> +	struct mlx5_vdpa_net *ndev = file->private;
> +
> +	seq_printf(file, "0x%x\n", mlx5_flow_table_id(ndev->rxft));
> +	return 0;
> +}
> +
> +DEFINE_SHOW_ATTRIBUTE(rx_flow_table);
> +
> +void mlx5_vdpa_remove_rx_flow_table(struct mlx5_vdpa_net *ndev)
> +{
> +	if (ndev->debugfs)
> +		debugfs_remove(ndev->rx_table_dent);
> +}
> +
> +void mlx5_vdpa_add_rx_flow_table(struct mlx5_vdpa_net *ndev)
> +{
> +	ndev->rx_table_dent = debugfs_create_file("table_id", 0444, ndev->rx_dent,
> +						  ndev, &rx_flow_table_fops);
> +}
> +
> +void mlx5_vdpa_add_debugfs(struct mlx5_vdpa_net *ndev)
> +{
> +	struct mlx5_core_dev *mdev;
> +
> +	mdev = ndev->mvdev.mdev;
> +	ndev->debugfs = debugfs_create_dir(dev_name(&ndev->mvdev.vdev.dev),
> +					   mlx5_debugfs_get_dev_root(mdev));
> +	if (!IS_ERR(ndev->debugfs))
> +		ndev->rx_dent = debugfs_create_dir("rx", ndev->debugfs);
> +}
> +
> +void mlx5_vdpa_remove_debugfs(struct dentry *dbg)
> +{
> +	debugfs_remove_recursive(dbg);
> +}
> diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> index 64fdb940380f..ee50da33e25b 100644
> --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c
> +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> @@ -1388,11 +1388,16 @@ static int create_tir(struct mlx5_vdpa_net *ndev)
>   
>   	err = mlx5_vdpa_create_tir(&ndev->mvdev, in, &ndev->res.tirn);
>   	kfree(in);
> +	if (err)
> +		return err;
> +
> +	mlx5_vdpa_add_tirn(ndev);
>   	return err;
>   }
>   
>   static void destroy_tir(struct mlx5_vdpa_net *ndev)
>   {
> +	mlx5_vdpa_remove_tirn(ndev);
>   	mlx5_vdpa_destroy_tir(&ndev->mvdev, ndev->res.tirn);
>   }
>   
> @@ -1576,6 +1581,7 @@ static int setup_steering(struct mlx5_vdpa_net *ndev)
>   		mlx5_vdpa_warn(&ndev->mvdev, "failed to create flow table\n");
>   		return PTR_ERR(ndev->rxft);
>   	}
> +	mlx5_vdpa_add_rx_flow_table(ndev);
>   
>   	err = mac_vlan_add(ndev, ndev->config.mac, 0, false);
>   	if (err)
> @@ -1584,6 +1590,7 @@ static int setup_steering(struct mlx5_vdpa_net *ndev)
>   	return 0;
>   
>   err_add:
> +	mlx5_vdpa_remove_rx_flow_table(ndev);
>   	mlx5_destroy_flow_table(ndev->rxft);
>   	return err;
>   }
> @@ -1591,6 +1598,7 @@ static int setup_steering(struct mlx5_vdpa_net *ndev)
>   static void teardown_steering(struct mlx5_vdpa_net *ndev)
>   {
>   	clear_mac_vlan_table(ndev);
> +	mlx5_vdpa_remove_rx_flow_table(ndev);
>   	mlx5_destroy_flow_table(ndev->rxft);
>   }
>   
> @@ -3167,6 +3175,7 @@ static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name,
>   	if (err)
>   		goto err_reg;
>   
> +	mlx5_vdpa_add_debugfs(ndev);
>   	mgtdev->ndev = ndev;
>   	return 0;
>   
> @@ -3193,6 +3202,8 @@ static void mlx5_vdpa_dev_del(struct vdpa_mgmt_dev *v_mdev, struct vdpa_device *
>   	struct mlx5_vdpa_net *ndev = to_mlx5_vdpa_ndev(mvdev);
>   	struct workqueue_struct *wq;
>   
> +	mlx5_vdpa_remove_debugfs(ndev->debugfs);
> +	ndev->debugfs = NULL;
>   	if (ndev->nb_registered) {
>   		mlx5_notifier_unregister(mvdev->mdev, &ndev->nb);
>   		ndev->nb_registered = false;
> diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.h b/drivers/vdpa/mlx5/net/mlx5_vnet.h
> index 6691c879a6ca..f2cef3925e5b 100644
> --- a/drivers/vdpa/mlx5/net/mlx5_vnet.h
> +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.h
> @@ -16,6 +16,7 @@ struct mlx5_vdpa_net_resources {
>   	u32 tirn;
>   	u32 rqtn;
>   	bool valid;
> +	struct dentry *tirn_dent;
>   };
>   
>   #define MLX5V_MACVLAN_SIZE 256
> @@ -43,6 +44,7 @@ struct mlx5_vdpa_net {
>   	struct vdpa_callback config_cb;
>   	struct mlx5_vdpa_wq_ent cvq_ent;
>   	struct hlist_head macvlan_hash[MLX5V_MACVLAN_SIZE];
> +	struct dentry *debugfs;
>   };
>   
>   struct macvlan_node {
> @@ -52,4 +54,11 @@ struct macvlan_node {
>   	u64 macvlan;
>   };
>   
> +void mlx5_vdpa_add_debugfs(struct mlx5_vdpa_net *ndev);
> +void mlx5_vdpa_remove_debugfs(struct dentry *dbg);
> +void mlx5_vdpa_add_rx_flow_table(struct mlx5_vdpa_net *ndev);
> +void mlx5_vdpa_remove_rx_flow_table(struct mlx5_vdpa_net *ndev);
> +void mlx5_vdpa_add_tirn(struct mlx5_vdpa_net *ndev);
> +void mlx5_vdpa_remove_tirn(struct mlx5_vdpa_net *ndev);
> +
>   #endif /* __MLX5_VNET_H__ */