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;
Date:   Mon, 19 Jun 2023 14:38:33 +0200
From:   Maciej Fijalkowski <maciej.fijalkowski@intel.com>
To:     Petr Oros <poros@redhat.com>
CC:     <netdev@vger.kernel.org>, <intel-wired-lan@lists.osuosl.org>,
        <jesse.brandeburg@intel.com>, <linux-kernel@vger.kernel.org>,
        <edumazet@google.com>, <anthony.l.nguyen@intel.com>,
        <kuba@kernel.org>, <pabeni@redhat.com>, <davem@davemloft.net>,
        <michal.swiatkowski@intel.com>
Subject: Re: [Intel-wired-lan] [PATCH net] ice: ice_vsi_release cleanup
Message-ID: <ZJBMSWygwtovyNgU@boxer>
References: <20230619084948.360128-1-poros@redhat.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20230619084948.360128-1-poros@redhat.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?bRBoW1/VY/PE0IZm+MGECeSPcx/FBKlwuzJR2LpBsJDx/a71eb1Mcc1Mj6dk?=
 =?us-ascii?Q?UMhV68T8Td+w5C5UHiZC3Sp6pNTFjsvkXhzL1JQDEm1BQ7B8eHVG/5VKTlRq?=
 =?us-ascii?Q?DKmT0QdZ8HuYzCrQN5Lamweg9Hbg9uIPGyMuk3SrWWYtltmZAB8euO13dAq9?=
 =?us-ascii?Q?Z0MXRp2DxBgSrihLtZaEcFanCwlNNuv78owl+cMky2lX0rhgkVdrls5oWlk3?=
 =?us-ascii?Q?q8hS/DTU7M3qsrNOQJhJAI5TBiIcEGuU0rq1R/euF5+FwDkO3vThpSz4k/OA?=
 =?us-ascii?Q?u9nGULG9857OhujXT3UsA28h4yv90qjNSqNfwxs76DqJplx4Aq6cY8IZMFp5?=
 =?us-ascii?Q?bwYWtIrhs/KjhOTqt37I/aj6xUoBOKN+lI4vxFf6+AsBQLPg8pnU+Gu8X/lH?=
 =?us-ascii?Q?k8DsDav+K0mFMj35CmeACSo8VUxtlmuLlS2yaArLYMdzp9cSVRYr4RqgXaNk?=
 =?us-ascii?Q?fbEQTyH0uNFw27GIkcuKZRTmB2bqHTglqkJCugh1n1KJ6qbk+f7kLGt3I2px?=
 =?us-ascii?Q?Axw1TNijR4oBzkr1uPW4QzHSOO8UCpBBi44yMxM5ntVXDrB5Q3cicjw1PWqZ?=
 =?us-ascii?Q?DPuBfnXz2ezt94NLDqRQWhKIwU22hwo/G1MQVAFakuGHNrYRcjh/XOFq4eyj?=
 =?us-ascii?Q?XwcwNSmKtl61wP8g6FDZbaPxD31XHtE4Ac3hhY/2LfZGIPmwNurZkJHur/ll?=
 =?us-ascii?Q?+/4051Fcl+KphRdoI/wQ4quWFk8AVTE2yWSjJNT6Y4qHifwRuWv/JCrdcl0s?=
 =?us-ascii?Q?OKX8yjKfCyiAHidUJRqPaAFbiB4hReDHOCVBIdg6SWnNTJqBk01aes5H3NQt?=
 =?us-ascii?Q?4S8hzhDcbgadB5Rmx1/UgJ4kQ8OnP19OOcXKmtjD+EW79gydPaz4F1tO/x7Z?=
 =?us-ascii?Q?uX64ra85RvXQUoOv5mXGodDwY8+soTyQg0qTXuSqMBEiMK9pdEhU5ZXFa4xe?=
 =?us-ascii?Q?w8nIWVf89xHEVpTRuQiwXFL2ol8isoBX5+sN6xizwcmYmnwaNb0OoQF4CNwk?=
 =?us-ascii?Q?2BiMtjsFE23Vis51ZxY0r2A7b4H8DL9RukGNoeaPixnqFQ1MGn8VWdnIcndH?=
 =?us-ascii?Q?tDOdJDw9MIfSbjXjlUlZtTFDTsp6RVygCEUlM7ysZUD5KYmJt+/+pEcu1jHM?=
 =?us-ascii?Q?tUS3wnenUzm6PazVulSrPAdUrldqZkrKDGjSxCw5fY9iW/dYKLELkXyyJhte?=
 =?us-ascii?Q?LRXNdXYBWPDkUPAuHgyXSOOpturTvKg0AY6QprEZPxk+6EqUTYKbvx6xD1Za?=
 =?us-ascii?Q?7xkbhtAVkx0pGTJ2KfuMv/fB/qgERJovGFkELOuf26XkN59nrUAgaxL+jc87?=
 =?us-ascii?Q?yvVOaYuyeJChhvuoiP6RSf8wxhGIADP1bgFww3wdpR75k7yW9uM1pK9cAFdk?=
 =?us-ascii?Q?uha+EyqiinBCA3G5rvaRX4Pwlh4Ra515wfnQdgR5UF4zJKqg5XVHEQnfUSDq?=
 =?us-ascii?Q?Diu7ui3RcM3A7cbU5fva8pxGkYdx/9fe2N/7I4CIUVSWlxm9B/yM+f5r7gSF?=
 =?us-ascii?Q?w+kKMUcX8lfdlt+dDAEgcamciw1rr/19SVmJxTwidY1wHF64El3IXiXiZhKm?=
 =?us-ascii?Q?iZvq8PgfmBk/2hiIAvBUO6luBzdWvn8yAavyCNz7Vx3ZERhTSApF8R1Jw+Cc?=
 =?us-ascii?Q?rQ=3D=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: d332ab7b-bab0-42b0-bfee-08db70c21cfc
X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB6117.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jun 2023 12:38:41.6868
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: td+0FXxx1qmn6S2+ImVpN1eDQN/CDbCd87DED3cl9eQ+8K82xBEdFF5nwukBtegGwDoTnmNjJNWjmALYYwtRXekyIEsF0wNyCiIOdQ7b6R4=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW6PR11MB8339
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,
        SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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 Mon, Jun 19, 2023 at 10:49:48AM +0200, Petr Oros wrote:
> Since commit 6624e780a577fc ("ice: split ice_vsi_setup into smaller
> functions") ice_vsi_release does things twice. There is unregister
> netdev which is unregistered in ice_deinit_eth also.
> 
> It also unregisters the devlink_port twice which is also unregistered
> in ice_deinit_eth(). This double deregistration is hidden because
> devl_port_unregister ignores the return value of xa_erase.
> 
> [   68.642167] Call Trace:
> [   68.650385]  ice_devlink_destroy_pf_port+0xe/0x20 [ice]
> [   68.655656]  ice_vsi_release+0x445/0x690 [ice]
> [   68.660147]  ice_deinit+0x99/0x280 [ice]
> [   68.664117]  ice_remove+0x1b6/0x5c0 [ice]
> 
> [  171.103841] Call Trace:
> [  171.109607]  ice_devlink_destroy_pf_port+0xf/0x20 [ice]
> [  171.114841]  ice_remove+0x158/0x270 [ice]
> [  171.118854]  pci_device_remove+0x3b/0xc0
> [  171.122779]  device_release_driver_internal+0xc7/0x170
> [  171.127912]  driver_detach+0x54/0x8c
> [  171.131491]  bus_remove_driver+0x77/0xd1
> [  171.135406]  pci_unregister_driver+0x2d/0xb0
> [  171.139670]  ice_module_exit+0xc/0x55f [ice]

Hi Petr,
can you tell us when in particular this call trace was observed?

CC: Michal Swiatkowski <michal.swiatkowski@intel.com>

> 
> Fixes: 6624e780a577 ("ice: split ice_vsi_setup into smaller functions")
> Signed-off-by: Petr Oros <poros@redhat.com>
> ---
>  drivers/net/ethernet/intel/ice/ice_lib.c | 27 ------------------------
>  1 file changed, 27 deletions(-)
> 
> diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c
> index 11ae0e41f518a1..284a1f0bfdb545 100644
> --- a/drivers/net/ethernet/intel/ice/ice_lib.c
> +++ b/drivers/net/ethernet/intel/ice/ice_lib.c
> @@ -3272,39 +3272,12 @@ int ice_vsi_release(struct ice_vsi *vsi)
>  		return -ENODEV;
>  	pf = vsi->back;
>  
> -	/* do not unregister while driver is in the reset recovery pending
> -	 * state. Since reset/rebuild happens through PF service task workqueue,
> -	 * it's not a good idea to unregister netdev that is associated to the
> -	 * PF that is running the work queue items currently. This is done to
> -	 * avoid check_flush_dependency() warning on this wq
> -	 */
> -	if (vsi->netdev && !ice_is_reset_in_progress(pf->state) &&
> -	    (test_bit(ICE_VSI_NETDEV_REGISTERED, vsi->state))) {
> -		unregister_netdev(vsi->netdev);
> -		clear_bit(ICE_VSI_NETDEV_REGISTERED, vsi->state);
> -	}
> -
> -	if (vsi->type == ICE_VSI_PF)
> -		ice_devlink_destroy_pf_port(pf);
> -
>  	if (test_bit(ICE_FLAG_RSS_ENA, pf->flags))
>  		ice_rss_clean(vsi);
>  
>  	ice_vsi_close(vsi);
>  	ice_vsi_decfg(vsi);
>  
> -	if (vsi->netdev) {
> -		if (test_bit(ICE_VSI_NETDEV_REGISTERED, vsi->state)) {
> -			unregister_netdev(vsi->netdev);
> -			clear_bit(ICE_VSI_NETDEV_REGISTERED, vsi->state);
> -		}
> -		if (test_bit(ICE_VSI_NETDEV_ALLOCD, vsi->state)) {
> -			free_netdev(vsi->netdev);
> -			vsi->netdev = NULL;
> -			clear_bit(ICE_VSI_NETDEV_ALLOCD, vsi->state);
> -		}
> -	}
> -
>  	/* retain SW VSI data structure since it is needed to unregister and
>  	 * free VSI netdev when PF is not in reset recovery pending state,\
>  	 * for ex: during rmmod.
> -- 
> 2.41.0
> 
> _______________________________________________
> Intel-wired-lan mailing list
> Intel-wired-lan@osuosl.org
> https://lists.osuosl.org/mailman/listinfo/intel-wired-lan