From patchwork Sat Apr 13 12:16:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuya Kusakabe X-Patchwork-Id: 1085113 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="de89g+g9"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44hDK80HN1z9s8m for ; Sat, 13 Apr 2019 22:17:00 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727006AbfDMMQw (ORCPT ); Sat, 13 Apr 2019 08:16:52 -0400 Received: from mail-ot1-f66.google.com ([209.85.210.66]:33645 "EHLO mail-ot1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726833AbfDMMQw (ORCPT ); Sat, 13 Apr 2019 08:16:52 -0400 Received: by mail-ot1-f66.google.com with SMTP id j10so10727442otq.0 for ; Sat, 13 Apr 2019 05:16:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to:cc; bh=nTOnydtBsDuB0o0Qs3ezrUn8HLj9QpOwZwL2zd/TJRg=; b=de89g+g9dYzx4X2STFzwblx38kDilOgYL+Ufy0IM3pKEma29VN7yOZ2Ehpo+skbsvI /nIklfMnwWqj3t9+yUDgxWmnByyTZrxkPag0X3+2I/aE5zdayZB6aC3No5NVM5bHCf1u vqCk6m7LG+qHeM4PRuJS0IUH0vx8+pnutlqIFlQO4q8tEwPNEpCVDy6Av5bAlXj1yBAG gu4vINsFLXd2eIkmpzhGzda56p6sHKNfnrRorJNthB4ZH9gqu0MibvGIB1gNpdugR1MD n+oJTiS3kZ6bL7oeao/fw4z1EU4i1nqxOEuEwWx34vZXvTk8PUNPV9spG2BurN1B+7Rk Hw8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to:cc; bh=nTOnydtBsDuB0o0Qs3ezrUn8HLj9QpOwZwL2zd/TJRg=; b=ZkLkW81VrUoXbeY7sJadgdVTv9MDlZbdBqZFBieCRVzV3r4Sj/SNy5DwnuNN37exjR 65Tp5lzF4s4HMPmix6JqjWjTPn1S35YmNklmzMcBAD5004Jn/xOnhTcrZgz9atCsPMOl EDOatz2Fku2GgfGBXuN2TSnSRl9vZTm7JuS96EeYTVMmwqbs8/JSj4Pgdj1LmKwoEzXR ovypWB74UMrf1eij2YBEAZR1uZMrY+C+c6d7WXvvYMA1NBv8PlDl+TkxjtJOoq2IliIs vYrpLXT2Mh2mz+nX1Nh55kRlrfxB6BNCZ+5zjqyaNW1nxaDweZbJooud0/jbdkwUKj8s 5LGA== X-Gm-Message-State: APjAAAUvY1mrOTrCEMnH+ReaNIpio1yRXyfeIQTcOz8f1PJVd+bZbC0u xZhqCPtnIWKAyWywaYNd91XpyYit/eWX9NFGHos= X-Google-Smtp-Source: APXvYqxiTkrK2Pw1PzcNy4maVLvpwRZqF6Fccz+YjdT2g5YRBv5IU4csehk768hgpG+juIbwUKg+LztGUxyisjB+Qko= X-Received: by 2002:a05:6830:190:: with SMTP id q16mr38717902ota.47.1555157811539; Sat, 13 Apr 2019 05:16:51 -0700 (PDT) MIME-Version: 1.0 From: Yuya Kusakabe Date: Sat, 13 Apr 2019 21:16:40 +0900 Message-ID: Subject: [PATCH] net: Fix missing meta data in skb with vlan packet To: davem@davemloft.net Cc: taketarou2@gmail.com, netdev@vger.kernel.org Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org skb_reorder_vlan_header() should move XDP meta data with ethernet header if XDP meta data exists. Signed-off-by: Yuya Kusakabe Signed-off-by: Takeru Hayasaka Co-developed-by: Takeru Hayasaka Reviewed-by: Toshiaki Makita --- net/core/skbuff.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) } -- 2.20.1 diff --git a/net/core/skbuff.c b/net/core/skbuff.c index ef2cd5712098..6bc663249c4c 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -5083,7 +5083,8 @@ EXPORT_SYMBOL_GPL(skb_gso_validate_mac_len); static struct sk_buff *skb_reorder_vlan_header(struct sk_buff *skb) { - int mac_len; + int mac_len, meta_len; + void *meta; if (skb_cow(skb, skb_headroom(skb)) < 0) { kfree_skb(skb); @@ -5095,6 +5096,13 @@ static struct sk_buff *skb_reorder_vlan_header(struct sk_buff *skb) memmove(skb_mac_header(skb) + VLAN_HLEN, skb_mac_header(skb), mac_len - VLAN_HLEN - ETH_TLEN); } + + meta_len = skb_metadata_len(skb); + if (meta_len) { + meta = skb_metadata_end(skb) - meta_len; + memmove(meta + VLAN_HLEN, meta, meta_len); + }; + skb->mac_header += VLAN_HLEN; return skb;