IB/hfi1: Create common expected receive verbs/PSM code (9c1a99c3) · Commits · 戴 / test

drivers/infiniband/hw/hfi1/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@
		obj-$(CONFIG_INFINIBAND_HFI1) += hfi1.o

		hfi1-y := affinity.o chip.o device.o driver.o efivar.o \
		eprom.o file_ops.o firmware.o \
		eprom.o exp_rcv.o file_ops.o firmware.o \
		init.o intr.o mad.o mmu_rb.o pcie.o pio.o pio_copy.o platform.o \
		qp.o qsfp.o rc.o ruc.o sdma.o sysfs.o trace.o \
		uc.o ud.o user_exp_rcv.o user_pages.o user_sdma.o verbs.o \

drivers/infiniband/hw/hfi1/exp_rcv.c

0 → 100644

+118 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright(c) 2017 Intel Corporation.
		*
		* This file is provided under a dual BSD/GPLv2 license. When using or
		* redistributing this file, you may do so under either license.
		*
		* GPL LICENSE SUMMARY
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of version 2 of the GNU General Public License as
		* published by the Free Software Foundation.
		*
		* This program is distributed in the hope that it will be useful, but
		* WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
		* General Public License for more details.
		*
		* BSD LICENSE
		*
		* Redistribution and use in source and binary forms, with or without
		* modification, are permitted provided that the following conditions
		* are met:
		*
		* - Redistributions of source code must retain the above copyright
		* notice, this list of conditions and the following disclaimer.
		* - Redistributions in binary form must reproduce the above copyright
		* notice, this list of conditions and the following disclaimer in
		* the documentation and/or other materials provided with the
		* distribution.
		* - Neither the name of Intel Corporation nor the names of its
		* contributors may be used to endorse or promote products derived
		* from this software without specific prior written permission.
		*
		* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
		* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
		* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
		* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
		* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
		* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
		* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
		* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
		* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
		* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
		* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		*
		*/

		#include "exp_rcv.h"
		#include "trace.h"

		/**
		* exp_tid_group_init - initialize exp_tid_set
		* @set - the set
		*/
		void hfi1_exp_tid_group_init(struct exp_tid_set *set)
		{
		INIT_LIST_HEAD(&set->list);
		set->count = 0;
		}

		/**
		* alloc_ctxt_rcv_groups - initialize expected receive groups
		* @rcd - the context to add the groupings to
		*/
		int hfi1_alloc_ctxt_rcv_groups(struct hfi1_ctxtdata *rcd)
		{
		struct hfi1_devdata *dd = rcd->dd;
		u32 tidbase;
		struct tid_group *grp;
		int i;

		hfi1_exp_tid_group_init(&rcd->tid_group_list);
		hfi1_exp_tid_group_init(&rcd->tid_used_list);
		hfi1_exp_tid_group_init(&rcd->tid_full_list);

		tidbase = rcd->expected_base;
		for (i = 0; i < rcd->expected_count /
		dd->rcv_entries.group_size; i++) {
		grp = kzalloc(sizeof(*grp), GFP_KERNEL);
		if (!grp)
		goto bail;
		grp->size = dd->rcv_entries.group_size;
		grp->base = tidbase;
		tid_group_add_tail(grp, &rcd->tid_group_list);
		tidbase += dd->rcv_entries.group_size;
		}

		return 0;
		bail:
		hfi1_free_ctxt_rcv_groups(rcd);
		return -ENOMEM;
		}

		/**
		* free_ctxt_rcv_groups - free expected receive groups
		* @rcd - the context to free
		*
		* The routine dismantles the expect receive linked
		* list and clears any tids associated with the receive
		* context.
		*
		* This should only be called for kernel contexts and the
		* a base user context.
		*/
		void hfi1_free_ctxt_rcv_groups(struct hfi1_ctxtdata *rcd)
		{
		struct tid_group grp, gptr;

		WARN_ON(!EXP_TID_SET_EMPTY(rcd->tid_full_list));
		WARN_ON(!EXP_TID_SET_EMPTY(rcd->tid_used_list));

		list_for_each_entry_safe(grp, gptr, &rcd->tid_group_list.list, list) {
		tid_group_remove(grp, &rcd->tid_group_list);
		kfree(grp);
		}

		hfi1_clear_tids(rcd);
		}

drivers/infiniband/hw/hfi1/exp_rcv.h

0 → 100644

+187 −0

Original line number	Diff line number	Diff line
		#ifndef _HFI1_EXP_RCV_H
		#define _HFI1_EXP_RCV_H
		/*
		* Copyright(c) 2017 Intel Corporation.
		*
		* This file is provided under a dual BSD/GPLv2 license. When using or
		* redistributing this file, you may do so under either license.
		*
		* GPL LICENSE SUMMARY
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of version 2 of the GNU General Public License as
		* published by the Free Software Foundation.
		*
		* This program is distributed in the hope that it will be useful, but
		* WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
		* General Public License for more details.
		*
		* BSD LICENSE
		*
		* Redistribution and use in source and binary forms, with or without
		* modification, are permitted provided that the following conditions
		* are met:
		*
		* - Redistributions of source code must retain the above copyright
		* notice, this list of conditions and the following disclaimer.
		* - Redistributions in binary form must reproduce the above copyright
		* notice, this list of conditions and the following disclaimer in
		* the documentation and/or other materials provided with the
		* distribution.
		* - Neither the name of Intel Corporation nor the names of its
		* contributors may be used to endorse or promote products derived
		* from this software without specific prior written permission.
		*
		* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
		* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
		* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
		* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
		* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
		* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
		* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
		* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
		* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
		* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
		* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		*
		*/

		#include "hfi.h"

		#define EXP_TID_SET_EMPTY(set) (set.count == 0 && list_empty(&set.list))

		#define EXP_TID_TIDLEN_MASK 0x7FFULL
		#define EXP_TID_TIDLEN_SHIFT 0
		#define EXP_TID_TIDCTRL_MASK 0x3ULL
		#define EXP_TID_TIDCTRL_SHIFT 20
		#define EXP_TID_TIDIDX_MASK 0x3FFULL
		#define EXP_TID_TIDIDX_SHIFT 22
		#define EXP_TID_GET(tid, field) \
		(((tid) >> EXP_TID_TID##field##_SHIFT) & EXP_TID_TID##field##_MASK)

		#define EXP_TID_SET(field, value) \
		(((value) & EXP_TID_TID##field##_MASK) << \
		EXP_TID_TID##field##_SHIFT)
		#define EXP_TID_CLEAR(tid, field) ({ \
		(tid) &= ~(EXP_TID_TID##field##_MASK << \
		EXP_TID_TID##field##_SHIFT); \
		})
		#define EXP_TID_RESET(tid, field, value) do { \
		EXP_TID_CLEAR(tid, field); \
		(tid) \|= EXP_TID_SET(field, (value)); \
		} while (0)

		/*
		* Define fields in the KDETH header so we can update the header
		* template.
		*/
		#define KDETH_OFFSET_SHIFT 0
		#define KDETH_OFFSET_MASK 0x7fff
		#define KDETH_OM_SHIFT 15
		#define KDETH_OM_MASK 0x1
		#define KDETH_TID_SHIFT 16
		#define KDETH_TID_MASK 0x3ff
		#define KDETH_TIDCTRL_SHIFT 26
		#define KDETH_TIDCTRL_MASK 0x3
		#define KDETH_INTR_SHIFT 28
		#define KDETH_INTR_MASK 0x1
		#define KDETH_SH_SHIFT 29
		#define KDETH_SH_MASK 0x1
		#define KDETH_KVER_SHIFT 30
		#define KDETH_KVER_MASK 0x3
		#define KDETH_JKEY_SHIFT 0x0
		#define KDETH_JKEY_MASK 0xff
		#define KDETH_HCRC_UPPER_SHIFT 16
		#define KDETH_HCRC_UPPER_MASK 0xff
		#define KDETH_HCRC_LOWER_SHIFT 24
		#define KDETH_HCRC_LOWER_MASK 0xff

		#define KDETH_GET(val, field) \
		(((le32_to_cpu((val))) >> KDETH_##field##_SHIFT) & KDETH_##field##_MASK)
		#define KDETH_SET(dw, field, val) do { \
		u32 dwval = le32_to_cpu(dw); \
		dwval &= ~(KDETH_##field##_MASK << KDETH_##field##_SHIFT); \
		dwval \|= (((val) & KDETH_##field##_MASK) << \
		KDETH_##field##_SHIFT); \
		dw = cpu_to_le32(dwval); \
		} while (0)

		#define KDETH_RESET(dw, field, val) ({ dw = 0; KDETH_SET(dw, field, val); })

		/* KDETH OM multipliers and switch over point */
		#define KDETH_OM_SMALL 4
		#define KDETH_OM_SMALL_SHIFT 2
		#define KDETH_OM_LARGE 64
		#define KDETH_OM_LARGE_SHIFT 6
		#define KDETH_OM_MAX_SIZE (1 << ((KDETH_OM_LARGE / KDETH_OM_SMALL) + 1))

		struct tid_group {
		struct list_head list;
		u32 base;
		u8 size;
		u8 used;
		u8 map;
		};

		/*
		* Write an "empty" RcvArray entry.
		* This function exists so the TID registaration code can use it
		* to write to unused/unneeded entries and still take advantage
		* of the WC performance improvements. The HFI will ignore this
		* write to the RcvArray entry.
		*/
		static inline void rcv_array_wc_fill(struct hfi1_devdata *dd, u32 index)
		{
		/*
		* Doing the WC fill writes only makes sense if the device is
		* present and the RcvArray has been mapped as WC memory.
		*/
		if ((dd->flags & HFI1_PRESENT) && dd->rcvarray_wc)
		writeq(0, dd->rcvarray_wc + (index * 8));
		}

		static inline void tid_group_add_tail(struct tid_group *grp,
		struct exp_tid_set *set)
		{
		list_add_tail(&grp->list, &set->list);
		set->count++;
		}

		static inline void tid_group_remove(struct tid_group *grp,
		struct exp_tid_set *set)
		{
		list_del_init(&grp->list);
		set->count--;
		}

		static inline void tid_group_move(struct tid_group *group,
		struct exp_tid_set *s1,
		struct exp_tid_set *s2)
		{
		tid_group_remove(group, s1);
		tid_group_add_tail(group, s2);
		}

		static inline struct tid_group tid_group_pop(struct exp_tid_set set)
		{
		struct tid_group *grp =
		list_first_entry(&set->list, struct tid_group, list);
		list_del_init(&grp->list);
		set->count--;
		return grp;
		}

		static inline u32 rcventry2tidinfo(u32 rcventry)
		{
		u32 pair = rcventry & ~0x1;

		return EXP_TID_SET(IDX, pair >> 1) \|
		EXP_TID_SET(CTRL, 1 << (rcventry - pair));
		}

		int hfi1_alloc_ctxt_rcv_groups(struct hfi1_ctxtdata *rcd);
		void hfi1_free_ctxt_rcv_groups(struct hfi1_ctxtdata *rcd);
		void hfi1_exp_tid_group_init(struct exp_tid_set *set);

		#endif /* _HFI1_EXP_RCV_H */

drivers/infiniband/hw/hfi1/file_ops.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -804,7 +804,7 @@ static int hfi1_file_close(struct inode inode, struct file fp)

		dd->rcd[uctxt->ctxt] = NULL;

		hfi1_user_exp_rcv_grp_free(uctxt);
		hfi1_free_ctxt_rcv_groups(uctxt);
		hfi1_clear_ctxt_pkey(dd, uctxt);

		uctxt->rcvwait_to = 0;
		@@ -1260,7 +1260,7 @@ static int setup_base_ctxt(struct hfi1_filedata *fd)
		if (ret)
		goto setup_failed;

		ret = hfi1_user_exp_rcv_grp_init(fd);
		ret = hfi1_alloc_ctxt_rcv_groups(uctxt);
		if (ret)
		goto setup_failed;

drivers/infiniband/hw/hfi1/user_exp_rcv.c

+0 −121

Original line number	Diff line number	Diff line
		@@ -51,14 +51,6 @@
		#include "trace.h"
		#include "mmu_rb.h"

		struct tid_group {
		struct list_head list;
		u32 base;
		u8 size;
		u8 used;
		u8 map;
		};

		struct tid_rb_node {
		struct mmu_rb_node mmu;
		unsigned long phys;
		@@ -75,8 +67,6 @@ struct tid_pageset {
		u16 count;
		};

		#define EXP_TID_SET_EMPTY(set) (set.count == 0 && list_empty(&set.list))

		#define num_user_pages(vaddr, len) \
		(1 + (((((unsigned long)(vaddr) + \
		(unsigned long)(len) - 1) & PAGE_MASK) - \
		@@ -109,88 +99,6 @@ static struct mmu_rb_ops tid_rb_ops = {
		.invalidate = tid_rb_invalidate
		};

		static inline u32 rcventry2tidinfo(u32 rcventry)
		{
		u32 pair = rcventry & ~0x1;

		return EXP_TID_SET(IDX, pair >> 1) \|
		EXP_TID_SET(CTRL, 1 << (rcventry - pair));
		}

		static inline void exp_tid_group_init(struct exp_tid_set *set)
		{
		INIT_LIST_HEAD(&set->list);
		set->count = 0;
		}

		static inline void tid_group_remove(struct tid_group *grp,
		struct exp_tid_set *set)
		{
		list_del_init(&grp->list);
		set->count--;
		}

		static inline void tid_group_add_tail(struct tid_group *grp,
		struct exp_tid_set *set)
		{
		list_add_tail(&grp->list, &set->list);
		set->count++;
		}

		static inline struct tid_group tid_group_pop(struct exp_tid_set set)
		{
		struct tid_group *grp =
		list_first_entry(&set->list, struct tid_group, list);
		list_del_init(&grp->list);
		set->count--;
		return grp;
		}

		static inline void tid_group_move(struct tid_group *group,
		struct exp_tid_set *s1,
		struct exp_tid_set *s2)
		{
		tid_group_remove(group, s1);
		tid_group_add_tail(group, s2);
		}

		int hfi1_user_exp_rcv_grp_init(struct hfi1_filedata *fd)
		{
		struct hfi1_ctxtdata *uctxt = fd->uctxt;
		struct hfi1_devdata *dd = fd->dd;
		u32 tidbase;
		u32 i;
		struct tid_group grp, gptr;

		exp_tid_group_init(&uctxt->tid_group_list);
		exp_tid_group_init(&uctxt->tid_used_list);
		exp_tid_group_init(&uctxt->tid_full_list);

		tidbase = uctxt->expected_base;
		for (i = 0; i < uctxt->expected_count /
		dd->rcv_entries.group_size; i++) {
		grp = kzalloc(sizeof(*grp), GFP_KERNEL);
		if (!grp)
		goto grp_failed;

		grp->size = dd->rcv_entries.group_size;
		grp->base = tidbase;
		tid_group_add_tail(grp, &uctxt->tid_group_list);
		tidbase += dd->rcv_entries.group_size;
		}

		return 0;

		grp_failed:
		list_for_each_entry_safe(grp, gptr, &uctxt->tid_group_list.list,
		list) {
		list_del_init(&grp->list);
		kfree(grp);
		}

		return -ENOMEM;
		}

		/*
		* Initialize context and file private data needed for Expected
		* receive caching. This needs to be done after the context has
		@@ -266,18 +174,6 @@ int hfi1_user_exp_rcv_init(struct hfi1_filedata *fd)
		return ret;
		}

		void hfi1_user_exp_rcv_grp_free(struct hfi1_ctxtdata *uctxt)
		{
		struct tid_group grp, gptr;

		list_for_each_entry_safe(grp, gptr, &uctxt->tid_group_list.list,
		list) {
		list_del_init(&grp->list);
		kfree(grp);
		}
		hfi1_clear_tids(uctxt);
		}

		void hfi1_user_exp_rcv_free(struct hfi1_filedata *fd)
		{
		struct hfi1_ctxtdata *uctxt = fd->uctxt;
		@@ -302,23 +198,6 @@ void hfi1_user_exp_rcv_free(struct hfi1_filedata *fd)
		fd->entry_to_rb = NULL;
		}

		/*
		* Write an "empty" RcvArray entry.
		* This function exists so the TID registaration code can use it
		* to write to unused/unneeded entries and still take advantage
		* of the WC performance improvements. The HFI will ignore this
		* write to the RcvArray entry.
		*/
		static inline void rcv_array_wc_fill(struct hfi1_devdata *dd, u32 index)
		{
		/*
		* Doing the WC fill writes only makes sense if the device is
		* present and the RcvArray has been mapped as WC memory.
		*/
		if ((dd->flags & HFI1_PRESENT) && dd->rcvarray_wc)
		writeq(0, dd->rcvarray_wc + (index * 8));
		}

		/*
		* RcvArray entry allocation for Expected Receives is done by the
		* following algorithm:

Admin message