Received: by 2002:a05:6358:11c7:b0:104:8066:f915 with SMTP id i7csp905823rwl; Wed, 29 Mar 2023 09:54:16 -0700 (PDT) X-Google-Smtp-Source: AKy350abQYD3Tus1TyJqgcmsAPPm1p/7X3VUxaOEvtxkRv8+ngPtta/nWmkBoK2YnOzPh8zmfr/G X-Received: by 2002:a05:6402:1005:b0:501:caae:e0de with SMTP id c5-20020a056402100500b00501caaee0demr20078910edu.4.1680108856672; Wed, 29 Mar 2023 09:54:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680108856; cv=none; d=google.com; s=arc-20160816; b=BpvatI6IC4mTft+YQY5LVo5fZ2X0AxoAuak7e4uvO73tRcNAXYwJ3prBxe8tXIbK3Q 5cp8KbRont2kB1yHqgJmoy35GmSfOWpyCx8fsCigKfXsFvQVPU2KDwDSZxHrrC/7Mnhv 0r83cbw58X1lLDDbazkyCuIpXaN4fEVFRQCY7FqqZ5DznfykvFk8iuBQzAj/bsMMm6le lihYlhKvLusLep4bK2Zf7fd+kVtfJ+fzvsIYm5XH/BP2wg4GMSyLY7tt52VBOcdj7tms P3HgW+cZimAbPLWyXToZ773i2Df409JMirFy8vQENdKlUVlb3CSoI0TkVrAbZWH4dAmC ZboQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:cc:to:from :subject:dkim-signature; bh=vdLO4Y9b3BsmrzeQcmRa2KtBaNDjkTa0G8yC7xzEAHs=; b=0D+hFzr1+ag6pHBEd0pb821dwiXxim82kidRE3XrVSdUCq30pkk6nrZ5lEZZzgIytp ldnJtpsZfPjLnNZRlWV6X2noH5FXtHY2Pgagn0l3Fee+9GrMzpTk8t1ZiOz15gYCVQzI kM4WA7kqLq1dZhCPGhuGbCN5pwJNV9YBY7J/6N93AhX4O5QolzLZr7I8iHZUBFL2lDG2 lZ1wkudhDKLf1E1ypAn6htNCp8rahMVqklK9h2zh3f+vmqd+Go7ngoRJ/RzgMWv7k/Uq /XXQV0JB8MglefZLZEv8/5GdwxiM/Y9ffcs25+dQt2jYViAEfuYfWFNRJsSxhm/PyQ3c 4+zg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ONlXOSmm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m13-20020a056402050d00b00501d6a277eesi23649699edv.164.2023.03.29.09.53.51; Wed, 29 Mar 2023 09:54:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ONlXOSmm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230023AbjC2QaZ (ORCPT + 99 others); Wed, 29 Mar 2023 12:30:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230025AbjC2QaL (ORCPT ); Wed, 29 Mar 2023 12:30:11 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E35C35240 for ; Wed, 29 Mar 2023 09:29:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680107357; 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=vdLO4Y9b3BsmrzeQcmRa2KtBaNDjkTa0G8yC7xzEAHs=; b=ONlXOSmma5Wt/k0voP+RJJVRrfYaDEleAyzy1ZeBjAVOOmt5/Jst3J6cYomL2G6DNVV4Zy vkD5aVrksLbNBovZRxKGPZKSY3bes/5RetrikvNG9HXGbCO+pwLQcjwzL7W7Ii8x/8vGw1 nVBQoeZtgBilqVUigVT4cOp02PRI+lk= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-147-lMCce-KrNl6Ba0Qy_Vxf1Q-1; Wed, 29 Mar 2023 12:29:10 -0400 X-MC-Unique: lMCce-KrNl6Ba0Qy_Vxf1Q-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 82961857F81; Wed, 29 Mar 2023 16:29:09 +0000 (UTC) Received: from firesoul.localdomain (unknown [10.45.242.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3913F2027040; Wed, 29 Mar 2023 16:29:09 +0000 (UTC) Received: from [10.1.1.1] (localhost [IPv6:::1]) by firesoul.localdomain (Postfix) with ESMTP id 5A33E30736C72; Wed, 29 Mar 2023 18:29:08 +0200 (CEST) Subject: [PATCH bpf RFC-V2 2/5] igc: bpf_xdp_metadata_rx_hash return xdp rss hash type From: Jesper Dangaard Brouer To: bpf@vger.kernel.org, Stanislav Fomichev Cc: Jesper Dangaard Brouer , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, martin.lau@kernel.org, ast@kernel.org, daniel@iogearbox.net, alexandr.lobakin@intel.com, larysa.zaremba@intel.com, xdp-hints@xdp-project.net, anthony.l.nguyen@intel.com, yoong.siang.song@intel.com, boon.leong.ong@intel.com, intel-wired-lan@lists.osuosl.org, pabeni@redhat.com, jesse.brandeburg@intel.com, kuba@kernel.org, edumazet@google.com, john.fastabend@gmail.com, hawk@kernel.org, davem@davemloft.net Date: Wed, 29 Mar 2023 18:29:08 +0200 Message-ID: <168010734832.3039990.11189218865563948327.stgit@firesoul> In-Reply-To: <168010726310.3039990.2753040700813178259.stgit@firesoul> References: <168010726310.3039990.2753040700813178259.stgit@firesoul> User-Agent: StGit/1.4 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Update API for bpf_xdp_metadata_rx_hash() by returning xdp rss hash type via mapping table. Signed-off-by: Jesper Dangaard Brouer --- drivers/net/ethernet/intel/igc/igc_main.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c index b382476f347c..a14f0597524a 100644 --- a/drivers/net/ethernet/intel/igc/igc_main.c +++ b/drivers/net/ethernet/intel/igc/igc_main.c @@ -6496,6 +6496,26 @@ static int igc_xdp_rx_timestamp(const struct xdp_md *_ctx, u64 *timestamp) return -ENODATA; } +/* Mapping HW RSS Type to enum xdp_rss_hash_type */ +enum xdp_rss_hash_type igc_xdp_rss_type[IGC_RSS_TYPE_MAX_TABLE] = { + [IGC_RSS_TYPE_NO_HASH] = XDP_RSS_TYPE_L2, + [IGC_RSS_TYPE_HASH_TCP_IPV4] = XDP_RSS_TYPE_L4_IPV4_TCP, + [IGC_RSS_TYPE_HASH_IPV4] = XDP_RSS_TYPE_L3_IPV4, + [IGC_RSS_TYPE_HASH_TCP_IPV6] = XDP_RSS_TYPE_L4_IPV6_TCP, + [IGC_RSS_TYPE_HASH_IPV6_EX] = XDP_RSS_TYPE_L3_IPV6_EX, + [IGC_RSS_TYPE_HASH_IPV6] = XDP_RSS_TYPE_L3_IPV6, + [IGC_RSS_TYPE_HASH_TCP_IPV6_EX] = XDP_RSS_TYPE_L4_IPV6_TCP_EX, + [IGC_RSS_TYPE_HASH_UDP_IPV4] = XDP_RSS_TYPE_L4_IPV4_UDP, + [IGC_RSS_TYPE_HASH_UDP_IPV6] = XDP_RSS_TYPE_L4_IPV6_UDP, + [IGC_RSS_TYPE_HASH_UDP_IPV6_EX] = XDP_RSS_TYPE_L4_IPV6_UDP_EX, + [10] = XDP_RSS_TYPE_NONE, /* RSS Type above 9 "Reserved" by HW */ + [11] = XDP_RSS_TYPE_NONE, /* keep array sized for SW bit-mask */ + [12] = XDP_RSS_TYPE_NONE, /* to handle future HW revisons */ + [13] = XDP_RSS_TYPE_NONE, + [14] = XDP_RSS_TYPE_NONE, + [15] = XDP_RSS_TYPE_NONE, +}; + static int igc_xdp_rx_hash(const struct xdp_md *_ctx, u32 *hash) { const struct igc_xdp_buff *ctx = (void *)_ctx; @@ -6505,7 +6525,7 @@ static int igc_xdp_rx_hash(const struct xdp_md *_ctx, u32 *hash) *hash = le32_to_cpu(ctx->rx_desc->wb.lower.hi_dword.rss); - return 0; + return igc_xdp_rss_type[igc_rss_type(ctx->rx_desc)]; } const struct xdp_metadata_ops igc_xdp_metadata_ops = {