ehca: assure 4k alignment for firmware control block in 64k page mode
PATCH 1/4 ehca: assure 4k alignment for firmware control block in 64k page mode
Hello Roland!
This is a patch of ehca that assures 4k alignment for firmware control block in 64k page mode, because kzalloc()'s result address might not be 4k aligned if kernel's 64k page is enabled. Thus, we introduced wrappers called ehca_alloc/free_fw_ctrlblock(), which use a slab cache for objects with 4k length and 4k alignment in order to alloc/free firmware control blocks in 64k page mode. In 4k page mode those wrappers just are defines of get_zeroed_page() and free_page().
Thanks!
Nam
---
ehca_hca.c | 17 ++++++++------- ehca_irq.c | 17 +++++++-------- ehca_iverbs.h | 8 +++++++ ehca_main.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++--------- ehca_mrmw.c | 8 +++---- ehca_qp.c | 12 ++++++----- 6 files changed, 89 insertions(+), 35 deletions(-)
drivers/infiniband/hw/ehca/ehca_hca.c +9 -8
@@ -40,6 +40,7 @@*/ #include "ehca_tools.h" +#include "ehca_iverbs.h" #include "hcp_if.h" int ehca_query_device (struct ib_device *ibdev,struct ib_device_attr *props)
@@ -49,7 +50,7 @@ int ehca_query_device(struct ib_device * ib_device);struct hipz_query_hca *rblock; - rblock =kzalloc (H_CB_ALIGNMENT ,GFP_KERNEL ); + rblock = (struct hipz_query_hca *)ehca_alloc_fw_ctrlblock ();if (!rblock) {ehca_err (&shca->ib_device,"Can't allocate rblock memory." );return -ENOMEM ;
@@ -96,7 +97,7 @@ int ehca_query_device(struct ib_device * = min_t(int, rblock->max_total_mcast_qp_attach, INT_MAX); query_device1: -kfree (rblock); +ehca_free_fw_ctrlblock (rblock);return ret; }
@@ -109,7 +110,7 @@ int ehca_query_port(struct ib_device *ib ib_device);struct hipz_query_port *rblock; - rblock =kzalloc (H_CB_ALIGNMENT ,GFP_KERNEL ); + rblock = (struct hipz_query_port *)ehca_alloc_fw_ctrlblock ();if (!rblock) {ehca_err (&shca->ib_device,"Can't allocate rblock memory." );return -ENOMEM ;
@@ -162,7 +163,7 @@ int ehca_query_port(struct ib_device *ib props->active_speed =0x1 ; query_port1: -kfree (rblock); +ehca_free_fw_ctrlblock (rblock);return ret; }
@@ -178,7 +179,7 @@ int ehca_query_pkey(struct ib_device *ibreturn -EINVAL ; } - rblock =kzalloc (H_CB_ALIGNMENT ,GFP_KERNEL ); + rblock = (struct hipz_query_port *)ehca_alloc_fw_ctrlblock ();if (!rblock) {ehca_err (&shca->ib_device,"Can't allocate rblock memory." );return -ENOMEM ;
@@ -193,7 +194,7 @@ int ehca_query_pkey(struct ib_device *ibmemcpy (pkey, &rblock->pkey_entries + index,sizeof (u16)); query_pkey1: -kfree (rblock); +ehca_free_fw_ctrlblock (rblock);return ret; }
@@ -211,7 +212,7 @@ int ehca_query_gid(struct ib_device *ibdreturn -EINVAL ; } - rblock =kzalloc (H_CB_ALIGNMENT ,GFP_KERNEL ); + rblock = (struct hipz_query_port *)ehca_alloc_fw_ctrlblock ();if (!rblock) {ehca_err (&shca->ib_device,"Can't allocate rblock memory." );return -ENOMEM ;
@@ -227,7 +228,7 @@ int ehca_query_gid(struct ib_device *ibdmemcpy (&gid->raw[8 ], &rblock->guid_entries[index],sizeof (u64)); query_gid1: -kfree (rblock); +ehca_free_fw_ctrlblock (rblock);return ret; }
drivers/infiniband/hw/ehca/ehca_irq.c +8 -9
@@ -45,6 +45,7 @@ #include "ehca_iverbs.h"#include "ehca_tools.h" #include "hcp_if.h" #include "hipz_fns.h" +#include "ipz_pt_fn.h" #define EQE_COMPLETION_EVENT EHCA_BMASK_IBM(1,1)#define EQE_CQ_QP_NUMBER EHCA_BMASK_IBM(8,31)
@@ -137,38 +138,36 @@ int ehca_error_data(struct ehca_shca *shu64 *rblock;unsigned long block_count; - rblock =kzalloc (H_CB_ALIGNMENT ,GFP_KERNEL ); + rblock = (u64 *)ehca_alloc_fw_ctrlblock ();if (!rblock) {ehca_err (&shca->ib_device,"Cannot allocate rblock memory." ); ret = -ENOMEM ; goto error_data1; } +/* rblock must be 4K aligned and should be 4K large */ ret =hipz_h_error_data (shca->ipz_hca_handle, resource, rblock, &block_count); -if (ret ==H_R_STATE ) { +if (ret ==H_R_STATE )ehca_err (&shca->ib_device,"No error data is available: %lx." , resource); - }else if (ret ==H_SUCCESS ) {int length; length =EHCA_BMASK_GET (ERROR_DATA_LENGTH , rblock[0 ]); -if (length >PAGE_SIZE ) - length =PAGE_SIZE ; +if (length >EHCA_PAGESIZE ) + length =EHCA_PAGESIZE ;print_error_data (shca, data, rblock, length); - } -else { + }else ehca_err (&shca->ib_device,"Error data could not be fetched: %lx" , resource); - } -kfree (rblock); +ehca_free_fw_ctrlblock (rblock); error_data1:return ret;
drivers/infiniband/hw/ehca/ehca_iverbs.h +8 -0
@@ -179,4 +179,12 @@ int ehca_mmap_register(u64 physical,voidint ehca_munmap (unsigned long addr,size_t len); +#ifdef CONFIG_PPC_64K_PAGES +void *ehca_alloc_fw_ctrlblock (void ); +void ehca_free_fw_ctrlblock (void *ptr); +#else +#define ehca_alloc_fw_ctrlblock () get_zeroed_page(GFP_KERNEL) +#define ehca_free_fw_ctrlblock (ptr) free_page((unsigned long)(ptr)) +#endif +#endif
drivers/infiniband/hw/ehca/ehca_main.c +53 -9
143 lines not on this page · raw message
drivers/infiniband/hw/ehca/ehca_mrmw.c +4 -4
@@ -1013,7 +1013,7 @@ int ehca_reg_mr_rpages(struct ehca_shcau32 i;u64 *kpage; - kpage =kzalloc (H_CB_ALIGNMENT ,GFP_KERNEL ); + kpage = (u64 *)ehca_alloc_fw_ctrlblock ();if (!kpage) {ehca_err (&shca->ib_device,"kpage alloc failed" ); ret = -ENOMEM ;
@@ -1092,7 +1092,7 @@ int ehca_reg_mr_rpages(struct ehca_shca ehca_reg_mr_rpages_exit1: -kfree (kpage); +ehca_free_fw_ctrlblock (kpage); ehca_reg_mr_rpages_exit0:if (ret) ehca_err(&shca->ib_device, "ret=%x shca=%p e_mr=%p pginfo=%p "
@@ -1124,7 +1124,7 @@ inline int ehca_rereg_mr_rereg1(struct eehca_mrmw_map_acl (acl, &hipz_acl);ehca_mrmw_set_pgsize_hipz_acl (&hipz_acl); - kpage =kzalloc (H_CB_ALIGNMENT ,GFP_KERNEL ); + kpage = (u64 *)ehca_alloc_fw_ctrlblock ();if (!kpage) {ehca_err (&shca->ib_device,"kpage alloc failed" ); ret = -ENOMEM ;
@@ -1181,7 +1181,7 @@ inline int ehca_rereg_mr_rereg1(struct e } ehca_rereg_mr_rereg1_exit1: -kfree (kpage); +ehca_free_fw_ctrlblock (kpage); ehca_rereg_mr_rereg1_exit0:if ( ret && (ret != -EAGAIN ) ) ehca_err(&shca->ib_device, "ret=%x lkey=%x rkey=%x "
drivers/infiniband/hw/ehca/ehca_qp.c +7 -5
@@ -811,8 +811,9 @@ static int internal_modify_qp(struct ib_unsigned long spl_flags =0 ;/* do query_qp to obtain current attr values */ - mqpcb =kzalloc (H_CB_ALIGNMENT ,GFP_KERNEL ); -if (mqpcb ==NULL ) { + mqpcb = (struct hcp_modify_qp_control_block *) +ehca_alloc_fw_ctrlblock (); +if (!mqpcb) {ehca_err (ibqp->device,"Could not get zeroed page for mqpcb " "ehca_qp=%p qp_num=%x " , my_qp, ibqp->qp_num);return -ENOMEM ;
@@ -1225,7 +1226,7 @@ modify_qp_exit2: } modify_qp_exit1: -kfree (mqpcb); +ehca_free_fw_ctrlblock (mqpcb);return ret; }
@@ -1277,7 +1278,8 @@ int ehca_query_qp(struct ib_qp *qp,return -EINVAL ; } - qpcb =kzalloc (H_CB_ALIGNMENT ,GFP_KERNEL ); + qpcb = (struct hcp_modify_qp_control_block *) +ehca_alloc_fw_ctrlblock ();if (!qpcb) {ehca_err (qp->device,"Out of memory for qpcb " "ehca_qp=%p qp_num=%x" , my_qp, qp->qp_num);
@@ -1401,7 +1403,7 @@ int ehca_query_qp(struct ib_qp *qp,ehca_dmp (qpcb,4 *70 ,"qp_num=%x" , qp->qp_num); query_qp_exit1: -kfree (qpcb); +ehca_free_fw_ctrlblock (qpcb);return ret; }
drivers/infiniband/hw/ehca/ehca_hca.c +9 -8
@@ -40,6 +40,7 @@*/ #include "ehca_tools.h" +#include "ehca_iverbs.h" #include "hcp_if.h" int ehca_query_device (struct ib_device *ibdev,struct ib_device_attr *props)
@@ -49,7 +50,7 @@ int ehca_query_device(struct ib_device * ib_device);struct hipz_query_hca *rblock; - rblock =kzalloc (H_CB_ALIGNMENT ,GFP_KERNEL ); + rblock = (struct hipz_query_hca *)ehca_alloc_fw_ctrlblock ();if (!rblock) {ehca_err (&shca->ib_device,"Can't allocate rblock memory." );return -ENOMEM ;
@@ -96,7 +97,7 @@ int ehca_query_device(struct ib_device * = min_t(int, rblock->max_total_mcast_qp_attach, INT_MAX); query_device1: -kfree (rblock); +ehca_free_fw_ctrlblock (rblock);return ret; }
@@ -109,7 +110,7 @@ int ehca_query_port(struct ib_device *ib ib_device);struct hipz_query_port *rblock; - rblock =kzalloc (H_CB_ALIGNMENT ,GFP_KERNEL ); + rblock = (struct hipz_query_port *)ehca_alloc_fw_ctrlblock ();if (!rblock) {ehca_err (&shca->ib_device,"Can't allocate rblock memory." );return -ENOMEM ;
@@ -162,7 +163,7 @@ int ehca_query_port(struct ib_device *ib props->active_speed =0x1 ; query_port1: -kfree (rblock); +ehca_free_fw_ctrlblock (rblock);return ret; }
@@ -178,7 +179,7 @@ int ehca_query_pkey(struct ib_device *ibreturn -EINVAL ; } - rblock =kzalloc (H_CB_ALIGNMENT ,GFP_KERNEL ); + rblock = (struct hipz_query_port *)ehca_alloc_fw_ctrlblock ();if (!rblock) {ehca_err (&shca->ib_device,"Can't allocate rblock memory." );return -ENOMEM ;
@@ -193,7 +194,7 @@ int ehca_query_pkey(struct ib_device *ibmemcpy (pkey, &rblock->pkey_entries + index,sizeof (u16)); query_pkey1: -kfree (rblock); +ehca_free_fw_ctrlblock (rblock);return ret; }
@@ -211,7 +212,7 @@ int ehca_query_gid(struct ib_device *ibdreturn -EINVAL ; } - rblock =kzalloc (H_CB_ALIGNMENT ,GFP_KERNEL ); + rblock = (struct hipz_query_port *)ehca_alloc_fw_ctrlblock ();if (!rblock) {ehca_err (&shca->ib_device,"Can't allocate rblock memory." );return -ENOMEM ;
@@ -227,7 +228,7 @@ int ehca_query_gid(struct ib_device *ibdmemcpy (&gid->raw[8 ], &rblock->guid_entries[index],sizeof (u64)); query_gid1: -kfree (rblock); +ehca_free_fw_ctrlblock (rblock);return ret; }
drivers/infiniband/hw/ehca/ehca_irq.c +8 -9
@@ -45,6 +45,7 @@ #include "ehca_iverbs.h"#include "ehca_tools.h" #include "hcp_if.h" #include "hipz_fns.h" +#include "ipz_pt_fn.h" #define EQE_COMPLETION_EVENT EHCA_BMASK_IBM(1,1)#define EQE_CQ_QP_NUMBER EHCA_BMASK_IBM(8,31)
@@ -137,38 +138,36 @@ int ehca_error_data(struct ehca_shca *shu64 *rblock;unsigned long block_count; - rblock =kzalloc (H_CB_ALIGNMENT ,GFP_KERNEL ); + rblock = (u64 *)ehca_alloc_fw_ctrlblock ();if (!rblock) {ehca_err (&shca->ib_device,"Cannot allocate rblock memory." ); ret = -ENOMEM ; goto error_data1; } +/* rblock must be 4K aligned and should be 4K large */ ret =hipz_h_error_data (shca->ipz_hca_handle, resource, rblock, &block_count); -if (ret ==H_R_STATE ) { +if (ret ==H_R_STATE )ehca_err (&shca->ib_device,"No error data is available: %lx." , resource); - }else if (ret ==H_SUCCESS ) {int length; length =EHCA_BMASK_GET (ERROR_DATA_LENGTH , rblock[0 ]); -if (length >PAGE_SIZE ) - length =PAGE_SIZE ; +if (length >EHCA_PAGESIZE ) + length =EHCA_PAGESIZE ;print_error_data (shca, data, rblock, length); - } -else { + }else ehca_err (&shca->ib_device,"Error data could not be fetched: %lx" , resource); - } -kfree (rblock); +ehca_free_fw_ctrlblock (rblock); error_data1:return ret;
drivers/infiniband/hw/ehca/ehca_iverbs.h +8 -0
@@ -179,4 +179,12 @@ int ehca_mmap_register(u64 physical,voidint ehca_munmap (unsigned long addr,size_t len); +#ifdef CONFIG_PPC_64K_PAGES +void *ehca_alloc_fw_ctrlblock (void ); +void ehca_free_fw_ctrlblock (void *ptr); +#else +#define ehca_alloc_fw_ctrlblock () get_zeroed_page(GFP_KERNEL) +#define ehca_free_fw_ctrlblock (ptr) free_page((unsigned long)(ptr)) +#endif +#endif
drivers/infiniband/hw/ehca/ehca_main.c +53 -9
143 lines not on this page · raw message
drivers/infiniband/hw/ehca/ehca_mrmw.c +4 -4
@@ -1013,7 +1013,7 @@ int ehca_reg_mr_rpages(struct ehca_shcau32 i;u64 *kpage; - kpage =kzalloc (H_CB_ALIGNMENT ,GFP_KERNEL ); + kpage = (u64 *)ehca_alloc_fw_ctrlblock ();if (!kpage) {ehca_err (&shca->ib_device,"kpage alloc failed" ); ret = -ENOMEM ;
@@ -1092,7 +1092,7 @@ int ehca_reg_mr_rpages(struct ehca_shca ehca_reg_mr_rpages_exit1: -kfree (kpage); +ehca_free_fw_ctrlblock (kpage); ehca_reg_mr_rpages_exit0:if (ret) ehca_err(&shca->ib_device, "ret=%x shca=%p e_mr=%p pginfo=%p "
@@ -1124,7 +1124,7 @@ inline int ehca_rereg_mr_rereg1(struct eehca_mrmw_map_acl (acl, &hipz_acl);ehca_mrmw_set_pgsize_hipz_acl (&hipz_acl); - kpage =kzalloc (H_CB_ALIGNMENT ,GFP_KERNEL ); + kpage = (u64 *)ehca_alloc_fw_ctrlblock ();if (!kpage) {ehca_err (&shca->ib_device,"kpage alloc failed" ); ret = -ENOMEM ;
@@ -1181,7 +1181,7 @@ inline int ehca_rereg_mr_rereg1(struct e } ehca_rereg_mr_rereg1_exit1: -kfree (kpage); +ehca_free_fw_ctrlblock (kpage); ehca_rereg_mr_rereg1_exit0:if ( ret && (ret != -EAGAIN ) ) ehca_err(&shca->ib_device, "ret=%x lkey=%x rkey=%x "
drivers/infiniband/hw/ehca/ehca_qp.c +7 -5
@@ -811,8 +811,9 @@ static int internal_modify_qp(struct ib_unsigned long spl_flags =0 ;/* do query_qp to obtain current attr values */ - mqpcb =kzalloc (H_CB_ALIGNMENT ,GFP_KERNEL ); -if (mqpcb ==NULL ) { + mqpcb = (struct hcp_modify_qp_control_block *) +ehca_alloc_fw_ctrlblock (); +if (!mqpcb) {ehca_err (ibqp->device,"Could not get zeroed page for mqpcb " "ehca_qp=%p qp_num=%x " , my_qp, ibqp->qp_num);return -ENOMEM ;
@@ -1225,7 +1226,7 @@ modify_qp_exit2: } modify_qp_exit1: -kfree (mqpcb); +ehca_free_fw_ctrlblock (mqpcb);return ret; }
@@ -1277,7 +1278,8 @@ int ehca_query_qp(struct ib_qp *qp,return -EINVAL ; } - qpcb =kzalloc (H_CB_ALIGNMENT ,GFP_KERNEL ); + qpcb = (struct hcp_modify_qp_control_block *) +ehca_alloc_fw_ctrlblock ();if (!qpcb) {ehca_err (qp->device,"Out of memory for qpcb " "ehca_qp=%p qp_num=%x" , my_qp, qp->qp_num);
@@ -1401,7 +1403,7 @@ int ehca_query_qp(struct ib_qp *qp,ehca_dmp (qpcb,4 *70 ,"qp_num=%x" , qp->qp_num); query_qp_exit1: -kfree (qpcb); +ehca_free_fw_ctrlblock (qpcb);return ret; }
Quoted 9 lines · Hoang-Nam Nguyen
drivers/infiniband/hw/ehca/ehca_main.c +9
-0+/* constructor ctblk_cache */ +void ehca_ctblk_ctor (void *ptr,kmem_cache_t *cache,unsigned long flags) +{ +memset (ptr,0 ,EHCA_PAGESIZE ); +} + +void *ehca_alloc_fw_ctrlblock (void ) +{ +void *ret =kmem_cache_alloc (ctblk_cache,SLAB_KERNEL );
drivers/infiniband/hw/ehca/ehca_main.c spinlock_t ehca_cq_idr_lock; · line 127
Quoted 10 lines
drivers/infiniband/hw/ehca/ehca_main.c +10
-0+if (!ret) + ehca_gen_err("Out of memory for ctblk"); +return ret; +} + +void ehca_free_fw_ctrlblock (void *ptr) +{ +if (ptr) + kmem_cache_free(ctblk_cache, ptr); +
This seems broken. You have a constructor for newly allocated objects, but there is no destructor and it seems that objects passed to ehca_free_fw_ctrlblock are not guaranteed to be initialized either.
I'd simply move the memset into the alloc function and get rid of the constructor here.
Arnd <><
Hi Arnd,
Quoted 1 line
This seems broken. You have a constructor for newly allocated objects,
but
Quoted 4 lines
there is no destructor and it seems that objects passed to
ehca_free_fw_ctrlblockare not guaranteed to be initialized either. I'd simply move the memset into the alloc function and get rid of the constructor here.
Yep, I was not aware that ctor is not called for every kmem_cache_alloc(). Thx for pointing this out. Nam
Hi Roland!
Quoted 2 lines
Arnd wrote:
This seems broken. You have a constructor for newly allocated objects,
but
Quoted 4 lines
there is no destructor and it seems that objects passed to
ehca_free_fw_ctrlblockare not guaranteed to be initialized either. I'd simply move the memset into the alloc function and get rid of the constructor here.
As Arnd stated I need to fix this ctor issue. Do you prefer me to resend all patches in proper format (non-mangled inline) or just this one bug fix? Thanks!
Nam
Quoted 2 lines
As Arnd stated I need to fix this ctor issue. Do you prefer me to resend all patches in proper format (non-mangled inline) or just this one bug fix?
I have the rest of the patches, so you just need to resend a fixed version of this one. BTW see my previous response about kmem_cache_zalloc() -- I think that's the best way to fix this.
In the future though if you can make a patch-sending script or something that lets you avoid the attachments that would be great.
Hi Roland!
Quoted 1 line
Quoted 1 line
As Arnd stated I need to fix this ctor issue. Do you prefer me to
resend
Quoted 1 line
Quoted 1 line
all patches in proper format (non-mangled inline) or just this one bug
fix?
Quoted 3 lines
I have the rest of the patches, so you just need to resend a fixed version of this one. BTW see my previous response about
kmem_cache_zalloc()-- I think that's the best way to fix this.
Yes. This makes sense to me. Will send this one patch soon.
Quoted 2 lines
In the future though if you can make a patch-sending script or something that lets you avoid the attachments that would be great.
Sure, will do. I just found out that I'm using an old version of kmail and its editor (all fancy editing is turned off, just plain text) just manngles leading and trailing tabs and spaces...
Thanks
Nam
Quoted 2 lines
I'd simply move the memset into the alloc function and get rid of the constructor here.
Slightly better still would be to use kmem_cache_zalloc() (save a tiny bit of text by getting rid of the call to memset).
- R.
drivers/infiniband/hw/ehca/ehca_iverbs.h int ehca_mmap_register(u64 physical,void · line 188
Quoted 7 lines
drivers/infiniband/hw/ehca/ehca_iverbs.h +7
-0+#ifdef CONFIG_PPC_64K_PAGES +void *ehca_alloc_fw_ctrlblock (void ); +void ehca_free_fw_ctrlblock (void *ptr); +#else +#define ehca_alloc_fw_ctrlblock () get_zeroed_page(GFP_KERNEL) +#define ehca_free_fw_ctrlblock (ptr) free_page((unsigned long)(ptr)) +#endif
Maybe you want to make sure that ehca_alloc_fw_ctrlblock() always returns a void pointer, so you can avoid all the casts in your code?
static inline void *ehca_alloc_fw_ctrlblock(void)
{
return (void *)get_zeroed_page(GFP_KERNEL);
}[email protected] wrote on 06.11.2006 15:58:39:
Quoted 1 line
Maybe you want to make sure that
ehca_alloc_fw_ctrlblock()always returns
a
Quoted 5 lines
void pointer, so you can avoid all the casts in your code? static inline void
*ehca_alloc_fw_ctrlblock(void){ return (void *)get_zeroed_page(GFP_KERNEL); }
Yes, good point. That helps to avoid different warnings between 4k and 64k page modes.
Thx
Nam