From patchwork Thu Jul 20 17:36:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 9855401 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A1C2460392 for ; Thu, 20 Jul 2017 17:36:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8209828826 for ; Thu, 20 Jul 2017 17:36:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7662328829; Thu, 20 Jul 2017 17:36:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D731628826 for ; Thu, 20 Jul 2017 17:36:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935282AbdGTRgO (ORCPT ); Thu, 20 Jul 2017 13:36:14 -0400 Received: from quartz.orcorp.ca ([184.70.90.242]:59948 "EHLO quartz.orcorp.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934775AbdGTRgO (ORCPT ); Thu, 20 Jul 2017 13:36:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=obsidianresearch.com; s=rsa1; h=In-Reply-To:Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To:From:Date; bh=8dnIi0gqKZ1Xp67YJq1ZAC1qCymti1Y9OhhwUkrVy6A=; b=qyHlVJ1hUgHsjjnaAvrdId+UFa8GlhAU2EejlqNx6MwhI7/FP8R8MJtIjF0cTYn5/Uay80c5/LhmPmtqPChQQx/M3scXhsRukMpwEK8lAo0wraY5DQ1hl0dIVKjwfGk8X+BmoVHjGRaNj+YHeD+ZpXxs/mSPC5OQF8FJ3RJ8IRU=; Received: from [10.0.0.156] (helo=jggl.edm.orcorp.ca) by quartz.orcorp.ca with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1dYFMy-0001E9-FI; Thu, 20 Jul 2017 11:36:12 -0600 Received: from jgg by jggl.edm.orcorp.ca with local (Exim 4.86_2) (envelope-from ) id 1dYFMy-0002zj-D9; Thu, 20 Jul 2017 11:36:12 -0600 Date: Thu, 20 Jul 2017 11:36:12 -0600 From: Jason Gunthorpe To: Bart Van Assche Cc: "linux-rdma@vger.kernel.org" , "leonro@mellanox.com" Subject: Re: [PATCH v2 rdma-core 4/8] mlx5: Avoid sparse complaints about !! Message-ID: <20170720173612.GA11767@obsidianresearch.com> References: <1500570064-11712-1-git-send-email-jgunthorpe@obsidianresearch.com> <1500570064-11712-5-git-send-email-jgunthorpe@obsidianresearch.com> <1500571411.3181.4.camel@wdc.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1500571411.3181.4.camel@wdc.com> User-Agent: Mutt/1.5.24 (2015-08-30) X-Broken-Reverse-DNS: no host name found for IP address 10.0.0.156 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Thu, Jul 20, 2017 at 05:23:32PM +0000, Bart Van Assche wrote: > Since patches 4 and 5 touch the same code: shouldn't these two patches > be squashed into a single patch? Oops, yes, that is a rebasing error on my part. Thanks for noticing Here is the corrected patch: From f4d0eb7dd6ebbdbfababd5cd42f7bbd8fb935978 Mon Sep 17 00:00:00 2001 From: Jason Gunthorpe Date: Fri, 7 Apr 2017 14:34:45 -0600 Subject: [PATCH] mlx5: Avoid sparse complaints about !! Sparse says: warning: dubious: !x & y Unclear why sparse thinks this is bad. Hoist this code into an inline and write the test as == instead of !!. Signed-off-by: Jason Gunthorpe --- providers/mlx5/cq.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/providers/mlx5/cq.c b/providers/mlx5/cq.c index 500116133c1f9e..a5167477db1a20 100644 --- a/providers/mlx5/cq.c +++ b/providers/mlx5/cq.c @@ -182,6 +182,15 @@ static inline int handle_responder_lazy(struct mlx5_cq *cq, struct mlx5_cqe64 *c return err; } +/* Returns IBV_WC_IP_CSUM_OK or 0 */ +static inline int get_csum_ok(struct mlx5_cqe64 *cqe) +{ + return (((cqe->hds_ip_ext & (MLX5_CQE_L4_OK | MLX5_CQE_L3_OK)) == + (MLX5_CQE_L4_OK | MLX5_CQE_L3_OK)) & + (get_cqe_l3_hdr_type(cqe) == MLX5_CQE_L3_HDR_TYPE_IPV4)) + << IBV_WC_IP_CSUM_OK_SHIFT; +} + static inline int handle_responder(struct ibv_wc *wc, struct mlx5_cqe64 *cqe, struct mlx5_resource *cur_rsc, struct mlx5_srq *srq) { @@ -206,11 +215,7 @@ static inline int handle_responder(struct ibv_wc *wc, struct mlx5_cqe64 *cqe, if (likely(cur_rsc->type == MLX5_RSC_TYPE_QP)) { wq = &qp->rq; if (qp->qp_cap_cache & MLX5_RX_CSUM_VALID) - wc->wc_flags |= (!!(cqe->hds_ip_ext & MLX5_CQE_L4_OK) & - !!(cqe->hds_ip_ext & MLX5_CQE_L3_OK) & - (get_cqe_l3_hdr_type(cqe) == - MLX5_CQE_L3_HDR_TYPE_IPV4)) << - IBV_WC_IP_CSUM_OK_SHIFT; + wc->wc_flags |= get_csum_ok(cqe); } else { wq = &(rsc_to_mrwq(cur_rsc)->rq); } @@ -1105,11 +1110,7 @@ static inline int mlx5_cq_read_wc_flags(struct ibv_cq_ex *ibcq) int wc_flags = 0; if (cq->flags & MLX5_CQ_FLAGS_RX_CSUM_VALID) - wc_flags = (!!(cq->cqe64->hds_ip_ext & MLX5_CQE_L4_OK) & - !!(cq->cqe64->hds_ip_ext & MLX5_CQE_L3_OK) & - (get_cqe_l3_hdr_type(cq->cqe64) == - MLX5_CQE_L3_HDR_TYPE_IPV4)) << - IBV_WC_IP_CSUM_OK_SHIFT; + wc_flags = get_csum_ok(cq->cqe64); switch (mlx5dv_get_cqe_opcode(cq->cqe64)) { case MLX5_CQE_RESP_WR_IMM: