6.18.54-rc1 review
Subsystems (6)
Greg Kroah-Hartman
maintainerPATCH 377/398 scsi: fnic: Make debug logging protocol independent
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Karan Tilak Kumar <[email protected]>
[ Upstream commit b93c38a9f2ce5441c90de55776f8df97679cf8a2 ]
Make the fnic debug macros take struct fnic instead of struct Scsi_Host so FCP and NVMe initiator roles can share the same logging interface.
Add fnic_printk() to route FCP initiator messages through shost_printk() and non-SCSI role messages through printk(). Add role and non-SCSI role messages through printk(). Add role predicates and separate FDLS, FIP, and NVMe logging masks.
Convert FCS, FIP, SCSI, ISR, and main debug call sites to pass the fnic instance directly, and keep FIP VLAN MAC descriptors skipped while reporting unexpected descriptor types.
Stable-dep-of: 0cb1fd924126 ("scsi: fnic: Fix missed link-up when critical IRQ targets offline CPU")
--- drivers/scsi/fnic/fdls_disc.c | 726 +++++++++++++++++++++--------------------- drivers/scsi/fnic/fip.c | 117 +++--- drivers/scsi/fnic/fip.h | 2 drivers/scsi/fnic/fnic.h | 74 ++-- drivers/scsi/fnic/fnic_fcs.c | 126 +++---- drivers/scsi/fnic/fnic_isr.c | 28 - drivers/scsi/fnic/fnic_main.c | 56 +-- drivers/scsi/fnic/fnic_scsi.c | 210 ++++++------ 8 files changed, 675 insertions(+), 664 deletions(-)
drivers/scsi/fnic/fdls_disc.c +369 -357
@@ -104,7 +104,7 @@ uint8_t *fdls_alloc_frame(struct fnic_ip frame =mempool_alloc (fnic->frame_pool,GFP_ATOMIC );if (frame ==NULL ) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"Failed to allocate frame" );return NULL ; }
@@ -136,7 +136,7 @@ uint16_t fdls_alloc_oxid(struct fnic_ipo*/ idx =find_next_zero_bit (oxid_pool->bitmap,FNIC_OXID_POOL_SZ , oxid_pool->next_idx);if (idx ==FNIC_OXID_POOL_SZ ) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Alloc oxid: all oxid slots are busy iport state:%d\n" , iport->state);return FNIC_UNASSIGNED_OXID ;
@@ -148,7 +148,7 @@ uint16_t fdls_alloc_oxid(struct fnic_ipo oxid =FNIC_OXID_ENCODE (idx, oxid_frame_type); *active_oxid = oxid; -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"alloc oxid: 0x%x, iport state: %d\n" , oxid, iport->state);return oxid;
@@ -169,7 +169,7 @@ static void fdls_free_oxid_idx(struct fnlockdep_assert_held (&fnic->fnic_lock); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"free oxid idx: 0x%x\n" , oxid_idx);WARN_ON (!test_and_clear_bit (oxid_idx, oxid_pool->bitmap));
@@ -194,7 +194,7 @@ void fdls_reclaim_oxid_handler(struct wostruct reclaim_entry_s *reclaim_entry, *next;unsigned long delay_j, cur_jiffies; -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Reclaim oxid callback\n" );spin_lock_irqsave (&fnic->fnic_lock, fnic->lock_flags);
@@ -223,7 +223,7 @@ void fdls_reclaim_oxid_handler(struct wo delay_j = reclaim_entry->expires - cur_jiffies;schedule_delayed_work (&oxid_pool->oxid_reclaim_work, delay_j); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Scheduling next callback at:%ld jiffies\n" , delay_j); }
@@ -266,7 +266,7 @@ void fdls_schedule_oxid_free(struct fniclockdep_assert_held (&fnic->fnic_lock); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Schedule oxid free. oxid: 0x%x\n" , *active_oxid); *active_oxid =FNIC_UNASSIGNED_OXID ;
@@ -275,7 +275,7 @@ void fdls_schedule_oxid_free(struct fnickzalloc (sizeof (struct reclaim_entry_s ),GFP_ATOMIC );if (!reclaim_entry) { -FNIC_FCS_DBG (KERN_WARNING , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_WARNING , fnic,"Failed to allocate memory for reclaim struct for oxid idx: %d\n" , oxid_idx);
@@ -313,7 +313,7 @@ void fdls_schedule_oxid_free_retry_work(for_each_set_bit (idx, oxid_pool->pending_schedule_free,FNIC_OXID_POOL_SZ ) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Schedule oxid free. oxid idx: %d\n" , idx); reclaim_entry =kzalloc (sizeof (*reclaim_entry),GFP_KERNEL );
@@ -416,7 +416,7 @@ fdls_start_fabric_timer(struct fnic_iporstruct fnic *fnic = iport->fnic;if (iport->fabric.timer_pending) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"iport fcid: 0x%x: Canceling fabric disc timer\n" , iport->fcid);fnic_del_fabric_timer_sync (fnic);
@@ -429,7 +429,7 @@ fdls_start_fabric_timer(struct fnic_ipor fabric_tov = jiffies +msecs_to_jiffies (timeout);mod_timer (&iport->fabric.retry_timer,round_jiffies (fabric_tov)); iport->fabric.timer_pending =1 ; -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"fabric timer is %d " , timeout); }
@@ -441,7 +441,7 @@ fdls_start_tport_timer(struct fnic_iportstruct fnic *fnic = iport->fnic;if (tport->timer_pending) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"tport fcid 0x%x: Canceling disc timer\n" , tport->fcid);fnic_del_tport_timer_sync (fnic, tport);
@@ -575,7 +575,7 @@ fdls_send_rscn_resp(struct fnic_iport_s frame =fdls_alloc_frame (iport);if (frame ==NULL ) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"Failed to allocate frame to send RSCN response" );return ; }
@@ -588,7 +588,7 @@ fdls_send_rscn_resp(struct fnic_iport_s oxid =FNIC_STD_GET_OX_ID (rscn_fchdr);FNIC_STD_SET_OX_ID (pels_acc->fchdr, oxid); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: FDLS send RSCN response with oxid: 0x%x" , iport->fcid, oxid);
@@ -608,7 +608,7 @@ fdls_send_logo_resp(struct fnic_iport_s frame =fdls_alloc_frame (iport);if (frame ==NULL ) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"Failed to allocate frame to send LOGO response" );return ; }
@@ -621,7 +621,7 @@ fdls_send_logo_resp(struct fnic_iport_s oxid =FNIC_STD_GET_OX_ID (req_fchdr);FNIC_STD_SET_OX_ID (plogo_resp->fchdr, oxid); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: FDLS send LOGO response with oxid: 0x%x" , iport->fcid, oxid);
@@ -642,7 +642,7 @@ fdls_send_tport_abts(struct fnic_iport_s frame =fdls_alloc_frame (iport);if (frame ==NULL ) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"Failed to allocate frame to send tport ABTS" );return ; }
@@ -665,7 +665,7 @@ fdls_send_tport_abts(struct fnic_iport_sFNIC_STD_SET_OX_ID (*ptport_abts, tport->active_oxid); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: FDLS send tport abts: tport->state: %d " , iport->fcid, tport->state);
@@ -687,7 +687,7 @@ static void fdls_send_fabric_abts(struct frame =fdls_alloc_frame (iport);if (frame ==NULL ) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"Failed to allocate frame to send fabric ABTS" );return ; }
@@ -750,7 +750,7 @@ static void fdls_send_fabric_abts(struct oxid = iport->active_oxid_fabric_req;FNIC_STD_SET_OX_ID (*pfabric_abts, oxid); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: FDLS send fabric abts. iport->fabric.state: %d oxid: 0x%x" , iport->fcid, iport->fabric.state, oxid);
@@ -773,7 +773,7 @@ static uint8_t *fdls_alloc_init_fdmi_abt frame =fdls_alloc_frame (iport);if (frame ==NULL ) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"Failed to allocate frame to send FDMI ABTS" );return NULL ; }
@@ -802,7 +802,7 @@ static void fdls_send_fdmi_abts(struct fif (frame ==NULL )return ; -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: FDLS send FDMI PLOGI abts. iport->fabric.state: %d oxid: 0x%x" , iport->fcid, iport->fabric.state, iport->active_oxid_fdmi_plogi);fnic_send_fcoe_frame (iport, frame, frame_size);
@@ -813,7 +813,7 @@ static void fdls_send_fdmi_abts(struct fif (frame ==NULL )return ; -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: FDLS send FDMI RHBA abts. iport->fabric.state: %d oxid: 0x%x" , iport->fcid, iport->fabric.state, iport->active_oxid_fdmi_rhba);fnic_send_fcoe_frame (iport, frame, frame_size);
@@ -828,7 +828,7 @@ static void fdls_send_fdmi_abts(struct freturn ; } -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: FDLS send FDMI RPA abts. iport->fabric.state: %d oxid: 0x%x" , iport->fcid, iport->fabric.state, iport->active_oxid_fdmi_rpa);fnic_send_fcoe_frame (iport, frame, frame_size);
@@ -840,7 +840,7 @@ arm_timer:mod_timer (&iport->fabric.fdmi_timer,round_jiffies (fdmi_tov)); iport->fabric.fdmi_pending |=FDLS_FDMI_ABORT_PENDING ; -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: iport->fabric.fdmi_pending: 0x%x" , iport->fcid, iport->fabric.fdmi_pending); }
@@ -856,7 +856,7 @@ static void fdls_send_fabric_flogi(struc frame =fdls_alloc_frame (iport);if (frame ==NULL ) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"Failed to allocate frame to send FLOGI" ); iport->fabric.flags |=FNIC_FDLS_RETRY_FRAME ; goto err_out;
@@ -885,7 +885,7 @@ static void fdls_send_fabric_flogi(struc &iport->active_oxid_fabric_req);if (oxid ==FNIC_UNASSIGNED_OXID ) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: Failed to allocate OXID to send FLOGI" , iport->fcid);mempool_free (frame, fnic->frame_pool);
@@ -894,7 +894,7 @@ static void fdls_send_fabric_flogi(struc }FNIC_STD_SET_OX_ID (pflogi->fchdr, oxid); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: FDLS send fabric FLOGI with oxid: 0x%x" , iport->fcid, oxid);
@@ -916,7 +916,7 @@ static void fdls_send_fabric_plogi(struc frame =fdls_alloc_frame (iport);if (frame ==NULL ) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"Failed to allocate frame to send PLOGI" ); iport->fabric.flags |=FNIC_FDLS_RETRY_FRAME ; goto err_out;
@@ -928,7 +928,7 @@ static void fdls_send_fabric_plogi(struc oxid =fdls_alloc_oxid (iport,FNIC_FRAME_TYPE_FABRIC_PLOGI , &iport->active_oxid_fabric_req);if (oxid ==FNIC_UNASSIGNED_OXID ) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: Failed to allocate OXID to send fabric PLOGI" , iport->fcid);mempool_free (frame, fnic->frame_pool);
@@ -937,7 +937,7 @@ static void fdls_send_fabric_plogi(struc }FNIC_STD_SET_OX_ID (pplogi->fchdr, oxid); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: FDLS send fabric PLOGI with oxid: 0x%x" , iport->fcid, oxid);
@@ -962,7 +962,7 @@ static void fdls_send_fdmi_plogi(struct frame =fdls_alloc_frame (iport);if (frame ==NULL ) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"Failed to allocate frame to send FDMI PLOGI" ); goto err_out; }
@@ -974,7 +974,7 @@ static void fdls_send_fdmi_plogi(struct &iport->active_oxid_fdmi_plogi);if (oxid ==FNIC_UNASSIGNED_OXID ) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: Failed to allocate OXID to send FDMI PLOGI" , iport->fcid);mempool_free (frame, fnic->frame_pool);
@@ -985,7 +985,7 @@ static void fdls_send_fdmi_plogi(structhton24 (d_id,FC_FID_MGMT_SERV );FNIC_STD_SET_D_ID (pplogi->fchdr, d_id); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: FDLS send FDMI PLOGI with oxid: 0x%x" , iport->fcid, oxid);
@@ -1009,7 +1009,7 @@ static void fdls_send_rpn_id(struct fnic frame =fdls_alloc_frame (iport);if (frame ==NULL ) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"Failed to allocate frame to send RPN_ID" ); iport->fabric.flags |=FNIC_FDLS_RETRY_FRAME ; goto err_out;
@@ -1036,7 +1036,7 @@ static void fdls_send_rpn_id(struct fnic &iport->active_oxid_fabric_req);if (oxid ==FNIC_UNASSIGNED_OXID ) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: Failed to allocate OXID to send RPN_ID" , iport->fcid);mempool_free (frame, fnic->frame_pool);
@@ -1045,7 +1045,7 @@ static void fdls_send_rpn_id(struct fnic }FNIC_STD_SET_OX_ID (prpn_id->fchdr, oxid); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: FDLS send RPN ID with oxid: 0x%x" , iport->fcid, oxid);
@@ -1068,7 +1068,7 @@ static void fdls_send_scr(struct fnic_ip frame =fdls_alloc_frame (iport);if (frame ==NULL ) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"Failed to allocate frame to send SCR" ); iport->fabric.flags |=FNIC_FDLS_RETRY_FRAME ; goto err_out;
@@ -1090,7 +1090,7 @@ static void fdls_send_scr(struct fnic_ip oxid =fdls_alloc_oxid (iport,FNIC_FRAME_TYPE_FABRIC_SCR , &iport->active_oxid_fabric_req);if (oxid ==FNIC_UNASSIGNED_OXID ) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: Failed to allocate OXID to send SCR" , iport->fcid);mempool_free (frame, fnic->frame_pool);
@@ -1099,7 +1099,7 @@ static void fdls_send_scr(struct fnic_ip }FNIC_STD_SET_OX_ID (pscr->fchdr, oxid); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: FDLS send SCR with oxid: 0x%x" , iport->fcid, oxid);
@@ -1123,7 +1123,7 @@ static void fdls_send_gpn_ft(struct fnic frame =fdls_alloc_frame (iport);if (frame ==NULL ) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"Failed to allocate frame to send GPN FT" ); iport->fabric.flags |=FNIC_FDLS_RETRY_FRAME ; goto err_out;
@@ -1148,7 +1148,7 @@ static void fdls_send_gpn_ft(struct fnic &iport->active_oxid_fabric_req);if (oxid ==FNIC_UNASSIGNED_OXID ) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: Failed to allocate OXID to send GPN FT" , iport->fcid);mempool_free (frame, fnic->frame_pool);
@@ -1157,7 +1157,7 @@ static void fdls_send_gpn_ft(struct fnic }FNIC_STD_SET_OX_ID (pgpn_ft->fchdr, oxid); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: FDLS send GPN FT with oxid: 0x%x" , iport->fcid, oxid);
@@ -1183,7 +1183,7 @@ fdls_send_tgt_adisc(struct fnic_iport_s frame =fdls_alloc_frame (iport);if (frame ==NULL ) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"Failed to allocate frame to send TGT ADISC" ); tport->flags |=FNIC_FDLS_RETRY_FRAME ; goto err_out;
@@ -1203,7 +1203,7 @@ fdls_send_tgt_adisc(struct fnic_iport_s oxid =fdls_alloc_oxid (iport,FNIC_FRAME_TYPE_TGT_ADISC , &tport->active_oxid);if (oxid ==FNIC_UNASSIGNED_OXID ) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: Failed to allocate OXID to send TGT ADISC" , iport->fcid);mempool_free (frame, fnic->frame_pool);
@@ -1222,7 +1222,7 @@ fdls_send_tgt_adisc(struct fnic_iport_s padisc->els.adisc_cmd =ELS_ADISC ; -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: FDLS send ADISC to tgt fcid: 0x%x" , iport->fcid, tport->fcid);
@@ -1242,7 +1242,7 @@ bool fdls_delete_tport(struct fnic_iportif ((tport->state ==FDLS_TGT_STATE_OFFLINING ) || (tport->state ==FDLS_TGT_STATE_OFFLINE )) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"tport fcid 0x%x: tport state is offlining/offline\n" , tport->fcid);return false;
@@ -1257,7 +1257,7 @@ bool fdls_delete_tport(struct fnic_iport tport->flags |=FNIC_FDLS_TPORT_TERMINATING ;if (tport->timer_pending) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"tport fcid 0x%x: Canceling disc timer\n" , tport->fcid);fnic_del_tport_timer_sync (fnic, tport);
@@ -1272,9 +1272,9 @@ bool fdls_delete_tport(struct fnic_iport tport_del_evt =kzalloc (sizeof (struct fnic_tport_event_s ),GFP_ATOMIC );if (!tport_del_evt) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, -"Failed to allocate memory for tport fcid: 0x%0x\n" , - tport->fcid); +FNIC_FCS_DBG (KERN_INFO , fnic, +"iport: 0x%x tport 0x%x: Failed to allocate memory\n" , + iport->fcid, tport->fcid);return false; } tport_del_evt->event =TGT_EV_RPORT_DEL ;
@@ -1282,9 +1282,9 @@ bool fdls_delete_tport(struct fnic_iportlist_add_tail (&tport_del_evt->links, &fnic->tport_event_list);queue_work (fnic_event_queue, &fnic->tport_work); }else { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, -"tport 0x%x not reg with scsi_transport. Freeing locally" , - tport->fcid); +FNIC_FCS_DBG (KERN_INFO , fnic, +"tport 0x%x not registered, freeing locally\n" , + tport->fcid);list_del (&tport->links);kfree (tport); }
@@ -1305,7 +1305,7 @@ fdls_send_tgt_plogi(struct fnic_iport_s frame =fdls_alloc_frame (iport);if (frame ==NULL ) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"Failed to allocate frame to send TGT PLOGI" ); tport->flags |=FNIC_FDLS_RETRY_FRAME ; goto err_out;
@@ -1316,7 +1316,7 @@ fdls_send_tgt_plogi(struct fnic_iport_s oxid =fdls_alloc_oxid (iport,FNIC_FRAME_TYPE_TGT_PLOGI , &tport->active_oxid);if (oxid ==FNIC_UNASSIGNED_OXID ) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: Failed to allocate oxid to send PLOGI to fcid: 0x%x" , iport->fcid, tport->fcid);mempool_free (frame, fnic->frame_pool);
@@ -1330,7 +1330,7 @@ fdls_send_tgt_plogi(struct fnic_iport_shton24 (d_id, tport->fcid);FNIC_STD_SET_D_ID (pplogi->fchdr, d_id); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: FDLS send tgt PLOGI to tgt: 0x%x with oxid: 0x%x" , iport->fcid, tport->fcid, oxid);
@@ -1353,7 +1353,7 @@ fnic_fc_plogi_rsp_rdf(struct fnic_iport_be16_to_cpu (plogi_rsp->els.fl_cssp[2 ].cp_rdfs) &FNIC_FC_C3_RDF ;struct fnic *fnic = iport->fnic; -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"MFS: b2b_rdf_size: 0x%x spc3_rdf_size: 0x%x" , b2b_rdf_size, spc3_rdf_size);
@@ -1372,7 +1372,7 @@ static void fdls_send_register_fc4_types frame =fdls_alloc_frame (iport);if (frame ==NULL ) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"Failed to allocate frame to send RFT" );return ; }
@@ -1396,7 +1396,7 @@ static void fdls_send_register_fc4_types &iport->active_oxid_fabric_req);if (oxid ==FNIC_UNASSIGNED_OXID ) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: Failed to allocate OXID to send RFT" , iport->fcid);mempool_free (frame, fnic->frame_pool);
@@ -1404,15 +1404,18 @@ static void fdls_send_register_fc4_types }FNIC_STD_SET_OX_ID (prft_id->fchdr, oxid); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, -"0x%x: FDLS send RFT with oxid: 0x%x" , iport->fcid, - oxid); prft_id->rft_id.fr_fts.ff_type_map[0 ] =cpu_to_be32 (1 <<FC_TYPE_FCP ); prft_id->rft_id.fr_fts.ff_type_map[1 ] =cpu_to_be32 (1 << (FC_TYPE_CT %FC_NS_BPW )); +FNIC_FCS_DBG (KERN_INFO , fnic, +"0x%x: FDLS send RFT 0x%08x 0x%08x 0x%08x with oxid: 0x%x" , + iport->fcid, prft_id->rft_id.fr_fts.ff_type_map[0 ], + prft_id->rft_id.fr_fts.ff_type_map[1 ], + prft_id->rft_id.fr_fts.ff_type_map[2 ], + oxid);fnic_send_fcoe_frame (iport, frame, frame_size);
@@ -1432,7 +1435,7 @@ static void fdls_send_register_fc4_featu frame =fdls_alloc_frame (iport);if (frame ==NULL ) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"Failed to allocate frame to send RFF" );return ; }
@@ -1458,7 +1461,7 @@ static void fdls_send_register_fc4_featu &iport->active_oxid_fabric_req);if (oxid ==FNIC_UNASSIGNED_OXID ) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: Failed to allocate OXID to send RFF" , iport->fcid);mempool_free (frame, fnic->frame_pool);
@@ -1466,12 +1469,13 @@ static void fdls_send_register_fc4_featu }FNIC_STD_SET_OX_ID (prff_id->fchdr, oxid); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, -"0x%x: FDLS send RFF with oxid: 0x%x" , iport->fcid, - oxid); - prff_id->rff_id.fr_type =FC_TYPE_FCP ; +FNIC_FCS_DBG (KERN_INFO , fnic, +"0x%x: FDLS send RFF with oxid: 0x%x type 0%x feat 0%x" , + iport->fcid, oxid, prff_id->rff_id.fr_type, + prff_id->rff_id.fr_feat); +fnic_send_fcoe_frame (iport, frame, frame_size);/* Even if fnic_send_fcoe_frame() fails we want to retry after timeout */
@@ -1493,7 +1497,7 @@ fdls_send_tgt_prli(struct fnic_iport_s * frame =fdls_alloc_frame (iport);if (frame ==NULL ) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"Failed to allocate frame to send TGT PRLI" ); tport->flags |=FNIC_FDLS_RETRY_FRAME ; goto err_out;
@@ -1513,7 +1517,7 @@ fdls_send_tgt_prli(struct fnic_iport_s * oxid =fdls_alloc_oxid (iport,FNIC_FRAME_TYPE_TGT_PRLI , &tport->active_oxid);if (oxid ==FNIC_UNASSIGNED_OXID ) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"0x%x: Failed to allocate OXID to send TGT PRLI to 0x%x" , iport->fcid, tport->fcid);mempool_free (frame, fnic->frame_pool);
@@ -1530,7 +1534,7 @@ fdls_send_tgt_prli(struct fnic_iport_s *FNIC_STD_SET_S_ID (pprli->fchdr, s_id);FNIC_STD_SET_D_ID (pprli->fchdr, d_id); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: FDLS send PRLI to tgt: 0x%x with oxid: 0x%x" , iport->fcid, tport->fcid, oxid);
@@ -1564,7 +1568,7 @@ void fdls_send_fabric_logo(struct fnic_i frame =fdls_alloc_frame (iport);if (frame ==NULL ) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"Failed to allocate frame to send fabric LOGO" );return ; }
@@ -1576,7 +1580,7 @@ void fdls_send_fabric_logo(struct fnic_i &iport->active_oxid_fabric_req);if (oxid ==FNIC_UNASSIGNED_OXID ) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: Failed to allocate OXID to send fabric LOGO" , iport->fcid);mempool_free (frame, fnic->frame_pool);
@@ -1589,7 +1593,7 @@ void fdls_send_fabric_logo(struct fnic_i iport->fabric.flags &= ~FNIC_FDLS_FABRIC_ABORT_ISSUED ; -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: FDLS send fabric LOGO with oxid: 0x%x" , iport->fcid, oxid);
@@ -1621,7 +1625,7 @@ void fdls_tgt_logout(struct fnic_iport_s frame =fdls_alloc_frame (iport);if (frame ==NULL ) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"Failed to allocate frame to send fabric LOGO" );return ; }
@@ -1631,7 +1635,7 @@ void fdls_tgt_logout(struct fnic_iport_s oxid =fdls_alloc_oxid (iport,FNIC_FRAME_TYPE_TGT_LOGO , &tport->active_oxid);if (oxid ==FNIC_UNASSIGNED_OXID ) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: Failed to allocate OXID to send tgt LOGO" , iport->fcid);mempool_free (frame, fnic->frame_pool);
@@ -1642,7 +1646,7 @@ void fdls_tgt_logout(struct fnic_iport_shton24 (d_id, tport->fcid);FNIC_STD_SET_D_ID (plogo->fchdr, d_id); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: FDLS send tgt LOGO with oxid: 0x%x" , iport->fcid, oxid);
@@ -1657,7 +1661,7 @@ static void fdls_tgt_discovery_start(stru32 old_link_down_cnt = iport->fnic->link_down_cnt;struct fnic *fnic = iport->fnic; -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: Starting FDLS target discovery" , iport->fcid);list_for_each_entry_safe (tport, next, &iport->tport_list, links) {
@@ -1711,7 +1715,7 @@ static void fdls_target_restart_nexus(ststruct fnic *fnic = iport->fnic;bool retval = true; -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"tport fcid: 0x%x state: %d restart_count: %d" , tport->fcid, tport->state, tport->nexus_restart_count);
@@ -1721,13 +1725,13 @@ static void fdls_target_restart_nexus(st retval =fdls_delete_tport (iport, tport);if (retval != true) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"Error deleting tport: 0x%x" , fcid);return ; }if (nexus_restart_count >=FNIC_TPORT_MAX_NEXUS_RESTART ) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Exceeded nexus restart retries tport: 0x%x" , fcid);return ;
@@ -1744,7 +1748,7 @@ static void fdls_target_restart_nexus(st*/ new_tport =fdls_create_tport (iport, fcid, wwpn);if (!new_tport) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Error creating new tport: 0x%x" , fcid);return ; }
@@ -1773,12 +1777,12 @@ static struct fnic_tport_s *fdls_create_struct fnic_tport_s *tport;struct fnic *fnic = iport->fnic; -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"FDLS create tport: fcid: 0x%x wwpn: 0x%llx" , fcid, wwpn); tport =kzalloc (sizeof (struct fnic_tport_s ),GFP_ATOMIC );if (!tport) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Memory allocation failure while creating tport: 0x%x\n" , fcid);return NULL ;
@@ -1791,12 +1795,12 @@ static struct fnic_tport_s *fdls_create_ tport->wwpn = wwpn; tport->iport = iport; -FNIC_FCS_DBG (KERN_DEBUG , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_DEBUG , fnic,"Need to setup tport timer callback" );timer_setup (&tport->retry_timer, fdls_tport_timer_callback,0 ); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Added tport 0x%x" , tport->fcid);fdls_set_tport_state (tport,FDLS_TGT_STATE_INIT );list_add_tail (&tport->links, &iport->tport_list);
@@ -1847,7 +1851,7 @@ static void fdls_fdmi_register_hba(struc frame =fdls_alloc_frame (iport);if (frame ==NULL ) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"Failed to allocate frame to send FDMI RHBA" );return ; }
@@ -1875,7 +1879,7 @@ static void fdls_fdmi_register_hba(struc &iport->active_oxid_fdmi_rhba);if (oxid ==FNIC_UNASSIGNED_OXID ) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: Failed to allocate OXID to send FDMI RHBA" , iport->fcid);mempool_free (frame, fnic->frame_pool);
@@ -1896,14 +1900,14 @@ static void fdls_fdmi_register_hba(strucfnic_fdmi_attr_set (fdmi_attr,FNIC_FDMI_TYPE_NODE_NAME ,FNIC_FDMI_NN_LEN , data, &attr_off_bytes); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"NN set, off=%d" , attr_off_bytes);strscpy_pad (data,FNIC_FDMI_MANUFACTURER ,FNIC_FDMI_MANU_LEN );fnic_fdmi_attr_set (fdmi_attr,FNIC_FDMI_TYPE_MANUFACTURER ,FNIC_FDMI_MANU_LEN , data, &attr_off_bytes); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"MFG set <%s>, off=%d" , data, attr_off_bytes); err =vnic_dev_fw_info (fnic->vdev, &fw_info);
@@ -1912,7 +1916,7 @@ static void fdls_fdmi_register_hba(struc FNIC_FDMI_SERIAL_LEN);fnic_fdmi_attr_set (fdmi_attr,FNIC_FDMI_TYPE_SERIAL_NUMBER ,FNIC_FDMI_SERIAL_LEN , data, &attr_off_bytes); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"SERIAL set <%s>, off=%d" , data, attr_off_bytes); }
@@ -1923,21 +1927,21 @@ static void fdls_fdmi_register_hba(strucfnic_fdmi_attr_set (fdmi_attr,FNIC_FDMI_TYPE_MODEL ,FNIC_FDMI_MODEL_LEN , data, &attr_off_bytes); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"MODEL set <%s>, off=%d" , data, attr_off_bytes);strscpy_pad (data,FNIC_FDMI_MODEL_DESCRIPTION ,FNIC_FDMI_MODEL_DES_LEN );fnic_fdmi_attr_set (fdmi_attr,FNIC_FDMI_TYPE_MODEL_DES ,FNIC_FDMI_MODEL_DES_LEN , data, &attr_off_bytes); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"MODEL_DESC set <%s>, off=%d" , data, attr_off_bytes);if (!err) {strscpy_pad (data, fw_info->hw_version,FNIC_FDMI_HW_VER_LEN );fnic_fdmi_attr_set (fdmi_attr,FNIC_FDMI_TYPE_HARDWARE_VERSION ,FNIC_FDMI_HW_VER_LEN , data, &attr_off_bytes); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"HW_VER set <%s>, off=%d" , data, attr_off_bytes); }
@@ -1946,14 +1950,14 @@ static void fdls_fdmi_register_hba(strucfnic_fdmi_attr_set (fdmi_attr,FNIC_FDMI_TYPE_DRIVER_VERSION ,FNIC_FDMI_DR_VER_LEN , data, &attr_off_bytes); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"DRV_VER set <%s>, off=%d" , data, attr_off_bytes);strscpy_pad (data,"N/A" ,FNIC_FDMI_ROM_VER_LEN );fnic_fdmi_attr_set (fdmi_attr,FNIC_FDMI_TYPE_ROM_VERSION ,FNIC_FDMI_ROM_VER_LEN , data, &attr_off_bytes); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"ROM_VER set <%s>, off=%d" , data, attr_off_bytes);if (!err) {
@@ -1961,14 +1965,14 @@ static void fdls_fdmi_register_hba(strucfnic_fdmi_attr_set (fdmi_attr,FNIC_FDMI_TYPE_FIRMWARE_VERSION ,FNIC_FDMI_FW_VER_LEN , data, &attr_off_bytes); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"FW_VER set <%s>, off=%d" , data, attr_off_bytes); } len =sizeof (struct fc_std_fdmi_rhba ) + attr_off_bytes; frame_size += len; -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: FDLS send FDMI RHBA with oxid: 0x%x fs: %d" , iport->fcid, oxid, frame_size);
@@ -1992,7 +1996,7 @@ static void fdls_fdmi_register_pa(struct frame =fdls_alloc_frame (iport);if (frame ==NULL ) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"Failed to allocate frame to send FDMI RPA" );return ; }
@@ -2020,7 +2024,7 @@ static void fdls_fdmi_register_pa(struct &iport->active_oxid_fdmi_rpa);if (oxid ==FNIC_UNASSIGNED_OXID ) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: Failed to allocate OXID to send FDMI RPA" , iport->fcid);mempool_free (frame, fnic->frame_pool);
@@ -2085,7 +2089,7 @@ static void fdls_fdmi_register_pa(structfnic_fdmi_attr_set (fdmi_attr,FNIC_FDMI_TYPE_OS_NAME ,FNIC_FDMI_OS_NAME_LEN , data, &attr_off_bytes); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"OS name set <%s>, off=%d" , data, attr_off_bytes);sprintf (fc_host_system_hostname (fnic->host),"%s" ,utsname ()->nodename);
@@ -2094,13 +2098,13 @@ static void fdls_fdmi_register_pa(structfnic_fdmi_attr_set (fdmi_attr,FNIC_FDMI_TYPE_HOST_NAME ,FNIC_FDMI_HN_LEN , data, &attr_off_bytes); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Host name set <%s>, off=%d" , data, attr_off_bytes); len =sizeof (struct fc_std_fdmi_rpa ) + attr_off_bytes; frame_size += len; -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: FDLS send FDMI RPA with oxid: 0x%x fs: %d" , iport->fcid, oxid, frame_size);
@@ -2117,7 +2121,7 @@ void fdls_fabric_timer_callback(struct tstruct fnic *fnic = iport->fnic;unsigned long flags; -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"tp: %d fab state: %d fab retry counter: %d max_flogi_retries: %d" , iport->fabric.timer_pending, iport->fabric.state, iport->fabric.retry_counter, iport->max_flogi_retries);
@@ -2132,7 +2136,7 @@ void fdls_fabric_timer_callback(struct tif (iport->fabric.del_timer_inprogress) { iport->fabric.del_timer_inprogress =0 ;spin_unlock_irqrestore (&fnic->fnic_lock, flags); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"fabric_del_timer inprogress(%d). Skip timer cb" , iport->fabric.del_timer_inprogress);return ;
@@ -2160,7 +2164,7 @@ void fdls_fabric_timer_callback(struct t iport->fabric.flags &= ~FNIC_FDLS_FABRIC_ABORT_ISSUED ;fdls_send_fabric_flogi (iport); }else -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Exceeded max FLOGI retries" ); }break ;
@@ -2182,7 +2186,7 @@ void fdls_fabric_timer_callback(struct t iport->fabric.flags &= ~FNIC_FDLS_FABRIC_ABORT_ISSUED ;fdls_send_fabric_plogi (iport); }else -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Exceeded max PLOGI retries" ); }break ;
@@ -2213,7 +2217,7 @@ void fdls_fabric_timer_callback(struct telse {/* ABTS has timed out */ fdls_schedule_oxid_free (iport, &iport->active_oxid_fabric_req); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"ABTS timed out. Starting PLOGI: %p" , iport);fnic_fdls_start_plogi (iport); }
@@ -2230,7 +2234,7 @@ void fdls_fabric_timer_callback(struct t }else {/* ABTS has timed out */ fdls_schedule_oxid_free (iport, &iport->active_oxid_fabric_req); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"ABTS timed out. Starting PLOGI: %p" , iport);fnic_fdls_start_plogi (iport);/* go back to fabric Plogi */ }
@@ -2247,7 +2251,7 @@ void fdls_fabric_timer_callback(struct telse {/* ABTS has timed out */ fdls_schedule_oxid_free (iport, &iport->active_oxid_fabric_req); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"ABTS timed out. Starting PLOGI %p" , iport);fnic_fdls_start_plogi (iport);/* go back to fabric Plogi */ }
@@ -2269,7 +2273,7 @@ void fdls_fabric_timer_callback(struct tif (iport->fabric.retry_counter <FDLS_RETRY_COUNT ) {fdls_send_gpn_ft (iport, iport->fabric.state); }else { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"ABTS timeout for fabric GPN_FT. Check name server: %p" , iport); }
@@ -2289,7 +2293,7 @@ void fdls_fdmi_retry_plogi(struct fnic_i/* If max retries not exhausted, start over from fdmi plogi */ if (iport->fabric.fdmi_retry <FDLS_FDMI_MAX_RETRY ) { iport->fabric.fdmi_retry++; -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Retry FDMI PLOGI. FDMI retry: %d" , iport->fabric.fdmi_retry);fdls_send_fdmi_plogi (iport);
@@ -2307,7 +2311,7 @@ void fdls_fdmi_timer_callback(struct timspin_lock_irqsave (&fnic->fnic_lock, flags); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"iport->fabric.fdmi_pending: 0x%x\n" , iport->fabric.fdmi_pending);if (!iport->fabric.fdmi_pending) {
@@ -2315,7 +2319,7 @@ void fdls_fdmi_timer_callback(struct timspin_unlock_irqrestore (&fnic->fnic_lock, flags);return ; } -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"iport->fabric.fdmi_pending: 0x%x\n" , iport->fabric.fdmi_pending);/* if not abort pending, send an abort */
@@ -2324,7 +2328,7 @@ void fdls_fdmi_timer_callback(struct timspin_unlock_irqrestore (&fnic->fnic_lock, flags);return ; } -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"iport->fabric.fdmi_pending: 0x%x\n" , iport->fabric.fdmi_pending);/* ABTS pending for an active fdmi request that is pending.
@@ -2332,29 +2336,36 @@ void fdls_fdmi_timer_callback(struct tim* Schedule to free the OXID after 2*r_a_tov and proceed */ if (iport->fabric.fdmi_pending &FDLS_FDMI_PLOGI_PENDING ) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"FDMI PLOGI ABTS timed out. Schedule oxid free: 0x%x\n" , iport->active_oxid_fdmi_plogi);fdls_schedule_oxid_free (iport, &iport->active_oxid_fdmi_plogi); }else {if (iport->fabric.fdmi_pending &FDLS_FDMI_REG_HBA_PENDING ) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"FDMI RHBA ABTS timed out. Schedule oxid free: 0x%x\n" , iport->active_oxid_fdmi_rhba);fdls_schedule_oxid_free (iport, &iport->active_oxid_fdmi_rhba); }if (iport->fabric.fdmi_pending &FDLS_FDMI_RPA_PENDING ) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"FDMI RPA ABTS timed out. Schedule oxid free: 0x%x\n" , iport->active_oxid_fdmi_rpa);fdls_schedule_oxid_free (iport, &iport->active_oxid_fdmi_rpa); } } -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"iport->fabric.fdmi_pending: 0x%x\n" , iport->fabric.fdmi_pending); -fdls_fdmi_retry_plogi (iport); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, + iport->fabric.fdmi_pending =0 ; +/* If max retries not exhaused, start over from fdmi plogi */ +if (iport->fabric.fdmi_retry <FDLS_FDMI_MAX_RETRY ) { + iport->fabric.fdmi_retry++; +FNIC_FCS_DBG (KERN_INFO , fnic, +"retry fdmi timer %d" , iport->fabric.fdmi_retry); +fdls_send_fdmi_plogi (iport); + } +FNIC_FCS_DBG (KERN_INFO , fnic,"iport->fabric.fdmi_pending: 0x%x\n" , iport->fabric.fdmi_pending);spin_unlock_irqrestore (&fnic->fnic_lock, flags); }
@@ -2367,7 +2378,7 @@ static void fdls_send_delete_tport_msg(s tport_del_evt =kzalloc (sizeof (struct fnic_tport_event_s ),GFP_ATOMIC );if (!tport_del_evt) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Failed to allocate memory for tport event fcid: 0x%x" , tport->fcid);return ;
@@ -2400,13 +2411,13 @@ static void fdls_tport_timer_callback(stif (tport->del_timer_inprogress) { tport->del_timer_inprogress =0 ;spin_unlock_irqrestore (&fnic->fnic_lock, flags); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"tport_del_timer inprogress. Skip timer cb tport fcid: 0x%x\n" , tport->fcid);return ; } -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"tport fcid: 0x%x timer pending: %d state: %d retry counter: %d" , tport->fcid, tport->timer_pending, tport->state, tport->retry_counter);
@@ -2467,15 +2478,16 @@ static void fdls_tport_timer_callback(st }else {/* exceeded retry count */ fdls_schedule_oxid_free (iport, &tport->active_oxid); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"ADISC not responding. Deleting target port: 0x%x" , tport->fcid);fdls_send_delete_tport_msg (tport); }break ;default : -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, -"oxid: 0x%x Unknown tport state: 0x%x" , oxid, tport->state); +FNIC_FCS_DBG (KERN_INFO , fnic, +"0x%x timeout tport 0x%x oxid 0x%x state %d\n" , + iport->fcid, tport->fcid, oxid, tport->state);break ; }spin_unlock_irqrestore (&fnic->fnic_lock, flags);
@@ -2524,26 +2536,26 @@ fdls_process_tgt_adisc_rsp(struct fnic_i tport =fnic_find_tport_by_fcid (iport, tgt_fcid);if (!tport) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Tgt ADISC response tport not found: 0x%x" , tgt_fcid);return ; }if ((iport->state !=FNIC_IPORT_STATE_READY ) || (tport->state !=FDLS_TGT_STATE_ADISC ) || (tport->flags &FNIC_FDLS_TGT_ABORT_ISSUED )) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Dropping this ADISC response" ); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"iport state: %d tport state: %d Is abort issued on PRLI? %d" , iport->state, tport->state, (tport->flags &FNIC_FDLS_TGT_ABORT_ISSUED ));return ; }if (FNIC_STD_GET_OX_ID (fchdr) != tport->active_oxid) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Dropping frame from target: 0x%x" , tgt_fcid); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Reason: Stale ADISC/Aborted ADISC/OOO frame delivery" );return ; }
@@ -2555,7 +2567,7 @@ fdls_process_tgt_adisc_rsp(struct fnic_icase ELS_LS_ACC :atomic64_inc (&iport->iport_stats.tport_adisc_ls_accepts);if (tport->timer_pending) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"tport 0x%p Canceling fabric disc timer\n" , tport);fnic_del_tport_timer_sync (fnic, tport);
@@ -2565,12 +2577,12 @@ fdls_process_tgt_adisc_rsp(struct fnic_i frame_wwnn =get_unaligned_be64 (&adisc_rsp->els.adisc_wwnn); frame_wwpn =get_unaligned_be64 (&adisc_rsp->els.adisc_wwpn);if ((frame_wwnn == tport->wwnn) && (frame_wwpn == tport->wwpn)) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"ADISC accepted from target: 0x%x. Target logged in" , tgt_fcid);fdls_set_tport_state (tport,FDLS_TGT_STATE_READY ); }else { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Error mismatch frame: ADISC" ); }break ;
@@ -2580,14 +2592,14 @@ fdls_process_tgt_adisc_rsp(struct fnic_iif (((els_rjt->rej.er_reason ==ELS_RJT_BUSY ) || (els_rjt->rej.er_reason ==ELS_RJT_UNAB )) && (tport->retry_counter <FDLS_RETRY_COUNT )) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"ADISC ret ELS_LS_RJT BUSY. Retry from timer routine: 0x%x" , tgt_fcid);/* Retry ADISC again from the timer routine. */ tport->flags |=FNIC_FDLS_RETRY_FRAME ; }else { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"ADISC returned ELS_LS_RJT from target: 0x%x" , tgt_fcid);fdls_delete_tport (iport, tport);
@@ -2611,33 +2623,33 @@ fdls_process_tgt_plogi_rsp(struct fnic_i fcid =FNIC_STD_GET_S_ID (fchdr); tgt_fcid =ntoh24 (fcid); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"FDLS processing target PLOGI response: tgt_fcid: 0x%x" , tgt_fcid); tport =fnic_find_tport_by_fcid (iport, tgt_fcid);if (!tport) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"tport not found: 0x%x" , tgt_fcid);return ; }if ((iport->state !=FNIC_IPORT_STATE_READY ) || (tport->flags &FNIC_FDLS_TGT_ABORT_ISSUED )) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Dropping frame! iport state: %d tport state: %d" , iport->state, tport->state);return ; }if (tport->state !=FDLS_TGT_STATE_PLOGI ) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"PLOGI rsp recvd in wrong state. Drop the frame and restart nexus" );fdls_target_restart_nexus (tport);return ; }if (FNIC_STD_GET_OX_ID (fchdr) != tport->active_oxid) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"PLOGI response from target: 0x%x. Dropping frame" , tgt_fcid);return ;
@@ -2649,7 +2661,7 @@ fdls_process_tgt_plogi_rsp(struct fnic_iswitch (plogi_rsp->els.fl_cmd) {case ELS_LS_ACC :atomic64_inc (&iport->iport_stats.tport_plogi_ls_accepts); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"PLOGI accepted by target: 0x%x" , tgt_fcid);break ;
@@ -2658,14 +2670,14 @@ fdls_process_tgt_plogi_rsp(struct fnic_iif (((els_rjt->rej.er_reason ==ELS_RJT_BUSY ) || (els_rjt->rej.er_reason ==ELS_RJT_UNAB )) && (tport->retry_counter < iport->max_plogi_retries)) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"PLOGI ret ELS_LS_RJT BUSY. Retry from timer routine: 0x%x" , tgt_fcid);/* Retry plogi again from the timer routine. */ tport->flags |=FNIC_FDLS_RETRY_FRAME ;return ; } -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"PLOGI returned ELS_LS_RJT from target: 0x%x" , tgt_fcid);fdls_delete_tport (iport, tport);
@@ -2673,18 +2685,18 @@ fdls_process_tgt_plogi_rsp(struct fnic_idefault :atomic64_inc (&iport->iport_stats.tport_plogi_misc_rejects); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"PLOGI not accepted from target fcid: 0x%x" , tgt_fcid);return ; } -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Found the PLOGI target: 0x%x and state: %d" , (unsigned int ) tgt_fcid, tport->state);if (tport->timer_pending) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"tport fcid 0x%x: Canceling disc timer\n" , tport->fcid);fnic_del_tport_timer_sync (fnic, tport);
@@ -2702,13 +2714,13 @@ fdls_process_tgt_plogi_rsp(struct fnic_imin (max_payload_size, iport->max_payload_size);if (tport->max_payload_size <FNIC_MIN_DATA_FIELD_SIZE ) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"MFS: tport max frame size below spec bounds: %d" , tport->max_payload_size); tport->max_payload_size =FNIC_MIN_DATA_FIELD_SIZE ; } -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"MAX frame size: %u iport max_payload_size: %d tport mfs: %d" , max_payload_size, iport->max_payload_size, tport->max_payload_size);
@@ -2736,12 +2748,12 @@ fdls_process_tgt_prli_rsp(struct fnic_ip fcid =FNIC_STD_GET_S_ID (fchdr); tgt_fcid =ntoh24 (fcid); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"FDLS process tgt PRLI response: 0x%x" , tgt_fcid); tport =fnic_find_tport_by_fcid (iport, tgt_fcid);if (!tport) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"tport not found: 0x%x" , tgt_fcid);/* Handle or just drop? */ return ;
@@ -2749,24 +2761,24 @@ fdls_process_tgt_prli_rsp(struct fnic_ipif ((iport->state !=FNIC_IPORT_STATE_READY ) || (tport->flags &FNIC_FDLS_TGT_ABORT_ISSUED )) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Dropping frame! iport st: %d tport st: %d tport fcid: 0x%x" , iport->state, tport->state, tport->fcid);return ; }if (tport->state !=FDLS_TGT_STATE_PRLI ) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"PRLI rsp recvd in wrong state. Drop frame. Restarting nexus" );fdls_target_restart_nexus (tport);return ; }if (FNIC_STD_GET_OX_ID (fchdr) != tport->active_oxid) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Dropping PRLI response from target: 0x%x " , tgt_fcid); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Reason: Stale PRLI response/Aborted PDISC/OOO frame delivery" );return ; }
@@ -2777,11 +2789,11 @@ fdls_process_tgt_prli_rsp(struct fnic_ipswitch (prli_rsp->els_prli.prli_cmd) {case ELS_LS_ACC :atomic64_inc (&iport->iport_stats.tport_prli_ls_accepts); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"PRLI accepted from target: 0x%x" , tgt_fcid);if (prli_rsp->sp.spp_type !=FC_FC4_TYPE_SCSI ) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"mismatched target zoned with FC SCSI initiator: 0x%x" , tgt_fcid); mismatched_tgt = true;
@@ -2798,7 +2810,7 @@ fdls_process_tgt_prli_rsp(struct fnic_ip || (els_rjt->rej.er_reason == ELS_RJT_UNAB)) && (tport->retry_counter < FDLS_RETRY_COUNT)) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"PRLI ret ELS_LS_RJT BUSY. Retry from timer routine: 0x%x" , tgt_fcid);
@@ -2806,7 +2818,7 @@ fdls_process_tgt_prli_rsp(struct fnic_ip tport->flags |=FNIC_FDLS_RETRY_FRAME ;return ; } -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"PRLI returned ELS_LS_RJT from target: 0x%x" , tgt_fcid);
@@ -2815,17 +2827,17 @@ fdls_process_tgt_prli_rsp(struct fnic_ipreturn ;default :atomic64_inc (&iport->iport_stats.tport_prli_misc_rejects); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"PRLI not accepted from target: 0x%x" , tgt_fcid);return ; } -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Found the PRLI target: 0x%x and state: %d" , (unsigned int ) tgt_fcid, tport->state);if (tport->timer_pending) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"tport fcid 0x%x: Canceling disc timer\n" , tport->fcid);fnic_del_tport_timer_sync (fnic, tport);
@@ -2841,7 +2853,7 @@ fdls_process_tgt_prli_rsp(struct fnic_ip/* Check if the device plays Target Mode Function */ if (!(tport->fcp_csp &FCP_PRLI_FUNC_TARGET )) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Remote port(0x%x): no target support. Deleting it\n" , tgt_fcid);fdls_tgt_logout (iport, tport);
@@ -2854,16 +2866,16 @@ fdls_process_tgt_prli_rsp(struct fnic_ip/* Inform the driver about new target added */ tport_add_evt =kzalloc (sizeof (struct fnic_tport_event_s ),GFP_ATOMIC );if (!tport_add_evt) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, -"tport event memory allocation failure: 0x%0x\n" , - tport->fcid); +FNIC_FCS_DBG (KERN_INFO , fnic, +"iport fcid: 0x%x tport event memory allocation failure: 0x%0x\n" , + iport->fcid, tport->fcid);return ; } tport_add_evt->event =TGT_EV_RPORT_ADD ; tport_add_evt->arg1 = (void *) tport; -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, -"iport fcid: 0x%x add tport event fcid: 0x%x\n" , - tport->fcid, iport->fcid); +FNIC_FCS_DBG (KERN_INFO , fnic, +"iport fcid: 0x%x add tport event fcid: 0x%x\n" , + tport->fcid, iport->fcid);list_add_tail (&tport_add_evt->links, &fnic->tport_event_list);queue_work (fnic_event_queue, &fnic->tport_work); }
@@ -2881,21 +2893,21 @@ fdls_process_rff_id_rsp(struct fnic_iporuint16_t oxid =FNIC_STD_GET_OX_ID (fchdr);if (fdls_get_state (fdls) !=FDLS_STATE_REGISTER_FC4_FEATURES ) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"RFF_ID resp recvd in state(%d). Dropping." ,fdls_get_state (fdls));return ; }if (iport->active_oxid_fabric_req != oxid) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Incorrect OXID in response. state: %d, oxid recvd: 0x%x, active oxid: 0x%x\n" ,fdls_get_state (fdls), oxid, iport->active_oxid_fabric_req);return ; } rsp =FNIC_STD_GET_FC_CT_CMD ((&rff_rsp->fc_std_ct_hdr)); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: FDLS process RFF ID response: 0x%04x" , iport->fcid, (uint32_t ) rsp);
@@ -2904,7 +2916,7 @@ fdls_process_rff_id_rsp(struct fnic_iporswitch (rsp) {case FC_FS_ACC :if (iport->fabric.timer_pending) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Canceling fabric disc timer %p\n" , iport);fnic_del_fabric_timer_sync (fnic); }
@@ -2918,18 +2930,18 @@ fdls_process_rff_id_rsp(struct fnic_iporif (((reason_code ==FC_FS_RJT_BSY ) || (reason_code ==FC_FS_RJT_UNABL )) && (fdls->retry_counter <FDLS_RETRY_COUNT )) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"RFF_ID ret ELS_LS_RJT BUSY. Retry from timer routine %p" , iport);/* Retry again from the timer routine */ fdls->flags |=FNIC_FDLS_RETRY_FRAME ; }else { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"RFF_ID returned ELS_LS_RJT. Halting discovery %p" , iport);if (iport->fabric.timer_pending) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Canceling fabric disc timer %p\n" , iport);fnic_del_fabric_timer_sync (fnic); }
@@ -2954,14 +2966,14 @@ fdls_process_rft_id_rsp(struct fnic_iporuint16_t oxid =FNIC_STD_GET_OX_ID (fchdr);if (fdls_get_state (fdls) !=FDLS_STATE_REGISTER_FC4_TYPES ) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"RFT_ID resp recvd in state(%d). Dropping." ,fdls_get_state (fdls));return ; }if (iport->active_oxid_fabric_req != oxid) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Incorrect OXID in response. state: %d, oxid recvd: 0x%x, active oxid: 0x%x\n" ,fdls_get_state (fdls), oxid, iport->active_oxid_fabric_req);return ;
@@ -2969,7 +2981,7 @@ fdls_process_rft_id_rsp(struct fnic_ipor rsp =FNIC_STD_GET_FC_CT_CMD ((&rft_rsp->fc_std_ct_hdr)); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: FDLS process RFT ID response: 0x%04x" , iport->fcid, (uint32_t ) rsp);
@@ -2978,7 +2990,7 @@ fdls_process_rft_id_rsp(struct fnic_iporswitch (rsp) {case FC_FS_ACC :if (iport->fabric.timer_pending) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Canceling fabric disc timer %p\n" , iport);fnic_del_fabric_timer_sync (fnic); }
@@ -2992,19 +3004,19 @@ fdls_process_rft_id_rsp(struct fnic_iporif (((reason_code ==FC_FS_RJT_BSY ) || (reason_code ==FC_FS_RJT_UNABL )) && (fdls->retry_counter <FDLS_RETRY_COUNT )) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: RFT_ID ret ELS_LS_RJT BUSY. Retry from timer routine" , iport->fcid);/* Retry again from the timer routine */ fdls->flags |=FNIC_FDLS_RETRY_FRAME ; }else { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: RFT_ID REJ. Halting discovery reason %d expl %d" , iport->fcid, reason_code, rft_rsp->fc_std_ct_hdr.ct_explan);if (iport->fabric.timer_pending) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Canceling fabric disc timer %p\n" , iport);fnic_del_fabric_timer_sync (fnic); }
@@ -3029,20 +3041,20 @@ fdls_process_rpn_id_rsp(struct fnic_iporuint16_t oxid =FNIC_STD_GET_OX_ID (fchdr);if (fdls_get_state (fdls) !=FDLS_STATE_RPN_ID ) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"RPN_ID resp recvd in state(%d). Dropping." ,fdls_get_state (fdls));return ; }if (iport->active_oxid_fabric_req != oxid) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Incorrect OXID in response. state: %d, oxid recvd: 0x%x, active oxid: 0x%x\n" ,fdls_get_state (fdls), oxid, iport->active_oxid_fabric_req);return ; } rsp =FNIC_STD_GET_FC_CT_CMD ((&rpn_rsp->fc_std_ct_hdr)); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: FDLS process RPN ID response: 0x%04x" , iport->fcid, (uint32_t ) rsp);fdls_free_oxid (iport, oxid, &iport->active_oxid_fabric_req);
@@ -3050,7 +3062,7 @@ fdls_process_rpn_id_rsp(struct fnic_iporswitch (rsp) {case FC_FS_ACC :if (iport->fabric.timer_pending) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Canceling fabric disc timer %p\n" , iport);fnic_del_fabric_timer_sync (fnic); }
@@ -3064,17 +3076,17 @@ fdls_process_rpn_id_rsp(struct fnic_iporif (((reason_code ==FC_FS_RJT_BSY ) || (reason_code ==FC_FS_RJT_UNABL )) && (fdls->retry_counter <FDLS_RETRY_COUNT )) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"RPN_ID returned REJ BUSY. Retry from timer routine %p" , iport);/* Retry again from the timer routine */ fdls->flags |=FNIC_FDLS_RETRY_FRAME ; }else { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"RPN_ID ELS_LS_RJT. Halting discovery %p" , iport);if (iport->fabric.timer_pending) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Canceling fabric disc timer %p\n" , iport);fnic_del_fabric_timer_sync (fnic); }
@@ -3097,18 +3109,18 @@ fdls_process_scr_rsp(struct fnic_iport_sstruct fnic *fnic = iport->fnic;uint16_t oxid =FNIC_STD_GET_OX_ID (fchdr); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"FDLS process SCR response: 0x%04x" , (uint32_t ) scr_rsp->scr.scr_cmd);if (fdls_get_state (fdls) !=FDLS_STATE_SCR ) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"SCR resp recvd in state(%d). Dropping." ,fdls_get_state (fdls));return ; }if (iport->active_oxid_fabric_req != oxid) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Incorrect OXID in response. state: %d, oxid recvd: 0x%x, active oxid: 0x%x\n" ,fdls_get_state (fdls), oxid, iport->active_oxid_fabric_req); }
@@ -3119,7 +3131,7 @@ fdls_process_scr_rsp(struct fnic_iport_scase ELS_LS_ACC :atomic64_inc (&iport->iport_stats.fabric_scr_ls_accepts);if (iport->fabric.timer_pending) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Canceling fabric disc timer %p\n" , iport);fnic_del_fabric_timer_sync (fnic); }
@@ -3133,17 +3145,17 @@ fdls_process_scr_rsp(struct fnic_iport_sif (((els_rjt->rej.er_reason ==ELS_RJT_BUSY ) || (els_rjt->rej.er_reason ==ELS_RJT_UNAB )) && (fdls->retry_counter <FDLS_RETRY_COUNT )) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"SCR ELS_LS_RJT BUSY. Retry from timer routine %p" , iport);/* Retry again from the timer routine */ fdls->flags |=FNIC_FDLS_RETRY_FRAME ; }else { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"SCR returned ELS_LS_RJT. Halting discovery %p" , iport);if (iport->fabric.timer_pending) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Canceling fabric disc timer %p\n" , iport);fnic_del_fabric_timer_sync (fnic);
@@ -3171,7 +3183,7 @@ fdls_process_gpn_ft_tgt_list(struct fnicu32 old_link_down_cnt = iport->fnic->link_down_cnt;struct fnic *fnic = iport->fnic; -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: FDLS process GPN_FT tgt list" , iport->fcid); gpn_ft_tgt =
@@ -3185,7 +3197,7 @@ fdls_process_gpn_ft_tgt_list(struct fnic fcid =ntoh24 (gpn_ft_tgt->fcid); wwpn =be64_to_cpu (gpn_ft_tgt->wwpn); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"tport: 0x%x: ctrl:0x%x" , fcid, gpn_ft_tgt->ctrl);if (fcid == iport->fcid) {
@@ -3232,7 +3244,7 @@ fdls_process_gpn_ft_tgt_list(struct fnic rem_len -=sizeof (struct fc_gpn_ft_rsp_iu ); }if (rem_len <=0 ) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"GPN_FT response: malformed/corrupt frame rxlen: %d remlen: %d" , len, rem_len); }
@@ -3242,7 +3254,7 @@ fdls_process_gpn_ft_tgt_list(struct fniclist_for_each_entry_safe (tport, next, &iport->tport_list, links) {if (!(tport->flags &FNIC_FDLS_TPORT_IN_GPN_FT_LIST )) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Remove port: 0x%x not found in GPN_FT list" , tport->fcid);fdls_delete_tport (iport, tport);
@@ -3271,7 +3283,7 @@ fdls_process_gpn_ft_rsp(struct fnic_iporstruct fnic *fnic = iport->fnic;uint16_t oxid =FNIC_STD_GET_OX_ID (fchdr); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"FDLS process GPN_FT response: iport state: %d len: %d" , iport->state, len);
@@ -3291,14 +3303,14 @@ fdls_process_gpn_ft_rsp(struct fnic_ipor && ((fdls_get_state(fdls) == FDLS_STATE_RSCN_GPN_FT) || (fdls_get_state(fdls) == FDLS_STATE_SEND_GPNFT) || (fdls_get_state(fdls) == FDLS_STATE_TGT_DISCOVERY))))) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"GPNFT resp recvd in fab state(%d) iport_state(%d). Dropping." ,fdls_get_state (fdls), iport->state);return ; }if (iport->active_oxid_fabric_req != oxid) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Incorrect OXID in response. state: %d, oxid recvd: 0x%x, active oxid: 0x%x\n" ,fdls_get_state (fdls), oxid, iport->active_oxid_fabric_req); }
@@ -3311,10 +3323,10 @@ fdls_process_gpn_ft_rsp(struct fnic_iporswitch (rsp) {case FC_FS_ACC : -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: GPNFT_RSP accept" , iport->fcid);if (iport->fabric.timer_pending) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: Canceling fabric disc timer\n" , iport->fcid);fnic_del_fabric_timer_sync (fnic);
@@ -3329,7 +3341,7 @@ fdls_process_gpn_ft_rsp(struct fnic_ipor* that will be taken care in next link up event */ if (iport->state !=FNIC_IPORT_STATE_READY ) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Halting target discovery: fab st: %d iport st: %d " ,fdls_get_state (fdls), iport->state);break ;
@@ -3339,22 +3351,22 @@ fdls_process_gpn_ft_rsp(struct fnic_iporcase FC_FS_RJT : reason_code = gpn_ft_rsp->fc_std_ct_hdr.ct_reason; -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: GPNFT_RSP Reject reason: %d" , iport->fcid, reason_code);if (((reason_code ==FC_FS_RJT_BSY ) || (reason_code ==FC_FS_RJT_UNABL )) && (fdls->retry_counter <FDLS_RETRY_COUNT )) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: GPNFT_RSP ret REJ/BSY. Retry from timer routine" , iport->fcid);/* Retry again from the timer routine */ fdls->flags |=FNIC_FDLS_RETRY_FRAME ; }else { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: GPNFT_RSP reject" , iport->fcid);if (iport->fabric.timer_pending) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: Canceling fabric disc timer\n" , iport->fcid);fnic_del_fabric_timer_sync (fnic);
@@ -3368,7 +3380,7 @@ fdls_process_gpn_ft_rsp(struct fnic_ipor count =0 ;list_for_each_entry_safe (tport, next, &iport->tport_list, links) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"GPN_FT_REJECT: Remove port: 0x%x" , tport->fcid);fdls_delete_tport (iport, tport);
@@ -3378,7 +3390,7 @@ fdls_process_gpn_ft_rsp(struct fnic_ipor } count++; } -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"GPN_FT_REJECT: Removed (0x%x) ports" , count); }break ;
@@ -3403,7 +3415,7 @@ fdls_process_fabric_logo_rsp(struct fnicuint16_t oxid =FNIC_STD_GET_OX_ID (fchdr);if (iport->active_oxid_fabric_req != oxid) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Incorrect OXID in response. state: %d, oxid recvd: 0x%x, active oxid: 0x%x\n" ,fdls_get_state (fdls), oxid, iport->active_oxid_fabric_req); }
@@ -3412,7 +3424,7 @@ fdls_process_fabric_logo_rsp(struct fnicswitch (flogo_rsp->els.fl_cmd) {case ELS_LS_ACC :if (iport->fabric.state !=FDLS_STATE_FABRIC_LOGO ) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Flogo response. Fabric not in LOGO state. Dropping! %p" , iport);return ;
@@ -3422,25 +3434,25 @@ fdls_process_fabric_logo_rsp(struct fnic iport->state =FNIC_IPORT_STATE_LINK_WAIT ;if (iport->fabric.timer_pending) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"iport 0x%p Canceling fabric disc timer\n" , iport);fnic_del_fabric_timer_sync (fnic); } iport->fabric.timer_pending =0 ; -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Flogo response from Fabric for did: 0x%x" ,ntoh24 (fchdr->fh_d_id));return ;case ELS_LS_RJT : -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Flogo response from Fabric for did: 0x%x returned ELS_LS_RJT" ,ntoh24 (fchdr->fh_d_id));return ;default : -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"FLOGO response not accepted or rejected: 0x%x" , flogo_rsp->els.fl_cmd); }
@@ -3458,17 +3470,17 @@ fdls_process_flogi_rsp(struct fnic_iportstruct fnic *fnic = iport->fnic;uint16_t oxid =FNIC_STD_GET_OX_ID (fchdr); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: FDLS processing FLOGI response" , iport->fcid);if (fdls_get_state (fabric) !=FDLS_STATE_FABRIC_FLOGI ) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"FLOGI response received in state (%d). Dropping frame" ,fdls_get_state (fabric));return ; }if (iport->active_oxid_fabric_req != oxid) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Incorrect OXID in response. state: %d, oxid recvd: 0x%x, active oxid: 0x%x\n" ,fdls_get_state (fabric), oxid, iport->active_oxid_fabric_req);return ;
@@ -3480,7 +3492,7 @@ fdls_process_flogi_rsp(struct fnic_iportcase ELS_LS_ACC :atomic64_inc (&iport->iport_stats.fabric_flogi_ls_accepts);if (iport->fabric.timer_pending) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"iport fcid: 0x%x Canceling fabric disc timer\n" , iport->fcid);fnic_del_fabric_timer_sync (fnic);
@@ -3490,7 +3502,7 @@ fdls_process_flogi_rsp(struct fnic_iport iport->fabric.retry_counter =0 ; fcid =FNIC_STD_GET_D_ID (fchdr); iport->fcid =ntoh24 (fcid); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: FLOGI response accepted" , iport->fcid);/* Learn the Service Params */
@@ -3500,7 +3512,7 @@ fdls_process_flogi_rsp(struct fnic_iport iport->max_payload_size =min (rdf_size, iport->max_payload_size); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"max_payload_size from fabric: %u set: %d" , rdf_size, iport->max_payload_size);
@@ -3510,7 +3522,7 @@ fdls_process_flogi_rsp(struct fnic_iportif (FNIC_LOGI_FEATURES (flogi_rsp->els) &FNIC_FC_EDTOV_NSEC ) iport->e_d_tov = iport->e_d_tov /FNIC_NSEC_TO_MSEC ; -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"From fabric: R_A_TOV: %d E_D_TOV: %d" , iport->r_a_tov, iport->e_d_tov);
@@ -3521,13 +3533,13 @@ fdls_process_flogi_rsp(struct fnic_iportfnic_fdls_learn_fcoe_macs (iport, rx_frame, fcid);if (fnic_fdls_register_portid (iport, iport->fcid, rx_frame) !=0 ) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: FLOGI registration failed" , iport->fcid);break ; }memcpy (&fcmac[3 ], fcid,3 ); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Adding vNIC device MAC addr: %02x:%02x:%02x:%02x:%02x:%02x" , fcmac[0 ], fcmac[1 ], fcmac[2 ], fcmac[3 ], fcmac[4 ], fcmac[5 ]);
@@ -3535,7 +3547,7 @@ fdls_process_flogi_rsp(struct fnic_iportif (fdls_get_state (fabric) ==FDLS_STATE_FABRIC_FLOGI ) {fnic_fdls_start_plogi (iport); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"FLOGI response received. Starting PLOGI" ); }else {/* From FDLS_STATE_FABRIC_FLOGI state fabric can only go to
@@ -3543,7 +3555,7 @@ fdls_process_flogi_rsp(struct fnic_iport* state, hence we don't have to worry about undoing: * the fnic_fdls_register_portid and vnic_dev_add_addr */ -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"FLOGI response received in state (%d). Dropping frame" ,fdls_get_state (fabric)); }
@@ -3552,7 +3564,7 @@ fdls_process_flogi_rsp(struct fnic_iportcase ELS_LS_RJT :atomic64_inc (&iport->iport_stats.fabric_flogi_ls_rejects);if (fabric->retry_counter < iport->max_flogi_retries) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"FLOGI returned ELS_LS_RJT BUSY. Retry from timer routine %p" , iport);
@@ -3560,11 +3572,11 @@ fdls_process_flogi_rsp(struct fnic_iport fabric->flags |=FNIC_FDLS_RETRY_FRAME ; }else { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"FLOGI returned ELS_LS_RJT. Halting discovery %p" , iport);if (iport->fabric.timer_pending) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"iport 0x%p Canceling fabric disc timer\n" , iport);fnic_del_fabric_timer_sync (fnic);
@@ -3575,7 +3587,7 @@ fdls_process_flogi_rsp(struct fnic_iportbreak ;default : -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"FLOGI response not accepted: 0x%x" , flogi_rsp->els.fl_cmd);atomic64_inc (&iport->iport_stats.fabric_flogi_misc_rejects);
@@ -3594,13 +3606,13 @@ fdls_process_fabric_plogi_rsp(struct fniuint16_t oxid =FNIC_STD_GET_OX_ID (fchdr);if (fdls_get_state ((&iport->fabric)) !=FDLS_STATE_FABRIC_PLOGI ) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Fabric PLOGI response received in state (%d). Dropping frame" ,fdls_get_state (&iport->fabric));return ; }if (iport->active_oxid_fabric_req != oxid) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Incorrect OXID in response. state: %d, oxid recvd: 0x%x, active oxid: 0x%x\n" ,fdls_get_state (fdls), oxid, iport->active_oxid_fabric_req);return ;
@@ -3611,7 +3623,7 @@ fdls_process_fabric_plogi_rsp(struct fnicase ELS_LS_ACC :atomic64_inc (&iport->iport_stats.fabric_plogi_ls_accepts);if (iport->fabric.timer_pending) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"iport fcid: 0x%x fabric PLOGI response: Accepted\n" , iport->fcid);fnic_del_fabric_timer_sync (fnic);
@@ -3626,15 +3638,15 @@ fdls_process_fabric_plogi_rsp(struct fniif (((els_rjt->rej.er_reason ==ELS_RJT_BUSY ) || (els_rjt->rej.er_reason ==ELS_RJT_UNAB )) && (iport->fabric.retry_counter < iport->max_plogi_retries)) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: Fabric PLOGI ELS_LS_RJT BUSY. Retry from timer routine" , iport->fcid); }else { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: Fabric PLOGI ELS_LS_RJT. Halting discovery" , iport->fcid);if (iport->fabric.timer_pending) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"iport fcid: 0x%x Canceling fabric disc timer\n" , iport->fcid);fnic_del_fabric_timer_sync (fnic);
@@ -3645,7 +3657,7 @@ fdls_process_fabric_plogi_rsp(struct fni }break ;default : -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"PLOGI response not accepted: 0x%x" , plogi_rsp->els.fl_cmd);atomic64_inc (&iport->iport_stats.fabric_plogi_misc_rejects);
@@ -3664,7 +3676,7 @@ static void fdls_process_fdmi_plogi_rsp(uint16_t oxid =FNIC_STD_GET_OX_ID (fchdr);if (iport->active_oxid_fdmi_plogi != oxid) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Incorrect OXID in response. state: %d, oxid recvd: 0x%x, active oxid: 0x%x\n" ,fdls_get_state (fdls), oxid, iport->active_oxid_fdmi_plogi);return ;
@@ -3678,9 +3690,9 @@ static void fdls_process_fdmi_plogi_rsp( iport->fabric.fdmi_pending =0 ;switch (plogi_rsp->els.fl_cmd) {case ELS_LS_ACC : -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"FDLS process fdmi PLOGI response status: ELS_LS_ACC\n" ); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Sending fdmi registration for port 0x%x\n" , iport->fcid);
@@ -3691,7 +3703,7 @@ static void fdls_process_fdmi_plogi_rsp( round_jiffies(fdmi_tov));break ;case ELS_LS_RJT : -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Fabric FDMI PLOGI returned ELS_LS_RJT reason: 0x%x" , els_rjt->rej.er_reason);
@@ -3715,7 +3727,7 @@ static void fdls_process_fdmi_reg_ack(stuint16_t oxid;if (!iport->fabric.fdmi_pending) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"Received FDMI ack while not waiting: 0x%x\n" ,FNIC_STD_GET_OX_ID (fchdr));return ;
@@ -3725,7 +3737,7 @@ static void fdls_process_fdmi_reg_ack(stif ((iport->active_oxid_fdmi_rhba != oxid) && (iport->active_oxid_fdmi_rpa != oxid)) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Incorrect OXID in response. oxid recvd: 0x%x, active oxids(rhba,rpa): 0x%x, 0x%x\n" , oxid, iport->active_oxid_fdmi_rhba, iport->active_oxid_fdmi_rpa);return ;
@@ -3738,13 +3750,13 @@ static void fdls_process_fdmi_reg_ack(stfdls_free_oxid (iport, oxid, &iport->active_oxid_fdmi_rpa); } -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"iport fcid: 0x%x: Received FDMI registration ack\n" , iport->fcid);if (!iport->fabric.fdmi_pending) {timer_delete_sync (&iport->fabric.fdmi_timer); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"iport fcid: 0x%x: Canceling FDMI timer\n" , iport->fcid); }
@@ -3760,7 +3772,7 @@ static void fdls_process_fdmi_abts_rsp(s s_id =ntoh24 (FNIC_STD_GET_S_ID (fchdr));if (!(s_id !=FC_FID_MGMT_SERV )) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Received abts rsp with invalid SID: 0x%x. Dropping frame" , s_id);return ;
@@ -3770,23 +3782,23 @@ static void fdls_process_fdmi_abts_rsp(sswitch (FNIC_FRAME_TYPE (oxid)) {case FNIC_FRAME_TYPE_FDMI_PLOGI : -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Received FDMI PLOGI ABTS rsp with oxid: 0x%x" , oxid); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: iport->fabric.fdmi_pending: 0x%x" , iport->fcid, iport->fabric.fdmi_pending);fdls_free_oxid (iport, oxid, &iport->active_oxid_fdmi_plogi); iport->fabric.fdmi_pending &= ~FDLS_FDMI_PLOGI_PENDING ; iport->fabric.fdmi_pending &= ~FDLS_FDMI_ABORT_PENDING ; -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: iport->fabric.fdmi_pending: 0x%x" , iport->fcid, iport->fabric.fdmi_pending);break ;case FNIC_FRAME_TYPE_FDMI_RHBA : -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Received FDMI RHBA ABTS rsp with oxid: 0x%x" , oxid); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: iport->fabric.fdmi_pending: 0x%x" , iport->fcid, iport->fabric.fdmi_pending);
@@ -3800,14 +3812,14 @@ static void fdls_process_fdmi_abts_rsp(s iport->fabric.fdmi_pending &= ~FDLS_FDMI_ABORT_PENDING ;fdls_free_oxid (iport, oxid, &iport->active_oxid_fdmi_rhba); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: iport->fabric.fdmi_pending: 0x%x" , iport->fcid, iport->fabric.fdmi_pending);break ;case FNIC_FRAME_TYPE_FDMI_RPA : -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Received FDMI RPA ABTS rsp with oxid: 0x%x" , oxid); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: iport->fabric.fdmi_pending: 0x%x" , iport->fcid, iport->fabric.fdmi_pending);
@@ -3821,12 +3833,12 @@ static void fdls_process_fdmi_abts_rsp(s iport->fabric.fdmi_pending &= ~FDLS_FDMI_ABORT_PENDING ;fdls_free_oxid (iport, oxid, &iport->active_oxid_fdmi_rpa); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: iport->fabric.fdmi_pending: 0x%x" , iport->fcid, iport->fabric.fdmi_pending);break ;default : -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Received abts rsp with invalid oxid: 0x%x. Dropping frame" , oxid);break ;
@@ -3861,7 +3873,7 @@ fdls_process_fabric_abts_rsp(struct fnicif (!((s_id ==FC_FID_DIR_SERV ) || (s_id ==FC_FID_FLOGI ) || (s_id ==FC_FID_FCTRL ))) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Received abts rsp with invalid SID: 0x%x. Dropping frame" , s_id);return ;
@@ -3869,14 +3881,14 @@ fdls_process_fabric_abts_rsp(struct fnic oxid =FNIC_STD_GET_OX_ID (fchdr);if (iport->active_oxid_fabric_req != oxid) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Received abts rsp with invalid oxid: 0x%x. Dropping frame" , oxid);return ; }if (iport->fabric.timer_pending) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Canceling fabric disc timer %p\n" , iport);fnic_del_fabric_timer_sync (fnic); }
@@ -3884,11 +3896,11 @@ fdls_process_fabric_abts_rsp(struct fnic iport->fabric.flags &= ~FNIC_FDLS_FABRIC_ABORT_ISSUED ;if (fchdr->fh_r_ctl ==FC_RCTL_BA_ACC ) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Received abts rsp BA_ACC for fabric_state: %d OX_ID: 0x%x" , fabric_state,be16_to_cpu (ba_acc->acc.ba_ox_id)); }else if (fchdr->fh_r_ctl ==FC_RCTL_BA_RJT ) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"BA_RJT fs: %d OX_ID: 0x%x rc: 0x%x rce: 0x%x" , fabric_state,FNIC_STD_GET_OX_ID (&ba_rjt->fchdr), ba_rjt->rjt.br_reason, ba_rjt->rjt.br_explan);
@@ -3903,7 +3915,7 @@ fdls_process_fabric_abts_rsp(struct fnicif (iport->fabric.retry_counter < iport->max_flogi_retries)fdls_send_fabric_flogi (iport);else -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Exceeded max FLOGI retries" );break ;case FNIC_FRAME_TYPE_FABRIC_LOGO :
@@ -3914,7 +3926,7 @@ fdls_process_fabric_abts_rsp(struct fnicif (iport->fabric.retry_counter < iport->max_plogi_retries)fdls_send_fabric_plogi (iport);else -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Exceeded max PLOGI retries" );break ;case FNIC_FRAME_TYPE_FABRIC_RPN :
@@ -3928,7 +3940,7 @@ fdls_process_fabric_abts_rsp(struct fnicif (iport->fabric.retry_counter <FDLS_RETRY_COUNT )fdls_send_scr (iport);else { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"SCR exhausted retries. Start fabric PLOGI %p" , iport);fnic_fdls_start_plogi (iport);/* go back to fabric Plogi */
@@ -3938,7 +3950,7 @@ fdls_process_fabric_abts_rsp(struct fnicif (iport->fabric.retry_counter <FDLS_RETRY_COUNT )fdls_send_register_fc4_types (iport);else { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"RFT exhausted retries. Start fabric PLOGI %p" , iport);fnic_fdls_start_plogi (iport);/* go back to fabric Plogi */
@@ -3948,7 +3960,7 @@ fdls_process_fabric_abts_rsp(struct fnicif (iport->fabric.retry_counter <FDLS_RETRY_COUNT )fdls_send_register_fc4_features (iport);else { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"RFF exhausted retries. Start fabric PLOGI %p" , iport);fnic_fdls_start_plogi (iport);/* go back to fabric Plogi */
@@ -3958,7 +3970,7 @@ fdls_process_fabric_abts_rsp(struct fnicif (iport->fabric.retry_counter <=FDLS_RETRY_COUNT )fdls_send_gpn_ft (iport, fabric_state);else -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"GPN FT exhausted retries. Start fabric PLOGI %p" , iport);break ;
@@ -3967,7 +3979,7 @@ fdls_process_fabric_abts_rsp(struct fnic* We should not be here since we already validated rx oxid with * our active_oxid_fabric_req */ -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Invalid OXID/active oxid 0x%x\n" , oxid);WARN_ON (true);return ;
@@ -3987,7 +3999,7 @@ fdls_process_abts_req(struct fnic_iport_sizeof (struct fc_std_abts_ba_acc ); nport_id =ntoh24 (fchdr->fh_s_id); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Received abort from SID 0x%8x" , nport_id); tport =fnic_find_tport_by_fcid (iport, nport_id);
@@ -4000,7 +4012,7 @@ fdls_process_abts_req(struct fnic_iport_ frame =fdls_alloc_frame (iport);if (frame ==NULL ) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"0x%x: Failed to allocate frame to send response for ABTS req" , iport->fcid);return ;
@@ -4021,7 +4033,7 @@ fdls_process_abts_req(struct fnic_iport_ pba_acc->acc.ba_rx_id =cpu_to_be16 (FNIC_STD_GET_RX_ID (fchdr)); pba_acc->acc.ba_ox_id =cpu_to_be16 (FNIC_STD_GET_OX_ID (fchdr)); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: FDLS send BA ACC with oxid: 0x%x" , iport->fcid, oxid);
@@ -4041,7 +4053,7 @@ fdls_process_unsupported_els_req(structsizeof (struct fc_std_els_rjt_rsp );if (iport->fcid != d_id) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Dropping unsupported ELS with illegal frame bits 0x%x\n" , d_id);atomic64_inc (&iport->iport_stats.unsupported_frames_dropped);
@@ -4050,7 +4062,7 @@ fdls_process_unsupported_els_req(structif ((iport->state !=FNIC_IPORT_STATE_READY ) && (iport->state !=FNIC_IPORT_STATE_FABRIC_DISC )) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Dropping unsupported ELS request in iport state: %d" , iport->state);atomic64_inc (&iport->iport_stats.unsupported_frames_dropped);
@@ -4059,7 +4071,7 @@ fdls_process_unsupported_els_req(struct frame =fdls_alloc_frame (iport);if (frame ==NULL ) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"Failed to allocate frame to send response to unsupported ELS request" );return ; }
@@ -4067,7 +4079,7 @@ fdls_process_unsupported_els_req(struct pls_rsp = (struct fc_std_els_rjt_rsp *) (frame +FNIC_ETH_FCOE_HDRS_OFFSET );fdls_init_els_rjt_frame (frame, iport); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: Process unsupported ELS request from SID: 0x%x" , iport->fcid,ntoh24 (fchdr->fh_s_id));
@@ -4094,12 +4106,12 @@ fdls_process_rls_req(struct fnic_iport_suint16_t frame_size =FNIC_ETH_FCOE_HDRS_OFFSET +sizeof (struct fc_std_rls_acc ); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Process RLS request %d" , iport->fnic->fnic_num);if ((iport->state !=FNIC_IPORT_STATE_READY ) && (iport->state !=FNIC_IPORT_STATE_FABRIC_DISC )) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Received RLS req in iport state: %d. Dropping the frame." , iport->state);return ;
@@ -4107,7 +4119,7 @@ fdls_process_rls_req(struct fnic_iport_s frame =fdls_alloc_frame (iport);if (frame ==NULL ) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"Failed to allocate frame to send RLS accept" );return ; }
@@ -4148,33 +4160,33 @@ fdls_process_els_req(struct fnic_iport_sif ((iport->state !=FNIC_IPORT_STATE_READY ) && (iport->state !=FNIC_IPORT_STATE_FABRIC_DISC )) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Dropping ELS frame type: 0x%x in iport state: %d" , type, iport->state);return ; }switch (type) {case ELS_ECHO : -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"sending LS_ACC for ECHO request %d\n" , iport->fnic->fnic_num);break ;case ELS_RRQ : -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"sending LS_ACC for RRQ request %d\n" , iport->fnic->fnic_num);break ;default : -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"sending LS_ACC for 0x%x ELS frame\n" , type);break ; } frame =fdls_alloc_frame (iport);if (frame ==NULL ) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"Failed to allocate frame to send ELS response for 0x%x" , type);return ;
@@ -4220,17 +4232,17 @@ fdls_process_tgt_abts_rsp(struct fnic_ip tport =fnic_find_tport_by_fcid (iport, s_id);if (!tport) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"Received tgt abts rsp with invalid SID: 0x%x" , s_id);return ; }if (tport->timer_pending) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"tport 0x%p Canceling fabric disc timer\n" , tport);fnic_del_tport_timer_sync (fnic, tport); }if (iport->state !=FNIC_IPORT_STATE_READY ) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"Received tgt abts rsp in iport state(%d). Dropping." , iport->state);return ;
@@ -4245,15 +4257,15 @@ fdls_process_tgt_abts_rsp(struct fnic_ipswitch (frame_type) {case FNIC_FRAME_TYPE_TGT_ADISC :if (fchdr->fh_r_ctl ==FC_RCTL_BA_ACC ) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"OX_ID: 0x%x tgt_fcid: 0x%x rcvd tgt adisc abts resp BA_ACC" ,be16_to_cpu (ba_acc->acc.ba_ox_id), tport->fcid); }else if (fchdr->fh_r_ctl ==FC_RCTL_BA_RJT ) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"ADISC BA_RJT rcvd tport_fcid: 0x%x tport_state: %d " , tport->fcid, tport_state); -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"reason code: 0x%x reason code explanation:0x%x " , ba_rjt->rjt.br_reason, ba_rjt->rjt.br_explan);
@@ -4265,7 +4277,7 @@ fdls_process_tgt_abts_rsp(struct fnic_ipreturn ; }fdls_free_oxid (iport, oxid, &tport->active_oxid); -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"ADISC not responding. Deleting target port: 0x%x" , tport->fcid);fdls_delete_tport (iport, tport);
@@ -4278,14 +4290,14 @@ fdls_process_tgt_abts_rsp(struct fnic_ipbreak ;case FNIC_FRAME_TYPE_TGT_PLOGI :if (fchdr->fh_r_ctl ==FC_RCTL_BA_ACC ) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"Received tgt PLOGI abts response BA_ACC tgt_fcid: 0x%x" , tport->fcid); }else if (fchdr->fh_r_ctl ==FC_RCTL_BA_RJT ) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"PLOGI BA_RJT received for tport_fcid: 0x%x OX_ID: 0x%x" , tport->fcid,FNIC_STD_GET_OX_ID (fchdr)); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"reason code: 0x%x reason code explanation: 0x%x" , ba_rjt->rjt.br_reason, ba_rjt->rjt.br_explan);
@@ -4308,14 +4320,14 @@ fdls_process_tgt_abts_rsp(struct fnic_ipbreak ;case FNIC_FRAME_TYPE_TGT_PRLI :if (fchdr->fh_r_ctl ==FC_RCTL_BA_ACC ) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: Received tgt PRLI abts response BA_ACC" , tport->fcid); }else if (fchdr->fh_r_ctl ==FC_RCTL_BA_RJT ) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"PRLI BA_RJT received for tport_fcid: 0x%x OX_ID: 0x%x " , tport->fcid,FNIC_STD_GET_OX_ID (fchdr)); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"reason code: 0x%x reason code explanation: 0x%x" , ba_rjt->rjt.br_reason, ba_rjt->rjt.br_explan);
@@ -4331,7 +4343,7 @@ fdls_process_tgt_abts_rsp(struct fnic_ipfdls_set_tport_state (tport,FDLS_TGT_STATE_PLOGI );break ;default : -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Received ABTS response for unknown frame %p" , iport);break ; }
@@ -4351,14 +4363,14 @@ fdls_process_plogi_req(struct fnic_iportsizeof (struct fc_std_els_rjt_rsp );if (iport->fcid != d_id) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Received PLOGI with illegal frame bits. Dropping frame from 0x%x" , d_id);return ; }if (iport->state !=FNIC_IPORT_STATE_READY ) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Received PLOGI request in iport state: %d Dropping frame" , iport->state);return ;
@@ -4366,7 +4378,7 @@ fdls_process_plogi_req(struct fnic_iport frame =fdls_alloc_frame (iport);if (frame ==NULL ) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"Failed to allocate frame to send response to PLOGI request" );return ; }
@@ -4374,7 +4386,7 @@ fdls_process_plogi_req(struct fnic_iport pplogi_rsp = (struct fc_std_els_rjt_rsp *) (frame +FNIC_ETH_FCOE_HDRS_OFFSET );fdls_init_els_rjt_frame (frame, iport); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: Process PLOGI request from SID: 0x%x" , iport->fcid,ntoh24 (fchdr->fh_s_id));
@@ -4404,11 +4416,11 @@ fdls_process_logo_req(struct fnic_iport_ nport_id =ntoh24 (logo->els.fl_n_port_id); nport_name =be64_to_cpu (logo->els.fl_n_port_wwn); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Process LOGO request from fcid: 0x%x" , nport_id);if (iport->state !=FNIC_IPORT_STATE_READY ) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"Dropping LOGO req from 0x%x in iport state: %d" , nport_id, iport->state);return ;
@@ -4418,19 +4430,19 @@ fdls_process_logo_req(struct fnic_iport_if (!tport) {/* We are not logged in with the nport, log and drop... */ -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"Received LOGO from an nport not logged in: 0x%x(0x%llx)" , nport_id, nport_name);return ; }if (tport->fcid != nport_id) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"Received LOGO with invalid target port fcid: 0x%x(0x%llx)" , nport_id, nport_name);return ; }if (tport->timer_pending) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"tport fcid 0x%x: Canceling disc timer\n" , tport->fcid);fnic_del_tport_timer_sync (fnic, tport);
@@ -4447,7 +4459,7 @@ fdls_process_logo_req(struct fnic_iport_if ((iport->state ==FNIC_IPORT_STATE_READY ) && (fdls_get_state (&iport->fabric) !=FDLS_STATE_SEND_GPNFT ) && (fdls_get_state (&iport->fabric) !=FDLS_STATE_RSCN_GPN_FT )) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"Sending GPNFT in response to LOGO from Target:0x%x" , nport_id);fdls_send_gpn_ft (iport,FDLS_STATE_SEND_GPNFT );
@@ -4460,7 +4472,7 @@ fdls_process_logo_req(struct fnic_iport_fdls_send_logo_resp (iport, &logo->fchdr);if ((fdls_get_state (&iport->fabric) !=FDLS_STATE_SEND_GPNFT ) && (fdls_get_state (&iport->fabric) !=FDLS_STATE_RSCN_GPN_FT )) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"Sending GPNFT in response to LOGO from Target:0x%x" , nport_id);fdls_send_gpn_ft (iport,FDLS_STATE_SEND_GPNFT );
@@ -4487,11 +4499,11 @@ fdls_process_rscn(struct fnic_iport_s *iatomic64_inc (&iport->iport_stats.num_rscns); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"FDLS process RSCN %p" , iport);if (iport->state !=FNIC_IPORT_STATE_READY ) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"FDLS RSCN received in state(%d). Dropping" ,fdls_get_state (fdls));return ;
@@ -4508,18 +4520,18 @@ fdls_process_rscn(struct fnic_iport_s *iif ((rscn_payload_len ==0xFFFF ) && (sid ==FC_FID_FCTRL )) { rscn_type =PC_RSCN ; -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"pcrscn: PCRSCN received. sid: 0x%x payload len: 0x%x" , sid, rscn_payload_len); }else { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"RSCN payload_len: 0x%x page_len: 0x%x" , rscn_payload_len, rscn->els.rscn_page_len);/* if this happens then we need to send ADISC to all the tports. */ list_for_each_entry_safe (tport, next, &iport->tport_list, links) {if (tport->state ==FDLS_TGT_STATE_READY ) tport->flags |=FNIC_FDLS_TPORT_SEND_ADISC ; -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"RSCN for port id: 0x%x" , tport->fcid); } }/* end else */
@@ -4527,7 +4539,7 @@ fdls_process_rscn(struct fnic_iport_s *i num_ports = (rscn_payload_len -4 ) / rscn->els.rscn_page_len; rscn_port = (struct fc_els_rscn_page *)(rscn +1 ); } -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"RSCN received for num_ports: %d payload_len: %d page_len: %d " , num_ports, rscn_payload_len, rscn->els.rscn_page_len);
@@ -4551,14 +4563,14 @@ fdls_process_rscn(struct fnic_iport_s *iif (tport->state ==FDLS_TGT_STATE_READY ) tport->flags |=FNIC_FDLS_TPORT_SEND_ADISC ; -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"RSCN for port id: 0x%x" , tport->fcid); }break ; } tport =fnic_find_tport_by_fcid (iport, nport_id); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"RSCN port id list: 0x%x" , nport_id);if (!tport) {
@@ -4573,13 +4585,13 @@ fdls_process_rscn(struct fnic_iport_s *i rscn_type == PC_RSCN && fnic->role == FNIC_ROLE_FCP_INITIATOR) {if (fnic->pc_rscn_handling_status ==PC_RSCN_HANDLING_IN_PROGRESS ) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"PCRSCN handling already in progress. Skip host reset: %d" , iport->fnic->fnic_num);return ; } -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Processing PCRSCN. Queuing fnic for host reset: %d" , iport->fnic->fnic_num); fnic->pc_rscn_handling_status =PC_RSCN_HANDLING_IN_PROGRESS ;
@@ -4595,7 +4607,7 @@ fdls_process_rscn(struct fnic_iport_s *iqueue_work (reset_fnic_work_queue, &reset_fnic_work);spin_lock_irqsave (&fnic->fnic_lock, fnic->lock_flags); }else { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"FDLS process RSCN sending GPN_FT: newports: %d" , newports);fdls_send_gpn_ft (iport,FDLS_STATE_RSCN_GPN_FT );fdls_send_rscn_resp (iport, fchdr);
@@ -4644,20 +4656,20 @@ fdls_process_adisc_req(struct fnic_iportuint16_t acc_frame_size =FNIC_ETH_FCOE_HDRS_OFFSET +sizeof (struct fc_std_els_adisc ); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Process ADISC request %d" , iport->fnic->fnic_num); fcid =FNIC_STD_GET_S_ID (fchdr); tgt_fcid =ntoh24 (fcid); tport =fnic_find_tport_by_fcid (iport, tgt_fcid);if (!tport) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"tport for fcid: 0x%x not found. Dropping ADISC req." , tgt_fcid);return ; }if (iport->state !=FNIC_IPORT_STATE_READY ) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"Dropping ADISC req from fcid: 0x%x in iport state: %d" , tgt_fcid, iport->state);return ;
@@ -4668,16 +4680,16 @@ fdls_process_adisc_req(struct fnic_iportif ((frame_wwnn != tport->wwnn) || (frame_wwpn != tport->wwpn)) {/* send reject */ -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"ADISC req from fcid: 0x%x mismatch wwpn: 0x%llx wwnn: 0x%llx" , tgt_fcid, frame_wwpn, frame_wwnn); -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"local tport wwpn: 0x%llx wwnn: 0x%llx. Sending RJT" , tport->wwpn, tport->wwnn); rjt_frame =fdls_alloc_frame (iport);if (rjt_frame ==NULL ) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"Failed to allocate rjt_frame to send response to ADISC request" );return ; }
@@ -4700,7 +4712,7 @@ fdls_process_adisc_req(struct fnic_iport acc_frame =fdls_alloc_frame (iport);if (acc_frame ==NULL ) { -FNIC_FCS_DBG (KERN_ERR , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_ERR , fnic,"Failed to allocate frame to send ADISC accept" );return ; }
@@ -4754,7 +4766,7 @@ fnic_fdls_validate_and_get_frame_type(st/* some common validation */ if (fdls_get_state (fabric) >FDLS_STATE_FABRIC_FLOGI ) {if (iport->fcid != d_id || (!FNIC_FC_FRAME_CS_CTL (fchdr))) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"invalid frame received. Dropping frame" );return -1 ; }
@@ -4764,14 +4776,14 @@ fnic_fdls_validate_and_get_frame_type(stif ((fchdr->fh_r_ctl ==FC_RCTL_BA_ACC ) || (fchdr->fh_r_ctl ==FC_RCTL_BA_RJT )) {if (!(FNIC_FC_FRAME_TYPE_BLS (fchdr))) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Received ABTS invalid frame. Dropping frame" );return -1 ; }if (fdls_is_oxid_fabric_req (oxid)) {if (!(iport->fabric.flags &FNIC_FDLS_FABRIC_ABORT_ISSUED )) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Received unexpected ABTS RSP(oxid:0x%x) from 0x%x. Dropping frame" , oxid, s_id);return -1 ;
@@ -4782,7 +4794,7 @@ fnic_fdls_validate_and_get_frame_type(st }else if (fdls_is_oxid_tgt_req (oxid)) {return FNIC_TPORT_BLS_ABTS_RSP ; } -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Received ABTS rsp with unknown oxid(0x%x) from 0x%x. Dropping frame" , oxid, s_id);return -1 ;
@@ -4791,7 +4803,7 @@ fnic_fdls_validate_and_get_frame_type(st/* BLS ABTS Req */ if ((fchdr->fh_r_ctl ==FC_RCTL_BA_ABTS ) && (FNIC_FC_FRAME_TYPE_BLS (fchdr))) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Receiving Abort Request from s_id: 0x%x" , s_id);return FNIC_BLS_ABTS_REQ ; }
@@ -4803,7 +4815,7 @@ fnic_fdls_validate_and_get_frame_type(stif ((!FNIC_FC_FRAME_FCTL_FIRST_LAST_SEQINIT (fchdr)) || (!FNIC_FC_FRAME_UNSOLICITED (fchdr)) || (!FNIC_FC_FRAME_TYPE_ELS (fchdr))) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Received LOGO invalid frame. Dropping frame" );return -1 ; }
@@ -4812,12 +4824,12 @@ fnic_fdls_validate_and_get_frame_type(stif ((!FNIC_FC_FRAME_FCTL_FIRST_LAST_SEQINIT (fchdr)) || (!FNIC_FC_FRAME_TYPE_ELS (fchdr)) || (!FNIC_FC_FRAME_UNSOLICITED (fchdr))) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Received RSCN invalid FCTL. Dropping frame" );return -1 ; }if (s_id !=FC_FID_FCTRL ) -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Received RSCN from target FCTL: 0x%x type: 0x%x s_id: 0x%x." , fchdr->fh_f_ctl[0 ], fchdr->fh_type, s_id);return FNIC_ELS_RSCN_REQ ;
@@ -4832,7 +4844,7 @@ fnic_fdls_validate_and_get_frame_type(stcase ELS_RRQ :return FNIC_ELS_RRQ ;default : -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Unsupported frame (type:0x%02x) from fcid: 0x%x" , type, s_id);return FNIC_ELS_UNSUPPORTED_REQ ;
@@ -4841,14 +4853,14 @@ fnic_fdls_validate_and_get_frame_type(st/* solicited response from fabric or target */ oxid_frame_type =FNIC_FRAME_TYPE (oxid); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"oxid frame code: 0x%x, oxid: 0x%x\n" , oxid_frame_type, oxid);switch (oxid_frame_type) {case FNIC_FRAME_TYPE_FABRIC_FLOGI :if (type ==ELS_LS_ACC ) {if ((s_id !=FC_FID_FLOGI ) || (!FNIC_FC_FRAME_TYPE_ELS (fchdr))) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Received unknown frame. Dropping frame" );return -1 ; }
@@ -4859,7 +4871,7 @@ fnic_fdls_validate_and_get_frame_type(stif (type ==ELS_LS_ACC ) {if ((s_id !=FC_FID_DIR_SERV ) || (!FNIC_FC_FRAME_TYPE_ELS (fchdr))) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Received unknown frame. Dropping frame" );return -1 ; }
@@ -4870,7 +4882,7 @@ fnic_fdls_validate_and_get_frame_type(stif (type ==ELS_LS_ACC ) {if ((s_id !=FC_FID_FCTRL ) || (!FNIC_FC_FRAME_TYPE_ELS (fchdr))) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Received unknown frame. Dropping frame" );return -1 ; }
@@ -4879,7 +4891,7 @@ fnic_fdls_validate_and_get_frame_type(stcase FNIC_FRAME_TYPE_FABRIC_RPN :if ((s_id !=FC_FID_DIR_SERV ) || (!FNIC_FC_FRAME_TYPE_FC_GS (fchdr))) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Received unknown frame. Dropping frame" );return -1 ; }
@@ -4887,7 +4899,7 @@ fnic_fdls_validate_and_get_frame_type(stcase FNIC_FRAME_TYPE_FABRIC_RFT :if ((s_id !=FC_FID_DIR_SERV ) || (!FNIC_FC_FRAME_TYPE_FC_GS (fchdr))) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Received unknown frame. Dropping frame" );return -1 ; }
@@ -4895,7 +4907,7 @@ fnic_fdls_validate_and_get_frame_type(stcase FNIC_FRAME_TYPE_FABRIC_RFF :if ((s_id !=FC_FID_DIR_SERV ) || (!FNIC_FC_FRAME_TYPE_FC_GS (fchdr))) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Received unknown frame. Dropping frame" );return -1 ; }
@@ -4903,7 +4915,7 @@ fnic_fdls_validate_and_get_frame_type(stcase FNIC_FRAME_TYPE_FABRIC_GPN_FT :if ((s_id !=FC_FID_DIR_SERV ) || (!FNIC_FC_FRAME_TYPE_FC_GS (fchdr))) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Received unknown frame. Dropping frame" );return -1 ; }
@@ -4925,7 +4937,7 @@ fnic_fdls_validate_and_get_frame_type(streturn FNIC_TPORT_ADISC_RSP ;case FNIC_FRAME_TYPE_TGT_LOGO :if (!FNIC_FC_FRAME_TYPE_ELS (fchdr)) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Dropping Unknown frame in tport solicited exchange range type: 0x%x." , fchdr->fh_type);return -1 ;
@@ -4933,7 +4945,7 @@ fnic_fdls_validate_and_get_frame_type(streturn FNIC_TPORT_LOGO_RSP ;default :/* Drop the Rx frame and log/stats it */ -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Solicited response: unknown OXID: 0x%x" , oxid);return -1 ; }
@@ -5003,7 +5015,7 @@ void fnic_fdls_recv_frame(struct fnic_ipbreak ;case FNIC_TPORT_LOGO_RSP :/* Logo response from tgt which we have deleted */ -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Logo response from tgt: 0x%x" ,ntoh24 (fchdr->fh_s_id));break ;
@@ -5046,9 +5058,9 @@ void fnic_fdls_recv_frame(struct fnic_ipfdls_process_fdmi_reg_ack (iport, fchdr, frame_type);break ;default : -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"s_id: 0x%x d_did: 0x%x" , s_id, d_id); -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"Received unknown FCoE frame of len: %d. Dropping frame" , len);break ; }
@@ -5065,7 +5077,7 @@ void fnic_fdls_link_down(struct fnic_ipostruct fnic_tport_s *tport, *next;struct fnic *fnic = iport->fnic; -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: FDLS processing link down" , iport->fcid);fdls_set_state ((&iport->fabric),FDLS_STATE_LINKDOWN );
@@ -5075,7 +5087,7 @@ void fnic_fdls_link_down(struct fnic_ipofnic_fcpio_reset (iport->fnic);spin_lock_irqsave (&fnic->fnic_lock, fnic->lock_flags);list_for_each_entry_safe (tport, next, &iport->tport_list, links) { -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"removing rport: 0x%x" , tport->fcid);fdls_delete_tport (iport, tport); }
@@ -5088,6 +5100,6 @@ void fnic_fdls_link_down(struct fnic_ipo iport->flags &= ~FNIC_FDMI_ACTIVE ; } -FNIC_FCS_DBG (KERN_INFO , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_INFO , fnic,"0x%x: FDLS finish processing link down" , iport->fcid); }
drivers/scsi/fnic/fip.c +54 -63
379 lines not on this page · raw message
drivers/scsi/fnic/fip.h +1 -1
@@ -142,7 +142,7 @@ fnic_debug_dump_fip_frame(struct fnic *fu16 op =be16_to_cpu (fiph->fip_op);u8 sub = fiph->fip_subcode; -FNIC_FCS_DBG (KERN_DEBUG , fnic->host, fnic->fnic_num, +FNIC_FCS_DBG (KERN_DEBUG , fnic,"FIP %s packet contents: op: 0x%x sub: 0x%x (len = %d)" , pfx, op, sub, len);
drivers/scsi/fnic/fnic.h +41 -33
2 lines not on this page · raw message
drivers/scsi/fnic/fnic_fcs.c +63 -63
126 lines not on this page · raw message
drivers/scsi/fnic/fnic_isr.c +14 -14
Lines of this file are not shown. View the raw message.
drivers/scsi/fnic/fnic_main.c +29 -27
56 lines not on this page · raw message
drivers/scsi/fnic/fnic_scsi.c +104 -106
210 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
Greg Kroah-Hartman
maintainerPATCH 378/398 scsi: fnic: Bump up version number again
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Karan Tilak Kumar <[email protected]>
[ Upstream commit 2265541d221dc550dc89b52e49e9d9eb2f824996 ]
Bump up version number to 1.9.0.0.
Stable-dep-of: 0cb1fd924126 ("scsi: fnic: Fix missed link-up when critical IRQ targets offline CPU")
--- drivers/scsi/fnic/fnic.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/fnic/fnic.h +1 -1
@@ -30,7 +30,7 @@#define DRV_NAME "fnic"#define DRV_DESCRIPTION "Cisco FCoE HBA Driver" -#define DRV_VERSION "1.8.0.3" +#define DRV_VERSION "1.9.0.0"#define PFX DRV_NAME ": "#define DFX DRV_NAME "%d: "
Greg Kroah-Hartman
maintainerPATCH 379/398 scsi: fnic: Fix missed link-up when critical IRQ targets offline CPU
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arun Easi <[email protected]>
[ Upstream commit 0cb1fd924126f1f581621a5e804df98a02be9dff ]
When CPU Hyper Threading is disabled, sibling CPUs remain present but are reported offline. Managed MSI-X IRQs can still receive affinity masks that include those offline CPUs. If a driver-critical vector is managed, it can be parked on an offline CPU and the driver may miss critical events such as link-up.
Keep driver-critical vectors unmanaged so they can be migrated by the IRQ core when their target CPU is offlined.
Since HWQ-0 is unmanaged now, in some queue combinations there can be no mappings to it in mq_map. So without the blk-mq fix mentioned below, system may crash during cpu offline/online tests.
Depends-on: commit 10845a105bbc ("blk-mq: skip CPU offline notify on unmapped hctx")
--- drivers/scsi/fnic/fnic.h | 2 +- drivers/scsi/fnic/fnic_isr.c | 13 ++++++++++--- drivers/scsi/fnic/fnic_main.c | 33 ++++++++++++++++++++++++++++++++- 3 files changed, 43 insertions(+), 5 deletions(-)
drivers/scsi/fnic/fnic.h +1 -1
@@ -30,7 +30,7 @@#define DRV_NAME "fnic"#define DRV_DESCRIPTION "Cisco FCoE HBA Driver" -#define DRV_VERSION "1.9.0.0" +#define DRV_VERSION "1.9.0.1"#define PFX DRV_NAME ": "#define DFX DRV_NAME "%d: "
drivers/scsi/fnic/fnic_isr.c +10 -3
@@ -245,7 +245,14 @@ int fnic_set_intr_mode_msix(struct fnicunsigned int m =ARRAY_SIZE (fnic->wq);unsigned int o =ARRAY_SIZE (fnic->hw_copy_wq);unsigned int min_irqs = n + m +1 +1 ;/*rq, raw wq, wq, err*/ - +/* +* Make driver critical vectors unmanaged, or else it can get tied +* to an offline CPU. This can happen when hyper-threading is off. +*/ +struct irq_affinity affd = { + .pre_vectors = n + m +1 ,/* rq, raw wq, 1 ioq */ + .post_vectors =1 ,/* err */ + };/* * We need n RQs, m WQs, o Copy WQs, n+m+o CQs, and n+m+o+1 INTRs * (last INTR is used for WQ/RQ errors and notification area)
@@ -263,8 +270,8 @@ int fnic_set_intr_mode_msix(struct fnicint vec_count =0 ;int vecs = fnic->rq_count + fnic->raw_wq_count + fnic->wq_copy_count +1 ; - vec_count =pci_alloc_irq_vectors (fnic->pdev, min_irqs, vecs, -PCI_IRQ_MSIX |PCI_IRQ_AFFINITY ); + vec_count =pci_alloc_irq_vectors_affinity (fnic->pdev, min_irqs, + vecs,PCI_IRQ_MSIX |PCI_IRQ_AFFINITY , &affd);FNIC_ISR_DBG (KERN_INFO , fnic,"allocated %d MSI-X vectors\n" , vec_count);
drivers/scsi/fnic/fnic_main.c +32 -1
@@ -678,6 +678,8 @@ static int fnic_scsi_drv_init(struct fnivoid fnic_mq_map_queues_cpus (struct Scsi_Host *host) { +const struct cpumask *mask; +unsigned int queue, cpu;struct fnic *fnic = *((struct fnic **)shost_priv (host));struct pci_dev *l_pdev = fnic->pdev;int intr_mode = fnic->config.intr_mode;
@@ -698,7 +700,36 @@ void fnic_mq_map_queues_cpus(struct Scsireturn ; } -blk_mq_map_hw_queues (qmap, &l_pdev->dev,FNIC_PCI_OFFSET ); +for_each_possible_cpu (cpu) + qmap->mq_map[cpu] =0 ; + +/* +* Setup CPU to Queue mapping for all managed MSI-X IRQs. +* Q0 is driver critical and non-managed, hence start from Q1. +*/ +for (queue =1 ; queue < qmap->nr_queues; queue++) { +int irq_num =pci_irq_vector (fnic->pdev, + queue +FNIC_PCI_OFFSET ); + +if (irq_num <0 ) +continue ; + + mask =pci_irq_get_affinity (fnic->pdev, + queue +FNIC_PCI_OFFSET ); +if (!mask) { +shost_printk (KERN_ERR , host, +"failed to get irq_affinity map for queue:%d\n" , irq_num); +continue ; + } +FNIC_MAIN_DBG (KERN_INFO , fnic, +"got irq_affinity map for %d:\n" , irq_num); +for_each_cpu (cpu, mask) { + qmap->mq_map[cpu] = qmap->queue_offset + queue; +FNIC_MAIN_DBG (KERN_INFO , fnic, +"[Q%d] cpu:%d <=> irq:%d\n" , + queue, cpu, irq_num); + } + } }static int fnic_probe (struct pci_dev *pdev,const struct pci_device_id *ent)
Greg Kroah-Hartman
maintainerPATCH 380/398 smb: client: fix cifsFileInfo reference leak in deferred close
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fan Wu <[email protected]>
[ Upstream commit 5520e89a5a4f834bced64cf2ac927001cc513a40 ]
When cifs_close() defers a close, it hands the cifsFileInfo reference of the closing struct file to the queued work. Each execution of smb2_deferred_work_close() drops one such reference.
deferred_close_scheduled can be false while the work is pending: the workqueue clears PENDING when the callback starts to run, before the callback clears the flag under deferred_lock. A close in that interval requeues the running work, and the callback then clears the flag, leaving the requeued work pending with the flag down. A later cifs_open() can reuse the handle and its cifs_close() reaches the same branch: queue_delayed_work() fails because the work is still pending, but cifs_close() returns without dropping the closing file's reference. The cifsFileInfo count stays pinned and its tlink, dentry and server handle are leaked.
Check the return value and hand off the reference only when work was actually queued. Otherwise, use the shared _cifsFileInfo_put(), like the mod_delayed_work() branch above: the pending execution already owns its reference.
This issue was found by an in-house static analysis tool.
--- fs/smb/client/file.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
fs/smb/client/file.c +12 -5
@@ -1467,11 +1467,18 @@ int cifs_close(struct inode *inode, strucifsFileInfo_get (cfile); }else {/* Deferred close for files */ -queue_delayed_work (deferredclose_wq, - &cfile->deferred, cifs_sb->ctx->closetimeo); - cfile->deferred_close_scheduled = true; -spin_unlock (&cinode->deferred_lock); -return 0 ; +/* +* Each queued execution owns one reference. +* If nothing was queued, the reference of +* the closing file is dropped below. +*/ +if (queue_delayed_work (deferredclose_wq, + &cfile->deferred, + cifs_sb->ctx->closetimeo)) { + cfile->deferred_close_scheduled = true; +spin_unlock (&cinode->deferred_lock); +return 0 ; + } }spin_unlock (&cinode->deferred_lock);_cifsFileInfo_put (cfile, true, false);
Greg Kroah-Hartman
maintainerPATCH 381/398 xfs: add a xfs_rmap_inode_owner helper
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Hellwig <[email protected]>
[ Upstream commit f882fc7dd9f04f73d94379deb9e68d8db613c976 ]
Add a small wrapper for initializing the rmap owner to i_ino.
Stable-dep-of: 4d3c07591534 ("xfs: fix under-reservation of blocks when repairing sf directories")
--- fs/xfs/libxfs/xfs_bmap.c | 2 +- fs/xfs/libxfs/xfs_rmap.h | 2 ++ fs/xfs/scrub/bmap.c | 6 +++--- fs/xfs/scrub/reap.c | 3 +-- 4 files changed, 7 insertions(+), 6 deletions(-)
fs/xfs/libxfs/xfs_bmap.c +1 -1
@@ -820,7 +820,7 @@ xfs_bmap_local_to_extents( args.mp = ip->i_mount; args.total = total; args.minlen = args.maxlen = args.prod =1 ; -xfs_rmap_ino_owner (&args.oinfo, ip->i_ino, whichfork,0 ); +xfs_rmap_inode_owner (&args.oinfo, ip, whichfork,0 );/* * Allocate a block. We know we need only one, since the
fs/xfs/libxfs/xfs_rmap.h +2 -0
@@ -35,6 +35,8 @@ xfs_rmap_ino_owner(if (whichfork ==XFS_ATTR_FORK ) oi->oi_flags |=XFS_OWNER_INFO_ATTR_FORK ; } +#define xfs_rmap_inode_owner (oi, ip, whichfork, offset) \ + xfs_rmap_ino_owner(oi, (ip)->i_ino, whichfork, offset)static inline bool xfs_rmap_should_skip_owner_update(
fs/xfs/scrub/bmap.c +3 -3
@@ -352,7 +352,7 @@ xchk_bmap_rt_iextent_xref(case XFS_DATA_FORK :xchk_bmap_xref_rmap (info, irec, rgbno);if (!xfs_is_reflink_inode (info->sc->ip)) { -xfs_rmap_ino_owner (&oinfo, info->sc->ip->i_ino, +xfs_rmap_inode_owner (&oinfo, info->sc->ip, info->whichfork, irec->br_startoff);xchk_xref_is_only_rt_owned_by (info->sc, rgbno, irec->br_blockcount, &oinfo);
@@ -407,7 +407,7 @@ xchk_bmap_iextent_xref(case XFS_DATA_FORK :xchk_bmap_xref_rmap (info, irec, agbno);if (!xfs_is_reflink_inode (info->sc->ip)) { -xfs_rmap_ino_owner (&oinfo, info->sc->ip->i_ino, +xfs_rmap_inode_owner (&oinfo, info->sc->ip, info->whichfork, irec->br_startoff);xchk_xref_is_only_owned_by (info->sc, agbno, irec->br_blockcount, &oinfo);
@@ -419,7 +419,7 @@ xchk_bmap_iextent_xref(break ;case XFS_ATTR_FORK :xchk_bmap_xref_rmap (info, irec, agbno); -xfs_rmap_ino_owner (&oinfo, info->sc->ip->i_ino, +xfs_rmap_inode_owner (&oinfo, info->sc->ip, info->whichfork, irec->br_startoff);xchk_xref_is_only_owned_by (info->sc, agbno, irec->br_blockcount, &oinfo);
fs/xfs/scrub/reap.c +1 -2
@@ -1249,8 +1249,7 @@ xreap_bmapi_select( cur =xfs_rmapbt_init_cursor (sc->mp, sc->tp, sc->sa.agf_bp, sc->sa.pag); -xfs_rmap_ino_owner (&oinfo, rs->ip->i_ino, rs->whichfork, - imap->br_startoff); +xfs_rmap_inode_owner (&oinfo, rs->ip, rs->whichfork, imap->br_startoff); error =xfs_rmap_has_other_keys (cur, agbno,1 , &oinfo, crosslinked);if (error) goto out_cur;
Greg Kroah-Hartman
maintainerPATCH 382/398 xfs: convert xchk_inode_xref_set_corrupt to xchk_ip_xref_set_corrupt
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Hellwig <[email protected]>
[ Upstream commit bef4cee25fbc26ee8b07028e461190fa57b02788 ]
All xref corruption reports have the xfs_inode structure, so switch the helper to work based on that.
Stable-dep-of: 4d3c07591534 ("xfs: fix under-reservation of blocks when repairing sf directories")
--- fs/xfs/scrub/common.c | 6 +++--- fs/xfs/scrub/common.h | 4 ++-- fs/xfs/scrub/dirtree.c | 4 ++-- fs/xfs/scrub/inode.c | 6 +++--- fs/xfs/scrub/nlinks.c | 2 +- fs/xfs/scrub/rtbitmap.c | 4 ++-- fs/xfs/scrub/rtsummary.c | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-)
fs/xfs/scrub/common.c +3 -3
@@ -309,12 +309,12 @@ xchk_ino_set_corrupt(/* Record a corruption while cross-referencing with an inode. */ void -xchk_ino_xref_set_corrupt ( +xchk_ip_xref_set_corrupt (struct xfs_scrub *sc, -xfs_ino_t ino) +struct xfs_inode *ip) { sc->sm->sm_flags |=XFS_SCRUB_OFLAG_XCORRUPT ; -trace_xchk_ino_error (sc, ino, __return_address); +trace_xchk_ino_error (sc, ip->i_ino, __return_address); }/* Record corruption in a block indexed by a file fork. */
fs/xfs/scrub/common.h +2 -2
@@ -41,8 +41,8 @@ void xchk_qcheck_set_corrupt(struct xfs_void xchk_block_xref_set_corrupt (struct xfs_scrub *sc,struct xfs_buf *bp); -void xchk_ino_xref_set_corrupt (struct xfs_scrub *sc, -xfs_ino_t ino); +void xchk_ip_xref_set_corrupt (struct xfs_scrub *sc, +struct xfs_inode *ip);void xchk_fblock_xref_set_corrupt (struct xfs_scrub *sc,int whichfork,xfs_fileoff_t offset);
fs/xfs/scrub/dirtree.c +2 -2
@@ -981,7 +981,7 @@ xchk_dirtree(* parent pointers are corrupt; this scan cannot be completed * without full information. */ -xchk_ino_xref_set_corrupt (sc, sc->ip->i_ino); +xchk_ip_xref_set_corrupt (sc, sc->ip); error =0 ; goto out_scanlock; }
@@ -1011,7 +1011,7 @@ xchk_dirtree(if (oc.bad || oc.good + oc.suspect !=1 )xchk_ip_set_corrupt (sc, sc->ip);if (oc.suspect) -xchk_ino_xref_set_corrupt (sc, sc->ip->i_ino); +xchk_ip_xref_set_corrupt (sc, sc->ip); } out_scanlock:
fs/xfs/scrub/inode.c +3 -3
@@ -710,17 +710,17 @@ xchk_inode_xref_bmap(if (!xchk_should_check_xref (sc, &error,NULL ))return ;if (nextents <xfs_dfork_data_extents (dip)) -xchk_ino_xref_set_corrupt (sc, sc->ip->i_ino); +xchk_ip_xref_set_corrupt (sc, sc->ip); error =xchk_inode_count_blocks (sc,XFS_ATTR_FORK , &nextents, &acount);if (!xchk_should_check_xref (sc, &error,NULL ))return ;if (nextents !=xfs_dfork_attr_extents (dip)) -xchk_ino_xref_set_corrupt (sc, sc->ip->i_ino); +xchk_ip_xref_set_corrupt (sc, sc->ip);/* Check nblocks against the inode. */ if (count + acount !=be64_to_cpu (dip->di_nblocks)) -xchk_ino_xref_set_corrupt (sc, sc->ip->i_ino); +xchk_ip_xref_set_corrupt (sc, sc->ip); }/* Cross-reference with the other btrees. */
fs/xfs/scrub/nlinks.c +1 -1
@@ -741,7 +741,7 @@ xchk_nlinks_compare_inode(* number of subdirectory entries in the directory. */ if (obs.children != obs.backrefs) -xchk_ino_xref_set_corrupt (sc, ip->i_ino); +xchk_ip_xref_set_corrupt (sc, ip); }else {/* * Non-directories and unlinked directories should not have
fs/xfs/scrub/rtbitmap.c +2 -2
@@ -284,7 +284,7 @@ xchk_xref_is_used_rt_space(if (xfs_has_zoned (sc->mp)) {if (!xfs_zone_rgbno_is_valid (rtg,xfs_rtb_to_rgbno (sc->mp, rtbno) + len -1 )) -xchk_ino_xref_set_corrupt (sc,rtg_rmap (rtg)->i_ino); +xchk_ip_xref_set_corrupt (sc,rtg_rmap (rtg));return ; }
@@ -295,5 +295,5 @@ xchk_xref_is_used_rt_space(if (!xchk_should_check_xref (sc, &error,NULL ))return ;if (is_free) -xchk_ino_xref_set_corrupt (sc,rtg_bitmap (rtg)->i_ino); +xchk_ip_xref_set_corrupt (sc,rtg_bitmap (rtg)); }
fs/xfs/scrub/rtsummary.c +1 -1
@@ -190,7 +190,7 @@ xchk_rtsum_record_free( rtlen =xfs_rtxlen_to_extlen (mp, rec->ar_extcount);if (!xfs_verify_rtbext (mp, rtbno, rtlen)) { -xchk_ino_xref_set_corrupt (sc,rtg_bitmap (rtg)->i_ino); +xchk_ip_xref_set_corrupt (sc,rtg_bitmap (rtg));return -EFSCORRUPTED ; }
Greg Kroah-Hartman
maintainerPATCH 383/398 xfs: remove the i_ino field in struct xfs_inode
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Hellwig <[email protected]>
[ Upstream commit 1113a6d6d5d1336f4415fa1367aac0f853f0892d ]
Now that the VFS inode has a u64 i_ino field, there is no need to store a copy of the inode number in the xfs_inode structure.
Introduce an I_INO() wrapper as a shortcut to the inode number so that we don't have to propagate the VFS inode everywhere.
The only non-obvious part is the clearing of i_ino to 0 for RCU freeing the inode. None of this calls into VFS paths, which makes clearing the VFS inode field here just as safe as clearing the old field in the xfs_inode.
Stable adaptation for dependency of 4d3c07591534517c633945c8d8e6526f10e3fabc:
The stable VFS inode still has an unsigned long i_ino, so retain the 64-bit xfs_inode::i_ino and its existing initialization/reclaim handling. Define I_INO as a macro over that field instead of adding a function. Keep only the owner conversions in xrep_xattr_swap_prep and xrep_dir_swap_prep, which provide the context needed for the target to apply unchanged. Drop the remaining conversions, including changes to helpers and health monitoring code absent from this stable tree.
Also finish the preceding dependency's helper conversion in the stable xchk_rtsummary error path: call xchk_ip_xref_set_corrupt(sc, rbmip) instead of the removed xchk_ino_xref_set_corrupt. This preserves its cross-reference corruption reporting and fixes the allmodconfig build.
[ sashal: Reduced backport -- upstream 1113a6d6d5d13 touches 91 file(s), this
backport carries 4. Not backported here:
fs/xfs/libxfs/xfs_attr.c
fs/xfs/libxfs/xfs_attr_leaf.c
fs/xfs/libxfs/xfs_bmap_btree.c
fs/xfs/libxfs/xfs_bmap.c
fs/xfs/libxfs/xfs_btree.c
fs/xfs/libxfs/xfs_btree_staging.c
fs/xfs/libxfs/xfs_da_btree.c
fs/xfs/libxfs/xfs_dir2.c
... and 80 more
This note is generated from the file lists only; see the resolution record for the reasoning. ]
Stable-dep-of: 4d3c07591534 ("xfs: fix under-reservation of blocks when repairing sf directories")
--- fs/xfs/scrub/attr_repair.c | 2 +- fs/xfs/scrub/dir_repair.c | 2 +- fs/xfs/scrub/rtsummary.c | 2 +- fs/xfs/xfs_inode.h | 3 +++ 4 files changed, 6 insertions(+), 3 deletions(-)
fs/xfs/scrub/attr_repair.c +1 -1
@@ -1295,7 +1295,7 @@ xrep_xattr_swap_prep( .whichfork = XFS_ATTR_FORK, .trans = sc->tp, .total = 1, - .owner = sc->ip->i_ino, + .owner = I_INO(sc->ip), }; error =xfs_attr_shortform_to_leaf (&args);
fs/xfs/scrub/dir_repair.c +1 -1
@@ -1474,7 +1474,7 @@ xrep_dir_swap_prep( .whichfork = XFS_DATA_FORK, .trans = sc->tp, .total = 1, - .owner = sc->ip->i_ino, + .owner = I_INO(sc->ip), }; error =xfs_dir2_sf_to_block (&args);
fs/xfs/scrub/rtsummary.c +1 -1
@@ -359,7 +359,7 @@ xchk_rtsummary(* EFSCORRUPTED means the rtbitmap is corrupt, which is an xref * error since we're checking the summary file. */ -xchk_ino_xref_set_corrupt (sc, rbmip->i_ino); +xchk_ip_xref_set_corrupt (sc, rbmip);return 0 ; }if (error)
fs/xfs/xfs_inode.h +3 -0
@@ -184,6 +184,9 @@ static inline const struct inode *VFS_ICreturn &ip->i_vnode; } +/* The VFS inode number is only unsigned long on this stable branch. */ +#define I_INO (ip) ((ip)->i_ino) +/* * For regular files we only update the on-disk filesize when actually * writing data back to disk. Until then only the copy in the VFS inode
Greg Kroah-Hartman
maintainerPATCH 384/398 xfs: fix under-reservation of blocks when repairing sf directories
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Darrick J. Wong" <[email protected]>
[ Upstream commit 4d3c07591534517c633945c8d8e6526f10e3fabc ]
Whilst running QA on XFS for-next as of 7.3-rc2 with MKFS_OPTIONS="-n size=8192", I observed the following (trimmed) dmesg splat:
XFS: Assertion failed: args->total >= dp->i_nblocks - nblks, file: fs/xfs/libxfs/xfs_da_btree.c, line: 2387
WARNING: fs/xfs/xfs_message.c:104 at assfail+0x46/0x4a [xfs], CPU#0: xfs_scrub/1426511 CPU: 0 UID: 0 PID: 1426511 Comm: xfs_scrub Tainted: G W 7.3.0-rc2-djwx #rc2 PREEMPT(lazy) 6e418570b606a39783b0e7e7b30dc407b965f9e8 Tainted: [W]=WARN RIP: 0010:assfail+0x46/0x4a [xfs] RSP: 0018:ffffc900010d7890 EFLAGS: 00010246 RAX: 0000000000000000 RBX: 0000000000000000 RCX: 00000000ffffffd1 RDX: 0000000000000000 RSI: 0000000000000021 RDI: ffffffffa059fd38 RBP: 0000000000000002 R08: 0000000000000000 R09: 0000000000000000 R10: 000000000000000a R11: 000000007fffffff R12: ffffc900010d7940 R13: ffff888368d8f980 R14: ffffc900010d7a48 R15: ffffc900010d78d0 FS: 00007f445c5ce680(0000) GS:ffff8884a97ea000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f443803b9a8 CR3: 0000000107a4b000 CR4: 00000000003506f0 Call Trace: <TASK> xfs_da_grow_inode_int+0x2e0/0x300 [xfs 5de2257e14108c136f11317e6bbb8ac77efd392c] xfs_dir2_grow_inode+0x6e/0x150 [xfs 5de2257e14108c136f11317e6bbb8ac77efd392c] xfs_dir2_sf_to_block+0x149/0x870 [xfs 5de2257e14108c136f11317e6bbb8ac77efd392c] xrep_dir_swap_prep+0xe2/0x110 [xfs 5de2257e14108c136f11317e6bbb8ac77efd392c] xrep_dir_swap+0xfb/0x2f0 [xfs 5de2257e14108c136f11317e6bbb8ac77efd392c] xrep_dir_rebuild_tree+0x99/0x100 [xfs 5de2257e14108c136f11317e6bbb8ac77efd392c] xrep_directory+0x83/0x1c0 [xfs 5de2257e14108c136f11317e6bbb8ac77efd392c] xrep_attempt+0x4f/0x1e0 [xfs 5de2257e14108c136f11317e6bbb8ac77efd392c] xfs_scrub_metadata+0x393/0x5b0 [xfs 5de2257e14108c136f11317e6bbb8ac77efd392c] xfs_ioc_scrubv_metadata+0x306/0x570 [xfs 5de2257e14108c136f11317e6bbb8ac77efd392c] xfs_file_ioctl+0xa4f/0x1150 [xfs 5de2257e14108c136f11317e6bbb8ac77efd392c] __x64_sys_ioctl+0x76/0xc0 do_syscall_64+0x7a/0x3b0 entry_SYSCALL_64_after_hwframe+0x4b/0x53
This is a consequence of commit 0fe77e57588b98, which added the following assertion to xfs_da_grow_inode_int:
ASSERT(args->total >= dp->i_nblocks - nblks);
Tracing this back to xrep_dir_swap_prep, I noticed that the xfs_da_args object that's passed to xfs_dir2_sf_to_block sets args->total to 1. This is incorrect because mkfs set the directory block size to 8k and the filesystem block size to 4k. In other words, args->total should be 2 here, not 1.
Dave Chinner tripped over the same problem with the same branch through a different channel -- his test setup set the fs block size to 1k, in which case the directory block size is still set to 4k. Here, args->total should be 4.
Changing the assignment of args->total to sc->mp->m_dir_geo->fsbcount makes the assertion go away, but that isn't a complete fix. In xrep_tempexch_estimate, we also incorrectly assume that a shortform conversion requires 1 fsblock when it should be m_dir_geo->fsbcount. Without that, we can under-reserve space in the transaction and cause a filesystem shutdown.
Note that the xfs_dabuf_nfsb helper will compute the correct value for directories and xattr, so we use that instead of open-coding the logic. Also fix xrep_xattr_swap_prep to assign args->total via xfs_dabuf_nfsb to avoid one logic bomb if we ever support multi-fsblock attrs.
--- fs/xfs/libxfs/xfs_da_btree.c | 2 +- fs/xfs/libxfs/xfs_da_btree.h | 2 ++ fs/xfs/scrub/attr_repair.c | 2 +- fs/xfs/scrub/dir_repair.c | 2 +- fs/xfs/scrub/tempfile.c | 29 ++++++++++++++++++++++------- 5 files changed, 27 insertions(+), 10 deletions(-)
fs/xfs/libxfs/xfs_da_btree.c +1 -1
@@ -130,7 +130,7 @@ xfs_da_state_reset( state->mp = state->args->dp->i_mount; } -static inline int xfs_dabuf_nfsb (struct xfs_mount *mp,int whichfork) +inline int xfs_dabuf_nfsb (struct xfs_mount *mp,int whichfork) {if (whichfork ==XFS_DATA_FORK )return mp->m_dir_geo->fsbcount;
fs/xfs/libxfs/xfs_da_btree.h +2 -0
@@ -242,4 +242,6 @@ xfs_failaddr_t xfs_da3_node_header_checkextern struct kmem_cache *xfs_da_state_cache; +int xfs_dabuf_nfsb (struct xfs_mount *mp,int whichfork); +#endif /* __XFS_DA_BTREE_H__ */
fs/xfs/scrub/attr_repair.c +1 -1
@@ -1294,7 +1294,7 @@ xrep_xattr_swap_prep( .geo = sc->mp->m_attr_geo, .whichfork = XFS_ATTR_FORK, .trans = sc->tp, - .total = 1, + .total = xfs_dabuf_nfsb(sc->mp, XFS_ATTR_FORK), .owner = I_INO(sc->ip), };
fs/xfs/scrub/dir_repair.c +1 -1
@@ -1473,7 +1473,7 @@ xrep_dir_swap_prep( .geo = sc->mp->m_dir_geo, .whichfork = XFS_DATA_FORK, .trans = sc->tp, - .total = 1, + .total = xfs_dabuf_nfsb(sc->mp, XFS_DATA_FORK), .owner = I_INO(sc->ip), };
fs/xfs/scrub/tempfile.c +22 -7
@@ -649,6 +649,19 @@ xrep_tempexch_prep_request(return 0 ; } +static inline unsigned int +xrep_tempexch_estimate_sf_resblks ( +struct xfs_scrub *sc, +int whichfork) +{ +/* repairing a symlink target */ +if (S_ISLNK (VFS_I (sc->ip)->i_mode) && whichfork ==XFS_DATA_FORK ) +return 1 ; + +/* everything else is a directory or an xattr structure */ +return xfs_dabuf_nfsb (sc->mp, whichfork); +} +/* * Fill out the mapping exchange resource estimation structures in preparation * for exchanging the contents of a metadata file that we've rebuilt in the
@@ -663,6 +676,8 @@ xrep_tempexch_estimate(struct xfs_ifork *ifp;struct xfs_ifork *tifp;int whichfork =xfs_exchmaps_reqfork (req); +unsigned int sf_resblks = +xrep_tempexch_estimate_sf_resblks (sc, whichfork);int state =0 ;/*
@@ -693,9 +708,9 @@ xrep_tempexch_estimate(* plus the block we converted. */ req->ip1_bcount = sc->tempip->i_nblocks; - req->ip2_bcount =1 ; + req->ip2_bcount = sf_resblks; req->nr_exchanges =1 + tifp->if_nextents; - req->resblks =1 ; + req->resblks = sf_resblks;break ;case 2 :/*
@@ -707,10 +722,10 @@ xrep_tempexch_estimate(* is (worst case) the extent count of the file being repaired * plus the block we converted. */ - req->ip1_bcount =1 ; + req->ip1_bcount = sf_resblks; req->ip2_bcount = sc->ip->i_nblocks; req->nr_exchanges =1 + ifp->if_nextents; - req->resblks =1 ; + req->resblks = sf_resblks;break ;case 3 :/*
@@ -722,10 +737,10 @@ xrep_tempexch_estimate(* fileoff 0. Presumably, the caller could not exchange the * two inode fork areas directly. */ - req->ip1_bcount =1 ; - req->ip2_bcount =1 ; + req->ip1_bcount = sf_resblks; + req->ip2_bcount = sf_resblks; req->nr_exchanges =1 ; - req->resblks =2 ; + req->resblks =2 * sf_resblks;break ; }
Greg Kroah-Hartman
maintainerPATCH 385/398 drm/amdgpu: lock bo before calling amdgpu_vm_bo_update_shared
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pierre-Eric Pelloux-Prayer <[email protected]>
[ Upstream commit 36ffc58b8a8704e690a0ce679db26baa5759256f ]
BO's reservation object must be locked before using amdgpu_vm_bo_update_shared otherwise dma_resv_assert_held will complain in amdgpu_vm_update_shared.
Stable-dep-of: 636139603b99 ("drm/amdgpu: hold a runtime PM reference for P2P dma-buf attachments")
--- drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +7 -0
@@ -81,6 +81,7 @@ static int amdgpu_dma_buf_attach(structstruct drm_gem_object *obj = dmabuf->priv;struct amdgpu_bo *bo =gem_to_amdgpu_bo (obj);struct amdgpu_device *adev =amdgpu_ttm_adev (bo->tbo.bdev); +int r;/* * Disable peer-to-peer access for DCC-enabled VRAM surfaces on GFX12+.
@@ -98,8 +99,14 @@ static int amdgpu_dma_buf_attach(struct pci_p2pdma_distance(adev->pdev, attach->dev, false) < 0) attach->peer2peer = false; + r =dma_resv_lock (bo->tbo.base.resv,NULL ); +if (r) +return r; +amdgpu_vm_bo_update_shared (bo); +dma_resv_unlock (bo->tbo.base.resv); +return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 386/398 drm/amdgpu: hold a runtime PM reference for P2P dma-buf attachments
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mike Lothian <[email protected]>
[ Upstream commit 636139603b99d2e3a18a46cf3f8d39313ce8042e ]
amdgpu_dma_buf_map() adds VRAM to the allowed domains for a peer2peer attachment. GTT is only a fallback placement when VRAM is preferred, so ttm_bo_validate() migrates the buffer from GTT into VRAM. While the exporting device is runtime suspended its SDMA rings are down and the move fails:
amdgpu: Move buffer fallback to memcpy unavailable
An importer on a second GPU reaches this holding no runtime PM reference on the exporter, e.g. a compositor on the APU submitting a frame that references a buffer exported by an idle dGPU:
amdgpu_cs_ioctl -> amdgpu_cs_parser_bos -> amdgpu_cs_bo_validate
-> ttm_bo_validate -> amdgpu_bo_move -> dma_buf_map_attachment
-> amdgpu_dma_buf_map -> ttm_bo_validate -> amdgpu_bo_movePinning a dma-buf into VRAM has the same requirement, which commit 030631e97b20 ("drm/amdgpu: revert "take runtime pm reference when we attach a buffer" v2") called out as the one case that would need the reference back.
Take it in attach and drop it in detach. pm_runtime_get_if_active() never resumes the device, so it cannot deadlock against the reservation taken during resume, which is why the old pm_runtime_get_sync() had to go. If the device is not active, clear peer2peer instead: the buffer then stays in GTT, which remains accessible while the GPU is powered down. If runtime PM is disabled, take a plain reference so the put in detach stays balanced.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 43 +++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +42 -1
@@ -42,6 +42,7 @@#include <linux/dma-buf.h> #include <linux/dma-fence-array.h> #include <linux/pci-p2pdma.h> +#include <linux/pm_runtime.h> static const struct dma_buf_attach_ops amdgpu_dma_buf_attach_ops;
@@ -99,15 +100,54 @@ static int amdgpu_dma_buf_attach(struct pci_p2pdma_distance(adev->pdev, attach->dev, false) < 0) attach->peer2peer = false; +/* +* Only allow P2P while the exporter is active, and keep it active +* until detach. With runtime PM disabled take a plain reference so +* the put in detach stays balanced. +*/ +if (attach->peer2peer) { +struct device *dev =adev_to_drm (adev)->dev; +int ret =pm_runtime_get_if_active (dev); + +if (!ret) + attach->peer2peer = false; +else if (ret <0 ) +pm_runtime_get_noresume (dev); + } + r =dma_resv_lock (bo->tbo.base.resv,NULL );if (r) -return r; + goto err_pm_put;amdgpu_vm_bo_update_shared (bo);dma_resv_unlock (bo->tbo.base.resv);return 0 ; + +err_pm_put: +if (attach->peer2peer) +pm_runtime_put_autosuspend (adev_to_drm (adev)->dev); +return r; +} + +/** +* amdgpu_dma_buf_detach - &dma_buf_ops.detach implementation +* +* @dmabuf: DMA-buf where we remove the attachment from +* @attach: the attachment to remove +* +* Drop the runtime PM reference taken in amdgpu_dma_buf_attach(). +*/ +static void amdgpu_dma_buf_detach (struct dma_buf *dmabuf, +struct dma_buf_attachment *attach) +{ +struct drm_gem_object *obj = dmabuf->priv; +struct amdgpu_bo *bo =gem_to_amdgpu_bo (obj); +struct amdgpu_device *adev =amdgpu_ttm_adev (bo->tbo.bdev); + +if (attach->peer2peer) +pm_runtime_put_autosuspend (adev_to_drm (adev)->dev); }/**
@@ -336,6 +376,7 @@ static void amdgpu_dma_buf_vunmap(structconst struct dma_buf_ops amdgpu_dmabuf_ops = { .attach = amdgpu_dma_buf_attach, + .detach = amdgpu_dma_buf_detach, .pin = amdgpu_dma_buf_pin, .unpin = amdgpu_dma_buf_unpin, .map_dma_buf = amdgpu_dma_buf_map,
Greg Kroah-Hartman
maintainerPATCH 387/398 wifi: ipw2x00: Rename michael_mic() to libipw_michael_mic()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Biggers <[email protected]>
[ Upstream commit ea06baf59bd4b83c2cb13698411909e5e6be001e ]
Rename the driver-local michael_mic() function to libipw_michael_mic() to prevent a name conflict with the common michael_mic() function.
Note that this code will be superseded later when libipw starts using the common michael_mic(). This commit just prevents a bisection hazard.
Stable-dep-of: 06f42accaf3c ("wifi: libipw: reject TKIP frames without a full MIC")
--- drivers/net/wireless/intel/ipw2x00/libipw_crypto_tkip.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/intel/ipw2x00/libipw_crypto_tkip.c +3 -3
@@ -464,7 +464,7 @@ static int libipw_tkip_decrypt(struct skreturn keyidx; } -static int michael_mic (struct crypto_shash *tfm_michael,u8 *key,u8 *hdr, +static int libipw_michael_mic (struct crypto_shash *tfm_michael,u8 *key,u8 *hdr,u8 *data,size_t data_len,u8 *mic) {SHASH_DESC_ON_STACK (desc, tfm_michael);
@@ -546,7 +546,7 @@ static int libipw_michael_mic_add(structmichael_mic_hdr (skb, tkey->tx_hdr); pos =skb_put (skb,8 ); -if (michael_mic (tkey->tx_tfm_michael, &tkey->key[16 ], tkey->tx_hdr, +if (libipw_michael_mic (tkey->tx_tfm_michael, &tkey->key[16 ], tkey->tx_hdr, skb->data + hdr_len, skb->len -8 - hdr_len, pos))return -1 ;
@@ -584,7 +584,7 @@ static int libipw_michael_mic_verify(strreturn -1 ;michael_mic_hdr (skb, tkey->rx_hdr); -if (michael_mic (tkey->rx_tfm_michael, &tkey->key[24 ], tkey->rx_hdr, +if (libipw_michael_mic (tkey->rx_tfm_michael, &tkey->key[24 ], tkey->rx_hdr, skb->data + hdr_len, skb->len -8 - hdr_len, mic))return -1 ;if (memcmp (mic, skb->data + skb->len -8 ,8 ) !=0 ) {
Greg Kroah-Hartman
maintainerPATCH 388/398 wifi: mac80211, cfg80211: Export michael_mic() and move it to cfg80211
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Biggers <[email protected]>
[ Upstream commit 613c83766884503f0f6bfdc45964c84b5286091c ]
Export michael_mic() so that the ath11k and ath12k drivers can call it. In addition, move it from mac80211 to cfg80211 so that the ipw2x00 drivers, which depend on cfg80211 but not mac80211, can also call it.
Currently these drivers have their own local implementations of michael_mic() based on crypto_shash, which is redundant and inefficient. By consolidating all the Michael MIC code into cfg80211, we'll be able to remove the duplicate Michael MIC code in the crypto/ directory.
Stable-dep-of: 06f42accaf3c ("wifi: libipw: reject TKIP frames without a full MIC")
---
include/linux/ieee80211.h | 5 ++
net/mac80211/Makefile | 1
net/mac80211/michael.c | 83 -------------------------------------------
net/mac80211/michael.h | 22 -----------
net/mac80211/wpa.c | 1
net/wireless/Makefile | 2 -
net/wireless/michael-mic.c | 86 +++++++++++++++++++++++++++++++++++++++++++++
7 files changed, 92 insertions(+), 108 deletions(-)
delete mode 100644 net/mac80211/michael.h
rename net/{mac80211/michael.c => wireless/michael-mic.c} (96%)include/linux/ieee80211.h +5 -0
@@ -2249,6 +2249,11 @@ enum ieee80211_radio_measurement_actionc#define PMK_MAX_LEN 64#define SAE_PASSWORD_MAX_LEN 128 +#define MICHAEL_MIC_LEN 8 + +void michael_mic (const u8 *key,struct ieee80211_hdr *hdr, +const u8 *data,size_t data_len,u8 *mic); +/* Public action codes (IEEE Std 802.11-2016, 9.6.8.1, Table 9-307) */ enum ieee80211_pub_actioncode {WLAN_PUB_ACTION_20_40_BSS_COEX =0 ,
net/mac80211/Makefile +0 -1
@@ -18,7 +18,6 @@ mac80211-y := \ iface.o \ link.o \ rate.o \ - michael.o \ tkip.o \ aes_cmac.o \ aes_gmac.o \
net/mac80211/michael.c deleted +0 -83
83 lines not on this page · raw message
net/mac80211/michael.h deleted +0 -22
@@ -1,22 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* -* Michael MIC implementation - optimized for TKIP MIC operations -* Copyright 2002-2003, Instant802 Networks, Inc. -*/ - -#ifndef MICHAEL_H -#define MICHAEL_H - -#include <linux/types.h> -#include <linux/ieee80211.h> - -#define MICHAEL_MIC_LEN 8 - -struct michael_mic_ctx { -u32 l, r; -}; - -void michael_mic (const u8 *key,struct ieee80211_hdr *hdr, -const u8 *data,size_t data_len,u8 *mic); - -#endif /* MICHAEL_H */
net/mac80211/wpa.c +0 -1
@@ -18,7 +18,6 @@#include <crypto/utils.h> #include "ieee80211_i.h" -#include "michael.h" #include "tkip.h" #include "aes_ccm.h" #include "aes_cmac.h"
net/wireless/Makefile +1 -1
@@ -8,7 +8,7 @@ obj-$(CONFIG_WEXT_PRIV) += wext-priv.o cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o scan.o nl80211.o cfg80211-y += mlme.o ibss.o sme.o chan.o ethtool.o mesh.o ap.o trace.o ocb.o -cfg80211-y += pmsr.o +cfg80211-y += michael-mic.o pmsr.o cfg80211-$(CONFIG_OF) += of.o cfg80211-$(CONFIG_CFG80211_DEBUGFS) += debugfs.o cfg80211-$(CONFIG_CFG80211_WEXT) += wext-compat.o wext-sme.o
net/wireless/michael-mic.c new file +86 -0
86 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 389/398 wifi: ipw2x00: Use michael_mic() from cfg80211
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Biggers <[email protected]>
[ Upstream commit 32a0e1c63cdfaa9a6f1405b552b5f9eb2be61c59 ]
Just use the michael_mic() function from cfg80211 instead of a local implementation of it using the crypto_shash API.
Stable-dep-of: 06f42accaf3c ("wifi: libipw: reject TKIP frames without a full MIC")
--- drivers/net/wireless/intel/ipw2x00/Kconfig | 1 drivers/net/wireless/intel/ipw2x00/libipw_crypto_tkip.c | 120 ---------------- 2 files changed, 5 insertions(+), 116 deletions(-)
drivers/net/wireless/intel/ipw2x00/Kconfig +0 -1
@@ -154,7 +154,6 @@ config LIBIPW depends on PCI && CFG80211 select WIRELESS_EXT select CRYPTO - select CRYPTO_MICHAEL_MIC select CRYPTO_LIB_ARC4 select CRC32 help
drivers/net/wireless/intel/ipw2x00/libipw_crypto_tkip.c +5 -115
177 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 390/398 wifi: libipw: reject TKIP frames without a full MIC
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daehyeon Ko <[email protected]>
[ Upstream commit 06f42accaf3c6aecab1dcc57f68dde6c06c8b380 ]
libipw_michael_mic_verify() assumes that an skb contains an eight-byte Michael MIC. A short TKIP frame makes the unsigned payload length wrap, causing michael_mic() to read past the skb.
Check that the MIC is present before verifying it, and use the existing MICHAEL_MIC_LEN constant for all MIC lengths in the verifier.
--- drivers/net/wireless/intel/ipw2x00/libipw_crypto_tkip.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/net/wireless/intel/ipw2x00/libipw_crypto_tkip.c +7 -5
@@ -474,14 +474,16 @@ static int libipw_michael_mic_verify(str int hdr_len, void *priv) { struct libipw_tkip_data *tkey = priv; -u8 mic[8 ]; +u8 mic[MICHAEL_MIC_LEN ]; -if (!tkey->key_set) +if (!tkey->key_set || skb->len < hdr_len +MICHAEL_MIC_LEN )return -1 ;michael_mic (&tkey->key[24 ], (struct ieee80211_hdr *)skb->data, - skb->data + hdr_len, skb->len -8 - hdr_len, mic); -if (memcmp (mic, skb->data + skb->len -8 ,8 ) !=0 ) { + skb->data + hdr_len, + skb->len -MICHAEL_MIC_LEN - hdr_len, mic); +if (memcmp (mic, skb->data + skb->len -MICHAEL_MIC_LEN , +MICHAEL_MIC_LEN ) !=0 ) {struct ieee80211_hdr *hdr; hdr = (struct ieee80211_hdr *)skb->data; printk(KERN_DEBUG "%s: Michael MIC verification failed for "
@@ -499,7 +501,7 @@ static int libipw_michael_mic_verify(str tkey->rx_iv32 = tkey->rx_iv32_new; tkey->rx_iv16 = tkey->rx_iv16_new; -skb_trim (skb, skb->len -8 ); +skb_trim (skb, skb->len -MICHAEL_MIC_LEN );return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 391/398 smb: client: fix reparse buffer bounds in cifs_query_reparse_point()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Frank Sorenson <[email protected]>
[ Upstream commit 5f0306e731e2f46e91419eae57eee3a241c055e0 ]
In cifs_query_reparse_point(), the start >= end check before casting to struct reparse_data_buffer * only ensures the start pointer is within the response. It fails to verify that there is enough space remaining for the fixed 8-byte header of the structure.
If a server provides a DataOffset that leaves less than 8 bytes remaining, the check passes, but subsequent reads of ReparseTag and ReparseDataLength will occur out-of-bounds.
Fix this by ensuring the remaining space is at least the size of the reparse_data_buffer structure before accessing its fields.
--- fs/smb/client/cifssmb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/smb/client/cifssmb.c +1 -1
@@ -3015,7 +3015,7 @@ int cifs_query_reparse_point(const unsig end =2 +get_bcc (&io_rsp->hdr) + (__u8 *)&io_rsp->ByteCount; start = (__u8 *)&io_rsp->hdr.Protocol + data_offset; -if (start >= end) { +if (start >= end || (size_t )(end - start) <sizeof (*buf)) { rc = -EIO ; goto error; }
Greg Kroah-Hartman
maintainerPATCH 392/398 time/namespace: Export init_time_ns and do_timens_ktime_to_host()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maoyi Xie <[email protected]>
commit 766e828b011ca5f971554001611b4acab7c244c1 upstream.
timens_ktime_to_host() in compares the current time namespace against init_time_ns for the fast path. It calls do_timens_ktime_to_host() for the offset case. Both symbols are needed at link time by any caller of the inline.
All current callers are builtin, but ntsync can be built as module, which prevents it from using it.
Export both with EXPORT_SYMBOL_GPL.
--- kernel/time/namespace.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/time/namespace.c +2 -0
@@ -57,6 +57,7 @@ ktime_t do_timens_ktime_to_host(clockid_return tim; } +EXPORT_SYMBOL_GPL (do_timens_ktime_to_host);static struct ucounts *inc_time_namespaces (struct user_namespace *ns) {
@@ -364,6 +365,7 @@ struct time_namespace init_time_ns = { .ns.ops = &timens_operations, .frozen_offsets = true, }; +EXPORT_SYMBOL_GPL (init_time_ns);void __init time_ns_init (void ) {
Greg Kroah-Hartman
maintainerPATCH 393/398 ksmbd: fix partial normalized name responses
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <[email protected]>
commit f4fafaf02174c32bce2f9bb4196fadf13f1fd96e upstream.
Windows may request FILE_NORMALIZED_NAME_INFORMATION with an output buffer that only fits the fixed portion of the variable-length response. Treat the fixed portion as FILE_NORMALIZED_NAME_INFORMATION_SIZE so ksmbd returns STATUS_BUFFER_OVERFLOW instead of STATUS_INFO_LENGTH_MISMATCH.
This avoids rejecting valid partial normalized-name responses.
--- fs/smb/server/smb2pdu.c | 3 +++ fs/smb/server/smb2pdu.h | 1 + 2 files changed, 4 insertions(+)
fs/smb/server/smb2pdu.c +3 -0
@@ -5542,6 +5542,9 @@ static int smb2_get_info_file(struct ksmcase FILE_ALTERNATE_NAME_INFORMATION : fixed_len =FILE_ALTERNATE_NAME_INFORMATION_SIZE ;break ; +case FILE_NORMALIZED_NAME_INFORMATION : + fixed_len =FILE_NORMALIZED_NAME_INFORMATION_SIZE ; +break ;case FILE_STREAM_INFORMATION : fixed_len =FILE_STREAM_INFORMATION_SIZE ;break ;
fs/smb/server/smb2pdu.h +1 -0
@@ -213,6 +213,7 @@ struct file_sparse {#define FILE_ALLOCATION_INFORMATION_SIZE 19#define FILE_END_OF_FILE_INFORMATION_SIZE 20#define FILE_ALTERNATE_NAME_INFORMATION_SIZE 8 +#define FILE_NORMALIZED_NAME_INFORMATION_SIZE 8#define FILE_STREAM_INFORMATION_SIZE 32#define FILE_PIPE_INFORMATION_SIZE 23#define FILE_PIPE_LOCAL_INFORMATION_SIZE 24
Greg Kroah-Hartman
maintainerPATCH 394/398 wifi: mac80211: fix list iteration in ieee80211_add_virtual_monitor()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Antipov <[email protected]>
commit cbf0dc37bb4e949f1c76566657e71f8e0bdcf338 upstream.
Since 'mon_list' of 'struct ieee80211_local' is RCU-protected and an instances of 'struct ieee80211_sub_if_data' are linked there via 'u.mntr.list' member, adjust the corresponding list iteration in 'ieee80211_add_virtual_monitor()' accordingly.
--- net/mac80211/iface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/mac80211/iface.c +1 -1
@@ -1290,7 +1290,7 @@ configure_monitor:if (!creator_sdata) {struct ieee80211_sub_if_data *other; -list_for_each_entry (other, &local->mon_list, list) { +list_for_each_entry_rcu (other, &local->mon_list, u.mntr.list) {if (!other->vif.bss_conf.mu_mimo_owner)continue ;
Greg Kroah-Hartman
maintainerPATCH 395/398 ASoC: sdw_utils: subtract the endpoint that is not present
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bard Liao <[email protected]>
commit cb0ae6f22790ead71a866f94c7a5a70ad56af16a upstream.
When asoc_sdw_count_sdw_endpoints() count the num_ends, it doesn't skip the unpresented endpoints. But, asoc_sdw_parse_sdw_endpoints() will skip the unpresented endpoints either by quirk or the SDCA function doesn't show up the endpoint. The endpoint number mismatches between count and parse and the machine driver will show up a warning about it.
--- sound/soc/sdw_utils/soc_sdw_utils.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
sound/soc/sdw_utils/soc_sdw_utils.c +6 -2
@@ -1441,8 +1441,10 @@ int asoc_sdw_parse_sdw_endpoints(struct* endpoint check is not necessary */ if (dai_info->quirk && - !(dai_info->quirk_exclude ^ !!(dai_info->quirk & ctx->mc_quirk))) + !(dai_info->quirk_exclude ^ !!(dai_info->quirk & ctx->mc_quirk))) { + (*num_devs)--;continue ; + } }else {/* Check SDCA codec endpoint if there is no matching quirk */ ret =is_sdca_endpoint_present (dev, codec_info, adr_link, i, j);
@@ -1450,8 +1452,10 @@ int asoc_sdw_parse_sdw_endpoints(structreturn ret;/* The endpoint is not present, skip */ -if (!ret) +if (!ret) { + (*num_devs)--;continue ; + } } dev_dbg(dev,
Greg Kroah-Hartman
maintainerPATCH 396/398 Bluetooth: hci_qca: fix NULL pointer dereference in qca_setup() for non-serdev device
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zijun Hu <[email protected]>
commit 3ec629fee178d429f01ae843e4ea888de93012bf upstream.
hu->serdev is NULL for hci_uart attached via non-serdev paths, but qca_setup() unconditionally calls serdev_device_get_drvdata(hu->serdev) and dereferences the result, causing a NULL pointer dereference.
Fix by guarding the dereference with a NULL check, consistent with the rest of qca_setup().
--- drivers/bluetooth/hci_qca.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/bluetooth/hci_qca.c +6 -3
@@ -1917,9 +1917,12 @@ static int qca_setup(struct hci_uart *huconst char *rampatch_name =qca_get_rampatch_name (hu);int ret;struct qca_btsoc_version ver; -struct qca_serdev *qcadev =serdev_device_get_drvdata (hu->serdev); +struct qca_serdev *qcadev =NULL ;const char *soc_name; +if (hu->serdev) + qcadev =serdev_device_get_drvdata (hu->serdev); + ret =qca_check_speeds (hu);if (ret)return ret;
@@ -1981,7 +1984,7 @@ retry:case QCA_WCN6750 :case QCA_WCN6855 :case QCA_WCN7850 : -if (qcadev->bdaddr_property_broken) +if (qcadev && qcadev->bdaddr_property_broken)hci_set_quirk (hdev,HCI_QUIRK_BDADDR_PROPERTY_BROKEN );hci_set_aosp_capable (hdev);
@@ -2074,7 +2077,7 @@ out:else hu->hdev->set_bdaddr = qca_set_bdaddr; -if (qcadev->support_hfp_hw_offload) +if (qcadev && qcadev->support_hfp_hw_offload)qca_configure_hfp_offload (hdev); qca->fw_version =le16_to_cpu (ver.patch_ver);
Greg Kroah-Hartman
maintainerPATCH 397/398 Revert "ksmbd: Fix to handle removal of rfc1002 header from smb_hdr"
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
Revert commit 29dbb4e29e1f197172b1a0513f65c3ff6ec4fbc8 which is commit 0a70cac7896712a08e3cd22c16f44be976d40dbf upstream.
Commit 29dbb4e29e1f ("ksmbd: Fix to handle removal of rfc1002 header from smb_hdr") is a backport of upstream commit 0a70cac78967.
The upstream commit depends on SMB1 header refactoring which removed the RFC1002 length field from struct smb_hdr. Those prerequisite changes are not present in the 6.18.y stable tree, where ksmbd still defines struct smb_hdr with the smb_buf_length field.
As a result, smb_get_msg() advances the buffer by four bytes before it is cast to a structure that already includes the RFC1002 field. This causes a four-byte offset mismatch while parsing and constructing the initial SMB1 multi-protocol negotiate response.
Windows clients then receive a malformed negotiate response and abort the connection.
This reverts commit 29dbb4e29e1f ("ksmbd: Fix to handle removal of rfc1002 header from smb_hdr").
--- fs/smb/server/server.c | 2 +- fs/smb/server/smb_common.c | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-)
fs/smb/server/server.c +1 -1
@@ -95,7 +95,7 @@ static inline int check_conn_state(strucif (ksmbd_conn_exiting (work->conn) ||ksmbd_conn_need_reconnect (work->conn)) { - rsp_hdr =smb_get_msg (work->response_buf); + rsp_hdr = work->response_buf; rsp_hdr->Status.CifsError =STATUS_CONNECTION_DISCONNECTED ;return 1 ; }
fs/smb/server/smb_common.c +10 -10
@@ -140,7 +140,7 @@ int ksmbd_verify_smb_message(struct ksmbif (smb2_hdr->ProtocolId ==SMB2_PROTO_NUMBER )return ksmbd_smb2_check_message (work); - hdr =smb_get_msg (work->request_buf); + hdr = work->request_buf;if (*(__le32 *)hdr->Protocol ==SMB1_PROTO_NUMBER && hdr->Command ==SMB_COM_NEGOTIATE ) { work->conn->outstanding_credits++;
@@ -278,14 +278,15 @@ static int ksmbd_negotiate_smb_dialect(v req->DialectCount); } + proto = *(__le32 *)((struct smb_hdr *)buf)->Protocol;if (proto ==SMB1_PROTO_NUMBER ) {struct smb_negotiate_req *req; - req = (struct smb_negotiate_req *)smb_get_msg (buf); + req = (struct smb_negotiate_req *)buf;if (le16_to_cpu (req->ByteCount) <2 ) goto err_out; -if (offsetof(struct smb_negotiate_req , DialectsArray) + +if (offsetof(struct smb_negotiate_req , DialectsArray) -4 +le16_to_cpu (req->ByteCount) > smb_buf_length) { goto err_out; }
@@ -319,8 +320,8 @@ static u16 get_smb1_cmd_val(struct ksmbd*/ static int init_smb1_rsp_hdr (struct ksmbd_work *work) { -struct smb_hdr *rsp_hdr = (struct smb_hdr *)smb_get_msg (work->response_buf); -struct smb_hdr *rcv_hdr = (struct smb_hdr *)smb_get_msg (work->request_buf); +struct smb_hdr *rsp_hdr = (struct smb_hdr *)work->response_buf; +struct smb_hdr *rcv_hdr = (struct smb_hdr *)work->request_buf; rsp_hdr->Command =SMB_COM_NEGOTIATE ; *(__le32 *)rsp_hdr->Protocol =SMB1_PROTO_NUMBER ;
@@ -411,10 +412,9 @@ static int init_smb1_server(struct ksmbdint ksmbd_init_smb_server (struct ksmbd_conn *conn) { -struct smb_hdr *rcv_hdr = (struct smb_hdr *)smb_get_msg (conn->request_buf);__le32 proto; - proto = *(__le32 *)rcv_hdr->Protocol; + proto = *(__le32 *)((struct smb_hdr *)conn->request_buf)->Protocol;if (conn->need_neg == false) {if (proto ==SMB1_PROTO_NUMBER )return -EINVAL ;
@@ -572,12 +572,12 @@ static int __smb2_negotiate(struct ksmbdstatic int smb_handle_negotiate (struct ksmbd_work *work) { -struct smb_negotiate_rsp *neg_rsp =smb_get_msg (work->response_buf); +struct smb_negotiate_rsp *neg_rsp = work->response_buf;ksmbd_debug (SMB ,"Unsupported SMB1 protocol\n" ); -if (ksmbd_iov_pin_rsp (work, (void *)neg_rsp, -sizeof (struct smb_negotiate_rsp ))) +if (ksmbd_iov_pin_rsp (work, (void *)neg_rsp +4 , +sizeof (struct smb_negotiate_rsp ) -4 ))return -ENOMEM ; neg_rsp->hdr.Status.CifsError =STATUS_SUCCESS ;
Greg Kroah-Hartman
maintainerPATCH 398/398 smb/client: send lease break ACKs thru correct session for multiuser mounts
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: April Cardenas <[email protected]>
[ Upstream commit ebc5660132ddd244b57f03ed324922013a3d7363 ]
Currently, when cifs_oplock_break handles a break request from the server it searches for the appropriate tlink to handle the request but incorrectly uses the current fsuid as the search key, eventually causing read errors for users with multiuser mounts on NetApp. Fix this by using the tlink from the cfile struct instead to respond through the correct session.
As breaks are handled in a worker thread, the current fsuid isn't guaranteed to match the session that the break is intended for. This means that cifs_sb_tlink may search the rbtree using the wrong fsuid, and return a tlink with an incorrect session than
the lease break was intended for. As a result, the breaks
may be ACKed through an incorrect session.
While it seems that Samba/Windows Servers 2016-2025 ignore this as long as the lease key is correct, we ran into a case where if you're using NetApp ONTAP or Azure NetApp Files they will reject the ACK and return STATUS_LOCK_NOT_GRANTED errors on any future read requests a user may initiate through their still held open file handle, and the server will eventually close the file.
In the dmesg logs, the user may see errors like these:
CIFS: Status code returned 0xc0000128 STATUS_FILE_CLOSED
CIFS: VFS: Send error in read = -9
With a multiuser mount using NetApp, this issue is really easy for users to hit on a wide variety of kernel versions by attempting to copy a file from the share
to the local machine through GNOME Files/Nautilus.
This copy will always result in Nautilus throwing
a Bad File Descriptor error to the user and fail. With this fix, you can copy files through Nautilus without issue.
Quoted 1 line
Quoted 1 line
From looking at the traces, it seems that glib will
open the file first, and call listxattr before actually attempting to copy the file data. The listxattr call always triggers a break, causing the copy to fail.
The proposed fix returns to the way the client grabbed the tlink before commit e8f5f849ffce2 ("cifs: fix potential oops in cifs_oplock_break").
The bulk of that commit (checking for list empty) remains untouched, and I think the change to using cifs_sb_tlink was intended to avoid a NULL/ERR deference on the tlink as well as update the reference count.
I believe this fix should preserve those safety properties, but of course I'd appreciate any corrections here.
--- fs/smb/client/file.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
fs/smb/client/file.c +2 -4
@@ -3148,8 +3148,6 @@ void cifs_oplock_break(struct work_struc struct cifsFileInfo *cfile = container_of(work, struct cifsFileInfo, oplock_break);struct inode *inode =d_inode (cfile->dentry); -struct super_block *sb = inode->i_sb; -struct cifs_sb_info *cifs_sb =CIFS_SB (sb);struct cifsInodeInfo *cinode =CIFS_I (inode);struct cifs_tcon *tcon;struct TCP_Server_Info *server;
@@ -3162,8 +3160,8 @@ void cifs_oplock_break(struct work_strucwait_on_bit (&cinode->flags,CIFS_INODE_PENDING_WRITERS ,TASK_UNINTERRUPTIBLE ); - tlink =cifs_sb_tlink (cifs_sb); -if (IS_ERR (tlink)) { + tlink =cifs_get_tlink (cfile->tlink); +if (IS_ERR_OR_NULL (tlink)) {/* drop the reference taken when the break was queued */ _cifsFileInfo_put (cfile, false/* do not wait for ourself */ , false); goto out;
Am 23.09.2026 um 16:01 schrieb Greg Kroah-Hartman:
Quoted 4 lines
This is the start of the stable review cycle for the 6.18.54 release. There are 398 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Builds, boots and works on my 2-socket Ivy Bridge Xeon E5-2697v2 server. No dmesg oddities or regressions found.
Beste Grüße,
Peter Schneider
Signature · 8 lines
Climb the mountain not to plant your flag, but to embrace the challenge, enjoy the air and behold the view. Climb it so you can see the world, not so the world can see you. -- David McCullough Jr. OpenPGP: 0xA3828BD796CCE11A8CADE8866E3A92C92C3FF244 Download: https://www.peters-netzplatz.de/download/pschneider1968_pub.asc https://keys.mailvelope.com/pks/lookup?op=get&[email protected] https://keys.mailvelope.com/pks/lookup?op=get&[email protected]
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.18.54 release. There are 398 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Fri, 25 Sep 2026 14:05:48 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.18.54-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.18.y
and the diffstat can be found below.thanks,
greg k-h
On ARCH_BRCMSTB using 32-bit and 64-bit ARM kernels, build tested on BMIPS_GENERIC:
Signature · 1 line
Florian
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.18.54 release. There are 398 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Fri, 25 Sep 2026 14:05:48 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.18.54-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.18.y
and the diffstat can be found below.thanks,
greg k-h
Built and booted successfully on RISC-V RV64 (HiFive Unmatched).
Hi!
Quoted 4 lines
This is the start of the stable review cycle for the 6.18.54 release. There are 398 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
CIP testing did not find any problems here:
https://gitlab.com/cip-project/cip-testing/linux-stable-rc-ci/-/tree/linux-6.18.y
Best regards,
Pavel
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.18.54 release. There are 398 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Fri, 25 Sep 2026 14:05:48 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.18.54-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.18.y
and the diffstat can be found below.thanks,
greg k-h
On an amd64 laptop (Lenovo ThinkPad T14 Gen 1) and an arm64 virtual machine, I tested 6.18.53 + stable-queue as of commit b1b54c5d771a22b69e435ef44b5fe9ac1e714703
("drop 3 patches and reorder one 6.18 patch based on RC review feedback").
Working well, no regressions observed.
Signature · 1 line
-Barry K. Nathan <[email protected]>
Build tested in our x86 config successfully without error.
Best Regards
Wentao Guan