From patchwork Mon Oct 2 08:23:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kalderon X-Patchwork-Id: 820377 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=CAVIUMNETWORKS.onmicrosoft.com header.i=@CAVIUMNETWORKS.onmicrosoft.com header.b="hYbHFnMf"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y5Fby6sPBz9t4X for ; Mon, 2 Oct 2017 19:25:50 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751336AbdJBIZs (ORCPT ); Mon, 2 Oct 2017 04:25:48 -0400 Received: from mail-co1nam03on0068.outbound.protection.outlook.com ([104.47.40.68]:10800 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750962AbdJBIZo (ORCPT ); Mon, 2 Oct 2017 04:25:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=pKL0TGblK85Xz5dL51RNFqt8nbTT5arbekvip3aXetM=; b=hYbHFnMf7OLgvSdX920IdZdNYlyUGMiVo42DexLw4W5lw/MR6z1vo5p74V7ZRM1heYnQfYnpyaLd/M8k6yOXHuawcrGLKa4d9SLEJpOyYHI9VcbjNecv+WNq8/9AJWJoO7rPPnVnwa3QSlrrwI3JaUrnrVtnkE1hkCE/In+2ue4= Received: from CO2PR07CA0072.namprd07.prod.outlook.com (10.174.192.40) by BLUPR07MB482.namprd07.prod.outlook.com (10.141.203.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Mon, 2 Oct 2017 08:25:41 +0000 Received: from BL2FFO11OLC005.protection.gbl (2a01:111:f400:7c09::160) by CO2PR07CA0072.outlook.office365.com (2603:10b6:100::40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.11 via Frontend Transport; Mon, 2 Oct 2017 08:25:40 +0000 Authentication-Results: spf=none (sender IP is 50.232.66.26) smtp.mailfrom=cavium.com; vger.kernel.org; dkim=none (message not signed) header.d=none; vger.kernel.org; dmarc=none action=none header.from=cavium.com; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) Received: from CAEXCH02.caveonetworks.com (50.232.66.26) by BL2FFO11OLC005.mail.protection.outlook.com (10.173.160.91) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.56.11 via Frontend Transport; Mon, 2 Oct 2017 08:25:39 +0000 Received: from lb-tlvb-michal.il.qlogic.com.com (10.185.6.89) by CAEXCH02.caveonetworks.com (10.17.4.29) with Microsoft SMTP Server id 14.2.347.0; Mon, 2 Oct 2017 01:25:36 -0700 From: Michal Kalderon To: CC: , , , Michal Kalderon , "Ariel Elior" Subject: [PATCH net-next 11/12] qed: Add support for MPA header being split over two tcp packets Date: Mon, 2 Oct 2017 11:23:57 +0300 Message-ID: <1506932638-26268-12-git-send-email-Michal.Kalderon@cavium.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1506932638-26268-1-git-send-email-Michal.Kalderon@cavium.com> References: <1506932638-26268-1-git-send-email-Michal.Kalderon@cavium.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:50.232.66.26; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(346002)(376002)(2980300002)(428002)(199003)(189002)(356003)(106466001)(50226002)(101416001)(4326008)(478600001)(76176999)(50986999)(47776003)(105586002)(189998001)(36756003)(2351001)(5660300001)(305945005)(81156014)(50466002)(8936002)(104016004)(5003940100001)(69596002)(48376002)(81166006)(8676002)(72206003)(54906003)(2906002)(316002)(107886003)(16586007)(77096006)(2950100002)(6916009)(86362001)(6666003); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR07MB482; H:CAEXCH02.caveonetworks.com; FPR:; SPF:None; PTR:50-232-66-26-static.hfc.comcastbusiness.net; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11OLC005; 1:Qt6SPR6cWcylNScb43PsPfLIpPU8i+e5dgkLtO8sTFwy54qFyqyRur96znDjNLXBZ+B1znLXkUmP13ASvaEsidYoLbukBqhEccN/p7k+AUQj6bIv3RlF+nmda68hQqzP X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 621c1755-cb20-427f-c3f8-08d5096f2a6c X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:BLUPR07MB482; X-Microsoft-Exchange-Diagnostics: 1; BLUPR07MB482; 3:VBllTKP5vfVf5yNMxjr7FBIKBjCsKT/n+AkntwEZ1/qEch4/UPek/MwYLX/IM6OLLYiydibp98k1pUVMnEK4AYElyd6onesZJTD2GtTYdKGLUAglifv4sf0crWdc6yKRum2K7bLX9kSZYT/jL/65PP6RSCLUdMIK2IXpTKaorQhwVQrrrAlG5ZaZUMsvPLnrSi53hd0ZSNtC/RRTt+5qYi/owefKlAgWGC04erfUb26bmLpRo/qwAxSMN0pElM1vm0nT8fF6wM5zE1cxaLFo/CIuKjwhrVVmb8g6rx6R/VC7JIjckmowjmGh4DivdBQ+mA9AP2tragS6IM2dQpgzDg==; 25:8WmlhjuiY8gFsEboUK2tQBgCNaw2dYa/u6Y1sVm6pjGP3FCCpeWtmlgkY0yWVVE3KBmDxPvsP0EoXSPKrnOS9XprXzOoqsj9rUQeeB75VsHmd6gqGMQrGNTprSVTmqFvd61378MY9T+f40t2GeQ5kB1+KblHclYE4CPSnUR+KvtLiJVEdH/OWsskFE8FTc0BElIfkINUfyqGeJzcmm8yeD5+A8eeRQrT/wGzfQzo3t/fnE4DGs3lM/xWKzqCVHgAbXO2M3OxLFHyK+ZFgl0SDbJguu4AuoICxWcGFjs6NwKIwafPoOQpv0PA76t6cxsRSMDiT0JYL3LxQcOWbE4UJw==; 31:YtVYQq+wPruPNdE4v/o/9LqCaa9TTVe8yR9IfeDUfmaVswU+Gd47IPu/hiK0qn97+L/yseXFGwsJiBFFK06j5cc5bTxrPerxW3iBURmJvTwWdWQxzfm0QuzygOsTMow/eOjIY3uTGbu0voXPe8I7a5pOXO5Z/X/Qcxo3QeNwSlFvQe+hxL4WWBsvc+06hDwKvuV4l1Cd/avYZs5Ql0oObrSsdu7k5AnptJOxAtkuCNo= X-MS-TrafficTypeDiagnostic: BLUPR07MB482: X-Microsoft-Exchange-Diagnostics: 1; BLUPR07MB482; 20:wMCteaZg4v37ttQe4bLA0E3Y+EuMDyvf7BsfTjRm6Cd7WmidOcv9po0x7vE40jk3KEi8CL4tbtaNM/NIIvbXiL9Tmnq7AFL/ur9XitHzeAMG6hvTfNYXE+Cc1ZCyDJ4UCU6SRZy64SdIU9KKsWynHgEWAZO2srzzBpwfOIJ9VqB9lG7/Iyl+eCAViGTrMgqSrfD5maUpB6iRhnVCvrzl8yscoU8p3a/wh7tbNWUcy1vcsrVpMCVHYLMPTwrqqJqZjRxpnNejWXnUpIxRZkqA4IBEfvYgM/xsGnvjdw8G0oi2zDzlnkKrxZzX3i6V7o/NdYie8kGDj3aAZRlfF3zgP2MFqysIHy2/0REv5jH7pUF1XsmyV5JtZE8YFtI8ytFV5/2w5lgLH7gMyo7rxI4SrlHWlXJWmHbS7QGQuyXQNW0fqSUUoTOXyOFNB6kuY2wHiG/Wlp9lJCzAds3WLQlWRhOK6RN3nkoCgvf2r3we/GKcU6S+/NOXF5qVoT1q+NB3; 4:M/n4pbfc0a/uB2werMPERkpkCgciAV3uDmAbZ9EUoFcohWJkvOa7S9ETX8r5yKps0TkSDtK3zozu13tZ55NQt/n14h4XUeiEvCHrHICmK03j/ayxp3qMKXSqCa6CcD4OKWx2mzKqTnaF3OTWk0Xom/U+/oXq47+/P/wEJkBx2l1vfDfEFQjEN9NF4mGKd8mBosTGksh0O4KI0O6d5NVRDnLX/M+QSPMV/14UHjcYPvusSLdkjIX02LXLIOiux9IH X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3002001)(100000703101)(100105400095)(6041248)(20161123560025)(20161123558100)(20161123555025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BLUPR07MB482; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BLUPR07MB482; X-Forefront-PRVS: 0448A97BF2 X-Microsoft-Exchange-Diagnostics: 1; BLUPR07MB482; 23:Yyv9xs6NeAPwbtjPZ7C/ycnZ++M65LIcDgS5D5Sx0KanzsnUFu8D3q1UAh0UzK3k6q+lVK41I3IVY6HZgcpFzEbhlJPzSYTr+YjZmAIShq4Cr7/NBUaf0x7asHNU6ZKbvGxb7qZQ0omytFZVhffWLUX+WM9EnJvCPk23xjHcMk5oQYRBZ8jGfiQIPUtEGHfRXhKyFvpq3CK9hD4Rq8EFKcigpBwHmRriVZ4walAyZN8GM20e51CEilGyvQ7+0orHsoFTMYavtwJn9y11hr04qxyCJzoHBIarg+h0D4e0FGmN8h5D3/iYWvxJ0I5sipY0vHgMEq+JqxOo2S9Ln+cROZAxi9tSHhC280ZwJdpAICNAqBkUl6ssM+o4Ntd95qIuSbWWwiZztnYeXjoKDVI3uzIL1pca5JPg1ofUWeeuOImvbDdgRHWbrPsi49Py6oNY0k8cmqKMEV7gAs0SqZD6W86YP0Ue/GeqB2kmwy5+UH2j99NATqotSqj3n9+X0V+0AKA1swnFwYkyfVO/5Yw/1w+5poFE+RnyiX2PXDhPH8bBEJcgo9ebvf+OEFB6Hk6VHM7jaZzhlM2CBV8+VjFxPpmbc4pXEvQiGF8L+AjpcwPVtSUDEwwmpiHP8UOqKbKTjm+Q42dp6w3P0XHRHrsXTHvOE7JvO5ooRzqM5K9jsAWb8Vl4AJvZ0EqAHAGHfAtBnOCqnw/QYb4dGNo/RbisnFU9DAGrmDiUh0AjEn6Glsl+7wC7h2wj0nn5eG0trgtx4JbC6Hst6Oj9qWXS+pnorILhurDo/GxLwNMFoSXfE56jatMv+676+zUQTVK9YU/GfW/+YVxtIr9svfD8CcJeipntJnB3+oF54rWmwP7YQbk3VYafW2uCARc5RLFeRxQdMQZmn0E76qEpySYT1PFITm1aZFIpfW6wabtOM8o/JNGQHhfy+f3LXcACM8OMOJ6TCm0E2ccWLYAl3QUQl+eJVOQefM6seWOT5LoRPs/nxUptSgI8MDw9YDe3nKWHi6aw X-Microsoft-Exchange-Diagnostics: 1; BLUPR07MB482; 6:b9ugeSJdILl0fFvg5Q+MVVX4msclaEnsCBWssuZVIj/195mvYH3Ao95rqtZZTHEtH9rkhpuPnfXrFJUCMrQBNsY6KOOuagSE/EXuxWR9dewso1dp9smpQDItJcRBniBHe1CX1idPCAZkdq9+eLLSTG50VCmZEbFXB/3qabZSxoveA38CO1tey2nb6M1aTMuHoMiKw/jtWDh49I7sOoOaX5VtlPkiAiDpLqfDwTNGnC5Lg8lx7yHIx3qTIGYMqomgEluL4buvMTNZCSsS9xHMywKeMZ2FwM5T9DnAOPxvToYhEKJS0ZwsZvBGsFY9ctOcJLUvE0hizl9sAvG87SOtZg==; 5:TC4CFGXG6WfAvKpdY6m9srla706SBO3g2geuBJfbg58apdJWS6TOhP8WR/ZQXjsTRMTvCW96EtRfQmIQ7WEltUCcr94gloE2Eroy/Cm0TIHLRz+XajMZoVwvUR+kP620ZyOxIIHA8fexUFSQEnFfKg==; 24:tV2ierpQYR50PdNliOI6XReyg9DXJ2CayaJSe5A01cjCSSwC2eFTl4+Phj5xOleesqiR4BwB/HGilikzHDxWiXuYX/87HMdXIM/kEXqlz3g=; 7:qi3uA4ikLtS3WBpYIg7J6RsUDwJ8wPgTGW1VQP7dhSauVh534z6pAc2JNj53pQf+YmM6pnHJspetV2aCK4xFRf1k4Ui9jDm65afy2O3uKQpoA5DhUrlo+sQCp/0e8omOH4CMkmuZSh4oy7WbRy9+9gZBUm+Ziv8MdTdihnLxff7bGjKGv//3m+rElMISK5PV/ZYX7m8TfbYpQSrtdfYmjGvDJFUXr3JrxcfemZS26Z0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Oct 2017 08:25:39.7152 (UTC) X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=711e4ccf-2e9b-4bcf-a551-4094005b6194; Ip=[50.232.66.26]; Helo=[CAEXCH02.caveonetworks.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR07MB482 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org There is a special case where an MPA header is split over to tcp packets, in this case we need to wait for the next packet to get the fpdu length. We use the incomplete_bytes to mark this fpdu as a "special" one which requires updating the length with the next packet Signed-off-by: Michal Kalderon Signed-off-by: Ariel Elior --- drivers/net/ethernet/qlogic/qed/qed_iwarp.c | 36 ++++++++++++++++++++++++++++- drivers/net/ethernet/qlogic/qed/qed_iwarp.h | 6 +++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/qlogic/qed/qed_iwarp.c b/drivers/net/ethernet/qlogic/qed/qed_iwarp.c index 8b17369..2994942 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_iwarp.c +++ b/drivers/net/ethernet/qlogic/qed/qed_iwarp.c @@ -1742,6 +1742,7 @@ enum qed_iwarp_mpa_pkt_type { QED_IWARP_MPA_PKT_UNALIGNED }; +#define QED_IWARP_INVALID_FPDU_LENGTH 0xffff #define QED_IWARP_MPA_FPDU_LENGTH_SIZE (2) #define QED_IWARP_MPA_CRC32_DIGEST_SIZE (4) @@ -1774,6 +1775,15 @@ enum qed_iwarp_mpa_pkt_type { goto out; } + /* special case of one byte remaining... + * lower byte will be read next packet + */ + if (tcp_payload_len == 1) { + fpdu->fpdu_length = *mpa_data << BITS_PER_BYTE; + pkt_type = QED_IWARP_MPA_PKT_PARTIAL; + goto out; + } + mpa_len = ntohs(*((u16 *)(mpa_data))); fpdu->fpdu_length = QED_IWARP_FPDU_LEN_WITH_PAD(mpa_len); @@ -1802,7 +1812,9 @@ enum qed_iwarp_mpa_pkt_type { fpdu->mpa_frag = buf->data_phys_addr + pkt_data->first_mpa_offset; fpdu->mpa_frag_virt = (u8 *)(buf->data) + pkt_data->first_mpa_offset; - if (tcp_payload_size < fpdu->fpdu_length) + if (tcp_payload_size == 1) + fpdu->incomplete_bytes = QED_IWARP_INVALID_FPDU_LENGTH; + else if (tcp_payload_size < fpdu->fpdu_length) fpdu->incomplete_bytes = fpdu->fpdu_length - tcp_payload_size; else fpdu->incomplete_bytes = 0; /* complete fpdu */ @@ -1810,6 +1822,27 @@ enum qed_iwarp_mpa_pkt_type { fpdu->mpa_frag_len = fpdu->fpdu_length - fpdu->incomplete_bytes; } +static void +qed_iwarp_update_fpdu_length(struct qed_hwfn *p_hwfn, + struct qed_iwarp_fpdu *fpdu, u8 *mpa_data) +{ + u16 mpa_len; + + /* Update incomplete packets if needed */ + if (fpdu->incomplete_bytes == QED_IWARP_INVALID_FPDU_LENGTH) { + /* Missing lower byte is now available */ + mpa_len = fpdu->fpdu_length | *mpa_data; + fpdu->fpdu_length = QED_IWARP_FPDU_LEN_WITH_PAD(mpa_len); + fpdu->mpa_frag_len = fpdu->fpdu_length; + /* one byte of hdr */ + fpdu->incomplete_bytes = fpdu->fpdu_length - 1; + DP_VERBOSE(p_hwfn, + QED_MSG_RDMA, + "MPA_ALIGN: Partial header mpa_len=%x fpdu_length=%x incomplete_bytes=%x\n", + mpa_len, fpdu->fpdu_length, fpdu->incomplete_bytes); + } +} + static int qed_iwarp_send_fpdu(struct qed_hwfn *p_hwfn, struct qed_iwarp_fpdu *fpdu, @@ -1960,6 +1993,7 @@ enum qed_iwarp_mpa_pkt_type { curr_pkt->first_mpa_offset += fpdu->fpdu_length; break; case QED_IWARP_MPA_PKT_UNALIGNED: + qed_iwarp_update_fpdu_length(p_hwfn, fpdu, mpa_data); rc = qed_iwarp_send_fpdu(p_hwfn, fpdu, curr_pkt, buf, mpa_buf->tcp_payload_len, pkt_type); diff --git a/drivers/net/ethernet/qlogic/qed/qed_iwarp.h b/drivers/net/ethernet/qlogic/qed/qed_iwarp.h index 58db51a..c58793a 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_iwarp.h +++ b/drivers/net/ethernet/qlogic/qed/qed_iwarp.h @@ -69,6 +69,12 @@ struct qed_iwarp_ll2_mpa_buf { u8 placement_offset; }; +/* In some cases a fpdu will arrive with only one byte of the header, in this + * case the fpdu_length will be partial (contain only higher byte and + * incomplete bytes will contain the invalid value + */ +#define QED_IWARP_INVALID_INCOMPLETE_BYTES 0xffff + struct qed_iwarp_fpdu { struct qed_iwarp_ll2_buff *mpa_buf; void *mpa_frag_virt;