From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 68606A0543; Tue, 25 Oct 2022 10:00:25 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C351742B8E; Tue, 25 Oct 2022 10:00:05 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2134.outbound.protection.outlook.com [40.107.223.134]) by mails.dpdk.org (Postfix) with ESMTP id BBBDE42BC8 for ; Tue, 25 Oct 2022 10:00:01 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Yt9rugJsfwJSC2tCLfeedfGWpxMV5khhHSmg/0F4brZXPtPFiiorHYTFd3KykOZ+l1C4TNOeqQ2HHh1H7SRciL2N4Z+S2s1MKxTDKraSl2khCPInlhRsOE3VLXwWBU3phufl0wDCtWbu9jp8g4hXA+4nyWVr0Xmo2WaA6Y0s8xApzQ9IykahLL7vBj63q4NKkgaCsXpLfOBzXuiEm8TGLoOvKag7WUR8rvf2iFqW0J81ncBWadtVrI2ixC8J07SmLJf69TUD6lhLGspukONFh3baoP5pwjLN1U3HIcIckC07RvaSwFg/szMXAgqLMkf1k4k8SuV3YIXvuJd7ypxO/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=v73wimmFWgfwI3fjKH/mn9V5sGXHkKvCdDBijGF1e9Y=; b=Mz+15Y55yUvoszGf1bbIMhh77N/SFKoZlorVnzYaVbzUb7aWFxoiBC3GmPdCAz/46W+aLYtU9NKOk2WcMWUBUY1xevjH3c6z2/UTsaijQARAbZ38AMDaW6N1iYLkJDiktVWK+/L2gn7ISODWvOcapJuKz3NdF9t/BZuKqpWkao+5LFJXjoM3ZT60Yqu2+4/af/CUwmFvpIpLzoE79kcNq0kWK+bZ//2aDyk0B8Du+rwN8+Y33OLOnHyGggwTYnwg4zkuX+zacIT018fZuKKoI8lxwOl8ZUlPJDxr7lsnAKOvLYOwB948Dt2nWEmjWxKCnzS8cfCjn/8oMBsepEyI5g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=v73wimmFWgfwI3fjKH/mn9V5sGXHkKvCdDBijGF1e9Y=; b=LOlRIrnTMFO9WJNKOWniGssgvSwdvydONYBORymOyTOngyuwF5wqt1Adzy3ACFIey2FSaPbivMJfBy/kGrRqkI+TxrUpD5G53vUSwY1RZCaisziqRS37XymX8mFw/wpbnm1ScfnYdSPezy2fhjae+X71rr+5zDFikDikkbTgnDo= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by MW5PR13MB5439.namprd13.prod.outlook.com (2603:10b6:303:196::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.20; Tue, 25 Oct 2022 07:59:59 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::7c26:1a0b:2825:6f4b]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::7c26:1a0b:2825:6f4b%4]) with mapi id 15.20.5723.014; Tue, 25 Oct 2022 07:59:59 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v3 04/26] net/nfp: prepare for IPv4 tunnel encap flow action Date: Tue, 25 Oct 2022 15:58:56 +0800 Message-Id: <20221025075918.7778-5-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.29.3 In-Reply-To: <20221025075918.7778-1-chaoyong.he@corigine.com> References: <1666427069-10553-1-git-send-email-chaoyong.he@corigine.com> <20221025075918.7778-1-chaoyong.he@corigine.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: SG2PR01CA0142.apcprd01.prod.exchangelabs.com (2603:1096:4:8f::22) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|MW5PR13MB5439:EE_ X-MS-Office365-Filtering-Correlation-Id: 8fdf8a8a-9d8b-4e97-c939-08dab65ee9e7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GmNcHNvo7H8dlvcTBaTPB+9BX6Z05p0Lt0p08IgyZ3k2Wv2U8cgP28EWYlWB4hVTLv3Cbbv/Hr2Ls4J07mTyaCKgGsAIqMp/5HVbJ/sVPHQS+FBQ/Bm7VHnJmonhNus8mQR1PfqheUHi/IpUy9efk9wAJ9QENqg4znNXDk2WEEaF+ZoZXVuPzr60Jqz70kNvaeqK1NiivGeVb41Lm7IxZ/NQ3W6+WuQYeC/qmeEipXNjCkWSqmSSOOj/q3C3VwLcXb/3Ji37q0mIvOlyRdbnUy6aBSmqFvuO00ZQu7CFs02skAZHdFH6ucJhTng5fOucDKkpWuwalj4XxRdcOcr/XFwkVNV/Ekv3wVhOTxvB/5ND4ESnHLjlvvCOpFXt8RqsRAqFIGGirsNe/rqipZ0wKyy934JcyRih2397ksTizE5YTTC2JEc7P1sNHW6foVDV4mGPKOiU5yGFWKD56XrWLT3H/tNV73FdG2CgDyKsJPEuUk4IZO6/htspEvGtjvXIB2sTjytmeioV0ly+TYto1jrQrbn+XNJZyI4QSzEFYH3mDRg09FUK2FGYmfN9+idW7KPpNUc5FWpKolQPZSOEghM/Vqj0CBaFSrjh2MG3mOuCjcFq/+XWvc+THwM+yhXbWcatBZGRnMbn4oXxiFxgCTT8WoE+XOlbVoMfjc2d9dP7L2dBMSXEMxJ6pL4L4VckN5FbXb44QcN1vYfSzzePUm54gCPbKiZAzArbtvGAQ5T13c2+aOpEaf5Ep6kU9kgUwDyvZ9itkRdSuSmywlReXw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(39850400004)(366004)(396003)(346002)(376002)(136003)(451199015)(83380400001)(6506007)(478600001)(316002)(38100700002)(52116002)(38350700002)(2906002)(41300700001)(30864003)(5660300002)(6486002)(44832011)(66946007)(66476007)(4326008)(66556008)(8676002)(6916009)(66574015)(1076003)(8936002)(6512007)(86362001)(2616005)(26005)(107886003)(6666004)(36756003)(186003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?aVNVM1ZCWkc3VmptbUJiTWtRK0x1SkdMNG5XWjN0RnQ3Uk4yMTgxZUpTWFFP?= =?utf-8?B?ZWxxTGxxRy9lZElnamMzOC9uNE41RlFXMXJtaUJsYlcwanJhNlByQURTVFl1?= =?utf-8?B?VmdNZFVmN2FaTSt1RlVaWUF4bUd3ZGcyUHQvN0hTR0xSQkxxUnlybDhBNmt2?= =?utf-8?B?VUVPVDBuaXpKTDRvejdtWmh5Rld6ZzV0b2RKWFloWk9jVGZXYVQrTlpzMDJ1?= =?utf-8?B?c2tFSXlTQmgzVzM5UGIxUDUzeXVRVThWOE84RHM5SVVpRTVjQVNjSUVaK0FN?= =?utf-8?B?S1RQYXRqNEh6RzFheGUzMjFDZFd5TGZHc1BZYzExTHNRUFJDTkUyOFo5MTY5?= =?utf-8?B?QmFHdmNCUkgrNnV0UjRvZjB5OGVsRmFTblNaV05SaXA3NlAyNmVVK0xRL1hz?= =?utf-8?B?anlldSs0bnhhdjNuYW9LWFRrQlpYaDFER0JGQTlDcUFOTDJXbWRGOUJFNGp6?= =?utf-8?B?WTYwOWcyMEF6NmFEV1NIeURNRU5BVTl4TEJqWVhKK2lBSktRaDE2Sk1idVhz?= =?utf-8?B?NEVoWkprNjBNV0pHYnZ0WFhkY1VlMGhTdVQrWEd4bzVwaStyOUFhbVNpclo1?= =?utf-8?B?b0ovZEVNdWRXOUpva29BVzczenFLZGhJMWpSQUNlb2hoaVVkQXhNRlZkUTV0?= =?utf-8?B?bVM0Szhwd0ZDTThzWWVYMEpaazVYUWt5enBibTgxTVpBNlY4SEZwTlIyZWFS?= =?utf-8?B?S0gva3NNYk05cnFsZDYyaldaajJpcXBWa2YrYm5IM01oWWFWaUM2RUZjaUp1?= =?utf-8?B?eUwvS25VWXpjU1k4TEFSYTR3allPWEgwbXlSSVpuTFliZFJCcFZHd25TeitN?= =?utf-8?B?dE1UdDN0dk9wSm45OXNMWWE4N2RqT1lyZHNxbENSeTQrRUtrVVRVUmlYdDJL?= =?utf-8?B?OFUyajVMOXBsYTJlYzJzb1NJNjcwb05URUdFQzlVcG5GQlQ4bFdGZEM4NGNX?= =?utf-8?B?aDZPYmhjclFWVU5CaHJ0OFhaSWhLbSsrdWhFM3VsTVFRWDhIYmRMeGJkVUFN?= =?utf-8?B?QlljUzExdGdWVE5VL0NEMkJMMkRUbXI0bFFvVXZMYWgwWVQ2MXlJdGJLOThv?= =?utf-8?B?elNPUTNGNmtyWWVMeituQTkwbmVqdW9XcCtDRzJNUE1IUGRIU3BsRGUrM1VE?= =?utf-8?B?blVjMGljd1ZZYS9xektybGZCWFRpKzdUUU9pL0k2d1lFWFEwN1RzRW1KcXh2?= =?utf-8?B?OWkrall3WC9ualAwUkFyeXZvU0JxZDRCZ0N3aWozcTc3bmZIeDlpaDdTR1FN?= =?utf-8?B?RUpyZHI2Vkc1dkFSUlMwaHowSGt6RDRLRHRPc1d0bFd1ZmwwNitGY2ZGQ2tE?= =?utf-8?B?YWFMeHhaais2SzVzZENleDJNaEE5RVptMlVQS0pSVjhXdDd2ek9PUDJ4cjZL?= =?utf-8?B?Y2FBbFg3ZXRXQ0ZUSktERFdZSXVkRnh3b0s1dVVYbG40TW1kVVZYSGZPTjJZ?= =?utf-8?B?REU2T1Iyb3ltVGgwaENCVXE4Ulh4MmJIOG5JYklmdHdBSXF4NWdZM29jT1NG?= =?utf-8?B?bnlXSGVsdTVXRUZKL2dSYU50ZW9zQjFkNk1YbWZSZjgrSE5scGNYdTlRc0NK?= =?utf-8?B?RkFRRHYyTVQ3WWdwTTVNb01VZnFYc1FZVjBNT2dLU3Azb296S3Y5bFY1bmxp?= =?utf-8?B?WXdjZys1MG93RE9GOCtQR3IwcjQrOHpUUUZDd05YcE54bkx5RzcycmtlUHFZ?= =?utf-8?B?N2YzK3NyQllBYU9DRjJSZTMwMlV6NWpHQkxQZWhiYnhwRFZYclptVnQ0MVZi?= =?utf-8?B?RzhaTS9ucmxOWDRCVWFoditDb1VLYzZ3YXBkc2lacHArWWFFeEhjUWN6UENa?= =?utf-8?B?UXdmclJldVBVSXdSdm01Z1VocGM2ekQ0cFByOU5ZeUt5aXhabjNyTEpYZE9l?= =?utf-8?B?dk9UZEFrNFViYkMvRnpBZHZ5YmcrWWpSZXZOU3NtYUMvWkpFbU5wUGNlejV0?= =?utf-8?B?d0hnQXhoUUZJUmVWakxlYndSV1BFSUxETXVWZjJaejEvL0ErcDFsV0IzUGR6?= =?utf-8?B?b2lRakx5d2lRVU14dVhtVk5xUnVJTXd2czVEcEpJRzFwNElmNU9kdytoQUcy?= =?utf-8?B?cURYV0x2K0djL0Rmczg5MjJrRk5oQWp2ZGtsMWxQeEd6NDRKK01YbTJUaVBJ?= =?utf-8?B?eWJKRUg3Q1IzakdHRklmeGNHd3pFd29oR3ZhZ1h5T3ExVTR1bUw5TkJaTFc3?= =?utf-8?B?ZFE9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8fdf8a8a-9d8b-4e97-c939-08dab65ee9e7 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Oct 2022 07:59:59.7402 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: BRT3Vr78mSAmJVFQm41Zz/FvP0d1cRxf39NVgH46HzMCkseBx7YQKSlBErkpeWEktTRF9RJ5WSYMLGYdUuA4hRS1+BGFvdeIsgklJg6mbVc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW5PR13MB5439 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Add the related data structure and functions, prepare for the encap action of IPv4 tunnel. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/flower/nfp_flower_cmsg.c | 29 ++++++++ drivers/net/nfp/flower/nfp_flower_cmsg.h | 93 ++++++++++++++++++++++++ drivers/net/nfp/nfp_flow.c | 88 ++++++++++++++++++++++ drivers/net/nfp/nfp_flow.h | 27 +++++++ 4 files changed, 237 insertions(+) diff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.c b/drivers/net/nfp/flower/nfp_flower_cmsg.c index 15d838117a..7021d1fd43 100644 --- a/drivers/net/nfp/flower/nfp_flower_cmsg.c +++ b/drivers/net/nfp/flower/nfp_flower_cmsg.c @@ -246,3 +246,32 @@ nfp_flower_cmsg_flow_add(struct nfp_app_fw_flower *app_fw_flower, return 0; } + +int +nfp_flower_cmsg_tun_neigh_v4_rule(struct nfp_app_fw_flower *app_fw_flower, + struct nfp_flower_cmsg_tun_neigh_v4 *payload) +{ + uint16_t cnt; + size_t msg_len; + struct rte_mbuf *mbuf; + struct nfp_flower_cmsg_tun_neigh_v4 *msg; + + mbuf = rte_pktmbuf_alloc(app_fw_flower->ctrl_pktmbuf_pool); + if (mbuf == NULL) { + PMD_DRV_LOG(DEBUG, "Failed to alloc mbuf for v4 tun neigh"); + return -ENOMEM; + } + + msg_len = sizeof(struct nfp_flower_cmsg_tun_neigh_v4); + msg = nfp_flower_cmsg_init(mbuf, NFP_FLOWER_CMSG_TYPE_TUN_NEIGH, msg_len); + memcpy(msg, payload, msg_len); + + cnt = nfp_flower_ctrl_vnic_xmit(app_fw_flower, mbuf); + if (cnt == 0) { + PMD_DRV_LOG(ERR, "Send cmsg through ctrl vnic failed."); + rte_pktmbuf_free(mbuf); + return -EIO; + } + + return 0; +} diff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.h b/drivers/net/nfp/flower/nfp_flower_cmsg.h index 996ba3b982..e44e311176 100644 --- a/drivers/net/nfp/flower/nfp_flower_cmsg.h +++ b/drivers/net/nfp/flower/nfp_flower_cmsg.h @@ -129,6 +129,36 @@ struct nfp_flower_cmsg_port_mod { rte_be16_t mtu; }; +struct nfp_flower_tun_neigh { + uint8_t dst_mac[RTE_ETHER_ADDR_LEN]; + uint8_t src_mac[RTE_ETHER_ADDR_LEN]; + rte_be32_t port_id; +}; + +/* + * NFP_FLOWER_CMSG_TYPE_TUN_NEIGH_V4 + * Bit 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 + * -----\ 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 + * +---------------------------------------------------------------+ + * 0 | DST_IPV4 | + * +---------------------------------------------------------------+ + * 1 | SRC_IPV4 | + * +---------------------------------------------------------------+ + * 2 | DST_MAC_B5_B4_B3_B2 | + * +-------------------------------+-------------------------------+ + * 3 | DST_MAC_B1_B0 | SRC_MAC_B5_B4 | + * +-------------------------------+-------------------------------+ + * 4 | SRC_MAC_B3_B2_B1_B0 | + * +---------------------------------------------------------------+ + * 5 | Egress Port (NFP internal) | + * +---------------------------------------------------------------+ + */ +struct nfp_flower_cmsg_tun_neigh_v4 { + rte_be32_t dst_ipv4; + rte_be32_t src_ipv4; + struct nfp_flower_tun_neigh common; +}; + /* * NFP_FLOWER_CMSG_TYPE_FLOW_STATS * Bit 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 @@ -574,6 +604,67 @@ struct nfp_fl_act_set_tport { rte_be16_t dst_port; }; +/* + * Pre-tunnel + * 3 2 1 + * 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | - | opcode | |jump_id| - |M| - |V| + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | ipv6_daddr_127_96 / ipv4_daddr | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | ipv6_daddr_95_64 | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | ipv6_daddr_63_32 | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | ipv6_daddr_31_0 | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + */ +struct nfp_fl_act_pre_tun { + struct nfp_fl_act_head head; + rte_be16_t flags; + union { + rte_be32_t ipv4_dst; + uint8_t ipv6_dst[16]; + }; +}; + +/* + * Set tunnel + * 3 2 1 + * 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | res | opcode | res | len_lw| reserved | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | tun_id0 | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | tun_id1 | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | reserved | type |r| idx | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | ipv4_flags | ttl | tos | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | reserved_cvs1 | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | reserved_cvs2 | reserved_cvs3 | + * | var_flags | var_np | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + */ +struct nfp_fl_act_set_tun { + struct nfp_fl_act_head head; + rte_be16_t reserved; + rte_be64_t tun_id; + rte_be32_t tun_type_index; + rte_be16_t tun_flags; + uint8_t ttl; + uint8_t tos; + rte_be16_t outer_vlan_tpid; + rte_be16_t outer_vlan_tci; + uint8_t tun_len; /* Only valid for NFP_FL_TUNNEL_GENEVE */ + uint8_t reserved2; + rte_be16_t tun_proto; /* Only valid for NFP_FL_TUNNEL_GENEVE */ +} __rte_packed; + int nfp_flower_cmsg_mac_repr(struct nfp_app_fw_flower *app_fw_flower); int nfp_flower_cmsg_repr_reify(struct nfp_app_fw_flower *app_fw_flower, struct nfp_flower_representor *repr); @@ -583,5 +674,7 @@ int nfp_flower_cmsg_flow_delete(struct nfp_app_fw_flower *app_fw_flower, struct rte_flow *flow); int nfp_flower_cmsg_flow_add(struct nfp_app_fw_flower *app_fw_flower, struct rte_flow *flow); +int nfp_flower_cmsg_tun_neigh_v4_rule(struct nfp_app_fw_flower *app_fw_flower, + struct nfp_flower_cmsg_tun_neigh_v4 *payload); #endif /* _NFP_CMSG_H_ */ diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index bbd9dbabde..f71f8b1d5b 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -1772,6 +1772,91 @@ nfp_flow_action_set_tc(char *act_data, tc_hl->reserved = 0; } +__rte_unused static void +nfp_flow_pre_tun_v4_process(struct nfp_fl_act_pre_tun *pre_tun, + rte_be32_t ipv4_dst) +{ + pre_tun->head.jump_id = NFP_FL_ACTION_OPCODE_PRE_TUNNEL; + pre_tun->head.len_lw = sizeof(struct nfp_fl_act_pre_tun) >> NFP_FL_LW_SIZ; + pre_tun->ipv4_dst = ipv4_dst; +} + +__rte_unused static void +nfp_flow_set_tun_process(struct nfp_fl_act_set_tun *set_tun, + enum nfp_flower_tun_type tun_type, + uint64_t tun_id, + uint8_t ttl, + uint8_t tos) +{ + /* Currently only support one pre-tunnel, so index is always 0. */ + uint8_t pretun_idx = 0; + uint32_t tun_type_index; + + tun_type_index = ((tun_type << 4) & 0xf0) | (pretun_idx & 0x07); + + set_tun->head.jump_id = NFP_FL_ACTION_OPCODE_SET_TUNNEL; + set_tun->head.len_lw = sizeof(struct nfp_fl_act_set_tun) >> NFP_FL_LW_SIZ; + set_tun->tun_type_index = rte_cpu_to_be_32(tun_type_index); + set_tun->tun_id = rte_cpu_to_be_64(tun_id); + set_tun->ttl = ttl; + set_tun->tos = tos; +} + +__rte_unused static int +nfp_flower_add_tun_neigh_v4_encap(struct nfp_app_fw_flower *app_fw_flower, + struct nfp_fl_rule_metadata *nfp_flow_meta, + struct nfp_fl_tun *tun, + const struct rte_ether_hdr *eth, + const struct rte_flow_item_ipv4 *ipv4) +{ + struct nfp_fl_tun *tmp; + struct nfp_flow_priv *priv; + struct nfp_flower_in_port *port; + struct nfp_flower_cmsg_tun_neigh_v4 payload; + + tun->payload.v6_flag = 0; + tun->payload.dst.dst_ipv4 = ipv4->hdr.dst_addr; + tun->payload.src.src_ipv4 = ipv4->hdr.src_addr; + memcpy(tun->payload.dst_addr, eth->dst_addr.addr_bytes, RTE_ETHER_ADDR_LEN); + memcpy(tun->payload.src_addr, eth->src_addr.addr_bytes, RTE_ETHER_ADDR_LEN); + + tun->ref_cnt = 1; + priv = app_fw_flower->flow_priv; + LIST_FOREACH(tmp, &priv->nn_list, next) { + if (memcmp(&tmp->payload, &tun->payload, sizeof(struct nfp_fl_tun_entry)) == 0) { + tmp->ref_cnt++; + return 0; + } + } + + LIST_INSERT_HEAD(&priv->nn_list, tun, next); + + port = (struct nfp_flower_in_port *)((char *)nfp_flow_meta + + sizeof(struct nfp_fl_rule_metadata) + + sizeof(struct nfp_flower_meta_tci)); + + memset(&payload, 0, sizeof(struct nfp_flower_cmsg_tun_neigh_v4)); + payload.dst_ipv4 = ipv4->hdr.dst_addr; + payload.src_ipv4 = ipv4->hdr.src_addr; + memcpy(payload.common.dst_mac, eth->dst_addr.addr_bytes, RTE_ETHER_ADDR_LEN); + memcpy(payload.common.src_mac, eth->src_addr.addr_bytes, RTE_ETHER_ADDR_LEN); + payload.common.port_id = port->in_port; + + return nfp_flower_cmsg_tun_neigh_v4_rule(app_fw_flower, &payload); +} + +__rte_unused static int +nfp_flower_del_tun_neigh_v4(struct nfp_app_fw_flower *app_fw_flower, + rte_be32_t ipv4) +{ + struct nfp_flower_cmsg_tun_neigh_v4 payload; + + memset(&payload, 0, sizeof(struct nfp_flower_cmsg_tun_neigh_v4)); + payload.dst_ipv4 = ipv4; + + return nfp_flower_cmsg_tun_neigh_v4_rule(app_fw_flower, &payload); +} + static int nfp_flow_compile_action(__rte_unused struct nfp_flower_representor *representor, const struct rte_flow_action actions[], @@ -2487,6 +2572,9 @@ nfp_flow_priv_init(struct nfp_pf_dev *pf_dev) goto free_mask_table; } + /* neighbor next list */ + LIST_INIT(&priv->nn_list); + return 0; free_mask_table: diff --git a/drivers/net/nfp/nfp_flow.h b/drivers/net/nfp/nfp_flow.h index 0ad89e51f4..892dbc08f1 100644 --- a/drivers/net/nfp/nfp_flow.h +++ b/drivers/net/nfp/nfp_flow.h @@ -90,6 +90,11 @@ enum nfp_flower_tun_type { NFP_FL_TUN_GENEVE = 4, }; +enum nfp_flow_type { + NFP_FLOW_COMMON, + NFP_FLOW_ENCAP, +}; + struct nfp_fl_key_ls { uint32_t key_layer_two; uint8_t key_layer; @@ -118,6 +123,24 @@ struct nfp_fl_payload { char *action_data; }; +struct nfp_fl_tun { + LIST_ENTRY(nfp_fl_tun) next; + uint8_t ref_cnt; + struct nfp_fl_tun_entry { + uint8_t v6_flag; + uint8_t dst_addr[RTE_ETHER_ADDR_LEN]; + uint8_t src_addr[RTE_ETHER_ADDR_LEN]; + union { + rte_be32_t dst_ipv4; + uint8_t dst_ipv6[16]; + } dst; + union { + rte_be32_t src_ipv4; + uint8_t src_ipv6[16]; + } src; + } payload; +}; + #define CIRC_CNT(head, tail, size) (((head) - (tail)) & ((size) - 1)) #define CIRC_SPACE(head, tail, size) CIRC_CNT((tail), ((head) + 1), (size)) struct circ_buf { @@ -161,13 +184,17 @@ struct nfp_flow_priv { struct nfp_fl_stats_id stats_ids; /**< The stats id ring. */ struct nfp_fl_stats *stats; /**< Store stats of flow. */ rte_spinlock_t stats_lock; /** < Lock the update of 'stats' field. */ + /* neighbor next */ + LIST_HEAD(, nfp_fl_tun)nn_list; /**< Store nn entry */ }; struct rte_flow { struct nfp_fl_payload payload; + struct nfp_fl_tun tun; size_t length; uint32_t hash_key; bool install_flag; + enum nfp_flow_type type; }; int nfp_flow_priv_init(struct nfp_pf_dev *pf_dev); -- 2.29.3