From nobody Mon Feb 9 18:19:31 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614798757; cv=none; d=zohomail.com; s=zohoarc; b=fV9hg2oK0Fvkio+Ben9tP6LxD8JqpxHi7NpYRxM0ymaMHS6yiBGqvH+sOOZtAmxb/T9BapdFzTnUcU4w2Zluru2QtAN0vtZvMYGtGyHg+UCwqTR5cZmnTPc0/Ke6W/F6NrH0xS47+moA9LPr7X6/fTzVFIV+2EyJJLVeJlkhCY0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614798757; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=+ne5diQd2gxsPBtDDhKD/phqfjDFTA6zzQ5kRhrkwDo=; b=AHOwr0tEq0RhbAk7PeNeUZI2IvaWPL5sS8hZwTXPRNRsvQd3YO6b3XLqR7s3wHOehSqgcT38fl/e1FWRPUEMjVRykytBjuViv/wsBWB6tgHj+EwF/4gIesPc85uylPFHwfvieUzvtk3reqd7FlmNylW0XxFHxf6F1jCzzzvgruc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1614798757173551.8347961565553; Wed, 3 Mar 2021 11:12:37 -0800 (PST) Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-524-VEWwvZqqPVaH-T-ivFMzIg-1; Wed, 03 Mar 2021 14:12:34 -0500 Received: by mail-wm1-f69.google.com with SMTP id q24so3445657wmc.1 for ; Wed, 03 Mar 2021 11:12:34 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id z188sm8934994wme.32.2021.03.03.11.12.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Mar 2021 11:12:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614798756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+ne5diQd2gxsPBtDDhKD/phqfjDFTA6zzQ5kRhrkwDo=; b=O6JFfd5oKqK3K6Ff/9sf6yHk2GSZ6kweGxGaSeHhiRo4nH7VmFhwae6cgmSOULUMzFLFkS kxOl3uDSFyKyD9I/RxrE6LMz6HIvmCb+9nXYpMvnlG43739hVEu4H+fR612gpZgX8Gcwrx A3ld80DAl3Z4/+END1iSbAZV5CA/DDw= X-MC-Unique: VEWwvZqqPVaH-T-ivFMzIg-1 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=+ne5diQd2gxsPBtDDhKD/phqfjDFTA6zzQ5kRhrkwDo=; b=ZaFlAeyWRHgBZJKAp6FzTunG/OFNwYCn4HZf/o7/7NCshFBIlp6SJ4chDHxRzns7AV cAHB9UdNdvfktSwoQ4JOMH2Xd8b0WefKdj7AxPtwsyIRPSrUQ7PIr6ZSyDVxc5Dcq91u vPbEqa+w8t4PAO75rj7q+gHR2p9u9XK95VhTg/5QZQNoZ96uG3r5HqvdR9rXIcT0BwPb hgd4Dg9/ApGZfLWs/DgstZRMAr5dg72f+nGeU8xsEWYZJx1pOKWbaFbp0K3Z5ELbXKy6 evrQy0qDrvmuLxH/zhndQmiuXWtGuzIhRn+c3taTN90gYrqPmvh0pWXzchBI3eiVGFgl SX1w== X-Gm-Message-State: AOAM53103mV4f/kZJZrAwcc42hlZblmoNt1iSJ+js9/pKkzx4yMYPggK n871/3qQcotUrWnjPFc4wtuJo6a+C4e8flE0G76gOld/VRduZoPlFcj4bevXycQHO/5zE/Pw090 ySLAuDUEX/KAs8g== X-Received: by 2002:a05:600c:3550:: with SMTP id i16mr422454wmq.170.1614798753381; Wed, 03 Mar 2021 11:12:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJwZA5/B1eI7smmS4ewi3nccrPKKBhVMku1/gpsBY17BdRWDdfNhFoWqUQrKMEk3cvQHqLn/FA== X-Received: by 2002:a05:600c:3550:: with SMTP id i16mr422439wmq.170.1614798753184; Wed, 03 Mar 2021 11:12:33 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Jason Wang , Bin Meng , Dmitry Fleytman , Peter Maydell , Richard Henderson , Bin Meng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH v3 05/10] hw/net: i82596: Remove the logic of padding short frames in the receive path Date: Wed, 3 Mar 2021 20:12:00 +0100 Message-Id: <20210303191205.1656980-6-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210303191205.1656980-1-philmd@redhat.com> References: <20210303191205.1656980-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) From: Bin Meng Now that we have implemented unified short frames padding in the QEMU networking codes, remove the same logic in the NIC codes. Signed-off-by: Bin Meng Message-Id: <1614763306-18026-5-git-send-email-bmeng.cn@gmail.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/net/i82596.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/hw/net/i82596.c b/hw/net/i82596.c index 055c3a1470c..1eca2e2d816 100644 --- a/hw/net/i82596.c +++ b/hw/net/i82596.c @@ -73,10 +73,6 @@ enum commands { #define I596_EOF 0x8000 #define SIZE_MASK 0x3fff =20 -#define ETHER_TYPE_LEN 2 -#define VLAN_TCI_LEN 2 -#define VLAN_HLEN (ETHER_TYPE_LEN + VLAN_TCI_LEN) - /* various flags in the chip config registers */ #define I596_PREFETCH (s->config[0] & 0x80) #define I596_PROMISC (s->config[8] & 0x01) @@ -489,8 +485,6 @@ bool i82596_can_receive(NetClientState *nc) return true; } =20 -#define MIN_BUF_SIZE 60 - ssize_t i82596_receive(NetClientState *nc, const uint8_t *buf, size_t sz) { I82596State *s =3D qemu_get_nic_opaque(nc); @@ -501,7 +495,6 @@ ssize_t i82596_receive(NetClientState *nc, const uint8_= t *buf, size_t sz) size_t bufsz =3D sz; /* length of data in buf */ uint32_t crc; uint8_t *crc_ptr; - uint8_t buf1[MIN_BUF_SIZE + VLAN_HLEN]; static const uint8_t broadcast_macaddr[6] =3D { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; =20 @@ -584,17 +577,6 @@ ssize_t i82596_receive(NetClientState *nc, const uint8= _t *buf, size_t sz) } } =20 - /* if too small buffer, then expand it */ - if (len < MIN_BUF_SIZE + VLAN_HLEN) { - memcpy(buf1, buf, len); - memset(buf1 + len, 0, MIN_BUF_SIZE + VLAN_HLEN - len); - buf =3D buf1; - if (len < MIN_BUF_SIZE) { - len =3D MIN_BUF_SIZE; - } - bufsz =3D len; - } - /* Calculate the ethernet checksum (4 bytes) */ len +=3D 4; crc =3D cpu_to_be32(crc32(~0, buf, sz)); --=20 2.26.2