Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Message-ID: <60b33e8926d188498fba980115cb3c681a18b8b1.camel@redhat.com>
Subject: Re: [PATCH] Fix fnic driver to remove bogus ratelimit messages.
From:   Laurence Oberman <loberman@redhat.com>
To:     lduncan@suse.com, linux-scsi@vger.kernel.org,
        linux-kernel@vger.kernel.org
Date:   Tue, 23 Mar 2021 14:31:19 -0400
In-Reply-To: <20210323172756.5743-1-lduncan@suse.com>
References: <20210323172756.5743-1-lduncan@suse.com>
Content-Type: text/plain; charset="UTF-8"
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Precedence: bulk

On Tue, 2021-03-23 at 10:27 -0700, lduncan@suse.com wrote:
> From: Lee Duncan <lduncan@suse.com>
> 
> Commit b43abcbbd5b1 ("scsi: fnic: Ratelimit printks to avoid
> looding when vlan is not set by the switch.i") added
> printk_ratelimit() in front of a couple of debug-mode
> messages, to reduce logging overrun when debugging the
> driver. The code:
> 
> >           if (printk_ratelimit())
> >                   FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host,
> >                             "Start VLAN Discovery\n");
> 
> ends up calling printk_ratelimit() quite often, triggering
> many kernel messages about callbacks being surpressed.
> 
> The fix is to decompose FNIC_FCS_DBG(), then change the order
> of checks so that printk_ratelimit() is only called if
> driver debugging is enabled.
> 
> Signed-off-by: Lee Duncan <lduncan@suse.com>
> ---
>  drivers/scsi/fnic/fnic_fcs.c | 14 ++++++++------
>  1 file changed, 8 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/scsi/fnic/fnic_fcs.c
> b/drivers/scsi/fnic/fnic_fcs.c
> index e0cee4dcb439..332b31493e79 100644
> --- a/drivers/scsi/fnic/fnic_fcs.c
> +++ b/drivers/scsi/fnic/fnic_fcs.c
> @@ -1343,9 +1343,10 @@ void fnic_handle_fip_timer(struct fnic *fnic)
>  	if (list_empty(&fnic->vlans)) {
>  		spin_unlock_irqrestore(&fnic->vlans_lock, flags);
>  		/* no vlans available, try again */
> -		if (printk_ratelimit())
> -			FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host,
> -				  "Start VLAN Discovery\n");
> +		if (unlikely(fnic_log_level & FNIC_FCS_LOGGING))
> +			if (printk_ratelimit())
> +				shost_printk(KERN_DEBUG, fnic->lport-
> >host,
> +						"Start VLAN
> Discovery\n");
>  		fnic_event_enq(fnic, FNIC_EVT_START_VLAN_DISC);
>  		return;
>  	}
> @@ -1363,9 +1364,10 @@ void fnic_handle_fip_timer(struct fnic *fnic)
>  	case FIP_VLAN_FAILED:
>  		spin_unlock_irqrestore(&fnic->vlans_lock, flags);
>  		/* if all vlans are in failed state, restart vlan disc
> */
> -		if (printk_ratelimit())
> -			FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host,
> -				  "Start VLAN Discovery\n");
> +		if (unlikely(fnic_log_level & FNIC_FCS_LOGGING))
> +			if (printk_ratelimit())
> +				shost_printk(KERN_DEBUG, fnic->lport-
> >host,
> +					  "Start VLAN Discovery\n");
>  		fnic_event_enq(fnic, FNIC_EVT_START_VLAN_DISC);
>  		break;
>  	case FIP_VLAN_SENT:

This looks good to me.
Reviewed-by: Laurence Oberman <loberman@redhat.com>