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 E9EDC455E5 for ; Tue, 9 Jul 2024 17:25:19 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E5CBE40A81; Tue, 9 Jul 2024 17:25:19 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2088.outbound.protection.outlook.com [40.107.236.88]) by mails.dpdk.org (Postfix) with ESMTP id 615804025C; Tue, 9 Jul 2024 17:25:17 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VGrDKyb50K1x+vO+2tTc0/nd1lrh5A41hboHZ8mX4EZcZBt58VwceObVU61H0BvuhDtEX9hO4Qx3ThP/mPDSbM8C1fPBcBOy/u4M4ZHoBDkLfnjQmJ7injAQ7Qm+kveJGzrqeK4qQHz3dOGtW4iQUcotE9TEgotWbCCigIFpRx++2EgljLz29nmna5wM+Ngy+NH/QjAtgp60FpxLv4nSSnr06J3PtHyMmMqO8bLBse01B7Fa2QkiBW+5ohF8UecVLgYi5t9u+me1TxM950QWUEv2VTwCR6LUHz1oHns4qdNhiCPfNpbGbnaS09b/EIH8mE0nbNbYX7yz2AdodgD2Vg== 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=S+lZCCVZucKuZ8DAP3thqr38Kq9TVa7QX95dnJzg5OI=; b=APM33Oci+efVT03Qdvbhc3GVKnHfPuXyxGVRzr6Dpt/N4uHZjNwh27nSOc0yE0llhPG57RM1bC857lISZGHLCUmvDd06BJ2gqMi3DXAsTN/5M67xoUhzCzsy9rJCal8f+U3zulr2crYvVnrRkS47fXbXDhK9WBdRUX2HSr5MY9i0wej6fC7ko2sBxcv6SNfcpsDE1byqpZbPWYz4vxA+tfcaBjhQ3fETCKh4w9FdSFs6Oea+frYT8iZRHqRqf2uvcGvnsKy/drsvc/EYNpFs7uf/3EKG+RVnSQgfrO2vHk9X4gpg6BrNPaUZy/rxhsq5MthJ2jPLQrZK7ZtRhnN+tA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=S+lZCCVZucKuZ8DAP3thqr38Kq9TVa7QX95dnJzg5OI=; b=CSsBazUYtuFUWoi9v2HLJJgbGCgsQjlfhAQASzWvd5oqx8/OTuj+IffCniI8lPTJ0V69SzKqayHbVSl0ZOGNiI6oX3ZResj2/pZf3c4PgPcvMY+NsiDHv+oZgz4QevdFji65JHiNQLLiwFeVEhOtp2Uu4In+ZdoX5ScmYzxdZD6crVMjC3ClqYhfrG2iHY0GVL61LowkZtOcLpwkOhn0/f8zIal6cZLATN/cqm0XFuZK+UrxoJO49jtFHVPY9hbvAOEp7psmD0u2uea3y9gO0b5i2Qnwo7ceJgR3ZYAfrYQ836jYLIdIJ4nuLe3x7L1MtSCEK93QQpDY4JTf3KEw1A== Received: from DM4PR12MB5184.namprd12.prod.outlook.com (2603:10b6:5:397::18) by CYYPR12MB8752.namprd12.prod.outlook.com (2603:10b6:930:b9::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.36; Tue, 9 Jul 2024 15:25:11 +0000 Received: from DM4PR12MB5184.namprd12.prod.outlook.com ([fe80::c8eb:eeb9:cd73:b236]) by DM4PR12MB5184.namprd12.prod.outlook.com ([fe80::c8eb:eeb9:cd73:b236%3]) with mapi id 15.20.7741.033; Tue, 9 Jul 2024 15:25:11 +0000 From: Bing Zhao To: Itamar Gozlan , Erez Shitrit , Hamdan Agbariya , Yevgeny Kliteynik , Alex Vesker , Slava Ovsiienko , "NBU-Contact-Thomas Monjalon (EXTERNAL)" , Suanming Mou , Dariusz Sosnowski , Ori Kam , Matan Azrad CC: "dev@dpdk.org" , "stable@dpdk.org" Subject: RE: [PATCH 8/8] net/mlx5/hws: fix NA64 copy TOS field instead of TTL Thread-Topic: [PATCH 8/8] net/mlx5/hws: fix NA64 copy TOS field instead of TTL Thread-Index: AQHa0fwNsyq9mlF0OEW3obZYwpT1BrHuhDoA Date: Tue, 9 Jul 2024 15:25:11 +0000 Message-ID: References: <20240707102532.2045942-10-igozlan@nvidia.com> <20240709123103.2101902-1-igozlan@nvidia.com> <20240709123103.2101902-9-igozlan@nvidia.com> In-Reply-To: <20240709123103.2101902-9-igozlan@nvidia.com> Accept-Language: en-US, zh-CN Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DM4PR12MB5184:EE_|CYYPR12MB8752:EE_ x-ms-office365-filtering-correlation-id: d46a936a-306c-4e94-be94-08dca02b52df x-ld-processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; ARA:13230040|376014|1800799024|366016|921020|38070700018; x-microsoft-antispam-message-info: =?us-ascii?Q?L+h3WJw20D4hnEfKMIxguLs7RROGqOjFIEwj0WVMItHYGXPapsUSQ3oVO49F?= =?us-ascii?Q?vuVIpvcNTLsYbkx70bQByGgqzQarSIh2d7kEGRLtul6IHfEMpkbUpMq/7rKJ?= =?us-ascii?Q?Tx9NaUNbN3auwTBPEQjHc2cvCO7OV8kcs9ru8/+HiZF4+23eFzBzx83I7dT1?= =?us-ascii?Q?t8iuPQN7u8fJ9X9aZtu8h8/UNXmbFTxHw/Q8RTAnWrg+yxmVpdPkIzh8pEEJ?= =?us-ascii?Q?qBFWG13RHr4RARuiUsFGiD7yJeqFpYErQRSmra8q/L/1CGa1lXlswCb/a/om?= =?us-ascii?Q?IGPtu8Y3KLFl9rfObWOTkojuz4MgCcZRvKeI2jcoNDxw0S+3QkWWJlZyqT+x?= =?us-ascii?Q?lfZlm7gRhfvL8E0B4Uf0jz5nC5Sd1LrXGkCAPD3dcrA/AzOxSIPs2dj3frAs?= =?us-ascii?Q?s2pR8khG5GwB9S88wGo9enyYlrEFnNMgNpz4LsA++Y5sj/wevRbz1RsXDz76?= =?us-ascii?Q?w9xV50eAtOnGrHdbX1LD+b3X2FRbFtPHEw91P0vjclRKqnSs/sddRCx0PKgj?= =?us-ascii?Q?gtyVWyPOUxqXYVJjJt3EhJ4AuHjZMKlkI3l1UhsDK9Z8p45p0oOZjOB7U9Af?= =?us-ascii?Q?o73U2n9ZHhhPDypN2nuLwg9LBc4P98cOTIVX/fKF+uEvO84EL9BpZ3ktWdV3?= =?us-ascii?Q?8Kaklls7r670rVcChh4M1Q61tHimDQnOWkaGbk466XcxcQjkPDltJzyH6tr5?= =?us-ascii?Q?KlIAfgZJ6eCyo896Zo/Dhbg8gYKb9ZIprSTsAw0UeAuP1qOOx7JRl7Z3rhca?= =?us-ascii?Q?+n3ikp8KXwLCy16Yr0TdwOxS5JcfdHv85gdlKrh+6szT88F8FYEeZkd1ixiE?= =?us-ascii?Q?1rySk9piQTvnfvHJ/ItZLw3gktjVBkFMvKBJ/21WdGwSrKBE2mc2SeP4THnq?= =?us-ascii?Q?5oTb+6FvKCPuddZTQzJW8wxoIybs36NQ7iJuPiuZZhjcF2CwXGrsVNNnnksr?= =?us-ascii?Q?xzVdalZRWo9ggqpqRfCh5wosIHLO9Um0YZc503h6mrGDDDnKOZwW+unkY501?= =?us-ascii?Q?6WCpWYA/w/Uh8NmDW9EPfTpnyxt1MMb15p+Sp9kzFXQzpExX18B2UlZatwTo?= =?us-ascii?Q?xLeUnRpfGnoDtK0ysmCoHyA5UrEbV1KVrXVe0+/Za+I6ls4faNq6bfjhf8g9?= =?us-ascii?Q?EOPghoQawrYNWWmybB/tikf+2XXdqmAb6v9n62Agde/DuG/vZ2Q5thregN32?= =?us-ascii?Q?EoNxZjO4D+qWA3yynsZGTLfNVANVzdE9qoJv8f+1JdxFvp7kU0rTSD+byGx1?= =?us-ascii?Q?rb0OsvPAkSa7anlsaNIY3U0EgqKVhcvIeIQDlUOuqT9LSFY8f4IasfZp8Xfc?= =?us-ascii?Q?hDcfUBhYHSUF70qoQvPNqqZbPjZBbpZabS3o3EwT+UnVz2bl+BmzNsVBbp7A?= =?us-ascii?Q?dmnMw4z5tB5SckyBJtfzeCVeiA9jpCawyLbIoxXuzpAl2VeqGTqY1hzwgh2f?= =?us-ascii?Q?zWL3JfkC+Aw=3D?= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM4PR12MB5184.namprd12.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(376014)(1800799024)(366016)(921020)(38070700018); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?m438hfdrsDDXcbAvm9P2Pc18QDIWqhYVJwCiUlg3ATXCj8y6NpGG83XMKqTk?= =?us-ascii?Q?LYK8Coa5GPpeDs5dEzP3g0RrMQBBdOVAbt5fT6ngZN8MsirdgmsIjxw4BIFx?= =?us-ascii?Q?5jI0b2ZiKTEsj6g1XTymTf/+wSg6U6CbeVHBkhT7EC9JPTAoEVeSzQc09mkU?= =?us-ascii?Q?NBl4nA6rNsaL7b2TJWB94V7sQyBUvQpWUGiosLluc77rClN0mP6ZysnljSP1?= =?us-ascii?Q?rxCAtq+J7mdPlysYXe/kOxdtmuJ6ymwMGO2B+de+pS2Ei2Mjutp9C/onRDfp?= =?us-ascii?Q?gJwsLpPpzvUswtv9ehvvErC1p7kEA+ao14IcVuVTT9LGf6YXZJXZdzJoLSdI?= =?us-ascii?Q?WYte4508eZvy2pJokkZqtUNGvtH4gwo9axWGvVv4q6Z9gapq5kzKYzovJdgP?= =?us-ascii?Q?cvtRf5D+vMdVxJdL5iCpKRsw33Xsa1lV3Z3J0kvMPn0LriDFOYI6/fOD2Jun?= =?us-ascii?Q?5omqd5Rnt7FDqgxsk13E4v4jfUiJECSi5D72Ru/fHHNqvuKgKdp8lHXfGTvp?= =?us-ascii?Q?/qYF04P3O+NsKfY9Ss8oW85zQ3EeJQiHT+aJJsPryfeFhwP+BnEjB+ob//WA?= =?us-ascii?Q?25nB2qg3flf41TXfrh/VAUDBze05vXotyYv2axFygOpWv1+T+ROWoK1GQfzd?= =?us-ascii?Q?loDFn/wcipWKQMWGHqVmU678rSa/dQylHF3BJjOjIolcN2CYoLnjS/oukz/v?= =?us-ascii?Q?hsBcFznKGYnHTZJLRjzKDrO0bbre8gxZP7aTg3xpBWV/PPjwGW0cT4+D9R12?= =?us-ascii?Q?55axO2gyQaGGdj7TgGRoXu4wDJysZxncJv8gcP0WvJwiiQyFoXigow53aWTs?= =?us-ascii?Q?R4dUz0Ei/Fn14CBp2+prQRaI2vLsyUr25YRMVCbdJB47A5hHdSM0n+1CFkdt?= =?us-ascii?Q?+wQ3OPkLQLTXpbV81Szkrq6haIDCfewy/CbaJ0DQgiwB/CEeeWdfuDqdseUr?= =?us-ascii?Q?XYGaTOwS3T5D38wtAVvMfgiIdan+82ZdjQl/Y7qr1Q+J2vQAbN8sImkT75RX?= =?us-ascii?Q?B2auWxAR2CyayCWGfYndr9LyhjH3CVlBVHMtQ7SNW59/i+Er5u9bgIFk8h+O?= =?us-ascii?Q?cj32POCyKm+56hjI2U8R120ALbQ+F7nc3rXpvocY/uah+0bD3lsy30NG7lCw?= =?us-ascii?Q?rK/w2fkmnrDVRVF7gPr81pfSnP7MQdJ8JVtyGJmyV3AfTiNVn97qpIaCYm8E?= =?us-ascii?Q?gdnntTPzQm2f7vZ1SfnNSrNN8WoW+1JigmLBAPPREWY+V6VwKVn/UVy/igte?= =?us-ascii?Q?mmUdXXqvU6WtSfZBcBaNZD6NXhmfwedmeHU5dOUEtANLel9AveCiixuP7BJz?= =?us-ascii?Q?IL5irQNbUeAou6dM4jOMqi22soUGrHCxjQUzTuDFwW5ZjUg9bkDIKkS7znQE?= =?us-ascii?Q?5d+zYFDUNRU2e/T3DN5xJhDcnFAztjR6IL7lZW2GGQwJUarA2glLcgiLM7Wy?= =?us-ascii?Q?NmXNHaAu6qp41qqlHPD/65M0PipcEQCsNwMNQGkBAyWIZxS2cVcT8Lw0+Fga?= =?us-ascii?Q?10W74zNqb6JxmAGrNT6cqs6KUBu/BrcZYT00y7/+Sc40929vFMWTm6dQ0A7V?= =?us-ascii?Q?oFr78oatpHCSDR85xK0=3D?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM4PR12MB5184.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d46a936a-306c-4e94-be94-08dca02b52df X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Jul 2024 15:25:11.4005 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: a4uOwg6x5RtVCXC3041VfSH4JYVljNgDP8fysB7FrRZi0uob9tlZNmIvSiYoOjYH1O1xngIf27TMHnq+DmQz7g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYYPR12MB8752 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi Itamar & Erez, Typo: NA64 -> NAT64 BR. Bing > -----Original Message----- > From: Itamar Gozlan > Sent: Tuesday, July 9, 2024 8:31 PM > To: Itamar Gozlan ; Erez Shitrit ; > Hamdan Agbariya ; Yevgeny Kliteynik > ; Alex Vesker ; Slava Ovsiienko > ; NBU-Contact-Thomas Monjalon (EXTERNAL) > ; Suanming Mou ; Dariusz > Sosnowski ; Bing Zhao ; Ori Kam > ; Matan Azrad > Cc: dev@dpdk.org; stable@dpdk.org > Subject: [PATCH 8/8] net/mlx5/hws: fix NA64 copy TOS field instead of TTL >=20 > From: Erez Shitrit >=20 > We don't have enough registers to copy TTL and TOS, so we will set TTL to > be the default value (64) and will copy TOS. >=20 > Fixes: 06d969a8c5b8 ("net/mlx5/hws: support NAT64 flow action") > Cc: erezsh@nvidia.com > Cc: stable@dpdk.org >=20 > Signed-off-by: Erez Shitrit > Acked-by: Matan Azrad > --- > drivers/net/mlx5/hws/mlx5dr_action.c | 66 +++++++++++++++++++++++----- > drivers/net/mlx5/hws/mlx5dr_action.h | 2 + > 2 files changed, 56 insertions(+), 12 deletions(-) >=20 > diff --git a/drivers/net/mlx5/hws/mlx5dr_action.c > b/drivers/net/mlx5/hws/mlx5dr_action.c > index 8d3d0033e5..8f6be37818 100644 > --- a/drivers/net/mlx5/hws/mlx5dr_action.c > +++ b/drivers/net/mlx5/hws/mlx5dr_action.c > @@ -315,21 +315,27 @@ mlx5dr_action_create_nat64_copy_state(struct > mlx5dr_context *ctx, > struct mlx5dr_action *action; > uint32_t packet_len_field; > uint8_t *action_ptr; > - uint32_t ttl_field; > + uint32_t tos_field; > + uint32_t tos_size; > uint32_t src_addr; > uint32_t dst_addr; > bool is_v4_to_v6; > + uint32_t ecn; >=20 > is_v4_to_v6 =3D attr->flags & MLX5DR_ACTION_NAT64_V4_TO_V6; >=20 > if (is_v4_to_v6) { > packet_len_field =3D MLX5_MODI_OUT_IPV4_TOTAL_LEN; > - ttl_field =3D MLX5_MODI_OUT_IPV4_TTL; > + tos_field =3D MLX5_MODI_OUT_IP_DSCP; > + tos_size =3D 6; > + ecn =3D MLX5_MODI_OUT_IP_ECN; > src_addr =3D MLX5_MODI_OUT_SIPV4; > dst_addr =3D MLX5_MODI_OUT_DIPV4; > } else { > packet_len_field =3D MLX5_MODI_OUT_IPV6_PAYLOAD_LEN; > - ttl_field =3D MLX5_MODI_OUT_IPV6_HOPLIMIT; > + tos_field =3D MLX5_MODI_OUT_IPV6_TRAFFIC_CLASS; > + tos_size =3D 8; > + ecn =3D 0; > src_addr =3D MLX5_MODI_OUT_SIPV6_31_0; > dst_addr =3D MLX5_MODI_OUT_DIPV6_31_0; > } > @@ -352,7 +358,7 @@ mlx5dr_action_create_nat64_copy_state(struct > mlx5dr_context *ctx, > } >=20 > /* | 8 bit - 8 bit - 16 bit | > - * | ttl - protocol - packet-len | > + * | TOS - protocol - packet-len | > */ > MLX5_SET(copy_action_in, action_ptr, action_type, > MLX5_MODIFICATION_TYPE_COPY); > MLX5_SET(copy_action_in, action_ptr, src_field, packet_len_field); > @@ -377,12 +383,25 @@ mlx5dr_action_create_nat64_copy_state(struct > mlx5dr_context *ctx, > action_ptr +=3D MLX5DR_ACTION_DOUBLE_SIZE; >=20 > MLX5_SET(copy_action_in, action_ptr, action_type, > MLX5_MODIFICATION_TYPE_COPY); > - MLX5_SET(copy_action_in, action_ptr, src_field, ttl_field); > + MLX5_SET(copy_action_in, action_ptr, src_field, tos_field); > MLX5_SET(copy_action_in, action_ptr, dst_field, > attr->registers[MLX5DR_ACTION_NAT64_REG_CONTROL]); > MLX5_SET(copy_action_in, action_ptr, dst_offset, 24); > - MLX5_SET(copy_action_in, action_ptr, length, 8); > + MLX5_SET(copy_action_in, action_ptr, length, tos_size); > action_ptr +=3D MLX5DR_ACTION_DOUBLE_SIZE; > + /* in ipv4 TOS =3D {dscp (6bits) - ecn (2bits) }*/ > + if (ecn) { > + MLX5_SET(copy_action_in, action_ptr, action_type, > MLX5_MODIFICATION_TYPE_NOP); > + action_ptr +=3D MLX5DR_ACTION_DOUBLE_SIZE; > + > + MLX5_SET(copy_action_in, action_ptr, action_type, > MLX5_MODIFICATION_TYPE_COPY); > + MLX5_SET(copy_action_in, action_ptr, src_field, ecn); > + MLX5_SET(copy_action_in, action_ptr, dst_field, > + attr->registers[MLX5DR_ACTION_NAT64_REG_CONTROL]); > + MLX5_SET(copy_action_in, action_ptr, dst_offset, 24 + > tos_size); > + MLX5_SET(copy_action_in, action_ptr, length, > MLX5DR_ACTION_NAT64_ECN_SIZE); > + action_ptr +=3D MLX5DR_ACTION_DOUBLE_SIZE; > + } >=20 > /* set sip and dip to 0, in order to have new csum */ > mlx5dr_action_create_nat64_zero_all_addr(&action_ptr, is_v4_to_v6); > @@ -543,10 +562,13 @@ mlx5dr_action_create_nat64_copy_back_state(struct > mlx5dr_context *ctx, > uint32_t packet_len_field; > uint32_t packet_len_add; > uint8_t *action_ptr; > + uint32_t tos_field; > uint32_t ttl_field; > + uint32_t tos_size; > uint32_t src_addr; > uint32_t dst_addr; > bool is_v4_to_v6; > + uint32_t ecn; >=20 > is_v4_to_v6 =3D attr->flags & MLX5DR_ACTION_NAT64_V4_TO_V6; >=20 > @@ -557,6 +579,9 @@ mlx5dr_action_create_nat64_copy_back_state(struct > mlx5dr_context *ctx, > ttl_field =3D MLX5_MODI_OUT_IPV6_HOPLIMIT; > src_addr =3D MLX5_MODI_OUT_SIPV6_31_0; > dst_addr =3D MLX5_MODI_OUT_DIPV6_31_0; > + tos_field =3D MLX5_MODI_OUT_IPV6_TRAFFIC_CLASS; > + tos_size =3D 8; > + ecn =3D 0; > } else { > packet_len_field =3D MLX5_MODI_OUT_IPV4_TOTAL_LEN; > /* ipv4 len is including 20 bytes of the header, so add 20 > over ipv6 len */ @@ -564,6 +589,9 @@ > mlx5dr_action_create_nat64_copy_back_state(struct mlx5dr_context *ctx, > ttl_field =3D MLX5_MODI_OUT_IPV4_TTL; > src_addr =3D MLX5_MODI_OUT_SIPV4; > dst_addr =3D MLX5_MODI_OUT_DIPV4; > + tos_field =3D MLX5_MODI_OUT_IP_DSCP; > + tos_size =3D 6; > + ecn =3D MLX5_MODI_OUT_IP_ECN; > } >=20 > memset(modify_action_data, 0, sizeof(modify_action_data)); @@ - > 578,20 +606,34 @@ mlx5dr_action_create_nat64_copy_back_state(struct > mlx5dr_context *ctx, > MLX5_SET(copy_action_in, action_ptr, length, 16); > action_ptr +=3D MLX5DR_ACTION_DOUBLE_SIZE; >=20 > - MLX5_SET(copy_action_in, action_ptr, action_type, > MLX5_MODIFICATION_TYPE_NOP); > - action_ptr +=3D MLX5DR_ACTION_DOUBLE_SIZE; > - > - MLX5_SET(copy_action_in, action_ptr, action_type, > MLX5_MODIFICATION_TYPE_NOP); > + MLX5_SET(set_action_in, action_ptr, action_type, > MLX5_MODIFICATION_TYPE_SET); > + MLX5_SET(set_action_in, action_ptr, field, ttl_field); > + MLX5_SET(set_action_in, action_ptr, length, 8); > + MLX5_SET(set_action_in, action_ptr, data, > +MLX5DR_ACTION_NAT64_TTL_DEFAULT_VAL); > action_ptr +=3D MLX5DR_ACTION_DOUBLE_SIZE; >=20 > + /* copy TOS */ > MLX5_SET(copy_action_in, action_ptr, action_type, > MLX5_MODIFICATION_TYPE_COPY); > MLX5_SET(copy_action_in, action_ptr, src_field, > attr->registers[MLX5DR_ACTION_NAT64_REG_CONTROL]); > - MLX5_SET(copy_action_in, action_ptr, dst_field, ttl_field); > + MLX5_SET(copy_action_in, action_ptr, dst_field, tos_field); > MLX5_SET(copy_action_in, action_ptr, src_offset, 24); > - MLX5_SET(copy_action_in, action_ptr, length, 8); > + MLX5_SET(copy_action_in, action_ptr, length, tos_size); > action_ptr +=3D MLX5DR_ACTION_DOUBLE_SIZE; >=20 > + if (ecn) { > + MLX5_SET(copy_action_in, action_ptr, action_type, > MLX5_MODIFICATION_TYPE_NOP); > + action_ptr +=3D MLX5DR_ACTION_DOUBLE_SIZE; > + > + MLX5_SET(copy_action_in, action_ptr, action_type, > MLX5_MODIFICATION_TYPE_COPY); > + MLX5_SET(copy_action_in, action_ptr, src_field, > + attr->registers[MLX5DR_ACTION_NAT64_REG_CONTROL]); > + MLX5_SET(copy_action_in, action_ptr, dst_field, ecn); > + MLX5_SET(copy_action_in, action_ptr, src_offset, 24 + > tos_size); > + MLX5_SET(copy_action_in, action_ptr, length, > MLX5DR_ACTION_NAT64_ECN_SIZE); > + action_ptr +=3D MLX5DR_ACTION_DOUBLE_SIZE; > + } > + > MLX5_SET(copy_action_in, action_ptr, action_type, > MLX5_MODIFICATION_TYPE_NOP); > action_ptr +=3D MLX5DR_ACTION_DOUBLE_SIZE; >=20 > diff --git a/drivers/net/mlx5/hws/mlx5dr_action.h > b/drivers/net/mlx5/hws/mlx5dr_action.h > index faea6bb1f4..ba4ce55228 100644 > --- a/drivers/net/mlx5/hws/mlx5dr_action.h > +++ b/drivers/net/mlx5/hws/mlx5dr_action.h > @@ -79,6 +79,8 @@ enum { > MLX5DR_ACTION_NAT64_IPV4_HEADER =3D 5, > MLX5DR_ACTION_NAT64_IPV6_VER =3D 0x60000000, > MLX5DR_ACTION_NAT64_IPV4_VER =3D 0x45000000, > + MLX5DR_ACTION_NAT64_TTL_DEFAULT_VAL =3D 64, > + MLX5DR_ACTION_NAT64_ECN_SIZE =3D 2, > }; >=20 > /* 3 stages for the nat64 action */ > -- > 2.39.3