From nobody Thu Dec 18 17:56:57 2025 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1583135395; cv=none; d=zohomail.com; s=zohoarc; b=C5aHH0slXIEMRIq7oBeY6mGhp9QUwbdAiQ/mBFeieEsKyiM7nUWSUXUDrfLMaZEcj6j0lxsjcEx/UNgnBhh6LPHffTHjJzgQ30d0tOV+IuYcTfAPx+rRsgLcRXkwFep0IIfougXB3Gd0nooPwQgWWq3Q6dg3pwkOaghJ7GVMF+g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583135395; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=1ApLhV3uZsOSY6jOtE730X7bpibd0Lku0jFdhIBohtk=; b=FT2riubgS31nmMHsCErnAflR/myPiY57+EzZDDkSn8o17aVePg+CL0liW1f037ozGl/SaDakl0hW/uGUfjJXAKMz1zGw8DpSzth9ZzMmowhH3heI4B4GCfkeZRrO7ST9w1FynkW3f+5zrxfbTDOwGFr3vvqMOGyRrn7ApzVBTb0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1583135395237789.7494069204157; Sun, 1 Mar 2020 23:49:55 -0800 (PST) Received: from localhost ([::1]:56100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8fpp-0003Ul-M2 for importer@patchew.org; Mon, 02 Mar 2020 02:49:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60286) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8fhe-0004oJ-K8 for qemu-devel@nongnu.org; Mon, 02 Mar 2020 02:41:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j8fhd-0003mz-JS for qemu-devel@nongnu.org; Mon, 02 Mar 2020 02:41:26 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:21596) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j8fhd-0003mn-FW for qemu-devel@nongnu.org; Mon, 02 Mar 2020 02:41:25 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-17-izamXhZENgOPPqeZgCdUxw-1; Mon, 02 Mar 2020 02:41:22 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 955CB107ACC4; Mon, 2 Mar 2020 07:41:21 +0000 (UTC) Received: from jason-ThinkPad-T430s.redhat.com (ovpn-12-58.pek2.redhat.com [10.72.12.58]) by smtp.corp.redhat.com (Postfix) with ESMTP id EBC5E60BF3; Mon, 2 Mar 2020 07:41:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583134885; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1ApLhV3uZsOSY6jOtE730X7bpibd0Lku0jFdhIBohtk=; b=NZhDr/5xbSCbKJnRCAdTwxHStn/GtEe8jUH7nQ9w+2vVz8yGK/4f0EKzXQPYD+QQOZvT/D WnBVW9Mwd8aB/mztNNx2YwF7lz4LrVtOoLaB7RDB0fyk7MXPHrrYgkcyG3N/FN2H3LE15G ge8Ox5gRrRgBWGmkvMOpWOfug0nccXQ= X-MC-Unique: izamXhZENgOPPqeZgCdUxw-1 From: Jason Wang To: peter.maydell@linaro.org Subject: [PULL 17/23] NetRxPkt: fix hash calculation of IPV6 TCP Date: Mon, 2 Mar 2020 15:40:30 +0800 Message-Id: <1583134836-23991-18-git-send-email-jasowang@redhat.com> In-Reply-To: <1583134836-23991-1-git-send-email-jasowang@redhat.com> References: <1583134836-23991-1-git-send-email-jasowang@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 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: Yuri Benditovich , Jason Wang , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Yuri Benditovich When requested to calculate the hash for TCPV6 packet, ignore overrides of source and destination addresses in in extension headers. Use these overrides when new hash type NetPktRssIpV6TcpEx requested. Use this type in e1000e hash calculation for IPv6 TCP, which should take in account overrides of the addresses. Signed-off-by: Yuri Benditovich Acked-by: Dmitry Fleytman Signed-off-by: Jason Wang --- hw/net/e1000e_core.c | 2 +- hw/net/net_rx_pkt.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c index d110c5a..94ea34d 100644 --- a/hw/net/e1000e_core.c +++ b/hw/net/e1000e_core.c @@ -582,7 +582,7 @@ e1000e_rss_calc_hash(E1000ECore *core, type =3D NetPktRssIpV4Tcp; break; case E1000_MRQ_RSS_TYPE_IPV6TCP: - type =3D NetPktRssIpV6Tcp; + type =3D NetPktRssIpV6TcpEx; break; case E1000_MRQ_RSS_TYPE_IPV6: type =3D NetPktRssIpV6; diff --git a/hw/net/net_rx_pkt.c b/hw/net/net_rx_pkt.c index b2a06bd..1e1c504 100644 --- a/hw/net/net_rx_pkt.c +++ b/hw/net/net_rx_pkt.c @@ -348,7 +348,7 @@ net_rx_pkt_calc_rss_hash(struct NetRxPkt *pkt, assert(pkt->isip6); assert(pkt->istcp); trace_net_rx_pkt_rss_ip6_tcp(); - _net_rx_rss_prepare_ip6(&rss_input[0], pkt, true, &rss_length); + _net_rx_rss_prepare_ip6(&rss_input[0], pkt, false, &rss_length); _net_rx_rss_prepare_tcp(&rss_input[0], pkt, &rss_length); break; case NetPktRssIpV6: --=20 2.5.0