From patchwork Tue Jun 29 20:28:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bob Pearson X-Patchwork-Id: 12350805 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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 5D47BC11F68 for ; Tue, 29 Jun 2021 20:28:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 38AD461DA6 for ; Tue, 29 Jun 2021 20:28:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235420AbhF2Uau (ORCPT ); Tue, 29 Jun 2021 16:30:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41552 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235419AbhF2Uat (ORCPT ); Tue, 29 Jun 2021 16:30:49 -0400 Received: from mail-oo1-xc29.google.com (mail-oo1-xc29.google.com [IPv6:2607:f8b0:4864:20::c29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5827DC061766 for ; Tue, 29 Jun 2021 13:28:20 -0700 (PDT) Received: by mail-oo1-xc29.google.com with SMTP id s10-20020a4aeaca0000b029024c2acf6eecso4779558ooh.9 for ; Tue, 29 Jun 2021 13:28:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mQfPuel+Ld/km4ObsU2/PoY2G39293TVnNTnnhYw84s=; b=iN7u9hGX4oUrC/Aw8TGJQNXdoMtCnkmY9CKnIWeXi+SeFB1fP0/2r0pSiXIdtuYcIz 75R7GYgAWXlOFv3lQ7hspoRAB0UTd/DwrYKusYc2xyjbSogpnHVzyWWR6dm5XTWW3Aoq HKdndK9dzf6w4DBO3VmChvEVcCjbJIVXJa27cCl7THGJAadZiJNZ5pgo9wcOSkf0Q5NH QIjLxEVLw6IPiT7FcPuuzQHKOBCGl6sEKorx2H9R4auuHIj2mF65T1pY6GKmqJ8ln3MX SO5gF65tcBceC8jsWzHbvH0AsOw8aff7SE7/BtEUdX7KcozY1eS0l0Nf9EncAhOkmFnW 8kYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mQfPuel+Ld/km4ObsU2/PoY2G39293TVnNTnnhYw84s=; b=dPrTa2JDG5hTm+EPDQt+ndbx+RjbN3RGi6aDHP3Upqn1dzzQ8eXcobjvjdt8xEcwOh Dnm2Wpt3o51TXQhWMgJSwf9y8zixl56/FI8EVrctZX53hlCSzIIJJvzWBCfPKGmXu3wQ 9m0r9TyH3s7AL5IAr1/6orpUVjDARt0BOIA9VY5cX8K+Fw8sDjcZf+x2VtrNoNOdbFuw r4Hb6mH0Fxeu9Kgy71R2VZqJlhggjIwex3b6Jm/PluQtCNyspgHlT++ZbJcnSy4qy8Sh doNR7RNrggc4sjPowfC08kRxwKBZcPa58VgcoYcNF4yRWwizJwv4TL1/PbSKBH07/sfM MbTQ== X-Gm-Message-State: AOAM531nscAFBIw3XxJfxk5yXpFVGqa9C39h/K0z+N13hQyrql0nRrO+ JGZXjQ+ak56+rZCxTB/Jotc= X-Google-Smtp-Source: ABdhPJw4vIZE1ufE5UIul3kBQy0L3mWnAoDH5bbOjgRv57hYhQnlRASNd/m/2ahbDsuH31rJujPS/g== X-Received: by 2002:a4a:c3c5:: with SMTP id e5mr5555853ooq.82.1624998499556; Tue, 29 Jun 2021 13:28:19 -0700 (PDT) Received: from localhost (2603-8081-140c-1a00-2b92-ca20-93cc-e890.res6.spectrum.com. [2603:8081:140c:1a00:2b92:ca20:93cc:e890]) by smtp.gmail.com with ESMTPSA id f25sm4325481oto.26.2021.06.29.13.28.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Jun 2021 13:28:19 -0700 (PDT) From: Bob Pearson To: jgg@nvidia.com, zyjzyj2000@gmail.com, linux-rdma@vger.kernel.org Cc: Bob Pearson Subject: [PATCH for-next resending 1/5] RDMA/rxe: Move ICRC checking to a subroutine Date: Tue, 29 Jun 2021 15:28:01 -0500 Message-Id: <20210629202804.29403-2-rpearsonhpe@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210629202804.29403-1-rpearsonhpe@gmail.com> References: <20210629202804.29403-1-rpearsonhpe@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org Move the code in rxe_recv that checks the ICRC on incoming packets to a subroutine rxe_check_icrc() and move it to rxe_icrc.c. Signed-off-by: Bob Pearson --- drivers/infiniband/sw/rxe/rxe_icrc.c | 38 ++++++++++++++++++++++++++++ drivers/infiniband/sw/rxe/rxe_loc.h | 2 ++ drivers/infiniband/sw/rxe/rxe_recv.c | 23 ++--------------- 3 files changed, 42 insertions(+), 21 deletions(-) diff --git a/drivers/infiniband/sw/rxe/rxe_icrc.c b/drivers/infiniband/sw/rxe/rxe_icrc.c index 66b2aad54bb7..5193dfa94a75 100644 --- a/drivers/infiniband/sw/rxe/rxe_icrc.c +++ b/drivers/infiniband/sw/rxe/rxe_icrc.c @@ -67,3 +67,41 @@ u32 rxe_icrc_hdr(struct rxe_pkt_info *pkt, struct sk_buff *skb) rxe_opcode[pkt->opcode].length - RXE_BTH_BYTES); return crc; } + +/** + * rxe_icrc_check - Compute ICRC for a packet and compare to the ICRC + * delivered in the packet. + * @skb: The packet buffer with packet info in skb->cb[] (receive path) + * + * Returns 0 on success or an error on failure + */ +int rxe_icrc_check(struct sk_buff *skb) +{ + struct rxe_pkt_info *pkt = SKB_TO_PKT(skb); + __be32 *icrcp; + u32 pkt_icrc; + u32 icrc; + + icrcp = (__be32 *)(pkt->hdr + pkt->paylen - RXE_ICRC_SIZE); + pkt_icrc = be32_to_cpu(*icrcp); + + icrc = rxe_icrc_hdr(pkt, skb); + icrc = rxe_crc32(pkt->rxe, icrc, (u8 *)payload_addr(pkt), + payload_size(pkt) + bth_pad(pkt)); + icrc = (__force u32)cpu_to_be32(~icrc); + + if (unlikely(icrc != pkt_icrc)) { + if (skb->protocol == htons(ETH_P_IPV6)) + pr_warn_ratelimited("bad ICRC from %pI6c\n", + &ipv6_hdr(skb)->saddr); + else if (skb->protocol == htons(ETH_P_IP)) + pr_warn_ratelimited("bad ICRC from %pI4\n", + &ip_hdr(skb)->saddr); + else + pr_warn_ratelimited("bad ICRC from unknown\n"); + + return -EINVAL; + } + + return 0; +} diff --git a/drivers/infiniband/sw/rxe/rxe_loc.h b/drivers/infiniband/sw/rxe/rxe_loc.h index 1ddb20855dee..6689e51647db 100644 --- a/drivers/infiniband/sw/rxe/rxe_loc.h +++ b/drivers/infiniband/sw/rxe/rxe_loc.h @@ -193,7 +193,9 @@ int rxe_completer(void *arg); int rxe_requester(void *arg); int rxe_responder(void *arg); +/* rxe_icrc.c */ u32 rxe_icrc_hdr(struct rxe_pkt_info *pkt, struct sk_buff *skb); +int rxe_icrc_check(struct sk_buff *skb); void rxe_resp_queue_pkt(struct rxe_qp *qp, struct sk_buff *skb); diff --git a/drivers/infiniband/sw/rxe/rxe_recv.c b/drivers/infiniband/sw/rxe/rxe_recv.c index 7a49e27da23a..8582b3163e2c 100644 --- a/drivers/infiniband/sw/rxe/rxe_recv.c +++ b/drivers/infiniband/sw/rxe/rxe_recv.c @@ -361,8 +361,6 @@ void rxe_rcv(struct sk_buff *skb) int err; struct rxe_pkt_info *pkt = SKB_TO_PKT(skb); struct rxe_dev *rxe = pkt->rxe; - __be32 *icrcp; - u32 calc_icrc, pack_icrc; if (unlikely(skb->len < RXE_BTH_BYTES)) goto drop; @@ -384,26 +382,9 @@ void rxe_rcv(struct sk_buff *skb) if (unlikely(err)) goto drop; - /* Verify ICRC */ - icrcp = (__be32 *)(pkt->hdr + pkt->paylen - RXE_ICRC_SIZE); - pack_icrc = be32_to_cpu(*icrcp); - - calc_icrc = rxe_icrc_hdr(pkt, skb); - calc_icrc = rxe_crc32(rxe, calc_icrc, (u8 *)payload_addr(pkt), - payload_size(pkt) + bth_pad(pkt)); - calc_icrc = (__force u32)cpu_to_be32(~calc_icrc); - if (unlikely(calc_icrc != pack_icrc)) { - if (skb->protocol == htons(ETH_P_IPV6)) - pr_warn_ratelimited("bad ICRC from %pI6c\n", - &ipv6_hdr(skb)->saddr); - else if (skb->protocol == htons(ETH_P_IP)) - pr_warn_ratelimited("bad ICRC from %pI4\n", - &ip_hdr(skb)->saddr); - else - pr_warn_ratelimited("bad ICRC from unknown\n"); - + err = rxe_icrc_check(skb); + if (unlikely(err)) goto drop; - } rxe_counter_inc(rxe, RXE_CNT_RCVD_PKTS);