From patchwork Mon Dec 4 22:18:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 844483 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@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; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="dTDJoxad"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yrK601xs3z9ryQ for ; Tue, 5 Dec 2017 09:18:48 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751746AbdLDWSq (ORCPT ); Mon, 4 Dec 2017 17:18:46 -0500 Received: from mail-pf0-f194.google.com ([209.85.192.194]:37432 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751428AbdLDWSo (ORCPT ); Mon, 4 Dec 2017 17:18:44 -0500 Received: by mail-pf0-f194.google.com with SMTP id n6so9623531pfa.4 for ; Mon, 04 Dec 2017 14:18:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=oizwXd5QkWMk+ijNMHuwHT0bKv6QzjZ9IvdwxEws0n4=; b=dTDJoxadGKzsJI9QTZKv1OLK6cv8SOkmNld1sxsJcL800t4rzwN3H7AXqRcGa/uAA2 5kZtEOy3WkbRkLFZlmM68dKPi8C/R5Td/1D6RiQzdNM2jFoKduF76PSYDkmMQkOrZCdW mKrGJ74C3x6QT3DHeNdNN4M70GU3haj8ypLwlLJLy8HQUe0tct2/ty5XVBnuftIKdBP1 t0L/8Z8989rV92LFlzCzxI81K9LzZ7s7NssbyQD8wL10ZV0rXcp/E0+1Abs3RQMIOsph fV53bnumu5tNPHSs6DLyRrthLZPacsSHWGwP/nN+HKLKEUWGTNLkEFfMRpNz2/sD66ut rHEg== 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=oizwXd5QkWMk+ijNMHuwHT0bKv6QzjZ9IvdwxEws0n4=; b=Nm9sLFgkw45gIEX/Os5AlXn5P2Y6Qp0qklg3qq3xfYTi3FNPe9yRmFBaiBHQWBBxn2 loQ8h2TIFABKjsCxttO4HtH+pYKwFGDk/v9YoqrHu3YNkbJ+Cdsk7MU8dEZJ1Lrsb7Qw EcibZaxgixpu3dQJFyCwNCrurAi27+Pp7JcA8jFgl0Tf1trT+275SLIIdEOWaGRhiH33 /DAuVrbv354RaKe9m0t/d2XOdShSJLURfmXIwAnshyFkN2p5fYzOxHDUsfg9t5zV3tha Zr5015ZdVDLtQxplfKUrSziq0wQM9g1ytadtNu2c8UKIKW+NeYFPH4oQQMC/PmzAfZQd 8wTQ== X-Gm-Message-State: AJaThX4NLeNLPMiFGFvn9JRpLxMuzG6No09jN5+VV/WHwnBSX4TDoQ2w MhG/l49IU8ULkupWMrAJMNoqE2It X-Google-Smtp-Source: AGs4zMZMNhu+vzxrpU0CubtnChExhXUO/3ELMJmLD6qzDEGMA/U5uQn4qJqjgrTjQEowTs6chpFaZQ== X-Received: by 10.101.82.203 with SMTP id z11mr15270119pgp.404.1512425918387; Mon, 04 Dec 2017 14:18:38 -0800 (PST) Received: from sc9-mailhost1.vmware.com ([208.91.2.1]) by smtp.gmail.com with ESMTPSA id h81sm27489909pfh.119.2017.12.04.14.18.37 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 04 Dec 2017 14:18:37 -0800 (PST) From: William Tu To: netdev@vger.kernel.org Subject: [PATCH net-next] bpf: move bpf csum flag check Date: Mon, 4 Dec 2017 14:18:29 -0800 Message-Id: <1512425909-105242-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 trivial move the BPF_F_ZERO_CSUM_TX check right below the 'flags & BPF_F_DONT_FRAGMENT', so common tun_flags handling is logically together. Signed-off-by: William Tu Acked-by: Daniel Borkmann --- net/core/filter.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/net/core/filter.c b/net/core/filter.c index 8ec5a504eb28..4d644ad17457 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -3013,6 +3013,8 @@ BPF_CALL_4(bpf_skb_set_tunnel_key, struct sk_buff *, skb, info->key.tun_flags = TUNNEL_KEY | TUNNEL_CSUM | TUNNEL_NOCACHE; if (flags & BPF_F_DONT_FRAGMENT) info->key.tun_flags |= TUNNEL_DONT_FRAGMENT; + if (flags & BPF_F_ZERO_CSUM_TX) + info->key.tun_flags &= ~TUNNEL_CSUM; info->key.tun_id = cpu_to_be64(from->tunnel_id); info->key.tos = from->tunnel_tos; @@ -3028,9 +3030,6 @@ BPF_CALL_4(bpf_skb_set_tunnel_key, struct sk_buff *, skb, info->key.u.ipv4.dst = cpu_to_be32(from->remote_ipv4); } - if (flags & BPF_F_ZERO_CSUM_TX) - info->key.tun_flags &= ~TUNNEL_CSUM; - return 0; }