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 X-Spam-Level: X-Spam-Status: No, score=-10.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1749AC43387 for ; Fri, 11 Jan 2019 14:34:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D320D218B0 for ; Fri, 11 Jan 2019 14:34:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547217258; bh=+ELslH/ty6WpziABfi7YX7D2YdyCwi22xyApWWz8wDI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=iWiBxcZYnQg9fB/Z/Rz0j3sjNzNAiF4IOQsvINYY0MjO8uJs0GPDz32dywSpDQJUK DVNQ0ZmRqNLCmE8e5Lzz5FMyBWCVrLo2ueAV1KVgo+7wvAc1/bDBVn6p//hK/LIgZF /BOqtnrx2+17YnnQY8Kba6wU9Vpk5j/ecvOsr1F8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389873AbfAKOeR (ORCPT ); Fri, 11 Jan 2019 09:34:17 -0500 Received: from mail.kernel.org ([198.145.29.99]:54466 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389849AbfAKOeL (ORCPT ); Fri, 11 Jan 2019 09:34:11 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CE84C2063F; Fri, 11 Jan 2019 14:34:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547217251; bh=+ELslH/ty6WpziABfi7YX7D2YdyCwi22xyApWWz8wDI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jpm7Wh3LMB2IrqmSddMxOisK0LdUvjYSG5w3tAj8osU1FJtZb3YLBtGMYjUGFTjwG RM91c/0OezK9n2D2sz+gGijsLBz+hR6Z0/RoWyIRDFZmgAq6j+Wb8Gjm9Fbty2XGA7 FepQZ7i2ouWEZcyvmu+nelSXUOwqwv5d/cuWZwDc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Walker Benjamin , Sagi Grimberg , Zhu Yanjun , Doug Ledford Subject: [PATCH 4.14 097/105] rxe: fix error completion wr_id and qp_num Date: Fri, 11 Jan 2019 15:15:08 +0100 Message-Id: <20190111131111.020885444@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190111131102.899065735@linuxfoundation.org> References: <20190111131102.899065735@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sagi Grimberg commit e48d8ed9c6193502d849b35767fd18e20bbd7ba2 upstream. Error completions must still contain a valid wr_id and qp_num such that the consumer can rely on. Correctly fill these fields in receive error completions. Reported-by: Walker Benjamin Cc: stable@vger.kernel.org Signed-off-by: Sagi Grimberg Reviewed-by: Zhu Yanjun Tested-by: Zhu Yanjun Signed-off-by: Doug Ledford Signed-off-by: Greg Kroah-Hartman --- drivers/infiniband/sw/rxe/rxe_resp.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) --- a/drivers/infiniband/sw/rxe/rxe_resp.c +++ b/drivers/infiniband/sw/rxe/rxe_resp.c @@ -845,11 +845,16 @@ static enum resp_states do_complete(stru memset(&cqe, 0, sizeof(cqe)); - wc->wr_id = wqe->wr_id; - wc->status = qp->resp.status; - wc->qp = &qp->ibqp; + if (qp->rcq->is_user) { + uwc->status = qp->resp.status; + uwc->qp_num = qp->ibqp.qp_num; + uwc->wr_id = wqe->wr_id; + } else { + wc->status = qp->resp.status; + wc->qp = &qp->ibqp; + wc->wr_id = wqe->wr_id; + } - /* fields after status are not required for errors */ if (wc->status == IB_WC_SUCCESS) { wc->opcode = (pkt->mask & RXE_IMMDT_MASK && pkt->mask & RXE_WRITE_MASK) ?