From nobody Mon Nov 25 06:37:51 2024 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; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1717486798; cv=none; d=zohomail.com; s=zohoarc; b=VGm31nEuek9wgkU1ObH2x8g9MjUAz2Tf8xS60bmLrz0cD4fhj/j2JP4jxWKc2URjUT9WClgPxp/FDyDuGR+lteeWjNHLYA/UiE0SxtfoDbWtrN3/v5tn4gY793xCWZ2BfS7JSKxPGWyyvPgEBcqgUmaLsw68NrrNNao1Fci766g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1717486798; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=kPpu3J9dgVPZaMNZ1JdOKNoZ3573PXztcqUvWlO+l9s=; b=Cls0X3BuWRJ70RGCa7b9E2Ojqb7Kpe1weintcHiqou4Vp1k4BEJKWb86Pp4pdUK+4wjMg+OhMfL0gyjJurT8F9iC+rwh20y/TeDfUjffEq65XDtNySkazIeJrwZO6cCPwS7o/LphCBOMV6UUmSED56Wgy6pk/eTQCpJc6qN0lFU= 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1717486798717641.9681119733752; Tue, 4 Jun 2024 00:39:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sEOl6-0001co-DO; Tue, 04 Jun 2024 03:39:04 -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 1sEOl2-00017R-CK for qemu-devel@nongnu.org; Tue, 04 Jun 2024 03:39:00 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sEOl0-0006Oq-Ea for qemu-devel@nongnu.org; Tue, 04 Jun 2024 03:39:00 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-641-tBt7MAoCPf-O1v7xcYSHeA-1; Tue, 04 Jun 2024 03:38:52 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 01AE785A5BA; Tue, 4 Jun 2024 07:38:52 +0000 (UTC) Received: from localhost.localdomain (unknown [10.72.112.238]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0A05A492BF8; Tue, 4 Jun 2024 07:38:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1717486737; 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=kPpu3J9dgVPZaMNZ1JdOKNoZ3573PXztcqUvWlO+l9s=; b=Pdq8GGLGo61eTJrmJ9uzyZhjAGtGl1rJFLzfWM7w4xaXMntob7giA29lObJdbhGy9UTtsN SWUweOgiMlNpEwqLYWRbCMmlyXghKGQXVq+RtFeuLUy9pIwYhsgQTXPXAHijxR3Qi7h069 eybYbkj3DeZPVS+qi7hklA7m5V9iOhc= X-MC-Unique: tBt7MAoCPf-O1v7xcYSHeA-1 From: Jason Wang To: peter.maydell@linaro.org, qemu-devel@nongnu.org Cc: Akihiko Odaki , Jason Wang Subject: [PULL 17/20] ebpf: Refactor tun_rss_steering_prog() Date: Tue, 4 Jun 2024 15:37:52 +0800 Message-ID: <20240604073755.1859-18-jasowang@redhat.com> In-Reply-To: <20240604073755.1859-1-jasowang@redhat.com> References: <20240604073755.1859-1-jasowang@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 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: pass client-ip=170.10.129.124; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-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 @redhat.com) X-ZM-MESSAGEID: 1717486800215100001 Content-Type: text/plain; charset="utf-8" From: Akihiko Odaki This saves branches and makes later BPF program changes easier. Signed-off-by: Akihiko Odaki Signed-off-by: Jason Wang --- tools/ebpf/rss.bpf.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/tools/ebpf/rss.bpf.c b/tools/ebpf/rss.bpf.c index 77434435ac..c989cb3cd8 100644 --- a/tools/ebpf/rss.bpf.c +++ b/tools/ebpf/rss.bpf.c @@ -547,27 +547,23 @@ int tun_rss_steering_prog(struct __sk_buff *skb) config =3D bpf_map_lookup_elem(&tap_rss_map_configurations, &key); toe =3D bpf_map_lookup_elem(&tap_rss_map_toeplitz_key, &key); =20 - if (config && toe) { - if (!config->redirect) { - return config->default_queue; - } + if (!config || !toe) { + return 0; + } =20 - if (calculate_rss_hash(skb, config, toe, &hash)) { - __u32 table_idx =3D hash % config->indirections_len; - __u16 *queue =3D 0; + if (config->redirect && calculate_rss_hash(skb, config, toe, &hash)) { + __u32 table_idx =3D hash % config->indirections_len; + __u16 *queue =3D 0; =20 - queue =3D bpf_map_lookup_elem(&tap_rss_map_indirection_table, - &table_idx); + queue =3D bpf_map_lookup_elem(&tap_rss_map_indirection_table, + &table_idx); =20 - if (queue) { - return *queue; - } + if (queue) { + return *queue; } - - return config->default_queue; } =20 - return 0; + return config->default_queue; } =20 char _license[] SEC("license") =3D "GPL v2"; --=20 2.42.0