From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 097B813B2A2; Tue, 27 Feb 2024 13:39:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709041163; cv=none; b=PstXSwZFi4unHEzt+vyDsZUAxOBVhtvIeEHwaPuTYD87ke5gPT+vaOfWYcKbjIR4QWO91fXgoiPbFI7RwE+SnWZm+d41E7OMeFfBZpD6ruPCVFR2Lt9N63pJEOr7jVcgiLMSReZ05rxifB8Ab8X9J8i+mci4adEhIRoLFaW3SZ0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709041163; c=relaxed/simple; bh=cqPKplUFaAYDmNf4DSib52HT+arog18Ed5NpwT213xM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DSoXLATfO6PHXLferc++LXBkmfyLFcTbYsTXssVL2szruy0mLHY59beKzah/uaxHSrh9JfZ9Sk47ov0QuK0vzEDXS3fk8tOPWdXoFc+tPi41q7pbnht2EfUP3nqiNunjBmDHtB9c+FILcH1m6ez+xpGd5w6gjTKzejECSyfKKyk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=c0JVC3Qr; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="c0JVC3Qr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 313FDC433C7; Tue, 27 Feb 2024 13:39:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1709041162; bh=cqPKplUFaAYDmNf4DSib52HT+arog18Ed5NpwT213xM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c0JVC3QrCwypfFoeyTe6zraLButxIquuMlbnBPqYme6EL0ZjUb7EA2Gl0dBJtAFwJ 0rZrZYzSAsndyJFz+8aDw4tT80bVZ+Di2HdDrO4UAypWPJXGxwKtTHB+MAIU/kmdcw dhGVzHbQYwlJgHRr6GQPfvgvZl9wTux4Qzy9SfOM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, LiHonggang , Bart Van Assche , Leon Romanovsky , Sasha Levin Subject: [PATCH 6.7 241/334] RDMA/srpt: Support specifying the srpt_service_guid parameter Date: Tue, 27 Feb 2024 14:21:39 +0100 Message-ID: <20240227131638.653413286@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240227131630.636392135@linuxfoundation.org> References: <20240227131630.636392135@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.7-stable review patch. If anyone has any objections, please let me know. ------------------ From: Bart Van Assche [ Upstream commit fdfa083549de5d50ebf7f6811f33757781e838c0 ] Make loading ib_srpt with this parameter set work. The current behavior is that setting that parameter while loading the ib_srpt kernel module triggers the following kernel crash: BUG: kernel NULL pointer dereference, address: 0000000000000000 Call Trace: parse_one+0x18c/0x1d0 parse_args+0xe1/0x230 load_module+0x8de/0xa60 init_module_from_file+0x8b/0xd0 idempotent_init_module+0x181/0x240 __x64_sys_finit_module+0x5a/0xb0 do_syscall_64+0x5f/0xe0 entry_SYSCALL_64_after_hwframe+0x6e/0x76 Cc: LiHonggang Reported-by: LiHonggang Fixes: a42d985bd5b2 ("ib_srpt: Initial SRP Target merge for v3.3-rc1") Signed-off-by: Bart Van Assche Link: https://lore.kernel.org/r/20240205004207.17031-1-bvanassche@acm.org Signed-off-by: Leon Romanovsky Signed-off-by: Sasha Levin --- drivers/infiniband/ulp/srpt/ib_srpt.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c index 58f70cfec45a7..d2dce6ce30a94 100644 --- a/drivers/infiniband/ulp/srpt/ib_srpt.c +++ b/drivers/infiniband/ulp/srpt/ib_srpt.c @@ -79,12 +79,16 @@ module_param(srpt_srq_size, int, 0444); MODULE_PARM_DESC(srpt_srq_size, "Shared receive queue (SRQ) size."); +static int srpt_set_u64_x(const char *buffer, const struct kernel_param *kp) +{ + return kstrtou64(buffer, 16, (u64 *)kp->arg); +} static int srpt_get_u64_x(char *buffer, const struct kernel_param *kp) { return sprintf(buffer, "0x%016llx\n", *(u64 *)kp->arg); } -module_param_call(srpt_service_guid, NULL, srpt_get_u64_x, &srpt_service_guid, - 0444); +module_param_call(srpt_service_guid, srpt_set_u64_x, srpt_get_u64_x, + &srpt_service_guid, 0444); MODULE_PARM_DESC(srpt_service_guid, "Using this value for ioc_guid, id_ext, and cm_listen_id instead of using the node_guid of the first HCA."); -- 2.43.0