From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DDE3AC76196 for ; Tue, 4 Apr 2023 00:13:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230511AbjDDANg (ORCPT ); Mon, 3 Apr 2023 20:13:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40976 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230501AbjDDANd (ORCPT ); Mon, 3 Apr 2023 20:13:33 -0400 Received: from out-57.mta0.migadu.com (out-57.mta0.migadu.com [91.218.175.57]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 24E80AB for ; Mon, 3 Apr 2023 17:13:31 -0700 (PDT) Message-ID: <8ddeafc2-bc5d-e84a-0abd-9b48ab68e68e@linux.dev> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1680567208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YQQ++PmjIebgaQWnJGOAxs8KzI+PU6D7AydCyE2QKWc=; b=QRmW6RKqznGNLZwDdQBr0jpTeRlbYDauw7hxuMAv+goisqeK66J2upfM5HHv6b5fW3v9Yo sv9T7M/+huiaO6/TOxvCqlp73anvgAjhAQ6GpAiqXt8w3UM/q50XU4MLLg8kLsXNVhIpQ8 EYejJvqm5oOifJjggJ4B6ksxRF4EUJQ= Date: Tue, 4 Apr 2023 08:13:22 +0800 MIME-Version: 1.0 Subject: Re: [PATCH 1/1] RDMA/rxe: Fix the error "trying to register non-static key in rxe_cleanup_task" To: Leon Romanovsky , Zhu Yanjun Cc: zyjzyj2000@gmail.com, jgg@ziepe.ca, linux-rdma@vger.kernel.org, syzbot+cfcc1a3c85be15a40cba@syzkaller.appspotmail.com References: <095b1562-0c5e-4390-adf3-59ec0ed3e97e@linux.dev> <20230401024417.3334889-1-yanjun.zhu@intel.com> <20230403181026.GB4514@unreal> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Zhu Yanjun In-Reply-To: <20230403181026.GB4514@unreal> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org 在 2023/4/4 2:10, Leon Romanovsky 写道: > On Sat, Apr 01, 2023 at 10:44:17AM +0800, Zhu Yanjun wrote: >> From: Zhu Yanjun >> >> In the function rxe_create_qp(), rxe_qp_from_init() is called to >> initialize qp, internally things like rxe_init_task are not setup until >> rxe_qp_init_req(). >> >> If an error occures before this point then the unwind will call >> rxe_cleanup() and eventually to rxe_qp_do_cleanup()/rxe_cleanup_task() >> which will oops when trying to access the uninitialized spinlock. >> >> If rxe_init_task is not executed, rxe_cleanup_task will not be called. >> >> Reported-by: syzbot+cfcc1a3c85be15a40cba@syzkaller.appspotmail.com >> Link: https://syzkaller.appspot.com/bug?id=fd85757b74b3eb59f904138486f755f71e090df8 >> >> Fixes: 8700e3e7c485 ("Soft RoCE driver") >> Fixes: 2d4b21e0a291 ("IB/rxe: Prevent from completer to operate on non valid QP") >> Signed-off-by: Zhu Yanjun >> --- >> drivers/infiniband/sw/rxe/rxe_qp.c | 15 ++++++++++++--- >> 1 file changed, 12 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/infiniband/sw/rxe/rxe_qp.c b/drivers/infiniband/sw/rxe/rxe_qp.c >> index ab72db68b58f..7856c02c1b46 100644 >> --- a/drivers/infiniband/sw/rxe/rxe_qp.c >> +++ b/drivers/infiniband/sw/rxe/rxe_qp.c >> @@ -176,6 +176,10 @@ static void rxe_qp_init_misc(struct rxe_dev *rxe, struct rxe_qp *qp, >> spin_lock_init(&qp->rq.producer_lock); >> spin_lock_init(&qp->rq.consumer_lock); >> >> + memset(&qp->req.task, 0, sizeof(struct rxe_task)); >> + memset(&qp->comp.task, 0, sizeof(struct rxe_task)); >> + memset(&qp->resp.task, 0, sizeof(struct rxe_task)); > IMHO QP is already zeroed here. Sure. Exactly. Here I just confirm that req.task, comp.task and resp.task are zeroed explicitly. If you think it had better remove these memset functions, I will follow your advice. Please let me know your advice. > Please don't send patches as reply-to. Got it. I will follow your advice. Thanks, Zhu Yanjun > > Thanks > >> + >> atomic_set(&qp->ssn, 0); >> atomic_set(&qp->skb_out, 0); >> } >> @@ -773,15 +777,20 @@ static void rxe_qp_do_cleanup(struct work_struct *work) >> >> qp->valid = 0; >> qp->qp_timeout_jiffies = 0; >> - rxe_cleanup_task(&qp->resp.task); >> + >> + if (qp->resp.task.func) >> + rxe_cleanup_task(&qp->resp.task); >> >> if (qp_type(qp) == IB_QPT_RC) { >> del_timer_sync(&qp->retrans_timer); >> del_timer_sync(&qp->rnr_nak_timer); >> } >> >> - rxe_cleanup_task(&qp->req.task); >> - rxe_cleanup_task(&qp->comp.task); >> + if (qp->req.task.func) >> + rxe_cleanup_task(&qp->req.task); >> + >> + if (qp->comp.task.func) >> + rxe_cleanup_task(&qp->comp.task); >> >> /* flush out any receive wr's or pending requests */ >> if (qp->req.task.func) >> -- >> 2.27.0 >>