From patchwork Thu Aug 10 06:25:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ziyang Xuan (William)" X-Patchwork-Id: 13348787 X-Patchwork-Delegate: bpf@iogearbox.net Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A884C1100 for ; Thu, 10 Aug 2023 06:25:16 +0000 (UTC) Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 457A410F5 for ; Wed, 9 Aug 2023 23:25:15 -0700 (PDT) Received: from canpemm500006.china.huawei.com (unknown [172.30.72.57]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4RLxhd2HLcz1L9XK; Thu, 10 Aug 2023 14:24:01 +0800 (CST) Received: from localhost.localdomain (10.175.104.82) by canpemm500006.china.huawei.com (7.192.105.130) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Thu, 10 Aug 2023 14:25:12 +0800 From: Ziyang Xuan To: , , , , , , , , , , , Subject: [PATCH bpf-next 1/2] bpf: Update h_proto of ethhdr when the outer protocol changed Date: Thu, 10 Aug 2023 14:25:01 +0800 Message-ID: <70fc4e7bf2c760b045898b3d004a0838902f7e08.1691639830.git.william.xuanziyang@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Originating-IP: [10.175.104.82] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To canpemm500006.china.huawei.com (7.192.105.130) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Patchwork-Delegate: bpf@iogearbox.net When use bpf_skb_adjust_room() to encapsulate or decapsulate packet, and outer protocol changed, we can update h_proto of ethhdr directly. Signed-off-by: Ziyang Xuan --- net/core/filter.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/net/core/filter.c b/net/core/filter.c index a094694899c9..0c156550c757 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -3409,6 +3409,14 @@ static u32 bpf_skb_net_base_len(const struct sk_buff *skb) BPF_ADJ_ROOM_ENCAP_L2_MASK) | \ BPF_F_ADJ_ROOM_DECAP_L3_MASK) +static inline void skb_update_protocol(struct sk_buff *skb, __be16 protocol) +{ + struct ethhdr *hdr = eth_hdr(skb); + + hdr->h_proto = protocol; + skb->protocol = protocol; +} + static int bpf_skb_net_grow(struct sk_buff *skb, u32 off, u32 len_diff, u64 flags) { @@ -3491,13 +3499,13 @@ static int bpf_skb_net_grow(struct sk_buff *skb, u32 off, u32 len_diff, skb_set_transport_header(skb, mac_len + nh_len); } - /* Match skb->protocol to new outer l3 protocol */ + /* Match skb->protocol and ethhdr->h_proto to new outer l3 protocol */ if (skb->protocol == htons(ETH_P_IP) && flags & BPF_F_ADJ_ROOM_ENCAP_L3_IPV6) - skb->protocol = htons(ETH_P_IPV6); + skb_update_protocol(skb, htons(ETH_P_IPV6)); else if (skb->protocol == htons(ETH_P_IPV6) && flags & BPF_F_ADJ_ROOM_ENCAP_L3_IPV4) - skb->protocol = htons(ETH_P_IP); + skb_update_protocol(skb, htons(ETH_P_IP)); } if (skb_is_gso(skb)) { @@ -3540,13 +3548,13 @@ static int bpf_skb_net_shrink(struct sk_buff *skb, u32 off, u32 len_diff, if (unlikely(ret < 0)) return ret; - /* Match skb->protocol to new outer l3 protocol */ + /* Match skb->protocol and ethhdr->h_proto to new outer l3 protocol */ if (skb->protocol == htons(ETH_P_IP) && flags & BPF_F_ADJ_ROOM_DECAP_L3_IPV6) - skb->protocol = htons(ETH_P_IPV6); + skb_update_protocol(skb, htons(ETH_P_IPV6)); else if (skb->protocol == htons(ETH_P_IPV6) && flags & BPF_F_ADJ_ROOM_DECAP_L3_IPV4) - skb->protocol = htons(ETH_P_IP); + skb_update_protocol(skb, htons(ETH_P_IP)); if (skb_is_gso(skb)) { struct skb_shared_info *shinfo = skb_shinfo(skb); From patchwork Thu Aug 10 06:25:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ziyang Xuan (William)" X-Patchwork-Id: 13348788 X-Patchwork-Delegate: bpf@iogearbox.net Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3E3731C31 for ; Thu, 10 Aug 2023 06:25:17 +0000 (UTC) Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 451B910FF for ; Wed, 9 Aug 2023 23:25:16 -0700 (PDT) Received: from canpemm500006.china.huawei.com (unknown [172.30.72.53]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4RLxfl21xNzqShM; Thu, 10 Aug 2023 14:22:23 +0800 (CST) Received: from localhost.localdomain (10.175.104.82) by canpemm500006.china.huawei.com (7.192.105.130) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Thu, 10 Aug 2023 14:25:13 +0800 From: Ziyang Xuan To: , , , , , , , , , , , Subject: [PATCH bpf-next 2/2] selftests/bpf: Remove unnecessary codes for updating h_proto of ethhdr Date: Thu, 10 Aug 2023 14:25:02 +0800 Message-ID: <678786447908dad330bb02e7124ea73938c366e1.1691639830.git.william.xuanziyang@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Originating-IP: [10.175.104.82] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To canpemm500006.china.huawei.com (7.192.105.130) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Patchwork-Delegate: bpf@iogearbox.net Since updating h_proto of ethhdr in kernel, remove the codes in user bpf program. Signed-off-by: Ziyang Xuan --- .../selftests/bpf/progs/test_tc_tunnel.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/tools/testing/selftests/bpf/progs/test_tc_tunnel.c b/tools/testing/selftests/bpf/progs/test_tc_tunnel.c index e6e678aa9874..a33be22a2dc4 100644 --- a/tools/testing/selftests/bpf/progs/test_tc_tunnel.c +++ b/tools/testing/selftests/bpf/progs/test_tc_tunnel.c @@ -236,17 +236,6 @@ static __always_inline int __encap_ipv4(struct __sk_buff *skb, __u8 encap_proto, BPF_F_INVALIDATE_HASH) < 0) return TC_ACT_SHOT; - /* if changing outer proto type, update eth->h_proto */ - if (encap_proto == IPPROTO_IPV6) { - struct ethhdr eth; - - if (bpf_skb_load_bytes(skb, 0, ð, sizeof(eth)) < 0) - return TC_ACT_SHOT; - eth.h_proto = bpf_htons(ETH_P_IP); - if (bpf_skb_store_bytes(skb, 0, ð, sizeof(eth), 0) < 0) - return TC_ACT_SHOT; - } - return TC_ACT_OK; } @@ -412,13 +401,6 @@ static int encap_ipv6_ipip6(struct __sk_buff *skb) BPF_F_INVALIDATE_HASH) < 0) return TC_ACT_SHOT; - /* update eth->h_proto */ - if (bpf_skb_load_bytes(skb, 0, ð, sizeof(eth)) < 0) - return TC_ACT_SHOT; - eth.h_proto = bpf_htons(ETH_P_IPV6); - if (bpf_skb_store_bytes(skb, 0, ð, sizeof(eth), 0) < 0) - return TC_ACT_SHOT; - return TC_ACT_OK; }