From patchwork Mon Sep 7 10:58:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: weili zhang <305753229@qq.com> X-Patchwork-Id: 1358796 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=qq.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=qq.com header.i=@qq.com header.a=rsa-sha256 header.s=s201512 header.b=GhSYwHBB; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BlQJQ5nr6z9sSJ for ; Mon, 7 Sep 2020 20:58:59 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2C80A85766; Mon, 7 Sep 2020 10:58:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BRBbp5rmMqbi; Mon, 7 Sep 2020 10:58:48 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by fraxinus.osuosl.org (Postfix) with ESMTP id D80E28448C; Mon, 7 Sep 2020 10:58:48 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id B2BCEC0052; Mon, 7 Sep 2020 10:58:48 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 4F2DEC0051 for ; Mon, 7 Sep 2020 10:58:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 3CAC520410 for ; Mon, 7 Sep 2020 10:58:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RXXHfNL4RcID for ; Mon, 7 Sep 2020 10:58:38 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from qq.com (out203-205-221-192.mail.qq.com [203.205.221.192]) by silver.osuosl.org (Postfix) with ESMTPS id 186F2203F6 for ; Mon, 7 Sep 2020 10:58:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1599476314; bh=otgbOrcDFsopnrNZsU945zqDUgoHYN/1m/2zQPtQJjA=; h=From:To:Cc:Subject:Date; b=GhSYwHBBmc+PiFNxoVX2qwRlLjWbB83TlbW/FYF7WUAqvSTZ1uEM7s8MkEhnCLhHe 1Ym7ocCMrR4xPtmBz6d9ZvwSAfEz8cCu8NhgUpofX8Y19zTF1pW0t5vBvPlNgU6zuk YiUNt7dkYQD/jeEAT+26tBAiuzdznSovcE/HIFl8= Received: from localhost.localdomain ([111.205.198.4]) by newxmesmtplogicsvrszb6.qq.com (NewEsmtp) with SMTP id E94B5063; Mon, 07 Sep 2020 18:58:20 +0800 X-QQ-mid: xmsmtpt1599476300tsx8nzm63 Message-ID: X-QQ-XMAILINFO: MoiCBUY3VLu8scXO2EUVl9CVS0RX4plOCM3HrZcZmU3GTBVfe+3SZfBzEa9MZN KUt9a5EsEMAPx4HV4ysGiNgS0ZfVcDwCsZBxcSv3aqh5qroX4IlCIGLHqoY6JGY6EXHK9oiQCScc bYMtj1butVSU5/ZqVbt81d4uT3kH+6FTsgNV3gewqHBAvKKCWD6nVwqndVfStyd7Sl1jC0Yw17yR 1XuZ5jeisdkRiunIogbDOd9PkHZv/nqRWn46NXuAwIhGW0YyaJO51k0vg4MCJ2FITlZtTa7Pi2xQ Lgz3KyryHZkV//1uG2R7EmQkY/J6Te7WvrlPnHzK/pO49OZN3B1FCjJDiLMSoPG1Z1OLJ6nKZNhm 74JFL0ubjDM7QiVS7BLLByokCofK9NPtaJmUpGoESERiS+6P/s9MI80bHhQjpBvdHY8mP3okboTF eqDTQOe5ts9SBNuiq0WgJFD/tvdzPbSdABHag8P0NA/1z4su3B1fF2CSgKqFjF9scK0lka8lYjjl me/lX5BclAzs5LtzFsKj8Ai7nrAajowHKSlaLdKItQcTOZW1o6noi4GpJ9PO1siBIzHYeUURJ7m/ UniYwq2RrtdMEpyIeuJb0oMzxTbF9RRgFrU3kWlBnrT3UiZ/fjl0QZGfYqOdV3+OWEovc0OPO3OW RyrYrVCzIYeHI8JibmFUO1msKQIUq9f+2NJg9qJrjJ6A4J+l/saaODtFRKGWRMgD28NnsU2l0a54 A62RCEDJkV0BKJ0aQtkaRpTAT3a5FWMekPXIf2JdH8m24= From: 305753229@qq.com To: ovs-dev@openvswitch.org Date: Mon, 7 Sep 2020 18:58:12 +0800 X-OQ-MSGID: <20200907105812.37497-1-305753229@qq.com> X-Mailer: git-send-email 2.24.2 (Apple Git-127) MIME-Version: 1.0 Cc: Weili Zhang <305753229@qq.com> Subject: [ovs-dev] [PATCH] We need strip the inner L2 padding bytes, before enapcasulate a packet. 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: Weili Zhang <305753229@qq.com> Signed-off-by: Weili Zhang <305753229@qq.com> --- lib/netdev-native-tnl.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/netdev-native-tnl.c b/lib/netdev-native-tnl.c index b89dfdd52..acfbb13c4 100644 --- a/lib/netdev-native-tnl.c +++ b/lib/netdev-native-tnl.c @@ -149,11 +149,15 @@ void * netdev_tnl_push_ip_header(struct dp_packet *packet, const void *header, int size, int *ip_tot_size) { + int padding = dp_packet_l2_pad_size(packet); struct eth_header *eth; struct ip_header *ip; struct ovs_16aligned_ip6_hdr *ip6; eth = dp_packet_push_uninit(packet, size); + if (padding) { + dp_packet_set_size(packet, dp_packet_size(packet) - padding); + } *ip_tot_size = dp_packet_size(packet) - sizeof (struct eth_header); memcpy(eth, header, size);