From patchwork Tue Feb 8 13:55:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 1589844 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=tbr0SSnT; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JtPgB1sZ5z9sFs for ; Wed, 9 Feb 2022 00:56:04 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1nHQyF-0005sY-G3; Tue, 08 Feb 2022 13:55:51 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nHQyC-0005qx-Rn for kernel-team@lists.ubuntu.com; Tue, 08 Feb 2022 13:55:48 +0000 Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 9882F3F324 for ; Tue, 8 Feb 2022 13:55:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1644328548; bh=lecNx0f8x3fGKW8twDRJqDA585u5I/YqroBqHx1zaAA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=tbr0SSnTEi3rRdHT2yz60IgmzbmFk/gMEVt7vlYCDae1Gdu64Yvd9AX7DIQiQvS0U naJ/kkilrYynwMnus/cgbYEyz0ktTpd0YL5eQD6yiCEVBaimLLPZJDSimsMJgiifRK Rs3o5YGZzA7GlwV1phjSlUEfYgEgTGCJlsjS/8Evz26JYV2ez3cO5rhp5LGAe5u2Yp C7/jdGaEYN8n0wPgVQze7AeaBzN94k9iy71ioZpe5V0CFq7fQ0QSDb2jR+U2VbaxYX aHhykegVOh3GHHSEBaUpH1vTpCF/jz23lgWhiS916oBm2brL1l6MlJP/421UxZQ3Aw VbqgZcLweYBCg== Received: by mail-pf1-f197.google.com with SMTP id i16-20020aa78d90000000b004be3e88d746so9826716pfr.13 for ; Tue, 08 Feb 2022 05:55:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lecNx0f8x3fGKW8twDRJqDA585u5I/YqroBqHx1zaAA=; b=10pBghdgCretanXAot9911rD7s/yJrsfHTDZF5+mAIewpMSrhx6F9kfBrsvYtMMb7t EOo+2fIwgUhk6hCjHXpgKQhrfhJ39UjwCr2DerNiiOKAF2cvJyMZ/JTtV11HyOWcEVTM +lARDFJxawU53DQFjpe+0N/2Fn2QLi9oOUZ1hkBJNFk7nFLTX/xyyE+xrU1dJOCkiWMF 3lLujcuTo4GZ3CscvcBYf3w2xinVwHlDhA4DqgXOguTbkHqkxzUOiUakfQaRONy7Mgo9 qJJWyo/IC1SG2MJU0+8bNv9OBaweytcRZ8qbKj95rL+MDdRyJelxfDt0w5USggR4OSXE bCyA== X-Gm-Message-State: AOAM532X8bub+DRuOBs11ezNnJga2EOtGSKvXBwiUwT2m1ntglupevrm bWkSmvG0PSpmmP+/21BmlJEwHk7NuR4mDppGT5j/RYUpICHEZ72wNH8ySsGyPtj/B5EtknJiDdY k9aIyq6FlcSwwGsvMExkk8b4AczKqXJb8/AZ1+T5Rsw== X-Received: by 2002:a63:8b41:: with SMTP id j62mr3539492pge.385.1644328546735; Tue, 08 Feb 2022 05:55:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJyzsIH0vaMP1W1CYKz9UO5AGtouAveyexU6QEdA3MVMTswqCVN369W8JxkOFSG3RCUi0GhuLw== X-Received: by 2002:a63:8b41:: with SMTP id j62mr3539480pge.385.1644328546456; Tue, 08 Feb 2022 05:55:46 -0800 (PST) Received: from localhost.localdomain ([69.163.84.166]) by smtp.gmail.com with ESMTPSA id d8sm17390334pfv.64.2022.02.08.05.55.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Feb 2022 05:55:46 -0800 (PST) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/2] net: mana: Add handling of CQE_RX_TRUNCATED Date: Tue, 8 Feb 2022 06:55:37 -0700 Message-Id: <20220208135538.15447-2-tim.gardner@canonical.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220208135538.15447-1-tim.gardner@canonical.com> References: <20220208135538.15447-1-tim.gardner@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Haiyang Zhang The proper way to drop this kind of CQE is advancing rxq tail without indicating the packet to the upper network layer. Signed-off-by: Haiyang Zhang Reviewed-by: Dexuan Cui Signed-off-by: David S. Miller (cherry picked from commit e4b7621982d29f26ff4d39af389e5e675a4ffed4 linux-next next-20220208) Signed-off-by: Tim Gardner --- drivers/net/ethernet/microsoft/mana/mana_en.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c index 987e11c02f727..5203f8824231a 100644 --- a/drivers/net/ethernet/microsoft/mana/mana_en.c +++ b/drivers/net/ethernet/microsoft/mana/mana_en.c @@ -991,8 +991,10 @@ static void mana_process_rx_cqe(struct mana_rxq *rxq, struct mana_cq *cq, break; case CQE_RX_TRUNCATED: - netdev_err(ndev, "Dropped a truncated packet\n"); - return; + ++ndev->stats.rx_dropped; + rxbuf_oob = &rxq->rx_oobs[rxq->buf_index]; + netdev_warn_once(ndev, "Dropped a truncated packet\n"); + goto drop; case CQE_RX_COALESCED_4: netdev_err(ndev, "RX coalescing is unsupported\n"); @@ -1054,6 +1056,7 @@ static void mana_process_rx_cqe(struct mana_rxq *rxq, struct mana_cq *cq, mana_rx_skb(old_buf, oob, rxq); +drop: mana_move_wq_tail(rxq->gdma_rq, rxbuf_oob->wqe_inf.wqe_size_in_bu); mana_post_pkt_rxq(rxq); From patchwork Tue Feb 8 13:55:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 1589843 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=JPJTxY2Q; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JtPgB1lVnz9sFn for ; Wed, 9 Feb 2022 00:56:05 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1nHQyG-0005tQ-Pi; Tue, 08 Feb 2022 13:55:52 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nHQyE-0005rX-4J for kernel-team@lists.ubuntu.com; Tue, 08 Feb 2022 13:55:50 +0000 Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id BE76D3FE41 for ; Tue, 8 Feb 2022 13:55:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1644328549; bh=XMGjG6HZ7i467Ae7/Tvs/FtdQW1ucrcpynZhetf1EGw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JPJTxY2QQ0b9kdpm/h8RIN8Xs+AN3e6QxcF18eB+uNbSUBqZhoKQE+cUR4JLjv4OQ zDa/BhtpKkhebqf2h7BTsDRiuzgOfG2+TMtSUxnf/yFhygmu+ra+kWA7K46deCpJ0w 5tj5Qew1gLNklz5JpBbjLjL2NFsAxL0KiYdIP4fh6e2BM1i/3ZBqrCwH0EcQZACN+3 2XpGXjkjmzD5Z/9JUccp9j5MPRZytdXUipebacwDy1xYY0d+d4+Pgdu75xa29WywfN 1au15YAUJHd1y1is99JP0rWjF8ylaIrhN7z1o65MGec6O5sA+EIeoQSFwfPPHkQcqS 26/riqWtggxCA== Received: by mail-pj1-f71.google.com with SMTP id a15-20020a17090ad80f00b001b8a1e1da50so2241185pjv.6 for ; Tue, 08 Feb 2022 05:55:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XMGjG6HZ7i467Ae7/Tvs/FtdQW1ucrcpynZhetf1EGw=; b=kt8toq1CsiWd1XKSumFXaiw5HFoBbFTF2damwP5WiwbesH7MtnJfkYoBdvGuJE9x3r Z4dnSIQwg3PD48DJ1pfWDSFj4/CM412vnGAu6jxG/MOnqAjS7NskEoyViKUCM4B+s5uQ McKbHGZoheUAdntSyyQJMBbDVWXB16b4Uyz43u3eNd7iqtPqbHqMxHyvgj+Yu76CaEnt vt9vCYIgcedOYMwf6XpXf5CHYOWrB2g4On42f7yDFFfwZRoEoi46MIxnwPiRaFZvzD3y Nfi5B2SyRU/JhjjvRJp7YMeB72C6Y0X5kOy2a12H9SWAWgX5Mt3MOi4L6RfozWYSEVir 1rXQ== X-Gm-Message-State: AOAM531DvyIx5/xp9x6yfHqqoVMVDaDpgEYCXuCae/uFIDc3Yfdmy808 aVrciHPaM49qtKDslgWl/jDS0mYuF6vxZ7f2FusXWHcpF8Jf1WQE9Zo6zAuQO8vm1cTl9U5rxDU EwGe89CMttqPkr5CPG4GviGaT/AmAgawvTq9iTNEagQ== X-Received: by 2002:a63:475e:: with SMTP id w30mr3612905pgk.175.1644328547863; Tue, 08 Feb 2022 05:55:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJz3PSGiiEa2012kgvwgDhi02MxE59MeTrgmNIIJhLMNoQ/vmdMB9PI7taX4RhfUjR2XiVNrTg== X-Received: by 2002:a63:475e:: with SMTP id w30mr3612890pgk.175.1644328547611; Tue, 08 Feb 2022 05:55:47 -0800 (PST) Received: from localhost.localdomain ([69.163.84.166]) by smtp.gmail.com with ESMTPSA id d8sm17390334pfv.64.2022.02.08.05.55.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Feb 2022 05:55:46 -0800 (PST) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/2] net: mana: Remove unnecessary check of cqe_type in mana_process_rx_cqe() Date: Tue, 8 Feb 2022 06:55:38 -0700 Message-Id: <20220208135538.15447-3-tim.gardner@canonical.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220208135538.15447-1-tim.gardner@canonical.com> References: <20220208135538.15447-1-tim.gardner@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Haiyang Zhang The switch statement already ensures cqe_type == CQE_RX_OKAY at that point. Signed-off-by: Haiyang Zhang Reviewed-by: Dexuan Cui Signed-off-by: David S. Miller (cherry picked from commit 68f831355052706e1f8498653f6c4d36643c0db8 linux-next next-20220208) Signed-off-by: Tim Gardner --- drivers/net/ethernet/microsoft/mana/mana_en.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c index 5203f8824231a..591c052b5d8ed 100644 --- a/drivers/net/ethernet/microsoft/mana/mana_en.c +++ b/drivers/net/ethernet/microsoft/mana/mana_en.c @@ -1010,9 +1010,6 @@ static void mana_process_rx_cqe(struct mana_rxq *rxq, struct mana_cq *cq, return; } - if (oob->cqe_hdr.cqe_type != CQE_RX_OKAY) - return; - pktlen = oob->ppi[0].pkt_len; if (pktlen == 0) {