net: e1000e: Correct the initial value of VET register

Jason Wang Thu, 22 Jul 2021 01:29:09 -0700


在 2021/7/21 下午12:15, Bin Meng 写道:

From: Christina Wang <christina.w...@windriver.com>

The initial value of VLAN Ether Type (VET) register is 0x8100, as per
the manual and real hardware.

While Linux e1000e driver always writes VET register to 0x8100, it is
not always the case for everyone. Drivers relying on the reset value
of VET won't be able to transmit and receive VLAN frames in QEMU.

Unlike e1000 in QEMU, e1000e uses a field 'vet' in "struct E1000Core"
to cache the value of VET register, but the cache only gets updated
when VET register is written. To always get a consistent VET value
no matter VET is written or remains its reset value, drop the 'vet'
field and use 'core->mac[VET]' directly.

Reported-by: Markus Carlstedt <markus.carlst...@windriver.com>
Signed-off-by: Christina Wang <christina.w...@windriver.com>
Signed-off-by: Bin Meng <bin.m...@windriver.com>

---

Changes in v3:
- add a "init-vet" property for versioned machines

Changes in v2:
- keep the 'vet' field in "struct E1000Core" for migration compatibility

  hw/core/machine.c    | 21 +++++++++++++++++++++
  hw/net/e1000e.c      |  8 +++++++-
  hw/net/e1000e_core.c |  9 ++++-----
  3 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/hw/core/machine.c b/hw/core/machine.c
index 29982c1ef1..8355df69c7 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -42,6 +42,7 @@ GlobalProperty hw_compat_6_0[] = {
      { "i8042", "extended-state", "false"},
      { "nvme-ns", "eui64-default", "off"},
      { "e1000", "init-vet", "off" },
+    { "e1000e", "init-vet", "off" },
  };



It looks to me doing compat in hw_compat_6_0 is sufficient.

The codes will do it automatically for the versions before 6.0.

E.g virt_machine_5_2_options() will call virt_machine_6_0_options() etc.

Other looks good.

Thanks

  const size_t hw_compat_6_0_len = G_N_ELEMENTS(hw_compat_6_0);

@@ -51,6 +52,7 @@ GlobalProperty hw_compat_5_2[] = {

      { "virtio-blk-device", "report-discard-granularity", "off" },
      { "virtio-net-pci", "vectors", "3"},
      { "e1000", "init-vet", "off" },
+    { "e1000e", "init-vet", "off" },
  };
  const size_t hw_compat_5_2_len = G_N_ELEMENTS(hw_compat_5_2);

@@ -65,6 +67,7 @@ GlobalProperty hw_compat_5_1[] = {

      { "pl011", "migrate-clk", "off" },
      { "virtio-pci", "x-ats-page-aligned", "off"},
      { "e1000", "init-vet", "off" },
+    { "e1000e", "init-vet", "off" },
  };
  const size_t hw_compat_5_1_len = G_N_ELEMENTS(hw_compat_5_1);

@@ -77,6 +80,7 @@ GlobalProperty hw_compat_5_0[] = {

      { "vmport", "x-cmds-v2", "off" },
      { "virtio-device", "x-disable-legacy-check", "true" },
      { "e1000", "init-vet", "off" },
+    { "e1000e", "init-vet", "off" },
  };
  const size_t hw_compat_5_0_len = G_N_ELEMENTS(hw_compat_5_0);

@@ -94,12 +98,14 @@ GlobalProperty hw_compat_4_2[] = {

      { "fw_cfg", "acpi-mr-restore", "false" },
      { "virtio-device", "use-disabled-flag", "false" },
      { "e1000", "init-vet", "off" },
+    { "e1000e", "init-vet", "off" },
  };
  const size_t hw_compat_4_2_len = G_N_ELEMENTS(hw_compat_4_2);

GlobalProperty hw_compat_4_1[] = {

      { "virtio-pci", "x-pcie-flr-init", "off" },
      { "e1000", "init-vet", "off" },
+    { "e1000e", "init-vet", "off" },
  };
  const size_t hw_compat_4_1_len = G_N_ELEMENTS(hw_compat_4_1);

@@ -113,6 +119,7 @@ GlobalProperty hw_compat_4_0[] = {

      { "virtio-balloon-device", "qemu-4-0-config-size", "true" },
      { "pl031", "migrate-tick-offset", "false" },
      { "e1000", "init-vet", "off" },
+    { "e1000e", "init-vet", "off" },
  };
  const size_t hw_compat_4_0_len = G_N_ELEMENTS(hw_compat_4_0);

@@ -131,11 +138,13 @@ GlobalProperty hw_compat_3_1[] = {

      { "virtio-balloon-device", "qemu-4-0-config-size", "false" },
      { "pcie-root-port-base", "disable-acs", "true" }, /* Added in 4.1 */
      { "e1000", "init-vet", "off" },
+    { "e1000e", "init-vet", "off" },
  };
  const size_t hw_compat_3_1_len = G_N_ELEMENTS(hw_compat_3_1);

GlobalProperty hw_compat_3_0[] = {

      { "e1000", "init-vet", "off" },
+    { "e1000e", "init-vet", "off" },
  };
  const size_t hw_compat_3_0_len = G_N_ELEMENTS(hw_compat_3_0);

@@ -147,6 +156,7 @@ GlobalProperty hw_compat_2_12[] = {

      { "vmware-svga", "global-vmstate", "true" },
      { "qxl-vga", "global-vmstate", "true" },
      { "e1000", "init-vet", "off" },
+    { "e1000e", "init-vet", "off" },
  };
  const size_t hw_compat_2_12_len = G_N_ELEMENTS(hw_compat_2_12);

@@ -156,6 +166,7 @@ GlobalProperty hw_compat_2_11[] = {

      { "vhost-user-blk-pci", "vectors", "2" },
      { "e1000", "migrate_tso_props", "off" },
      { "e1000", "init-vet", "off" },
+    { "e1000e", "init-vet", "off" },
  };
  const size_t hw_compat_2_11_len = G_N_ELEMENTS(hw_compat_2_11);

@@ -163,6 +174,7 @@ GlobalProperty hw_compat_2_10[] = {

      { "virtio-mouse-device", "wheel-axis", "false" },
      { "virtio-tablet-device", "wheel-axis", "false" },
      { "e1000", "init-vet", "off" },
+    { "e1000e", "init-vet", "off" },
  };
  const size_t hw_compat_2_10_len = G_N_ELEMENTS(hw_compat_2_10);

@@ -172,6 +184,7 @@ GlobalProperty hw_compat_2_9[] = {

      { "virtio-net-device", "x-mtu-bypass-backend", "off" },
      { "pcie-root-port", "x-migrate-msix", "false" },
      { "e1000", "init-vet", "off" },
+    { "e1000e", "init-vet", "off" },
  };
  const size_t hw_compat_2_9_len = G_N_ELEMENTS(hw_compat_2_9);

@@ -187,6 +200,7 @@ GlobalProperty hw_compat_2_8[] = {

      { "cirrus-vga", "vgamem_mb", "8" },
      { "isa-cirrus-vga", "vgamem_mb", "8" },
      { "e1000", "init-vet", "off" },
+    { "e1000e", "init-vet", "off" },
  };
  const size_t hw_compat_2_8_len = G_N_ELEMENTS(hw_compat_2_8);

@@ -197,6 +211,7 @@ GlobalProperty hw_compat_2_7[] = {

      { "intel-iommu", "x-buggy-eim", "true" },
      { "virtio-pci", "x-ignore-backend-features", "on" },
      { "e1000", "init-vet", "off" },
+    { "e1000e", "init-vet", "off" },
  };
  const size_t hw_compat_2_7_len = G_N_ELEMENTS(hw_compat_2_7);

@@ -206,6 +221,7 @@ GlobalProperty hw_compat_2_6[] = {

      { "virtio-pci", "disable-modern", "on",  .optional = true },
      { "virtio-pci", "disable-legacy", "off", .optional = true },
      { "e1000", "init-vet", "off" },
+    { "e1000e", "init-vet", "off" },
  };
  const size_t hw_compat_2_6_len = G_N_ELEMENTS(hw_compat_2_6);

@@ -216,6 +232,7 @@ GlobalProperty hw_compat_2_5[] = {

      { "vmxnet3", "x-old-msi-offsets", "on" },
      { "vmxnet3", "x-disable-pcie", "on" },
      { "e1000", "init-vet", "off" },
+    { "e1000e", "init-vet", "off" },
  };
  const size_t hw_compat_2_5_len = G_N_ELEMENTS(hw_compat_2_5);

@@ -224,6 +241,7 @@ GlobalProperty hw_compat_2_4[] = {

      { "virtio-blk-device", "scsi", "true", .optional = true },
      { "e1000", "extra_mac_registers", "off" },
      { "e1000", "init-vet", "off" },
+    { "e1000e", "init-vet", "off" },
      { "virtio-pci", "x-disable-pcie", "on" },
      { "virtio-pci", "migrate-extra", "off" },
      { "fw_cfg_mem", "dma_enabled", "off" },
@@ -242,11 +260,13 @@ GlobalProperty hw_compat_2_3[] = {
      { "migration", "send-section-footer", "off" },
      { "migration", "store-global-state", "off" },
      { "e1000", "init-vet", "off" },
+    { "e1000e", "init-vet", "off" },
  };
  const size_t hw_compat_2_3_len = G_N_ELEMENTS(hw_compat_2_3);

GlobalProperty hw_compat_2_2[] = {

      { "e1000", "init-vet", "off" },
+    { "e1000e", "init-vet", "off" },
  };
  const size_t hw_compat_2_2_len = G_N_ELEMENTS(hw_compat_2_2);

@@ -259,6 +279,7 @@ GlobalProperty hw_compat_2_1[] = {

      { "usb-kbd", "usb_version", "1" },
      { "virtio-pci", "virtio-pci-bus-master-bug-migration", "on" },
      { "e1000", "init-vet", "off" },
+    { "e1000e", "init-vet", "off" },
  };
  const size_t hw_compat_2_1_len = G_N_ELEMENTS(hw_compat_2_1);

diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c

index a8a77eca95..ac96f7665a 100644
--- a/hw/net/e1000e.c
+++ b/hw/net/e1000e.c
@@ -35,6 +35,7 @@

#include "qemu/osdep.h"

  #include "qemu/units.h"
+#include "net/eth.h"
  #include "net/net.h"
  #include "net/tap.h"
  #include "qemu/module.h"
@@ -79,7 +80,7 @@ struct E1000EState {
      bool disable_vnet;

E1000ECore core;

-
+    bool init_vet;
  };

#define E1000E_MMIO_IDX 0

@@ -527,6 +528,10 @@ static void e1000e_qdev_reset(DeviceState *dev)
      trace_e1000e_cb_qdev_reset();

e1000e_core_reset(&s->core);

+
+    if (s->init_vet) {
+        s->core.mac[VET] = ETH_P_VLAN;
+    }
  }

static int e1000e_pre_save(void *opaque)

@@ -666,6 +671,7 @@ static Property e1000e_properties[] = {
                          e1000e_prop_subsys_ven, uint16_t),
      DEFINE_PROP_SIGNED("subsys", E1000EState, subsys, 0,
                          e1000e_prop_subsys, uint16_t),
+    DEFINE_PROP_BOOL("init-vet", E1000EState, init_vet, true),
      DEFINE_PROP_END_OF_LIST(),
  };

diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c

index b75f2ab8fc..b4bf4ca2f1 100644
--- a/hw/net/e1000e_core.c
+++ b/hw/net/e1000e_core.c
@@ -731,7 +731,7 @@ e1000e_process_tx_desc(E1000ECore *core,
              if (e1000x_vlan_enabled(core->mac) &&
                  e1000x_is_vlan_txd(txd_lower)) {
                  net_tx_pkt_setup_vlan_header_ex(tx->tx_pkt,
-                    le16_to_cpu(dp->upper.fields.special), core->vet);
+                    le16_to_cpu(dp->upper.fields.special), core->mac[VET]);
              }
              if (e1000e_tx_pkt_send(core, tx, queue_index)) {
                  e1000e_on_tx_done_update_stats(core, tx->tx_pkt);
@@ -1012,7 +1012,7 @@ e1000e_receive_filter(E1000ECore *core, const uint8_t 
*buf, int size)
  {
      uint32_t rctl = core->mac[RCTL];

- if (e1000x_is_vlan_packet(buf, core->vet) &&

+    if (e1000x_is_vlan_packet(buf, core->mac[VET]) &&
          e1000x_vlan_rx_filter_enabled(core->mac)) {
          uint16_t vid = lduw_be_p(buf + 14);
          uint32_t vfta = ldl_le_p((uint32_t *)(core->mac + VFTA) +
@@ -1686,7 +1686,7 @@ e1000e_receive_iov(E1000ECore *core, const struct iovec 
*iov, int iovcnt)
      }

net_rx_pkt_attach_iovec_ex(core->rx_pkt, iov, iovcnt, iov_ofs,

-                               e1000x_vlan_enabled(core->mac), core->vet);
+                               e1000x_vlan_enabled(core->mac), core->mac[VET]);

e1000e_rss_parse_packet(core, core->rx_pkt, &rss_info);

      e1000e_rx_ring_init(core, &rxr, rss_info.queue);
@@ -2397,8 +2397,7 @@ static void
  e1000e_set_vet(E1000ECore *core, int index, uint32_t val)
  {
      core->mac[VET] = val & 0xffff;
-    core->vet = le16_to_cpu(core->mac[VET]);
-    trace_e1000e_vlan_vet(core->vet);
+    trace_e1000e_vlan_vet(core->mac[VET]);
  }

static void

Re: [PATCH v3 2/3] hw/net: e1000e: Correct the initial value of VET register

Reply via email to