From: Jiri Pirko <jiri@resnulli.us>
To: Slark Xiao <slark_xiao@163.com>
Cc: loic.poulain@linaro.org, ryazanov.s.a@gmail.com,
johannes@sipsolutions.net, davem@davemloft.net,
edumazet@google.com, kuba@kernel.org, pabeni@redhat.com,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
Hariprasad Kelam <hkelam@marvell.com>
Subject: Re: [PATCH net v2] net: wwan: Fix missing net device name for error message print
Date: Fri, 26 Apr 2024 13:33:04 +0200 [thread overview]
Message-ID: <ZiuQ8LAL1uyTVAxJ@nanopsycho> (raw)
In-Reply-To: <20240426092444.825735-1-slark_xiao@163.com>
Fri, Apr 26, 2024 at 11:24:44AM CEST, slark_xiao@163.com wrote:
>In my local, I got an error print in dmesg like below:
>"sequence number glitch prev=487 curr=0"
>After checking, it belongs to mhi_wwan_mbim.c. Refer to the usage
>of this net_err_ratelimited() API in other files, I think we
>should add net device name print before message context.
You don't add dev device name, but rather constant string.
>
>Fixes: aa730a9905b7 ("net: wwan: Add MHI MBIM network driver")
>Signed-off-by: Slark Xiao <slark_xiao@163.com>
>Reviewed-by: Hariprasad Kelam <hkelam@marvell.com>
>---
> drivers/net/wwan/mhi_wwan_mbim.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/drivers/net/wwan/mhi_wwan_mbim.c b/drivers/net/wwan/mhi_wwan_mbim.c
>index 3f72ae943b29..6cefee25efc4 100644
>--- a/drivers/net/wwan/mhi_wwan_mbim.c
>+++ b/drivers/net/wwan/mhi_wwan_mbim.c
>@@ -186,14 +186,14 @@ static int mbim_rx_verify_nth16(struct mhi_mbim_context *mbim, struct sk_buff *s
>
> if (skb->len < sizeof(struct usb_cdc_ncm_nth16) +
> sizeof(struct usb_cdc_ncm_ndp16)) {
>- net_err_ratelimited("frame too short\n");
>+ net_err_ratelimited("mbim: frame too short\n");
Does not make any sense. If you have multiple instances of mbim, you are
still clueless. You can access netdevice, print out the name as other
net_err_ratelimited() instances do. Btw, it would be more correct to use
netdev_err(), but there is no "ratelimited" variant of that. Perhaps
better to introduce it.
pw-bot: cr
> return -EINVAL;
> }
>
> nth16 = (struct usb_cdc_ncm_nth16 *)skb->data;
>
> if (nth16->dwSignature != cpu_to_le32(USB_CDC_NCM_NTH16_SIGN)) {
>- net_err_ratelimited("invalid NTH16 signature <%#010x>\n",
>+ net_err_ratelimited("mbim: invalid NTH16 signature <%#010x>\n",
> le32_to_cpu(nth16->dwSignature));
> return -EINVAL;
> }
>@@ -201,7 +201,7 @@ static int mbim_rx_verify_nth16(struct mhi_mbim_context *mbim, struct sk_buff *s
> /* No limit on the block length, except the size of the data pkt */
> len = le16_to_cpu(nth16->wBlockLength);
> if (len > skb->len) {
>- net_err_ratelimited("NTB does not fit into the skb %u/%u\n",
>+ net_err_ratelimited("mbim: NTB does not fit into the skb %u/%u\n",
> len, skb->len);
> return -EINVAL;
> }
>@@ -209,7 +209,7 @@ static int mbim_rx_verify_nth16(struct mhi_mbim_context *mbim, struct sk_buff *s
> if (mbim->rx_seq + 1 != le16_to_cpu(nth16->wSequence) &&
> (mbim->rx_seq || le16_to_cpu(nth16->wSequence)) &&
> !(mbim->rx_seq == 0xffff && !le16_to_cpu(nth16->wSequence))) {
>- net_err_ratelimited("sequence number glitch prev=%d curr=%d\n",
>+ net_err_ratelimited("mbim: sequence number glitch prev=%d curr=%d\n",
> mbim->rx_seq, le16_to_cpu(nth16->wSequence));
> }
> mbim->rx_seq = le16_to_cpu(nth16->wSequence);
>@@ -222,7 +222,7 @@ static int mbim_rx_verify_ndp16(struct sk_buff *skb, struct usb_cdc_ncm_ndp16 *n
> int ret;
>
> if (le16_to_cpu(ndp16->wLength) < USB_CDC_NCM_NDP16_LENGTH_MIN) {
>- net_err_ratelimited("invalid DPT16 length <%u>\n",
>+ net_err_ratelimited("mbim: invalid DPT16 length <%u>\n",
> le16_to_cpu(ndp16->wLength));
> return -EINVAL;
> }
>@@ -233,7 +233,7 @@ static int mbim_rx_verify_ndp16(struct sk_buff *skb, struct usb_cdc_ncm_ndp16 *n
>
> if (sizeof(struct usb_cdc_ncm_ndp16) +
> ret * sizeof(struct usb_cdc_ncm_dpe16) > skb->len) {
>- net_err_ratelimited("Invalid nframes = %d\n", ret);
>+ net_err_ratelimited("mbim: Invalid nframes = %d\n", ret);
> return -EINVAL;
> }
>
>--
>2.25.1
>
>
next prev parent reply other threads:[~2024-04-26 11:33 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-26 9:24 [PATCH net v2] net: wwan: Fix missing net device name for error message print Slark Xiao
2024-04-26 11:33 ` Jiri Pirko [this message]
2024-04-26 12:04 ` Loic Poulain
2024-04-27 5:57 ` Slark Xiao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZiuQ8LAL1uyTVAxJ@nanopsycho \
--to=jiri@resnulli.us \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=hkelam@marvell.com \
--cc=johannes@sipsolutions.net \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=loic.poulain@linaro.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=ryazanov.s.a@gmail.com \
--cc=slark_xiao@163.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.