From patchwork Mon May 14 23:54:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 913363 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="mjfz+Bh7"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40lHdN0XDjz9s08 for ; Tue, 15 May 2018 09:55:35 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752452AbeENXzY (ORCPT ); Mon, 14 May 2018 19:55:24 -0400 Received: from mail-pl0-f66.google.com ([209.85.160.66]:37084 "EHLO mail-pl0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752391AbeENXzW (ORCPT ); Mon, 14 May 2018 19:55:22 -0400 Received: by mail-pl0-f66.google.com with SMTP id w19-v6so5658779plq.4 for ; Mon, 14 May 2018 16:55:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=IbJuifHebJjz2tx9KXE5onJd+o6qnN0Qg4s9zcqtAGM=; b=mjfz+Bh7GRy1sOWW7v/2aPCbkIpUzbQiwEC8/mKHIlmRBKflifkWzboLYTHixP2OkM OQYaVdkxq7mR25xzB+jxLcOMkDArVGck0c2l0q8LMPcrQKNW8iifGW4vN9M6+93hjFg7 Q0yHOTSxgu7odFOeBA3jB0qw6bZ9eyFFx3zQ0JYAPCFZq76Df+W0nQ2qkoGHMu3tpDtY slS+ccU4pnoCPTzrOfPLGaZd5L/wc4FR+EbsNogp0F8IR/l0VF7HfunnxMKfjjp1lc56 eUFYS7GWWcF8YQBIl89F2PPrGD0X5luwCYNEgt71ahqs0SilFq/o+WELVkxzDB0Vmr1n CTTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=IbJuifHebJjz2tx9KXE5onJd+o6qnN0Qg4s9zcqtAGM=; b=RC5AelAxKOmCybb1KH9Nb3R2qFg6/qcGnGpCbx7MJDgvQnVHr5xm11Tu4eNb58ce4y 2EiW31ZkkAWTMkt9KOKq+iGpr0Tr7ErT1C+2ChgC1oKjk5z/oBpyWX+HbIEnSoOAy5TE 14Y/qI3N5fXfltEJwgtnlMCirZb7KY5bRpBSy/Yi3LaJWZv8UJXdroaRbGpEIiMOWdwF s0a9+HlcI12FIpu2KzfsYwnhUHtknWWf6R26TotPAaqp90w0fa3ouVQt8rCG6Gz6yJgG Lo6aJksHG3tWZnYIpkHTOZU1ju98PIBIWoqn7Oway9gtZBj98hVIIQfaKBlmIoW2vnaB rDcQ== X-Gm-Message-State: ALKqPwfKH9wxL35/EwsrKyP8p+3dXX71HcJZx2aeEmpvsjmdQNU060JA nHkxU70XnoumOA5LFUay8iT3W/8e X-Google-Smtp-Source: AB8JxZrdsKd/Cn/83hz/xXQe3K80F7W4aTCQvZxWTC8hoa7EUA2uMynPH1UBTWtjY4qhpthG/OxIig== X-Received: by 2002:a17:902:7582:: with SMTP id j2-v6mr11820215pll.65.1526342122259; Mon, 14 May 2018 16:55:22 -0700 (PDT) Received: from sc9-mailhost2.vmware.com ([66.170.99.2]) by smtp.gmail.com with ESMTPSA id f13-v6sm14239701pgs.84.2018.05.14.16.55.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 14 May 2018 16:55:21 -0700 (PDT) From: William Tu To: netdev@vger.kernel.org Subject: [PATCH net-next] erspan: set bso bit based on mirrored packet's len Date: Mon, 14 May 2018 16:54:36 -0700 Message-Id: <1526342076-43714-1-git-send-email-u9012063@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Before the patch, the erspan BSO bit (Bad/Short/Oversized) is not handled. BSO has 4 possible values: 00 --> Good frame with no error, or unknown integrity 11 --> Payload is a Bad Frame with CRC or Alignment Error 01 --> Payload is a Short Frame 10 --> Payload is an Oversized Frame Based the short/oversized definitions in RFC1757, the patch sets the bso bit based on the mirrored packet's size. Reported-by: Xiaoyan Jin Signed-off-by: William Tu --- include/net/erspan.h | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/include/net/erspan.h b/include/net/erspan.h index d044aa60cc76..5eb95f78ad45 100644 --- a/include/net/erspan.h +++ b/include/net/erspan.h @@ -219,6 +219,30 @@ static inline __be32 erspan_get_timestamp(void) return htonl((u32)h_usecs); } +/* ERSPAN BSO (Bad/Short/Oversized) + * 00b --> Good frame with no error, or unknown integrity + * 01b --> Payload is a Short Frame + * 10b --> Payload is an Oversized Frame + * 11b --> Payload is a Bad Frame with CRC or Alignment Error + */ +enum erspan_bso { + BSO_NOERROR, + BSO_SHORT, + BSO_OVERSIZED, + BSO_BAD, +}; + +static inline u8 erspan_detect_bso(struct sk_buff *skb) +{ + if (skb->len < ETH_ZLEN) + return BSO_SHORT; + + if (skb->len > ETH_FRAME_LEN) + return BSO_OVERSIZED; + + return BSO_NOERROR; +} + static inline void erspan_build_header_v2(struct sk_buff *skb, u32 id, u8 direction, u16 hwid, bool truncate, bool is_ipv4) @@ -248,6 +272,7 @@ static inline void erspan_build_header_v2(struct sk_buff *skb, vlan_tci = ntohs(qp->tci); } + bso = erspan_detect_bso(skb); skb_push(skb, sizeof(*ershdr) + ERSPAN_V2_MDSIZE); ershdr = (struct erspan_base_hdr *)skb->data; memset(ershdr, 0, sizeof(*ershdr) + ERSPAN_V2_MDSIZE);