From patchwork Mon Apr 13 17:17:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Ahern X-Patchwork-Id: 221238 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5177CC2BA19 for ; Mon, 13 Apr 2020 17:18:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2D7612072D for ; Mon, 13 Apr 2020 17:18:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586798339; bh=M+lOrV9SlrvxORyu69vZ9EjwGSUXp3w84j9gxHIDtt0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gv5nhuNzJvfrDtvmF0rHTJ/w0VkY1yqaB+pw3lk++GP2WWYrBQUtmV3ksg5T2avK9 YHnZxOWmpqu705gx7vk3XbdY0oW6246YZEiaoCPCnDrRl2URjbvzSIBTgZdRe2rhlQ 3XWbv4gHnMcd6j3YM7xPICsqB16ewsf5KONzKsaU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732685AbgDMRS4 (ORCPT ); Mon, 13 Apr 2020 13:18:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:38966 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732659AbgDMRSd (ORCPT ); Mon, 13 Apr 2020 13:18:33 -0400 Received: from C02YQ0RWLVCF.internal.digitalocean.com (c-73-181-34-237.hsd1.co.comcast.net [73.181.34.237]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C15872074B; Mon, 13 Apr 2020 17:18:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586798312; bh=M+lOrV9SlrvxORyu69vZ9EjwGSUXp3w84j9gxHIDtt0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oTRJo0nOkVXYlurAs5LS2zW+pWV8r2qiUEpoSKuOCqdo+f8JYZhHAyWHNQuHqGzEA lOmHDTFoVw/Fy+hQulUNxPfsGRH0lYRYZPuMP6XyxvOA/Rt9Upgt1VBMybric2PXrk TqmNcnzRsBUq00MuPqpVnZSH/gFb039hO201tDa0= From: David Ahern To: netdev@vger.kernel.org Cc: davem@davemloft.net, kuba@kernel.org, prashantbhole.linux@gmail.com, jasowang@redhat.com, brouer@redhat.com, toke@redhat.com, toshiaki.makita1@gmail.com, daniel@iogearbox.net, john.fastabend@gmail.com, ast@kernel.org, kafai@fb.com, songliubraving@fb.com, yhs@fb.com, andriin@fb.com, dsahern@gmail.com, David Ahern Subject: [PATCH RFC-v5 bpf-next 06/12] net: core: Rename do_xdp_generic to do_xdp_generic_rx Date: Mon, 13 Apr 2020 11:17:55 -0600 Message-Id: <20200413171801.54406-7-dsahern@kernel.org> X-Mailer: git-send-email 2.21.1 (Apple Git-122.3) In-Reply-To: <20200413171801.54406-1-dsahern@kernel.org> References: <20200413171801.54406-1-dsahern@kernel.org> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: David Ahern Rename do_xdp_generic to do_xdp_generic_rx to emphasize its use in the Rx path. Signed-off-by: Jason Wang Signed-off-by: Prashant Bhole Signed-off-by: David Ahern --- drivers/net/tun.c | 4 ++-- include/linux/netdevice.h | 2 +- net/core/dev.c | 7 ++++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 228fe449dc6d..20d94bf79cf7 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1895,7 +1895,7 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile, rcu_read_lock(); xdp_prog = rcu_dereference(tun->xdp_prog); if (xdp_prog) { - ret = do_xdp_generic(xdp_prog, skb); + ret = do_xdp_generic_rx(xdp_prog, skb); if (ret != XDP_PASS) { rcu_read_unlock(); local_bh_enable(); @@ -2459,7 +2459,7 @@ static int tun_xdp_one(struct tun_struct *tun, skb_probe_transport_header(skb); if (skb_xdp) { - err = do_xdp_generic(xdp_prog, skb); + err = do_xdp_generic_rx(xdp_prog, skb); if (err != XDP_PASS) goto out; } diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 3133247681fd..2649f2b36858 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -3711,7 +3711,7 @@ static inline void dev_consume_skb_any(struct sk_buff *skb) } void generic_xdp_tx(struct sk_buff *skb, struct bpf_prog *xdp_prog); -int do_xdp_generic(struct bpf_prog *xdp_prog, struct sk_buff *skb); +int do_xdp_generic_rx(struct bpf_prog *xdp_prog, struct sk_buff *skb); int netif_rx(struct sk_buff *skb); int netif_rx_ni(struct sk_buff *skb); int netif_receive_skb(struct sk_buff *skb); diff --git a/net/core/dev.c b/net/core/dev.c index 4f0c4fee1125..6da613fb6623 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -4620,7 +4620,7 @@ void generic_xdp_tx(struct sk_buff *skb, struct bpf_prog *xdp_prog) static DEFINE_STATIC_KEY_FALSE(generic_xdp_needed_key); -int do_xdp_generic(struct bpf_prog *xdp_prog, struct sk_buff *skb) +int do_xdp_generic_rx(struct bpf_prog *xdp_prog, struct sk_buff *skb) { /* Reinjected packets coming from act_mirred or similar should * not get XDP generic processing. @@ -4667,7 +4667,7 @@ int do_xdp_generic(struct bpf_prog *xdp_prog, struct sk_buff *skb) kfree_skb(skb); return XDP_DROP; } -EXPORT_SYMBOL_GPL(do_xdp_generic); +EXPORT_SYMBOL_GPL(do_xdp_generic_rx); static int netif_rx_internal(struct sk_buff *skb) { @@ -5017,7 +5017,8 @@ static int __netif_receive_skb_core(struct sk_buff *skb, bool pfmemalloc, int ret2; preempt_disable(); - ret2 = do_xdp_generic(rcu_dereference(skb->dev->xdp_prog), skb); + ret2 = do_xdp_generic_rx(rcu_dereference(skb->dev->xdp_prog), + skb); preempt_enable(); if (ret2 != XDP_PASS)