From patchwork Wed Nov 9 19:54:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 1701891 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=corigine.onmicrosoft.com header.i=@corigine.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-corigine-onmicrosoft-com header.b=EQu/tAFr; dkim-atps=neutral Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4N6whK54shz23lW for ; Thu, 10 Nov 2022 06:56:17 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id E920440AA1; Wed, 9 Nov 2022 19:56:15 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org E920440AA1 Authentication-Results: smtp2.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=corigine.onmicrosoft.com header.i=@corigine.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-corigine-onmicrosoft-com header.b=EQu/tAFr X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bB1X1OjU5dfI; Wed, 9 Nov 2022 19:56:15 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp2.osuosl.org (Postfix) with ESMTPS id 08B31400A6; Wed, 9 Nov 2022 19:56:13 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 08B31400A6 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id C9ACEC0070; Wed, 9 Nov 2022 19:56:13 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 77039C002D for ; Wed, 9 Nov 2022 19:56:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 5E539813BD for ; Wed, 9 Nov 2022 19:56:12 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 5E539813BD Authentication-Results: smtp1.osuosl.org; dkim=pass (1024-bit key) header.d=corigine.onmicrosoft.com header.i=@corigine.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-corigine-onmicrosoft-com header.b=EQu/tAFr X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id afSN4CcQpd1q for ; Wed, 9 Nov 2022 19:56:11 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org AEB8B81380 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2101.outbound.protection.outlook.com [40.107.92.101]) by smtp1.osuosl.org (Postfix) with ESMTPS id AEB8B81380 for ; Wed, 9 Nov 2022 19:56:11 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NVp85pcmJczbL05J5GhORTlLJRj1SL9l3c7DJnVnTNddXK6052LsLd23RC41zc6lZi91y/bP6DFhPEDSY6x1+ALnJijzq/O8yqPOjOG+noRZej3Q4sbmM2JikuraL7BaVnImEVZATnkBV6RuwdZh9cT0QhXlN07QTlS2uBtziugXnUeJOb1zWyUecw3X3CR0mZpdKzvci6LcHcxCFFsFxyhcVAdeUtVzmbehaW/7lLQRvr6//PKGB3JgM6FvyLHHdwAsPeqMGCm+7kfwfQzFQLFLVIj+EsjhU8IPRDDSDmazHk64KTioee79muIM/jXI7h0glqrTpfYcm0Yxyja5QA== 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=pMAoQOpfRoewSvidDMzOIf1hyRYMQ8WaysewNlHby/c=; b=F5lUOsWW8tG1SpjUvr5mGv6OFeNEfokh+Sw3/wJvzU2SBMuoQjCGl+H+SA8BlZVWnCTX3/mDXbWl4EeoI8MUx8YwY6iJRjl+gOiTHWSwnrTerjMtEVBvBxaY1HnWTDZhV1PXeSbq+cDsxBbRA34fbD3f2xXLjhyLmz6Q3y9B93U0fypL7SiMoH6WWmgpbYkBe1s/SPz2HdU+KYTqTg2Z7l3znYJcI/lnVQ0YQ3rdBprFi3bTy1AOIJNhge1Zme9olFweS8n2oAPonCA0nFOj3N8zMU+xVBejfh5su5EXWWz+kr949Vpw53CXngTTzCUlfA/Z24IbENVRhXRTmyZiDg== 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=pMAoQOpfRoewSvidDMzOIf1hyRYMQ8WaysewNlHby/c=; b=EQu/tAFrwleGv9Nh7mSymIrJLPBtiWwEdi4pEnC6zNgIFJvqo9+5QuZGEdE6qzhTIIoKwVO83G6Rfk5V9IRJxKQOKaUSS5yGIaHvbl3rGo2Uhxt3g/e5wLB2ZmVaPStXqbKi8n1N6Hi+H9LZZifbfKc1F9pnaTH2ra021Xc4y/g= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from PH0PR13MB4842.namprd13.prod.outlook.com (2603:10b6:510:78::6) by DM6PR13MB3985.namprd13.prod.outlook.com (2603:10b6:5:2a2::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.27; Wed, 9 Nov 2022 19:56:06 +0000 Received: from PH0PR13MB4842.namprd13.prod.outlook.com ([fe80::483b:9e84:fadc:da30]) by PH0PR13MB4842.namprd13.prod.outlook.com ([fe80::483b:9e84:fadc:da30%8]) with mapi id 15.20.5791.027; Wed, 9 Nov 2022 19:56:06 +0000 From: Simon Horman To: dev@openvswitch.org Date: Wed, 9 Nov 2022 14:54:39 -0500 Message-Id: <20221109195439.142438-1-simon.horman@corigine.com> X-Mailer: git-send-email 2.30.2 X-ClientProxiedBy: BLAPR03CA0148.namprd03.prod.outlook.com (2603:10b6:208:32e::33) To PH0PR13MB4842.namprd13.prod.outlook.com (2603:10b6:510:78::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR13MB4842:EE_|DM6PR13MB3985:EE_ X-MS-Office365-Filtering-Correlation-Id: 0cc63de1-d29d-4ada-cec7-08dac28c7047 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yw7MNJsJ0/1XmgdAIiXVA/vdA2ItzNi9E2f9FiRBijuJArLknAD8Xtxfj73+AcFUgXEgCn3R5IXEyhemOghTUGxMsRnh+mMXiYSFGHIVMGqHq/fv4xoRAyC5auuncSlY77+UpWrPHvTEVl2YdVs4TQLfAT/M0sNRkSI9YvpnG6BxM9C3rf/HdPGtii2XUFJc1ssnv0SiuapsNlJgKspN21nrHjyXDshT1jXUAtvhHo5TGBLr7Qq5MY77HkaU5n/QZhY4dFefTOUg6I7s78tG4boVut6kAd/gmWJ1p2BT8ia+jBn89+oFnsibDMHM1zYnme8u0bgDavY+McsblwWGZ5AJUXjY4mb/JpPoInFKXuoQ7a/xaoWWSbkv60DTW1902WYkVodVM8Gg1pTtXlPNFz1WyczF/RIRJK5g4HYfLs24uqj1z6iEcePS6lqeRBSPliF7GzzDhy4y83y17k8lVFc4pAeJUIPPbqGTgfXGNX5rmVrd3gjVsmUAyjctDbH3n9EE/ZaHF4use7hc7q7MzjA1+Wh48q1ePVEcoAzij3heDRHXI7fqs8a5vpLq2LyQcAfjvB3WKa8VDz48iO/bAjPgi3IYxjr0Fyeh3G4OvL8CIXd1Wny0Ts9WVZsbKRuNetXwU3uwWxANPQMzMMCpPD5X37P5VmBZOgaur9no3MfVYN1Bd+BaU4VWiWIBHn2eoT7CPF53XPzSt+Uacms3GaKHPfiliFeS75OG5gXJxGWhOBxMsROmfnHFbH9UgjiSbRRbJMMTYEj2ejAklbycCANVrjPUitFp8CzToYJdCY5L0dF3MqAO3h/y7V/otXZx X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR13MB4842.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(396003)(39830400003)(366004)(346002)(376002)(136003)(451199015)(83380400001)(6666004)(5660300002)(41300700001)(86362001)(38100700002)(478600001)(44832011)(6486002)(6916009)(8676002)(8936002)(6512007)(4326008)(52116002)(316002)(66556008)(66476007)(2616005)(54906003)(1076003)(6506007)(107886003)(186003)(66946007)(2906002)(26005)(38350700002)(36756003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4IUmZcxTiyhaNh9WIewslaAa4NlcnaMG82m6u3kYOQFJPhKtA0l0A70GOlhlV4QfoxFTF1IsnhR3ivNVX9r89zMW35Q5aWlqExC8vpMqCDRY7/XwLNpyrJ02N1ucHD+UzsQYnz/VubVpfIE4c98RLFsnogP0hl0Em7PPWW5C4VZFitqhPAiUc0lzP2v1dsMzngVDXRVJRpWnTb3GWYIy0P8azwCipmWyQVOE0aUY8XSLergwYdw+4DmM2YSDFGwpoo7z0+6YSNXJFMdyPlEpHbD8o2sov4bo3Y7do6BNnwyCnKE+VwvmeFSpJ2fjN9Nm+gl/Zma8Q8laPG1tt2+l7xfz9adFAVRq/HrR113zHYa+pfaK1dOIyxfO1jiVsab/fnP771mHGiEI11uKSMxlzs+xxfSi8UJm4/MQF55M3CBXJ15kijv/IAZYbUo01g6sUpZ0j24drFwaxqyc5Lq+syD2UExo5Pbd3Q8TZajT4wpKPPgycLFJyYjU3RXOtU37KO/SVesV6bOThJLo+M8F/8YXU8PevxiQUyQt/NUbYBerKKvfQs53xDDGL+d6xRmggGh8uC+T0cgMPqlhEtDHuWJBFyFWFBs2ZfYS3oXhJWskS82JNlyQGe4yNhp2lkSEvTvOO4JyjupP0AOM+1p/2y4im0wQiB1dTxtwcXxaXwD9UOWJU3dQ4D3Z9+YEAnEQNGa3605wHoCcBGX3TBwQBi224FXIDKqVrBG/m52EFXKxRpx9St46wUglIyZoNZJqpXeTvVz+t8LQJhEgZP5TiHFF7ecYLsdG/4d3Ja0GR7SGAqPyP/+l+CNCJ0cVHKSdr8Ork+JJb6ebqc2gyT57FGfBoLEl+xGsrpnkFCFugetpfIRL5fsXcZUB5/aTlvF/7+4wOh7phKIUE2l3NDaZfHISLOUIqMX26p72D1EbG7JYw8Jggkop3khQFdF6n48abgYMJ8MsPcByao6f9r+LvhBtKHDvWu+nn1kUeOX8k4/4m6GNj65redni/fWNK1eRLtnPgIpLGthNEByHioYK6lekI6h7KATXu6Vz7udBbQxvdoU80eOAl/bzM23PgQ6+1wjRN6DFSGtD8HMENHobi12/PbwLlE4LXw7Ahw/mfbW53ufBAi2sZDB1/mIgUSmAlF0GEtj+fXlimg3Dn96AH6L1Ir5RMnAI0/WZTTlRABHqD8/Jfr6cd4iYD78WOix1pnrFCAWPIbDc/LApXo5KeBFh13Ut0XRrDhP3SWCtWO8dyRY8wA+QqsK4V7khyn2vPe8MzMTQsZIoGQLtRTWGkAHyrEWPanZAEH8WYJDWTa0oGmiwoZaCH+/4ona4+2VY3LodjhzHQ9kL71wbFGHthNvLGnBYVQyklWY2uxxCfhCwotPbcSDjtUKIDDIFixHErc1fqvY6W8cbx/l5WESzmurHuvdjD2FffCdBKw/dmwL9CJAAUx55t/BdQlbM5s34U7+JSXlMgQOKe1y6HAUGgsLCP1CQtQSV94689evY6Z5ev1EUm6Ld5qksyHX6Fixm2yEPwwHLftDKfGa1ULXAh5ghOhniOvnIIVuojM63DClgS26Bj0Btth0holieonCQ8MJGNVVIXdBNHclyrnUPRw== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0cc63de1-d29d-4ada-cec7-08dac28c7047 X-MS-Exchange-CrossTenant-AuthSource: PH0PR13MB4842.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2022 19:56:06.2885 (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: rR87cvTHFSxVIOMxl910bvxl5kU+EKo3LABZS1WHR49sROTOUwUFrfI6o6HRoURV07T7xL6qI/wQcw+yXFTNfKYxv+0RZVHs0PbgKczt7Zw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR13MB3985 Cc: Eli Britstein , Simon Horman , Chaoyong He , oss-drivers@corigine.com, Ilya Maximets Subject: [ovs-dev] [PATCH v4] netdev-offload-dpdk: Enhance the support of tunnel pop action X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" From: Chaoyong He Populate the 'is_ipv6' field of 'struct rte_flow_tunnel', which can be used in the implementation of tunnel pop action for DPDK PMD. Fixes: be56e063d028 ("netdev-offload-dpdk: Support tunnel pop action.") Signed-off-by: Chaoyong He Reviewed-by: Louis Peens Signed-off-by: Simon Horman Acked-by: Eli Britstein --- lib/netdev-offload-dpdk.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) v4 * Reworked changelog * Dropped other patches from patchset v3 * Add fixes tag v2 * No change diff --git a/lib/netdev-offload-dpdk.c b/lib/netdev-offload-dpdk.c index 80a64a6cc06a..38f00fd309e6 100644 --- a/lib/netdev-offload-dpdk.c +++ b/lib/netdev-offload-dpdk.c @@ -1099,12 +1099,18 @@ vport_to_rte_tunnel(struct netdev *vport, const struct netdev_tunnel_config *tnl_cfg; memset(tunnel, 0, sizeof *tunnel); + + tnl_cfg = netdev_get_tunnel_config(vport); + if (!tnl_cfg) { + return -1; + } + + if (!IN6_IS_ADDR_V4MAPPED(&tnl_cfg->ipv6_dst)) { + tunnel->is_ipv6 = true; + } + if (!strcmp(netdev_get_type(vport), "vxlan")) { tunnel->type = RTE_FLOW_ITEM_TYPE_VXLAN; - tnl_cfg = netdev_get_tunnel_config(vport); - if (!tnl_cfg) { - return -1; - } tunnel->tp_dst = tnl_cfg->dst_port; if (!VLOG_DROP_DBG(&rl)) { ds_put_format(s_tnl, "flow tunnel create %d type vxlan; ",