Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ce6bf22 authored by Sebastian Sanchez's avatar Sebastian Sanchez Committed by Greg Kroah-Hartman
Browse files

staging/rdma/hfi1: Change num_rcv_contexts to num_user_contexts and its meaning 



num_rcv_contexts sets the number of user contexts, both receive and send.
Renaming it to num_user_contexts makes sense to reflect its true meaning.
When num_rcv_contexts is 0, the default behavior is the number of CPU
cores instead of 0 contexts. This commit changes the variable
num_rcv_contexts to num_user_contexts, and it also makes any negative
value for this variable default to the number of CPU cores, so if
num_user_contexts is set >= 0, the value will number of contexts.

Reviewed-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarSebastian Sanchez <sebastian.sanchez@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 07859def

drivers/staging/rdma/hfi1/chip.c

+3 −6
Original line number Diff line number Diff line
@@ -12426,7 +12426,6 @@ static int set_up_interrupts(struct hfi1_devdata *dd) 
static int set_up_context_variables(struct hfi1_devdata *dd)

{

	int num_kernel_contexts;

	int num_user_contexts;

	int total_contexts;

	int ret;

	unsigned ngroups;
@@ -12463,12 +12462,10 @@ static int set_up_context_variables(struct hfi1_devdata *dd) 
	}

	/*

	 * User contexts: (to be fixed later)

	 *	- set to num_rcv_contexts if non-zero

	 *	- default to 1 user context per CPU

	 *	- default to 1 user context per CPU if num_user_contexts is

	 *	  negative

	 */

	if (num_rcv_contexts)

		num_user_contexts = num_rcv_contexts;

	else

	if (num_user_contexts < 0)

		num_user_contexts = num_online_cpus();



	total_contexts = num_kernel_contexts + num_user_contexts;

drivers/staging/rdma/hfi1/hfi.h

+1 −1
Original line number Diff line number Diff line
@@ -1665,7 +1665,7 @@ void update_sge(struct hfi1_sge_state *ss, u32 length); 
extern unsigned int hfi1_max_mtu;

extern unsigned int hfi1_cu;

extern unsigned int user_credit_return_threshold;

extern uint num_rcv_contexts;

extern int num_user_contexts;

extern unsigned n_krcvqs;

extern u8 krcvqs[];

extern int krcvqsset;

drivers/staging/rdma/hfi1/init.c

+3 −3
Original line number Diff line number Diff line
@@ -82,10 +82,10 @@ 
 * Number of user receive contexts we are configured to use (to allow for more

 * pio buffers per ctxt, etc.)  Zero means use one user context per CPU.

 */

uint num_rcv_contexts;

module_param_named(num_rcv_contexts, num_rcv_contexts, uint, S_IRUGO);

int num_user_contexts = -1;

module_param_named(num_user_contexts, num_user_contexts, uint, S_IRUGO);

MODULE_PARM_DESC(

	num_rcv_contexts, "Set max number of user receive contexts to use");

	num_user_contexts, "Set max number of user contexts to use");



u8 krcvqs[RXE_NUM_DATA_VL];

int krcvqsset;