From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751957AbcJCFUl convert rfc822-to-8bit (ORCPT ); Mon, 3 Oct 2016 01:20:41 -0400 Received: from mga06.intel.com ([134.134.136.31]:6300 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750890AbcJCFUk (ORCPT ); Mon, 3 Oct 2016 01:20:40 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,288,1473145200"; d="scan'208";a="15545229" From: "Dilger, Andreas" To: James Simmons CC: Greg Kroah-Hartman , "devel@driverdev.osuosl.org" , "Drokin, Oleg" , Linux Kernel Mailing List , Lustre Development List Subject: Re: [lustre-devel] [PATCH] staging: lustre: ko2iblbd: handle ib_dereg_mr removal Thread-Topic: [lustre-devel] [PATCH] staging: lustre: ko2iblbd: handle ib_dereg_mr removal Thread-Index: AQHSHR0CU41s/mkYOU6yXJW4+L0I+KCWpuKA Date: Mon, 3 Oct 2016 05:20:38 +0000 Message-ID: <811D0FBE-A65A-4810-BD82-F6284254676F@intel.com> References: <1475461351-21495-1-git-send-email-jsimmons@infradead.org> In-Reply-To: <1475461351-21495-1-git-send-email-jsimmons@infradead.org> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.252.206.19] Content-Type: text/plain; charset="us-ascii" Content-ID: <230E0D633CFC5B429E6DF08C4668A4C4@intel.com> Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Oct 2, 2016, at 20:22, James Simmons wrote: > > In the rdma-next tree to be merged for 4.9-rc1 removes > the IB core function ib_get_dma_mr. This patch migrates > us way from this former function. > > Signed-off-by: James Simmons > --- > .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 19 ++++++++++++------- > .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 5 +++++ > 2 files changed, 17 insertions(+), 7 deletions(-) > > diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c > index c7a5d49..4010591 100644 > --- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c > +++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c > @@ -1316,7 +1316,7 @@ static void kiblnd_destroy_fmr_pool(struct kib_fmr_pool *fpo) > list_for_each_entry_safe(frd, tmp, &fpo->fast_reg.fpo_pool_list, > frd_list) { > list_del(&frd->frd_list); > - ib_dereg_mr(frd->frd_mr); > + kib_dereg_mr(fpo->fpo_hdev, frd->frd_mr); > LIBCFS_FREE(frd, sizeof(*frd)); > i++; > } > @@ -1422,14 +1422,14 @@ static int kiblnd_alloc_freg_pool(struct kib_fmr_poolset *fps, struct kib_fmr_po > > out_middle: > if (frd->frd_mr) > - ib_dereg_mr(frd->frd_mr); > + kib_dereg_mr(fpo->fpo_hdev, frd->frd_mr); > LIBCFS_FREE(frd, sizeof(*frd)); > > out: > list_for_each_entry_safe(frd, tmp, &fpo->fast_reg.fpo_pool_list, > frd_list) { > list_del(&frd->frd_list); > - ib_dereg_mr(frd->frd_mr); > + kib_dereg_mr(fpo->fpo_hdev, frd->frd_mr); > LIBCFS_FREE(frd, sizeof(*frd)); > } > > @@ -2288,8 +2288,8 @@ static void kiblnd_hdev_cleanup_mrs(struct kib_hca_dev *hdev) > if (!hdev->ibh_mrs) > return; > > - ib_dereg_mr(hdev->ibh_mrs); > - > + kib_dereg_mr(hdev, hdev->ibh_mrs); > + hdev->ibh_pd->device->dereg_mr(hdev->ibh_mrs); This should only call one of kib_dereg_mr() or hdev->...->dereg_mr() ? > hdev->ibh_mrs = NULL; > } > > @@ -2316,13 +2316,18 @@ static int kiblnd_hdev_setup_mrs(struct kib_hca_dev *hdev) > if (rc) > return rc; > > - mr = ib_get_dma_mr(hdev->ibh_pd, acflags); > + mr = hdev->ibh_pd->device->get_dma_mr(hdev->ibh_pd, acflags); Should we make a similar wrapper function kib_get_dma_mr()? Cheers, Andreas > if (IS_ERR(mr)) { > - CERROR("Failed ib_get_dma_mr : %ld\n", PTR_ERR(mr)); > + CERROR("Failed device get_dma_mr : %ld\n", PTR_ERR(mr)); > kiblnd_hdev_cleanup_mrs(hdev); > return PTR_ERR(mr); > } > > + mr->device = hdev->ibh_pd->device; > + mr->pd = hdev->ibh_pd; > + mr->uobject = NULL; > + mr->need_inval = false; > + > hdev->ibh_mrs = mr; > > return 0; > diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h > index 1457697..f8b49c5 100644 > --- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h > +++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h > @@ -178,6 +178,11 @@ struct kib_hca_dev { > atomic_t ibh_ref; /* refcount */ > }; > > +static inline void kib_dereg_mr(struct kib_hca_dev *hdev, struct ib_mr *mr) > +{ > + hdev->ibh_pd->device->dereg_mr(mr); > +} > + > /** # of seconds to keep pool alive */ > #define IBLND_POOL_DEADLINE 300 > /** # of seconds to retry if allocation failed */ > -- > 1.7.1 > > _______________________________________________ > lustre-devel mailing list > lustre-devel@lists.lustre.org > http://lists.lustre.org/listinfo.cgi/lustre-devel-lustre.org