From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 14D51C7EE29 for ; Mon, 5 Jun 2023 02:30:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id B7EDE60C22; Mon, 5 Jun 2023 02:30:23 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org B7EDE60C22 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org; s=default; t=1685932223; bh=qTcSCHM/fVST3klKJLq8Iy9GyWaP+3rO8iY44WCfQ8w=; h=From:To:Date:In-Reply-To:References:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=s5iIlRhoNTaHQEwolzl+xQamv+Zls7+uzF6/OfeXVSgnrIojAVFS3oE4n+a76by1p fL95pikcjGaA4vZKQZJ8/wqUoFh/cL617uagnxG3LJ3TYvVMzj6YJNqbJ7Mr9ODzmw unyLFXbYf3LhdJTCKiI5HlMovX52q3aOS+ZlGIxnG6kCcsBPXjLyntTw7msz4GKPYw K4kGGEcc2w1Dfd1ub/uvJ2omdNMrEB9c6nJTUwOWwxrCS0K8GAoNbJjVTJyG1Mm3Yw QqBm5EE9yhgdzgyFKx2qzx8wx/Mq+/5f3ej6pcqscpkCwTuzEyq54AiEXjabxYfvxZ Mtbfcp3K5dSow== X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ovkdldNVD_lM; Mon, 5 Jun 2023 02:30:22 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 8EDA760E35; Mon, 5 Jun 2023 02:30:22 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 8EDA760E35 Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id C4E421BF336 for ; Mon, 5 Jun 2023 02:29:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 9E76960BC4 for ; Mon, 5 Jun 2023 02:29:46 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 9E76960BC4 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id h-I4epEsLTKA for ; Mon, 5 Jun 2023 02:29:45 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org B3B5860BD6 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by smtp3.osuosl.org (Postfix) with ESMTPS id B3B5860BD6 for ; Mon, 5 Jun 2023 02:29:45 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6600,9927,10731"; a="358710427" X-IronPort-AV: E=Sophos;i="6.00,217,1681196400"; d="scan'208";a="358710427" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jun 2023 19:29:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10731"; a="1038604775" X-IronPort-AV: E=Sophos;i="6.00,217,1681196400"; d="scan'208";a="1038604775" Received: from dpdk-jf-ntb-v2.sh.intel.com ([10.67.119.16]) by fmsmga005.fm.intel.com with ESMTP; 04 Jun 2023 19:29:44 -0700 From: Junfeng Guo To: intel-wired-lan@lists.osuosl.org Date: Mon, 5 Jun 2023 10:29:15 +0800 Message-Id: <20230605022920.2361266-11-junfeng.guo@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230605022920.2361266-1-junfeng.guo@intel.com> References: <20230605022920.2361266-1-junfeng.guo@intel.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685932185; x=1717468185; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=METiWH3vFE1/Fh0ZnM5P0XrAO/mZFWYEjJBFCcmFrT0=; b=EAumA4wTp6TjkbQY1fAl/BAq7Cwt2hRKbUddVlcqeHDK6q/o72i+zjdY h1fQllW3ajo92JRyGaZxEiT0BEEg/hIm+N8+qZ8IHak3+HfELJvoM/8xO IPA1QLo7Sxu2kCU9N2ga0S0Ra8WPXiPfS7BA4v5igjv2XuCveU0lwWEXJ Jh5C382PTJAxk5Bu+uGxC3MKj3Td1GIGsWuXTahLRCkjsPA5Seg07O3/X m1E+u+f7m0Bn3ZGI868MymqLtx5HsHWNtVRKt8WX6CW9mkDWtIkGXYTo5 c0gl4aklrfRi1FiJA5uStVOO8KphjO5VahdJkx3GFa25F7RVyP2anNgh5 Q==; X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=EAumA4wT Subject: [Intel-wired-lan] [PATCH iwl-next 10/15] ice: add parser runtime skeleton X-BeenThere: intel-wired-lan@osuosl.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qi.z.zhang@intel.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" Add parser runtime data struct ice_parser_rt. Add below APIs for parser runtime preparation: ice_parser_rt_reset ice_parser_rt_pkt_buf_set Add below API skeleton for parser runtime execution: ice_parser_rt_execute Signed-off-by: Junfeng Guo --- drivers/net/ethernet/intel/ice/ice_parser.c | 39 ++++++++ drivers/net/ethernet/intel/ice/ice_parser.h | 24 +++++ .../net/ethernet/intel/ice/ice_parser_rt.c | 95 +++++++++++++++++++ .../net/ethernet/intel/ice/ice_parser_rt.h | 27 ++++++ 4 files changed, 185 insertions(+) create mode 100644 drivers/net/ethernet/intel/ice/ice_parser_rt.c create mode 100644 drivers/net/ethernet/intel/ice/ice_parser_rt.h diff --git a/drivers/net/ethernet/intel/ice/ice_parser.c b/drivers/net/ethernet/intel/ice/ice_parser.c index 68a8eee1c929..03a237de2c8d 100644 --- a/drivers/net/ethernet/intel/ice/ice_parser.c +++ b/drivers/net/ethernet/intel/ice/ice_parser.c @@ -300,3 +300,42 @@ void ice_parser_destroy(struct ice_parser *psr) devm_kfree(ice_hw_to_dev(psr->hw), psr); } + +/** + * ice_parser_run - parse on a packet in binary and return the result + * @psr: pointer to a parser instance + * @pkt_buf: packet data + * @pkt_len: packet length + * @rslt: input/output parameter to save parser result. + */ +int ice_parser_run(struct ice_parser *psr, const u8 *pkt_buf, + int pkt_len, struct ice_parser_result *rslt) +{ + ice_parser_rt_reset(&psr->rt); + ice_parser_rt_pktbuf_set(&psr->rt, pkt_buf, pkt_len); + + return ice_parser_rt_execute(&psr->rt, rslt); +} + +/** + * ice_parser_result_dump - dump a parser result info + * @hw: pointer to the hardware structure + * @rslt: parser result info to dump + */ +void ice_parser_result_dump(struct ice_hw *hw, struct ice_parser_result *rslt) +{ + int i; + + dev_info(ice_hw_to_dev(hw), "ptype = %d\n", rslt->ptype); + for (i = 0; i < rslt->po_num; i++) + dev_info(ice_hw_to_dev(hw), "proto = %d, offset = %d\n", + rslt->po[i].proto_id, rslt->po[i].offset); + + dev_info(ice_hw_to_dev(hw), "flags_psr = 0x%016llx\n", + (unsigned long long)rslt->flags_psr); + dev_info(ice_hw_to_dev(hw), "flags_pkt = 0x%016llx\n", + (unsigned long long)rslt->flags_pkt); + dev_info(ice_hw_to_dev(hw), "flags_sw = 0x%04x\n", rslt->flags_sw); + dev_info(ice_hw_to_dev(hw), "flags_fd = 0x%04x\n", rslt->flags_fd); + dev_info(ice_hw_to_dev(hw), "flags_rss = 0x%04x\n", rslt->flags_rss); +} diff --git a/drivers/net/ethernet/intel/ice/ice_parser.h b/drivers/net/ethernet/intel/ice/ice_parser.h index 8222e738d493..189fe254bfb4 100644 --- a/drivers/net/ethernet/intel/ice/ice_parser.h +++ b/drivers/net/ethernet/intel/ice/ice_parser.h @@ -13,6 +13,7 @@ #include "ice_proto_grp.h" #include "ice_flg_rd.h" #include "ice_xlt_kb.h" +#include "ice_parser_rt.h" struct ice_parser { struct ice_hw *hw; /* pointer to the hardware structure */ @@ -49,8 +50,31 @@ struct ice_parser { struct ice_xlt_kb *xlt_kb_fd; /* load data from section ICE_SID_XLT_KEY_BUILDER_RSS */ struct ice_xlt_kb *xlt_kb_rss; + struct ice_parser_rt rt; /* parser runtime */ }; int ice_parser_create(struct ice_hw *hw, struct ice_parser **psr); void ice_parser_destroy(struct ice_parser *psr); + +struct ice_parser_proto_off { + u8 proto_id; /* hardware protocol ID */ + u16 offset; /* offset where the protocol header start */ +}; + +struct ice_parser_result { + u16 ptype; /* 16 bits hardware PTYPE */ + /* protocol and header offset pairs */ + struct ice_parser_proto_off po[16]; + int po_num; /* number of pairs must <= 16 */ + u64 flags_psr; /* 64 bits parser flags */ + u64 flags_pkt; /* 64 bits packet flags */ + u16 flags_sw; /* 16 bits key builder flag for SW */ + u16 flags_acl; /* 16 bits key builder flag for ACL */ + u16 flags_fd; /* 16 bits key builder flag for FD */ + u16 flags_rss; /* 16 bits key builder flag for RSS */ +}; + +int ice_parser_run(struct ice_parser *psr, const u8 *pkt_buf, + int pkt_len, struct ice_parser_result *rslt); +void ice_parser_result_dump(struct ice_hw *hw, struct ice_parser_result *rslt); #endif /* _ICE_PARSER_H_ */ diff --git a/drivers/net/ethernet/intel/ice/ice_parser_rt.c b/drivers/net/ethernet/intel/ice/ice_parser_rt.c new file mode 100644 index 000000000000..0e276faac6c5 --- /dev/null +++ b/drivers/net/ethernet/intel/ice/ice_parser_rt.c @@ -0,0 +1,95 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2018-2023 Intel Corporation */ + +#include "ice_common.h" + +#define GPR_HB_IDX 64 +#define GPR_ERR_IDX 84 +#define GPR_FLG_IDX 104 +#define GPR_TSR_IDX 108 +#define GPR_NN_IDX 109 +#define GPR_HO_IDX 110 +#define GPR_NP_IDX 111 + +static void _rt_tsr_set(struct ice_parser_rt *rt, u16 tsr) +{ + rt->gpr[GPR_TSR_IDX] = tsr; +} + +static void _rt_ho_set(struct ice_parser_rt *rt, u16 ho) +{ + rt->gpr[GPR_HO_IDX] = ho; + memcpy(&rt->gpr[GPR_HB_IDX], &rt->pkt_buf[ho], 32); +} + +static void _rt_np_set(struct ice_parser_rt *rt, u16 pc) +{ + rt->gpr[GPR_NP_IDX] = pc; +} + +static void _rt_nn_set(struct ice_parser_rt *rt, u16 node) +{ + rt->gpr[GPR_NN_IDX] = node; +} + +static void _rt_flag_set(struct ice_parser_rt *rt, int idx) +{ + int y = idx / 16; + int x = idx % 16; + + rt->gpr[GPR_FLG_IDX + y] |= (u16)(1 << x); +} + +/** + * ice_parser_rt_reset - reset the parser runtime + * @rt: pointer to the parser runtime + */ +void ice_parser_rt_reset(struct ice_parser_rt *rt) +{ + struct ice_parser *psr = rt->psr; + struct ice_metainit_item *mi = &psr->mi_table[0]; + int i; + + memset(rt, 0, sizeof(*rt)); + + _rt_tsr_set(rt, mi->tsr); + _rt_ho_set(rt, mi->ho); + _rt_np_set(rt, mi->pc); + _rt_nn_set(rt, mi->pg_rn); + + rt->psr = psr; + + for (i = 0; i < 64; i++) { + if ((mi->flags & (1ul << i)) != 0ul) + _rt_flag_set(rt, i); + } +} + +/** + * ice_parser_rt_pktbuf_set - set a packet into parser runtime + * @rt: pointer to the parser runtime + * @pkt_buf: buffer with packet data + * @pkt_len: packet buffer length + */ +void ice_parser_rt_pktbuf_set(struct ice_parser_rt *rt, const u8 *pkt_buf, + int pkt_len) +{ + int len = min(ICE_PARSER_MAX_PKT_LEN, pkt_len); + u16 ho = rt->gpr[GPR_HO_IDX]; + + memcpy(rt->pkt_buf, pkt_buf, len); + rt->pkt_len = pkt_len; + + memcpy(&rt->gpr[GPR_HB_IDX], &rt->pkt_buf[ho], 32); +} + +/** + * ice_parser_rt_execute - parser execution routine + * @rt: pointer to the parser runtime + * @rslt: input/output parameter to save parser result + */ +int ice_parser_rt_execute(struct ice_parser_rt *rt, + struct ice_parser_result *rslt) +{ + return ICE_ERR_NOT_IMPL; +} diff --git a/drivers/net/ethernet/intel/ice/ice_parser_rt.h b/drivers/net/ethernet/intel/ice/ice_parser_rt.h new file mode 100644 index 000000000000..2c909a8dc01e --- /dev/null +++ b/drivers/net/ethernet/intel/ice/ice_parser_rt.h @@ -0,0 +1,27 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 2018-2023 Intel Corporation */ + +#ifndef _ICE_PARSER_RT_H_ +#define _ICE_PARSER_RT_H_ + +struct ice_parser_ctx; + +#define ICE_PARSER_MAX_PKT_LEN 504 +#define ICE_PARSER_GPR_NUM 128 + +struct ice_parser_rt { + struct ice_parser *psr; + u16 gpr[ICE_PARSER_GPR_NUM]; + u8 pkt_buf[ICE_PARSER_MAX_PKT_LEN + 32]; + u16 pkt_len; + u16 po; +}; + +void ice_parser_rt_reset(struct ice_parser_rt *rt); +void ice_parser_rt_pktbuf_set(struct ice_parser_rt *rt, const u8 *pkt_buf, + int pkt_len); + +struct ice_parser_result; +int ice_parser_rt_execute(struct ice_parser_rt *rt, + struct ice_parser_result *rslt); +#endif /* _ICE_PARSER_RT_H_ */ -- 2.25.1 _______________________________________________ Intel-wired-lan mailing list Intel-wired-lan@osuosl.org https://lists.osuosl.org/mailman/listinfo/intel-wired-lan