From: zhengyongjun <zhengyongjun3@huawei.com>
To: Hoang Huu Le <hoang.h.le@dektech.com.au>,
"jmaloy@redhat.com" <jmaloy@redhat.com>,
"ying.xue@windriver.com" <ying.xue@windriver.com>,
"davem@davemloft.net" <davem@davemloft.net>,
"kuba@kernel.org" <kuba@kernel.org>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
"tipc-discussion@lists.sourceforge.net"
<tipc-discussion@lists.sourceforge.net>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: 答复: [PATCH net-next] tipc: Return the correct errno code
Date: Mon, 2 Aug 2021 08:52:44 +0000 [thread overview]
Message-ID: <129ae4700e9740ad8ef1e5bb1862e2ff@huawei.com> (raw)
In-Reply-To: <VE1PR05MB7327C7E4BC3EAF9D398A6B86F1EF9@VE1PR05MB7327.eurprd05.prod.outlook.com>
Hi hoang,
I don't notice that patch has been merged, If you need me to send a revert patch, I will send it as soon as possible.
If you submit the revert patch by your team, it's also ok.
Thanks,
Zheng
-----邮件原件-----
发件人: Hoang Huu Le [mailto:hoang.h.le@dektech.com.au]
发送时间: 2021年8月2日 16:02
收件人: zhengyongjun <zhengyongjun3@huawei.com>; jmaloy@redhat.com; ying.xue@windriver.com; davem@davemloft.net; kuba@kernel.org; netdev@vger.kernel.org; tipc-discussion@lists.sourceforge.net; linux-kernel@vger.kernel.org
主题: RE: [PATCH net-next] tipc: Return the correct errno code
Hi Zheng,
The patch was being merged by accident. Will have you planning to revert it?
We need to do ASAP since calling path tipc_node_xmit() -> tipc_link_xmit() broken as side effect.
Thanks,
hoang
> -----Original Message-----
> From: zhengyongjun <zhengyongjun3@huawei.com>
> Sent: Friday, June 4, 2021 8:35 AM
> To: jmaloy@redhat.com; ying.xue@windriver.com; davem@davemloft.net;
> kuba@kernel.org; netdev@vger.kernel.org; tipc-
> discussion@lists.sourceforge.net; linux-kernel@vger.kernel.org
> Subject: 答复: [PATCH net-next] tipc: Return the correct errno code
>
> Sorry, this patch is wrong, please ignore it, thanks :)
>
> -----邮件原件-----
> 发件人: zhengyongjun
> 发送时间: 2021年6月4日 9:47
> 收件人: jmaloy@redhat.com; ying.xue@windriver.com; davem@davemloft.net;
> kuba@kernel.org; netdev@vger.kernel.org; tipc-
> discussion@lists.sourceforge.net; linux-kernel@vger.kernel.org
> 抄送: zhengyongjun <zhengyongjun3@huawei.com>
> 主题: [PATCH net-next] tipc: Return the correct errno code
>
> When kalloc or kmemdup failed, should return ENOMEM rather than ENOBUF.
>
> Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com>
> ---
> net/tipc/link.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/net/tipc/link.c b/net/tipc/link.c index
> c44b4bfaaee6..5b6181277cc5 100644
> --- a/net/tipc/link.c
> +++ b/net/tipc/link.c
> @@ -912,7 +912,7 @@ static int link_schedule_user(struct tipc_link *l, struct tipc_msg *hdr)
> skb = tipc_msg_create(SOCK_WAKEUP, 0, INT_H_SIZE, 0,
> dnode, l->addr, dport, 0, 0);
> if (!skb)
> - return -ENOBUFS;
> + return -ENOMEM;
> msg_set_dest_droppable(buf_msg(skb), true);
> TIPC_SKB_CB(skb)->chain_imp = msg_importance(hdr);
> skb_queue_tail(&l->wakeupq, skb);
> @@ -1030,7 +1030,7 @@ void tipc_link_reset(struct tipc_link *l)
> *
> * Consumes the buffer chain.
> * Messages at TIPC_SYSTEM_IMPORTANCE are always accepted
> - * Return: 0 if success, or errno: -ELINKCONG, -EMSGSIZE or -ENOBUFS
> + * Return: 0 if success, or errno: -ELINKCONG, -EMSGSIZE or -ENOBUFS
> + or -ENOMEM
> */
> int tipc_link_xmit(struct tipc_link *l, struct sk_buff_head *list,
> struct sk_buff_head *xmitq)
> @@ -1088,7 +1088,7 @@ int tipc_link_xmit(struct tipc_link *l, struct sk_buff_head *list,
> if (!_skb) {
> kfree_skb(skb);
> __skb_queue_purge(list);
> - return -ENOBUFS;
> + return -ENOMEM;
> }
> __skb_queue_tail(transmq, skb);
> tipc_link_set_skb_retransmit_time(skb, l);
> --
> 2.25.1
next prev parent reply other threads:[~2021-08-02 8:52 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-04 1:47 [PATCH net-next] tipc: Return the correct errno code Zheng Yongjun
2021-06-04 1:34 ` 答复: " zhengyongjun
2021-08-02 8:02 ` Hoang Huu Le
2021-08-02 8:52 ` zhengyongjun [this message]
2021-06-04 21:20 ` patchwork-bot+netdevbpf
2021-06-08 2:15 ` YueHaibing
2021-06-08 2:35 ` 答复: " zhengyongjun
2021-06-08 2:39 ` zhengyongjun
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=129ae4700e9740ad8ef1e5bb1862e2ff@huawei.com \
--to=zhengyongjun3@huawei.com \
--cc=davem@davemloft.net \
--cc=hoang.h.le@dektech.com.au \
--cc=jmaloy@redhat.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=tipc-discussion@lists.sourceforge.net \
--cc=ying.xue@windriver.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.