From patchwork Fri Feb 26 10:03:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 12106387 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.7 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,URIBL_BLOCKED,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 E113DC433DB for ; Fri, 26 Feb 2021 10:09:08 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 444D964EFA for ; Fri, 26 Feb 2021 10:09:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 444D964EFA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:35764 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFa3X-0001bH-0B for qemu-devel@archiver.kernel.org; Fri, 26 Feb 2021 05:09:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40546) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFZy1-0004Tm-SF for qemu-devel@nongnu.org; Fri, 26 Feb 2021 05:03:26 -0500 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]:40704) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lFZxy-0003BG-HO for qemu-devel@nongnu.org; Fri, 26 Feb 2021 05:03:25 -0500 Received: by mail-ej1-x62d.google.com with SMTP id u20so13824003ejb.7 for ; Fri, 26 Feb 2021 02:03:18 -0800 (PST) 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; bh=fKWkZpnZlOvCHwv8KGNYUKjSBi5KyPkqc2rbkP5sR8g=; b=r6Haf+yDxXW+1+DL5guoOT69saBAsvowJ+++0fgG4BdwRQAuliI+mF4AGad4BWnBIO nku5kqBP9rJX2qeJqpUNQjUua3MZZsozIBmEyQKJnwphm68AJk3Nd7m1Bgldufhomuqa ysW5RUfjmEZUwjiE55RCp3Y2kz+9OoKulPHTxHfazmCJZh+5aikPEqT+FJPDt84rk/yy zGPe8ivRuA9/RUegvGjRAt+KcKBWOs0QCVYM00toob34sVagPLQQ+B0yk3adaUQSirkw Jv1W7+1/Spugx3BJ4QhV4lP1rsG7cvPjNPo9hiQ5PJ5KpKPLwOqBJREMGOE9Hsd6EvuZ CEIA== 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; bh=fKWkZpnZlOvCHwv8KGNYUKjSBi5KyPkqc2rbkP5sR8g=; b=NY9diLbva1vW1KwcNg5sRi1GmZwiP9z+Dj2LUM8jGlsKEfWrpwWrAsvhzqScuxaJWu 6S38n4dCdhuSA/XOq6VHWlygtZ+TyK9PpmzFXiI+CxxliZX0CCtD4ewHbQfl55tZ/CSN hRMiCMgm2fI47vZrZYzgrmsecEwIuqvzqJbnNzU8JjxZYOtK51M4BhMBXsIa7M7XeAcA Tcf+afTyLV/S3m8YYBqeTKT/4Q4uCtqTkPRRlT0iEm+J66kRocmuB/6RsfqXUWufms9C 9ZsJyoLM1lBdQN+60rhYXIgppj6oCf6/8Xm1hqsRfhXsV/GPXTNyW3OaDCpxi3C82saI iO5A== X-Gm-Message-State: AOAM532Dcxc1FEpg1uwonhLXchUrwJmY3WJN/ofYYg+EUlOerIXxunMH jb28V2m367uADRUyz0vBeq0= X-Google-Smtp-Source: ABdhPJxyiYzd7eLzsleMsikM4+4N947n5ow3/QQrAtn7thxcnfn3pVdYdODnDF56edyA3o6ThSrBQA== X-Received: by 2002:a17:906:b6cc:: with SMTP id ec12mr2437288ejb.520.1614333797560; Fri, 26 Feb 2021 02:03:17 -0800 (PST) Received: from pek-vx-bsp2.wrs.com (ec2-44-242-66-180.us-west-2.compute.amazonaws.com. [44.242.66.180]) by smtp.gmail.com with ESMTPSA id a26sm5667554edm.15.2021.02.26.02.03.14 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Feb 2021 02:03:17 -0800 (PST) From: Bin Meng To: Jason Wang , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Peter Maydell , qemu-devel@nongnu.org Subject: [RFC PATCH 1/3] net: Pad short frames to minimum size (60 bytes) Date: Fri, 26 Feb 2021 18:03:04 +0800 Message-Id: <1614333786-74258-2-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1614333786-74258-1-git-send-email-bmeng.cn@gmail.com> References: <1614333786-74258-1-git-send-email-bmeng.cn@gmail.com> Received-SPF: pass client-ip=2a00:1450:4864:20::62d; envelope-from=bmeng.cn@gmail.com; helo=mail-ej1-x62d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bin Meng Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Bin Meng The minimum Ethernet frame length is 60 bytes, and we should pad frames whose length is smaller to the minimum size. This commit fixes the issue as seen with various ethernet models, that ARP requests get dropped, preventing the guest from becoming visible on the network. The following 2 commits that attempted to workaround this issue in e1000 and vmxenet3 before, should be reverted. commit 78aeb23eded2 ("e1000: Pad short frames to minimum size (60 bytes)") commit 40a87c6c9b11 ("vmxnet3: Pad short frames to minimum size (60 bytes)") Signed-off-by: Bin Meng --- net/net.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/net/net.c b/net/net.c index b038370..34004da 100644 --- a/net/net.c +++ b/net/net.c @@ -638,6 +638,7 @@ static ssize_t qemu_send_packet_async_with_flags(NetClientState *sender, NetPacketSent *sent_cb) { NetQueue *queue; + uint8_t min_buf[60]; int ret; #ifdef DEBUG_NET @@ -649,6 +650,14 @@ static ssize_t qemu_send_packet_async_with_flags(NetClientState *sender, return size; } + /* Pad to minimum Ethernet frame length */ + if (size < sizeof(min_buf)) { + memcpy(min_buf, buf, size); + memset(&min_buf[size], 0, sizeof(min_buf) - size); + buf = min_buf; + size = sizeof(min_buf); + } + /* Let filters handle the packet first */ ret = filter_receive(sender, NET_FILTER_DIRECTION_TX, sender, flags, buf, size, sent_cb); From patchwork Fri Feb 26 10:03:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 12106409 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.7 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,URIBL_BLOCKED,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 0FE4CC433E0 for ; Fri, 26 Feb 2021 10:13:40 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0BA4264EED for ; Fri, 26 Feb 2021 10:13:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0BA4264EED Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:44456 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFa7t-0005Y3-S9 for qemu-devel@archiver.kernel.org; Fri, 26 Feb 2021 05:13:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40540) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFZy0-0004Tk-V5 for qemu-devel@nongnu.org; Fri, 26 Feb 2021 05:03:26 -0500 Received: from mail-ej1-x632.google.com ([2a00:1450:4864:20::632]:44248) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lFZxy-0003BO-J9 for qemu-devel@nongnu.org; Fri, 26 Feb 2021 05:03:24 -0500 Received: by mail-ej1-x632.google.com with SMTP id w1so13813842ejf.11 for ; Fri, 26 Feb 2021 02:03:22 -0800 (PST) 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; bh=cvh9q9jShUm90b680zacQW5v3lxe1KF1xWzOx2ZWZx4=; b=fHWYqIRMPrA6xp1pdI87qpGk/L+MizuHWtiX12sQYU66zLgQW+ziUga8Mub3M3OLCx TH81MZxu61Kylx7S4VpGZ7w+dU8Qle8HmGtjEyx8WocGsaHDlNw8ArK3iWmJ6MpzjcPg 7gVKW4fQ/Mo3uUAaiSJ1h2b7EjmyA76bUTUzMREah3G6iR92NPvZ2Uzx7pQDzPC0PNaU Np554iTK20PWlZ6Moi4c4/k7qVKSMvD7JiNY4+Lkc5rVQpUlRV9kH6M0i2gM2yDZFm+z 0KqSstFbWtyuvqZA49C7XeaYKcAJYu1qvjkhX/ShpYR8eH7bppPnQwQ+skMwrFHyscfS 9+Xg== 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; bh=cvh9q9jShUm90b680zacQW5v3lxe1KF1xWzOx2ZWZx4=; b=O5e2Fk2kMZ4cLvywzhfj1x475dDAUNioouSmDRkDbYgHaqwB/0D5dq26yK0kP5qhea 2hP4xLzDw+Ju2fmwDSl3e0KgbAAtDUWGVnYuaEp7XLu5F03hTjlMY+R7WsZQJk6bGAji Z4/BEp2h+cOTJ5jz6mjUIW+38FQ5r+zhVYdvOPxqP4t8stt1kH4IwPStnkst0CvtGvhP eiwgPDDjlO6V5yFDNzHRU1hrKsAF0nIyvYDY0F9HzTaV8ZZBXvmntjbSqK7tkQTGmlU/ +IddY+lP0MybcsF9XmmFXrekVXDEYaesyS80yLPr3lwZLSWIETdJwJnhiSIDilY2ct1U 7t3Q== X-Gm-Message-State: AOAM532W/EWF3KEVL4GspFDTbasnygb2wztdJjo4k/6QD+C2f3VIBOLX D1EbExZRvKfx8ZR8lJ2rjy4= X-Google-Smtp-Source: ABdhPJxys/iyEq5OBkHD2aihByM1xsJhp5t97FpxqC3cfb4eHozZaSybVHlWaJNzWgsiFW0BYj8EdA== X-Received: by 2002:a17:906:dbd0:: with SMTP id yc16mr186858ejb.71.1614333801288; Fri, 26 Feb 2021 02:03:21 -0800 (PST) Received: from pek-vx-bsp2.wrs.com (ec2-44-242-66-180.us-west-2.compute.amazonaws.com. [44.242.66.180]) by smtp.gmail.com with ESMTPSA id a26sm5667554edm.15.2021.02.26.02.03.18 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Feb 2021 02:03:20 -0800 (PST) From: Bin Meng To: Jason Wang , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Peter Maydell , qemu-devel@nongnu.org Subject: [RFC PATCH 2/3] Revert "e1000: Pad short frames to minimum size (60 bytes)" Date: Fri, 26 Feb 2021 18:03:05 +0800 Message-Id: <1614333786-74258-3-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1614333786-74258-1-git-send-email-bmeng.cn@gmail.com> References: <1614333786-74258-1-git-send-email-bmeng.cn@gmail.com> Received-SPF: pass client-ip=2a00:1450:4864:20::632; envelope-from=bmeng.cn@gmail.com; helo=mail-ej1-x632.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bin Meng Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Bin Meng This reverts commit 78aeb23eded2d0b765bf9145c71f80025b568acd. The short frames padding is now handled in the QEMU networking codes. Revert this workaround in e1000. Signed-off-by: Bin Meng --- hw/net/e1000.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/hw/net/e1000.c b/hw/net/e1000.c index d8da2f6..8edc2e7 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -898,15 +898,7 @@ e1000_receive_iov(NetClientState *nc, const struct iovec *iov, int iovcnt) return 0; } - /* Pad to minimum Ethernet frame length */ - if (size < sizeof(min_buf)) { - iov_to_buf(iov, iovcnt, 0, min_buf, size); - memset(&min_buf[size], 0, sizeof(min_buf) - size); - min_iov.iov_base = filter_buf = min_buf; - min_iov.iov_len = size = sizeof(min_buf); - iovcnt = 1; - iov = &min_iov; - } else if (iov->iov_len < MAXIMUM_ETHERNET_HDR_LEN) { + if (iov->iov_len < MAXIMUM_ETHERNET_HDR_LEN) { /* This is very unlikely, but may happen. */ iov_to_buf(iov, iovcnt, 0, min_buf, MAXIMUM_ETHERNET_HDR_LEN); filter_buf = min_buf; From patchwork Fri Feb 26 10:03:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 12106411 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.7 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,URIBL_BLOCKED,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 52065C433DB for ; Fri, 26 Feb 2021 10:15:42 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9C1B664ED2 for ; Fri, 26 Feb 2021 10:15:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9C1B664ED2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:46664 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFa9s-0006aG-8P for qemu-devel@archiver.kernel.org; Fri, 26 Feb 2021 05:15:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40628) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFZyD-0004Xr-Sq for qemu-devel@nongnu.org; Fri, 26 Feb 2021 05:03:38 -0500 Received: from mail-ej1-x631.google.com ([2a00:1450:4864:20::631]:47091) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lFZy7-0003CP-IT for qemu-devel@nongnu.org; Fri, 26 Feb 2021 05:03:34 -0500 Received: by mail-ej1-x631.google.com with SMTP id r17so13769132ejy.13 for ; Fri, 26 Feb 2021 02:03:26 -0800 (PST) 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=XEWfqxxnvDDGBt8B/yYfy3YMj1liC4MhvByCE+lTPOc=; b=qUbTghhVjFs7FQVDaczumSzkdg8UX9lC9aSZ58WvYE5BTwyTxFoAaU4lWhfBZ+OsOl MwG2ESkasuPxNe6PBeBjlF376z+AoFFb/zAXeBXCICqilB2Vb/aI3ueiljPoxlYjE7Vj Ybd9Eewi/3M7vfG7xRWnpOHQuMcGOn1WKWdymPBCqCMwsvlOOO44yPKZ1ICMz3rfzQHi 1rbSL1dQmgssakC1qxKeZ3ir/GIIUC++nyffbThFokOXulxHybIEkVgJg8XNaokiXJCs ++iTDLc75+DvVWDIthyErCnc/e4GvdyqC5utnQ/G6IyQ3q6mGHqpPQ1BebJpp/poSq1U Xojg== 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=XEWfqxxnvDDGBt8B/yYfy3YMj1liC4MhvByCE+lTPOc=; b=pzhHRAZw3nV1pYIQQFJHqUUSYcSWgNV7UZrFJjneAf1q08HFKKfOJ8Gxen8YWmwwjw ZIopC66evq1nDw+EMZOwkDiGWU0bDlb7NMfXUmx8+aHlwnJfIAQfmfJvubSh/D4ORmYj 2ZqLdKVag4A8VIOsNg8kioGuqAlGJHh9OwtK5BVeumiSmuFozz59eZbHS3K4tyXiQzdO 8vsLe3XU6QF9EErT0tBtqUZ1ETWUm6oTr/dsfpwrAk6X5R4q9wGBlVn578zNLLaaXrFe tPhmgctJiEK7cm9MuU2OBakkGARkW9NtECQ8bEmQhy/T8jhMe2bbVB+xMeZaiOIYBo35 wc/Q== X-Gm-Message-State: AOAM532hrRW1IN7MkGeh5Na8DDF9lsX8ifjA5ptNX4dtWhqDoHKH6DfF oBUaIqVzmwjwaEFgUUWKY6bTKrWNJn4= X-Google-Smtp-Source: ABdhPJzxzNYAxAgpQBnbuor/tTFPJ51nvJaJM6aWgmXzYlg7CDUh5EgwDpM4K1R9i3tMFEHqxp0OtA== X-Received: by 2002:a17:907:1b1f:: with SMTP id mp31mr2444096ejc.348.1614333805189; Fri, 26 Feb 2021 02:03:25 -0800 (PST) Received: from pek-vx-bsp2.wrs.com (ec2-44-242-66-180.us-west-2.compute.amazonaws.com. [44.242.66.180]) by smtp.gmail.com with ESMTPSA id a26sm5667554edm.15.2021.02.26.02.03.21 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Feb 2021 02:03:24 -0800 (PST) From: Bin Meng To: Jason Wang , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Peter Maydell , qemu-devel@nongnu.org Subject: [RFC PATCH 3/3] Revert "vmxnet3: Pad short frames to minimum size (60 bytes)" Date: Fri, 26 Feb 2021 18:03:06 +0800 Message-Id: <1614333786-74258-4-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1614333786-74258-1-git-send-email-bmeng.cn@gmail.com> References: <1614333786-74258-1-git-send-email-bmeng.cn@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::631; envelope-from=bmeng.cn@gmail.com; helo=mail-ej1-x631.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bin Meng Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Bin Meng This reverts commit 40a87c6c9b11ef9c14e0301f76abf0eb2582f08e. The short frames padding is now handled in the QEMU networking codes. Revert this workaround in vmxnet3. Signed-off-by: Bin Meng --- hw/net/vmxnet3.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c index eff299f..d993cce 100644 --- a/hw/net/vmxnet3.c +++ b/hw/net/vmxnet3.c @@ -39,7 +39,6 @@ #define PCI_DEVICE_ID_VMWARE_VMXNET3_REVISION 0x1 #define VMXNET3_MSIX_BAR_SIZE 0x2000 -#define MIN_BUF_SIZE 60 /* Compatibility flags for migration */ #define VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS_BIT 0 @@ -1951,7 +1950,6 @@ vmxnet3_receive(NetClientState *nc, const uint8_t *buf, size_t size) { VMXNET3State *s = qemu_get_nic_opaque(nc); size_t bytes_indicated; - uint8_t min_buf[MIN_BUF_SIZE]; if (!vmxnet3_can_receive(nc)) { VMW_PKPRN("Cannot receive now"); @@ -1964,14 +1962,6 @@ vmxnet3_receive(NetClientState *nc, const uint8_t *buf, size_t size) size -= sizeof(struct virtio_net_hdr); } - /* Pad to minimum Ethernet frame length */ - if (size < sizeof(min_buf)) { - memcpy(min_buf, buf, size); - memset(&min_buf[size], 0, sizeof(min_buf) - size); - buf = min_buf; - size = sizeof(min_buf); - } - net_rx_pkt_set_packet_type(s->rx_pkt, get_eth_packet_type(PKT_GET_ETH_HDR(buf)));