From mboxrd@z Thu Jan 1 00:00:00 1970 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 4EDB8C433DB for ; Tue, 16 Mar 2021 08:16:28 +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 DB6E464FD1 for ; Tue, 16 Mar 2021 08:16:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DB6E464FD1 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]:48918 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lM4sM-000734-Mt for qemu-devel@archiver.kernel.org; Tue, 16 Mar 2021 04:16:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39498) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lM4pO-00023v-E7 for qemu-devel@nongnu.org; Tue, 16 Mar 2021 04:13:22 -0400 Received: from mail-ej1-x633.google.com ([2a00:1450:4864:20::633]:36096) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lM4pM-0007mP-Ml for qemu-devel@nongnu.org; Tue, 16 Mar 2021 04:13:22 -0400 Received: by mail-ej1-x633.google.com with SMTP id e19so70701500ejt.3 for ; Tue, 16 Mar 2021 01:13:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=9ZQ6AOd1nro/moZocOdsvBQpIZ609NYlDfUQCOQCk48=; b=OHGwo+SPUr4fnedP77sbQ+kKFi3+5N1HzSbQJ/0VKHpqN7m8QcMoWlpR5zlsLc6Q/3 8/YaOimYxwqvP5RgNJQouKaUk1Z5BcPmtbObih/uFQna+FScmk3riEHm228qn4pnriob ACdWGXTBNZSO23EnsLLjW8DJ8vJv21SbbvXD/HZzn95EBQqia5xkJN+/QvVfposfcuOJ 0hrejphNO1MdZgajSU5/0pQ3uNHpYM2CvaM65Nqj1iy9kBR2K1wFYcDy5KrwRtsvMbAh 6ZW7CALDVHP+1mIApPYkq3OT2jx0N8jQpuhxRAd3pXoUjWdbViQLJRiWMOjgixS7g/0l usnQ== 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=9ZQ6AOd1nro/moZocOdsvBQpIZ609NYlDfUQCOQCk48=; b=eIB6g8h1ueLLgEI8yhbn8gVjc/whDpBNo2kX3HtZKs8NCQueiXK2AsrtJmJpqGtdoA jf7lHMNfQCY/sDFmZMQApuVrJipgiSWfPCVLWCsEnptKozApXzIjhYvMKmoolZh1gbec 6oGnPfIB0EnVb14uMHuuziHnUWJAqvemAagXQJr08bAwD+YoQHbNoagXCjpQognftpF1 gehQTmBy0ss0gDpCe+3RYy6n5k7i3L6ijjBQ/GVB5q0T1ZYQWCjfkDAu0WII/yYMzXFJ KREmtwsckK4tVNrLupNlSMjUq9juCon0UJT/xesCVbSvV94gNC9JM+IxMflEAUEy2AQx SMZQ== X-Gm-Message-State: AOAM533bbxOoMyeHuOsYv9KDGC8h9zcY+V+YFRhMv5+xwAi/FJlTn9up nJ3spyL/EqrIgfXIr5PAo7k= X-Google-Smtp-Source: ABdhPJymblS7j+1W7dDToE9CqFPbb0Gd0563e/GbYsSoJhI4caCAbrt0BBhTOt3EB6Jj1mMaGk64IA== X-Received: by 2002:a17:906:f6ce:: with SMTP id jo14mr28625514ejb.476.1615882399274; Tue, 16 Mar 2021 01:13:19 -0700 (PDT) Received: from pek-vx-bsp9.wrs.com (ec2-44-242-66-180.us-west-2.compute.amazonaws.com. [44.242.66.180]) by smtp.gmail.com with ESMTPSA id a17sm5620333ejf.20.2021.03.16.01.13.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Mar 2021 01:13:18 -0700 (PDT) From: Bin Meng To: Jason Wang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , qemu-devel@nongnu.org Subject: [PATCH v3 04/13] net: tap: Pad short frames to minimum size before send Date: Tue, 16 Mar 2021 16:12:45 +0800 Message-Id: <20210316081254.72684-5-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210316081254.72684-1-bmeng.cn@gmail.com> References: <20210316081254.72684-1-bmeng.cn@gmail.com> Received-SPF: pass client-ip=2a00:1450:4864:20::633; envelope-from=bmeng.cn@gmail.com; helo=mail-ej1-x633.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: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Do the same for tap backend as what we did for slirp. Signed-off-by: Bin Meng --- Changes in v3: - use the pad_short_frame() helper for tap net/tap-win32.c | 9 +++++++++ net/tap.c | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/net/tap-win32.c b/net/tap-win32.c index 2b5dcda36e..e044a5ca35 100644 --- a/net/tap-win32.c +++ b/net/tap-win32.c @@ -31,6 +31,7 @@ #include "qemu-common.h" #include "clients.h" /* net_init_tap */ +#include "net/eth.h" #include "net/net.h" #include "net/tap.h" /* tap_has_ufo, ... */ #include "qemu/error-report.h" @@ -688,9 +689,17 @@ static void tap_win32_send(void *opaque) uint8_t *buf; int max_size = 4096; int size; + uint8_t min_pkt[ETH_ZLEN]; size = tap_win32_read(s->handle, &buf, max_size); if (size > 0) { + if (!s->nc.peer->do_not_pad) { + if (pad_short_frame(min_pkt, buf, size)) { + buf = min_pkt; + size = ETH_ZLEN; + } + } + qemu_send_packet(&s->nc, buf, size); tap_win32_free_buffer(s->handle, buf); } diff --git a/net/tap.c b/net/tap.c index b7512853f4..aa69cf1c73 100644 --- a/net/tap.c +++ b/net/tap.c @@ -32,6 +32,7 @@ #include #include +#include "net/eth.h" #include "net/net.h" #include "clients.h" #include "monitor/monitor.h" @@ -189,6 +190,7 @@ static void tap_send(void *opaque) while (true) { uint8_t *buf = s->buf; + uint8_t min_pkt[ETH_ZLEN]; size = tap_read_packet(s->fd, s->buf, sizeof(s->buf)); if (size <= 0) { @@ -200,6 +202,13 @@ static void tap_send(void *opaque) size -= s->host_vnet_hdr_len; } + if (!s->nc.peer->do_not_pad) { + if (pad_short_frame(min_pkt, buf, size)) { + buf = min_pkt; + size = ETH_ZLEN; + } + } + size = qemu_send_packet_async(&s->nc, buf, size, tap_send_completed); if (size == 0) { tap_read_poll(s, false); -- 2.17.1