Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp3117176ybi; Thu, 18 Jul 2019 21:21:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqysxVrPXpnlofuwCSm6//f6cr4dUk28mNhvehESluq8vrnxhtv/Kl7SdZvARjVQ4/0puBig X-Received: by 2002:a65:49cc:: with SMTP id t12mr48312479pgs.83.1563510097186; Thu, 18 Jul 2019 21:21:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563510097; cv=none; d=google.com; s=arc-20160816; b=S9A8b2VYW+PeegRCO0ksxQlvGk8ebij73vxwdTpErqxVyMgu8MUx+ujoCJU7nlscY4 G+B9jTOo6qWQuuj1g7dSHqUNFk+6JVAPFgB8OSw0DpvdITT+5zIm/4HDxc1U5umbDEqX ZGaDLsNIcn8KmSV2wLiCCWphqZgkDndZK6b94Rz26j5ydJKf7kJKP/iAcTcgeHsrSBVu OhUZIS7Ubddf8vRGB5CdeHCeGdS4KFfQYY2+xNBGl4oPGNY/DMyMMLmpNxktskzfJAr0 oBCGh4nOr6dwAzHCCyXbwX92Mns8Caz4EH6zLHNRR8ojHkES5VuKQ5AR7CbiFNlc8kK+ mP6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=FxfUY6UnDIcgkNrBBmS4VWZE385OIGiNOR+o0uT0RN4=; b=WSVIBAKlEnMx2yrBssl3zZZOwigztj81dTnEeqF50Gl2o6+r+JYqM+4YdchSeurt9C 1EwWe+MszRIsGhPd6XoqIdPsfbehlq32mhYHzvEzpB4QfWR1UdBpXxR3HARh1rzlSfrh DijyryRlWISG+kByOYP6BeUp90k/amRulVshx9C/D7AtUmZeOfI9McCRujJ0RXFQQK5z /yBn8nO7q/2ersBLbmuX62Q4pfs+zbokv+RZZ8OuOdC8TdNYnFNLohulrk0QVlTtVSp8 2+KEmPoEOFFZEymPA25O4i7NS/+y5mdkDvKJDOi9m5faeTZaEM+jMGjPFM0TvsbNJrUf FGvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="1/Xs2A1E"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m4si141745pgv.57.2019.07.18.21.21.21; Thu, 18 Jul 2019 21:21:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="1/Xs2A1E"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389874AbfGSEUa (ORCPT + 99 others); Fri, 19 Jul 2019 00:20:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:48080 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388895AbfGSEMi (ORCPT ); Fri, 19 Jul 2019 00:12:38 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0F497218D9; Fri, 19 Jul 2019 04:12:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563509557; bh=qE3Q9x5YdgO1hyOffk/qTRAgEMWyl3U7/3nVRaeVeHg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1/Xs2A1EQjgiA78RH2SFQSOh4hrCHuBeSY8eTHydjh1911KGzZJgxfGmkxxwZjlQk pZ3qpM1qH2JhterFE9WfXHH6IU6CeNs7GAkjVVnAysCExByFKyiiIKUI0UTHhiRVu5 peIcr8Nb/bPjWOmWBK/5ex57FbRlOYtzGYmteI+8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Konstantin Taranov , Jason Gunthorpe , Sasha Levin , linux-rdma@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 46/60] RDMA/rxe: Fill in wc byte_len with IB_WC_RECV_RDMA_WITH_IMM Date: Fri, 19 Jul 2019 00:10:55 -0400 Message-Id: <20190719041109.18262-46-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190719041109.18262-1-sashal@kernel.org> References: <20190719041109.18262-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Konstantin Taranov [ Upstream commit bdce1290493caa3f8119f24b5dacc3fb7ca27389 ] Calculate the correct byte_len on the receiving side when a work completion is generated with IB_WC_RECV_RDMA_WITH_IMM opcode. According to the IBA byte_len must indicate the number of written bytes, whereas it was always equal to zero for the IB_WC_RECV_RDMA_WITH_IMM opcode, even though data was transferred. Fixes: 8700e3e7c485 ("Soft RoCE driver") Signed-off-by: Konstantin Taranov Signed-off-by: Jason Gunthorpe Signed-off-by: Sasha Levin --- drivers/infiniband/sw/rxe/rxe_resp.c | 5 ++++- drivers/infiniband/sw/rxe/rxe_verbs.h | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/infiniband/sw/rxe/rxe_resp.c b/drivers/infiniband/sw/rxe/rxe_resp.c index 74328561bee2..9207682b7a2e 100644 --- a/drivers/infiniband/sw/rxe/rxe_resp.c +++ b/drivers/infiniband/sw/rxe/rxe_resp.c @@ -435,6 +435,7 @@ static enum resp_states check_rkey(struct rxe_qp *qp, qp->resp.va = reth_va(pkt); qp->resp.rkey = reth_rkey(pkt); qp->resp.resid = reth_len(pkt); + qp->resp.length = reth_len(pkt); } access = (pkt->mask & RXE_READ_MASK) ? IB_ACCESS_REMOTE_READ : IB_ACCESS_REMOTE_WRITE; @@ -860,7 +861,9 @@ static enum resp_states do_complete(struct rxe_qp *qp, pkt->mask & RXE_WRITE_MASK) ? IB_WC_RECV_RDMA_WITH_IMM : IB_WC_RECV; wc->vendor_err = 0; - wc->byte_len = wqe->dma.length - wqe->dma.resid; + wc->byte_len = (pkt->mask & RXE_IMMDT_MASK && + pkt->mask & RXE_WRITE_MASK) ? + qp->resp.length : wqe->dma.length - wqe->dma.resid; /* fields after byte_len are different between kernel and user * space diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.h b/drivers/infiniband/sw/rxe/rxe_verbs.h index 59f6a24db064..b2b76a316eba 100644 --- a/drivers/infiniband/sw/rxe/rxe_verbs.h +++ b/drivers/infiniband/sw/rxe/rxe_verbs.h @@ -214,6 +214,7 @@ struct rxe_resp_info { struct rxe_mem *mr; u32 resid; u32 rkey; + u32 length; u64 atomic_orig; /* SRQ only */ -- 2.20.1