From: Jason Gunthorpe <jgg@nvidia.com>
To: Bob Pearson <rpearsonhpe@gmail.com>
Cc: <zyjzyj2000@gmail.com>, <linux-rdma@vger.kernel.org>,
Bob Pearson <rpearson@hpe.com>
Subject: Re: [PATCH for next] RDMA/rxe: Fix small problem in network_type patch
Date: Fri, 16 Oct 2020 17:33:17 -0300 [thread overview]
Message-ID: <20201016203317.GS6219@nvidia.com> (raw)
In-Reply-To: <20201016202645.17819-1-rpearson@hpe.com>
On Fri, Oct 16, 2020 at 03:26:46PM -0500, Bob Pearson wrote:
> The patch referenced below has a typo that results in using the wrong
> L2 header size for outbound traffic. (V4 <-> V6).
>
> It also breaks RC traffic because they use AVs that use RDMA_NETWORK_XXX
> enums instead of RXE_NETWORK_TYPE_XXX enums. Fis this by making the
> encodings the same between these different types.
>
> Fixes: e0d696d201dd ("RDMA/rxe: Move the definitions for rxe_av.network_type to
> uAPI")
Don't word wrap these
> Signed-off-by: Bob Pearson <rpearson@hpe.com>
> drivers/infiniband/sw/rxe/rxe_net.c | 2 +-
> include/uapi/rdma/rdma_user_rxe.h | 5 +++--
> 2 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/infiniband/sw/rxe/rxe_net.c b/drivers/infiniband/sw/rxe/rxe_net.c
> index 575e1a4ec821..34bef7d8e6b4 100644
> +++ b/drivers/infiniband/sw/rxe/rxe_net.c
> @@ -442,7 +442,7 @@ struct sk_buff *rxe_init_packet(struct rxe_dev *rxe, struct rxe_av *av,
> if (IS_ERR(attr))
> return NULL;
>
> - if (av->network_type == RXE_NETWORK_TYPE_IPV6)
> + if (av->network_type == RXE_NETWORK_TYPE_IPV4)
> hdr_len = ETH_HLEN + sizeof(struct udphdr) +
> sizeof(struct iphdr);
> else
> diff --git a/include/uapi/rdma/rdma_user_rxe.h b/include/uapi/rdma/rdma_user_rxe.h
> index e591d8c1f3cf..ce430d3dceaf 100644
> +++ b/include/uapi/rdma/rdma_user_rxe.h
> @@ -40,8 +40,9 @@
> #include <linux/in6.h>
>
> enum {
> - RXE_NETWORK_TYPE_IPV4 = 1,
> - RXE_NETWORK_TYPE_IPV6 = 2,
> + /* good reasons to make same as RDMA_NETWORK_XXX */
> + RXE_NETWORK_TYPE_IPV4 = 2,
> + RXE_NETWORK_TYPE_IPV6 = 3,
> };
No just transcode them in the only place that matters, we still can't
break userspace
Jason
next prev parent reply other threads:[~2020-10-16 20:33 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-16 20:26 [PATCH for next] RDMA/rxe: Fix small problem in network_type patch Bob Pearson
2020-10-16 20:33 ` Jason Gunthorpe [this message]
2020-10-16 21:14 ` Bob Pearson
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=20201016203317.GS6219@nvidia.com \
--to=jgg@nvidia.com \
--cc=linux-rdma@vger.kernel.org \
--cc=rpearson@hpe.com \
--cc=rpearsonhpe@gmail.com \
--cc=zyjzyj2000@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).