From patchwork Mon Feb 24 16:47:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Taihsiang Ho (tai271828)" X-Patchwork-Id: 1243312 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com 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 ozlabs.org (Postfix) with ESMTPS id 48R7K25SvHz9sRh; Tue, 25 Feb 2020 03:47:33 +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 1j6GtF-0006SM-GT; Mon, 24 Feb 2020 16:47:29 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1j6GtE-0006S3-9W for kernel-team@lists.ubuntu.com; Mon, 24 Feb 2020 16:47:28 +0000 Received: from mail-wm1-f69.google.com ([209.85.128.69]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1j6GtE-0002A7-1S for kernel-team@lists.ubuntu.com; Mon, 24 Feb 2020 16:47:28 +0000 Received: by mail-wm1-f69.google.com with SMTP id u11so4wmb.4 for ; Mon, 24 Feb 2020 08:47:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=D+7BIw1V2+I1VzrZAFdjGip7Y5bben3xYHRdLxJbe5Q=; b=s3kE2aKEZPXrPxLkFdN8tl7c+yzp776oxkIVHMmZYWn2X+omZPngF5cq9o6EM+VrH2 wH6hNxTQW8xghU7Z0lh7cliVJi/s/wbRN0V7KlDBScCj2h/YSpaFfAho2/rtDokXEMWH VEnmMRmbv0KLExtYg4Z+AxrOhUU7lDBwYU/qafzzuwlzcSZsAI1jkHQ38AqnST+R1N4a 8dWTBXqFe4UIVvGtUXBmEVq2H1SrvvxnqaTYPnTDWBEWIBcm0hq0ILEOhsXs1hq41wb3 92plouROIMpdcMSCtAp4muxjy+4/4cV7ZPcqDLdoWpJwS6hggff3EVxVTiKJc+oiVWic IFZQ== X-Gm-Message-State: APjAAAWIh5AkTCNALdu1PdXTzniB9UB03QI0K//MMe4eijDB0TfALDDZ IPtsNya8huWsmIKyHFO1cqjZ5VRcY8tQuTvDvXxK6QKsMsJw1Q/VOuxHF8p232avhFKIfODBMvq droE4Bz9OiXq8WV8u6vN+3jq+6E4JEj7Edf2Nqsa21Q== X-Received: by 2002:adf:ab4e:: with SMTP id r14mr15578225wrc.350.1582562847505; Mon, 24 Feb 2020 08:47:27 -0800 (PST) X-Google-Smtp-Source: APXvYqz3/67+f8MUHCwaARmdFRq3axCr4+30GwP5kxfP/Ad5xskXYTQCTgwwAVyZanVZGsYMshJK9A== X-Received: by 2002:adf:ab4e:: with SMTP id r14mr15578209wrc.350.1582562847294; Mon, 24 Feb 2020 08:47:27 -0800 (PST) Received: from localhost.localdomain (2001-1c02-0b0d-8800-a872-a146-03c3-6812.cable.dynamic.v6.ziggo.nl. [2001:1c02:b0d:8800:a872:a146:3c3:6812]) by smtp.gmail.com with ESMTPSA id z14sm2594316wru.31.2020.02.24.08.47.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2020 08:47:26 -0800 (PST) From: "Taihsiang Ho (tai271828)" To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/1][SRU][B] net: hns3: pad the short frame before sending to the hardware Date: Tue, 25 Feb 2020 00:47:24 +0800 Message-Id: <20200224164724.26030-2-taihsiang.ho@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200224164724.26030-1-taihsiang.ho@canonical.com> References: <20200224164724.26030-1-taihsiang.ho@canonical.com> 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: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Yunsheng Lin BugLink: http://bugs.launchpad.net/bugs/1860320 The hardware can not handle short frames below or equal to 32 bytes according to the hardware user manual, and it will trigger a RAS error when the frame's length is below 33 bytes. This patch pads the SKB when skb->len is below 33 bytes before sending it to hardware. Fixes: 76ad4f0ee747 ("net: hns3: Add support of HNS3 Ethernet Driver for hip08 SoC") Signed-off-by: Yunsheng Lin Signed-off-by: Huazhong Tan Signed-off-by: David S. Miller (backported from commit 36c67349a1a1c88b9cf11d7ca7762ababdb38867) Signed-off-by: Taihsiang Ho (tai271828) Acked-by: Kleber Sacilotto de Souza --- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c index a6b834c6d323..f5f24c065a8b 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c @@ -32,6 +32,8 @@ static const char hns3_driver_string[] = static const char hns3_copyright[] = "Copyright (c) 2017 Huawei Corporation."; static struct hnae3_client client; +#define HNS3_MIN_TX_LEN 33U + /* hns3_pci_tbl - PCI Device ID Table * * Last entry must be all 0s @@ -1224,6 +1226,10 @@ netdev_tx_t hns3_nic_net_xmit(struct sk_buff *skb, struct net_device *netdev) int ret; int i; + /* Hardware can only handle short frames above 32 bytes */ + if (skb_put_padto(skb, HNS3_MIN_TX_LEN)) + return NETDEV_TX_OK; + /* Prefetch the data used later */ prefetch(skb->data);