From patchwork Fri Dec 1 23:26:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 843807 X-Patchwork-Delegate: davem@davemloft.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="Po7+VFAk"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ypVlS0JTwz9sMN for ; Sat, 2 Dec 2017 10:26:28 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751783AbdLAX0Z (ORCPT ); Fri, 1 Dec 2017 18:26:25 -0500 Received: from mail-pf0-f193.google.com ([209.85.192.193]:35197 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751432AbdLAX0W (ORCPT ); Fri, 1 Dec 2017 18:26:22 -0500 Received: by mail-pf0-f193.google.com with SMTP id j124so5296887pfc.2 for ; Fri, 01 Dec 2017 15:26:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=CeXjWKR152etOjULzmOnRs+reh2FdILx8UCSh3ZCpLk=; b=Po7+VFAkWTa3hndfbzmYtkXORigqrrd2CeD+sSq3pugJoG+4CwHcvBRWlB+gmeYYE/ Zn1tt6YnxBcpLGOE5HQq1GgHGFUVK7d6Ij4RO4c6LnFXT5Fa3neQvYJD/LWl+OPM0gif qJ4RK3AO0C+8FnvI72E1y+8TlLM8uTlXXGCe9zLuy5Sm306cMPgnJg2lQbbCczAzrqei 596zBr6y+iVQjVqoIs6cJAGMG2YOJ8O6RnppkFmtbfwKxDly2SrEpY9/vfwRE2KalXlk QEAH2lgj6gVdFtprc44HqEBRpP0Yes2YwnZNJbE4u6L4RStolbtulgVaWd1Y+lohs3i3 3rwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=CeXjWKR152etOjULzmOnRs+reh2FdILx8UCSh3ZCpLk=; b=IkRu0n+x3oAKUTQlDNqj88ozHNbbs/9TB5GJOJCiCN2P/91KG/j9o7awFQuomTN6qs 4XvemxI35pJIMUq2Ag3qn0WkH/NGe2rsRE38O9gDvl/2osw0EKgToj5fozcTn3tiZhAD +Sih3UfEEHT/xFTyLXlmjj3E7PkPnaDNuUdTztjfjIvP2uPdi6YNlxcC4gbv1/EK0QB4 2xyI/+AziYjkdTrDMBFnPKwUHNO6JqRdbIDbE0hAgdUxAN/EI3BOOrs9VmDxYS97a+XY yePtsK0d9rAarZxOHYTW64h/lKXazVZk85qi7iqp2dQD/XJwdm2mmmMdFhYgab4Nj2rR wTrQ== X-Gm-Message-State: AJaThX6/xbWyF2H/i7XUKWPxCTTkdlPQoUo0ciu+9Ap5LHJ1ACGemhNE mK1lL9kcWvJ/9jLdq7DVX9ZC6hhe X-Google-Smtp-Source: AGs4zMbTrH8Z7y5f+VTqDNLXz4LKaYbgM/VihVQ1ABIy6k6dhrgkF8yOi5+6UTk67MAsWvqQpP5mUg== X-Received: by 10.101.102.66 with SMTP id z2mr7481403pgv.352.1512170782180; Fri, 01 Dec 2017 15:26:22 -0800 (PST) Received: from sc9-mailhost3.vmware.com ([208.91.2.1]) by smtp.gmail.com with ESMTPSA id s66sm15408632pfd.74.2017.12.01.15.26.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Dec 2017 15:26:21 -0800 (PST) From: William Tu To: netdev@vger.kernel.org Cc: Daniel Borkmann Subject: [PATCH net-next 2/3] bpf: allow disabling tunnel csum for ipv6 Date: Fri, 1 Dec 2017 15:26:09 -0800 Message-Id: <1512170770-7866-3-git-send-email-u9012063@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1512170770-7866-1-git-send-email-u9012063@gmail.com> References: <1512170770-7866-1-git-send-email-u9012063@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Before the patch, BPF_F_ZERO_CSUM_TX can be used only for ipv4 tunnel. With introduction of ip6gretap collect_md mode, the flag should be also supported for ipv6. Signed-off-by: William Tu Cc: Daniel Borkmann Acked-by: Daniel Borkmann --- net/core/filter.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net/core/filter.c b/net/core/filter.c index 6a85e67fafce..8ec5a504eb28 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -3026,10 +3026,11 @@ BPF_CALL_4(bpf_skb_set_tunnel_key, struct sk_buff *, skb, IPV6_FLOWLABEL_MASK; } else { info->key.u.ipv4.dst = cpu_to_be32(from->remote_ipv4); - if (flags & BPF_F_ZERO_CSUM_TX) - info->key.tun_flags &= ~TUNNEL_CSUM; } + if (flags & BPF_F_ZERO_CSUM_TX) + info->key.tun_flags &= ~TUNNEL_CSUM; + return 0; }