From: Leon Romanovsky <leon@kernel.org>
To: Bernard Metzler <bmt@zurich.ibm.com>
Cc: linux-rdma@vger.kernel.org, jgg@ziepe.ca, geert@linux-m68k.org,
dledford@redhat.com
Subject: Re: [PATCH v3] RDMA/siw: Fix 64/32bit pointer inconsistency
Date: Thu, 22 Aug 2019 21:41:47 +0300 [thread overview]
Message-ID: <20190822184147.GO29433@mtr-leonro.mtl.com> (raw)
In-Reply-To: <20190822173738.26817-1-bmt@zurich.ibm.com>
On Thu, Aug 22, 2019 at 07:37:38PM +0200, Bernard Metzler wrote:
> Fixes improper casting between addresses and unsigned types.
> Changes siw_pbl_get_buffer() function to return appropriate
> dma_addr_t, and not u64.
>
> Also fixes debug prints. Now any potentially kernel private
> pointers are printed formatted as '%pK', to allow keeping that
> information secret.
>
> Fixes: d941bfe500be ("RDMA/siw: Change CQ flags from 64->32 bits")
> Fixes: b0fff7317bb4 ("rdma/siw: completion queue methods")
> Fixes: 8b6a361b8c48 ("rdma/siw: receive path")
> Fixes: b9be6f18cf9e ("rdma/siw: transmit path")
> Fixes: f29dd55b0236 ("rdma/siw: queue pair methods")
> Fixes: 2251334dcac9 ("rdma/siw: application buffer management")
> Fixes: 303ae1cdfdf7 ("rdma/siw: application interface")
> Fixes: 6c52fdc244b5 ("rdma/siw: connection management")
> Fixes: a531975279f3 ("rdma/siw: main include file")
>
> Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
> Reported-by: Jason Gunthorpe <jgg@ziepe.ca>
> Reported-by: Leon Romanovsky <leon@kernel.org>
> Signed-off-by: Bernard Metzler <bmt@zurich.ibm.com>
> ---
> drivers/infiniband/sw/siw/siw.h | 8 +--
> drivers/infiniband/sw/siw/siw_cm.c | 74 ++++++++++++---------------
> drivers/infiniband/sw/siw/siw_cq.c | 5 +-
> drivers/infiniband/sw/siw/siw_mem.c | 14 ++---
> drivers/infiniband/sw/siw/siw_mem.h | 2 +-
> drivers/infiniband/sw/siw/siw_qp.c | 2 +-
> drivers/infiniband/sw/siw/siw_qp_rx.c | 26 +++++-----
> drivers/infiniband/sw/siw/siw_qp_tx.c | 43 ++++++++--------
> drivers/infiniband/sw/siw/siw_verbs.c | 40 +++++++--------
> 9 files changed, 106 insertions(+), 108 deletions(-)
>
> diff --git a/drivers/infiniband/sw/siw/siw.h b/drivers/infiniband/sw/siw/siw.h
> index 77b1aabf6ff3..dba4535494ab 100644
> --- a/drivers/infiniband/sw/siw/siw.h
> +++ b/drivers/infiniband/sw/siw/siw.h
> @@ -138,9 +138,9 @@ struct siw_umem {
> };
>
> struct siw_pble {
> - u64 addr; /* Address of assigned user buffer */
> - u64 size; /* Size of this entry */
> - u64 pbl_off; /* Total offset from start of PBL */
> + dma_addr_t addr; /* Address of assigned buffer */
> + unsigned int size; /* Size of this entry */
> + unsigned long pbl_off; /* Total offset from start of PBL */
> };
>
> struct siw_pbl {
> @@ -734,7 +734,7 @@ static inline void siw_crc_skb(struct siw_rx_stream *srx, unsigned int len)
> "MEM[0x%08x] %s: " fmt, mem->stag, __func__, ##__VA_ARGS__)
>
> #define siw_dbg_cep(cep, fmt, ...) \
> - ibdev_dbg(&cep->sdev->base_dev, "CEP[0x%p] %s: " fmt, \
> + ibdev_dbg(&cep->sdev->base_dev, "CEP[0x%pK] %s: " fmt, \
> cep, __func__, ##__VA_ARGS__)
>
> void siw_cq_flush(struct siw_cq *cq);
> diff --git a/drivers/infiniband/sw/siw/siw_cm.c b/drivers/infiniband/sw/siw/siw_cm.c
> index 9ce8a1b925d2..ae7ea3ad7224 100644
> --- a/drivers/infiniband/sw/siw/siw_cm.c
> +++ b/drivers/infiniband/sw/siw/siw_cm.c
> @@ -355,8 +355,8 @@ static int siw_cm_upcall(struct siw_cep *cep, enum iw_cm_event_type reason,
> getname_local(cep->sock, &event.local_addr);
> getname_peer(cep->sock, &event.remote_addr);
> }
> - siw_dbg_cep(cep, "[QP %u]: id 0x%p, reason=%d, status=%d\n",
> - cep->qp ? qp_id(cep->qp) : -1, id, reason, status);
> + siw_dbg_cep(cep, "[QP %u]: reason=%d, status=%d\n",
> + cep->qp ? qp_id(cep->qp) : -1, reason, status);
^^^^
There is a chance that such construction (attempt to print -1 with %u)
will generate some sort of warning.
Thanks
next prev parent reply other threads:[~2019-08-22 18:41 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-22 17:37 [PATCH v3] RDMA/siw: Fix 64/32bit pointer inconsistency Bernard Metzler
2019-08-22 18:41 ` Leon Romanovsky [this message]
2019-08-22 19:08 ` Doug Ledford
2019-08-22 19:26 ` Leon Romanovsky
2019-08-23 14:33 ` Bernard Metzler
2019-08-23 14:42 ` Jason Gunthorpe
2019-08-23 15:05 ` Bernard Metzler
2019-08-23 16:13 ` Doug Ledford
2019-08-23 16:15 ` Jason Gunthorpe
2019-08-23 16:39 ` Doug Ledford
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=20190822184147.GO29433@mtr-leonro.mtl.com \
--to=leon@kernel.org \
--cc=bmt@zurich.ibm.com \
--cc=dledford@redhat.com \
--cc=geert@linux-m68k.org \
--cc=jgg@ziepe.ca \
--cc=linux-rdma@vger.kernel.org \
/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