From nobody Wed Feb 11 00:56:34 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1682505916; cv=none; d=zohomail.com; s=zohoarc; b=BG686TclU0Mu7O/wtdTxtK6tK0dMp+tUvU+ragmY2Nq3GVYfp1cW5fgJpG/gpg2PRZFB7SS8eYYRqzj13wE8qVCcxVw97ET88k/lfa+ijWe5YeXdplSZrBRgR9ECdGbwurB4ZNE7bGFiPzYlKQLO+MP4vbUCR62ZOAvNrr2y1YE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682505916; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject; bh=hPvTkBCxnRmVQmgIKjTmgQ+aBaL4yZpdSUSmce9k6qw=; b=jKf/P3QsKGcm8yKB7ldGAh711PL60SXEpY5KOFDj8tkGyG3WhWQAIJQpvj2u31CYLvctPb+OHj5HGh1ys0IItZYI6os4UV07DqsQLILptbpMxbZd52XnjvjsNU6vxST52FmdL5VX83ROnlJkYCvGdPxRH6zgjwg8jQVUJAw4PMA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1682505916528282.95770016296046; Wed, 26 Apr 2023 03:45:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1prcYs-0007fj-KA; Wed, 26 Apr 2023 06:39:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1prcYq-0007Th-2F for qemu-devel@nongnu.org; Wed, 26 Apr 2023 06:39:44 -0400 Received: from mail-pf1-x42c.google.com ([2607:f8b0:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1prcYo-0003Ms-Ft for qemu-devel@nongnu.org; Wed, 26 Apr 2023 06:39:43 -0400 Received: by mail-pf1-x42c.google.com with SMTP id d2e1a72fcca58-63b620188aeso8233728b3a.0 for ; Wed, 26 Apr 2023 03:39:42 -0700 (PDT) Received: from alarm.u-tokyo.ac.jp ([157.82.194.15]) by smtp.gmail.com with ESMTPSA id m11-20020a63580b000000b0051322a5aa64sm9317919pgb.3.2023.04.26.03.39.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Apr 2023 03:39:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20221208.gappssmtp.com; s=20221208; t=1682505581; x=1685097581; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hPvTkBCxnRmVQmgIKjTmgQ+aBaL4yZpdSUSmce9k6qw=; b=DkFfpWDB7JQG0jtLSNmOVVg5vO/dZzSvmx7VIMOexEKrLdylD1pEUHBqQK2Zk8VdAl riixcrcbjy8m7eaqDJFc9nXFXPDoa1IIFhCQjUdHKz3OjCHGLbycn6jUOuSvNxQTkyze R1hHMr/WPkXrgTtEyQfurtRBJtIjkgjg30pkIwcSLF133Xay1gsZPLiMiIp2tcVT2ytA WV1KEoyEAc6Vzsqzsp/uW49sQ/N061l94+g7CL6PVHhREuWXc3vBnglcs+EmOxt24EdN JWwGN2ivkHVi8i8YfW1cVIgsjyK/NVFvUPxD8Nmuz0T7PGmuI/QK9INsoNPkvVZJeo/V OCqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682505581; x=1685097581; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hPvTkBCxnRmVQmgIKjTmgQ+aBaL4yZpdSUSmce9k6qw=; b=O+IXjAf5iqqYvgiOyYBDKzHgbtkIXrbybxhdbKS0pY8ehlJo0pXk/0ClqSXzeICMyU fqVePtZj4WDMgli9GjQGkJUIfKVb12oPmFWtL1rSswaPcoB/6VD3x4G3vWdSeNo6iWkB aLCppQwc/JIQyhjVK+bSRDG/bTJL+8KjqmPOkt3HLPIpRboDm9VWgNI7LYChsvMna3AO NXTxCTDacAl/k5TGj6avt6WZA8b+Wak/SyFE3AfL/O//RtDoZdoyhxoJPYXtaj0U2ua6 uO7yu4Suo81GC1da4XKhd5o9LVO9n2XU/iIipmAZdtt4Bz+6GLau2LLFBSUezblwZO7B 2x4g== X-Gm-Message-State: AAQBX9dOQEAIv6JrB++TRrngEcxNL9LQ5X41uQjETOCPsrA0JM3bP5/O gR4uY/PsRtrVYJB6cWI264qbSg== X-Google-Smtp-Source: AKy350ayHnR9egIme6CpwqDYS2g+jGW0SaLz1+gDVhg6RhhsS1NHSBPBVaEyVs2WVJMDnqJVS0vlaA== X-Received: by 2002:a05:6a00:1305:b0:63d:a0d:6fa1 with SMTP id j5-20020a056a00130500b0063d0a0d6fa1mr23963010pfu.21.1682505581321; Wed, 26 Apr 2023 03:39:41 -0700 (PDT) From: Akihiko Odaki To: Cc: Sriram Yagnaraman , Jason Wang , Dmitry Fleytman , "Michael S . Tsirkin" , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal , Cleber Rosa , Laurent Vivier , Paolo Bonzini , qemu-devel@nongnu.org, Tomasz Dzieciol , Akihiko Odaki Subject: [PATCH v4 39/48] igb: Filter with the second VLAN tag for extended VLAN Date: Wed, 26 Apr 2023 19:37:07 +0900 Message-Id: <20230426103716.26279-40-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230426103716.26279-1-akihiko.odaki@daynix.com> References: <20230426103716.26279-1-akihiko.odaki@daynix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2607:f8b0:4864:20::42c; envelope-from=akihiko.odaki@daynix.com; helo=mail-pf1-x42c.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @daynix-com.20221208.gappssmtp.com) X-ZM-MESSAGEID: 1682505917046100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Akihiko Odaki --- hw/net/igb_core.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/hw/net/igb_core.c b/hw/net/igb_core.c index 688eaf7319..5345f57031 100644 --- a/hw/net/igb_core.c +++ b/hw/net/igb_core.c @@ -69,7 +69,7 @@ typedef struct IGBTxPktVmdqCallbackContext { =20 typedef struct L2Header { struct eth_header eth; - struct vlan_header vlan; + struct vlan_header vlan[2]; } L2Header; =20 static ssize_t @@ -1001,7 +1001,7 @@ static uint16_t igb_receive_assign(IGBCore *core, con= st L2Header *l2_header, uint32_t f, ra[2], *macp, rctl =3D core->mac[RCTL]; uint16_t queues =3D 0; uint16_t oversized =3D 0; - uint16_t vid =3D be16_to_cpu(l2_header->vlan.h_tci) & VLAN_VID_MASK; + size_t vlan_num =3D 0; int i; =20 memset(rss_info, 0, sizeof(E1000E_RSSInfo)); @@ -1010,8 +1010,19 @@ static uint16_t igb_receive_assign(IGBCore *core, co= nst L2Header *l2_header, *external_tx =3D true; } =20 - if (e1000x_is_vlan_packet(ehdr, core->mac[VET] & 0xffff) && - !e1000x_rx_vlan_filter(core->mac, PKT_GET_VLAN_HDR(ehdr))) { + if (core->mac[CTRL_EXT] & BIT(26)) { + if (be16_to_cpu(ehdr->h_proto) =3D=3D core->mac[VET] >> 16 && + be16_to_cpu(l2_header->vlan[0].h_proto) =3D=3D (core->mac[VET]= & 0xffff)) { + vlan_num =3D 2; + } + } else { + if (be16_to_cpu(ehdr->h_proto) =3D=3D (core->mac[VET] & 0xffff)) { + vlan_num =3D 1; + } + } + + if (vlan_num && + !e1000x_rx_vlan_filter(core->mac, l2_header->vlan + vlan_num - 1))= { return queues; } =20 @@ -1065,7 +1076,9 @@ static uint16_t igb_receive_assign(IGBCore *core, con= st L2Header *l2_header, if (e1000x_vlan_rx_filter_enabled(core->mac)) { uint16_t mask =3D 0; =20 - if (e1000x_is_vlan_packet(ehdr, core->mac[VET] & 0xffff)) { + if (vlan_num) { + uint16_t vid =3D be16_to_cpu(l2_header->vlan[vlan_num - 1]= .h_tci) & VLAN_VID_MASK; + for (i =3D 0; i < E1000_VLVF_ARRAY_SIZE; i++) { if ((core->mac[VLVF0 + i] & E1000_VLVF_VLANID_MASK) = =3D=3D vid && (core->mac[VLVF0 + i] & E1000_VLVF_VLANID_ENABLE))= { --=20 2.40.0