From mboxrd@z Thu Jan 1 00:00:00 1970 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 000A81FA5; Sun, 10 Sep 2023 07:43:54 +0000 (UTC) Received: from smtp-fw-80006.amazon.com (smtp-fw-80006.amazon.com [99.78.197.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A15B1A5; Sun, 10 Sep 2023 00:43:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1694331832; x=1725867832; h=from:to:cc:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version:subject; bh=buKlzYg9zWT3jNhXdXiDa9uiNTTVXOjL7I9fPhWzoQc=; b=oDnWE4cWlbteObNo/99DB/gjB9aKUFQhAatp/VUhRnbddW91d/iJAvlN WXUwkuFmUtB0pnO3QGe6Nc14gzPR5+bkfKeDI0/mlO6hRfQ1pItzN3NRh FjXSm6BqoPiROu5/Ro/Mgj/BOviDgRVEQV3G6bOou2pAGKSDwMEK468aY 8=; X-IronPort-AV: E=Sophos;i="6.02,241,1688428800"; d="scan'208";a="237758971" Subject: RE: [PATCH net-next 1/2] net: Tree wide: Replace xdp_do_flush_map() with xdp_do_flush(). Thread-Topic: [PATCH net-next 1/2] net: Tree wide: Replace xdp_do_flush_map() with xdp_do_flush(). Received: from pdx4-co-svc-p1-lb2-vlan3.amazon.com (HELO email-inbound-relay-iad-1d-m6i4x-d7759ebe.us-east-1.amazon.com) ([10.25.36.214]) by smtp-border-fw-80006.pdx80.corp.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Sep 2023 07:43:46 +0000 Received: from EX19D016EUA001.ant.amazon.com (iad12-ws-svc-p26-lb9-vlan2.iad.amazon.com [10.40.163.34]) by email-inbound-relay-iad-1d-m6i4x-d7759ebe.us-east-1.amazon.com (Postfix) with ESMTPS id C841E477F6; Sun, 10 Sep 2023 07:43:35 +0000 (UTC) Received: from EX19D047EUA003.ant.amazon.com (10.252.50.160) by EX19D016EUA001.ant.amazon.com (10.252.50.245) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.37; Sun, 10 Sep 2023 07:43:34 +0000 Received: from EX19D022EUA002.ant.amazon.com (10.252.50.201) by EX19D047EUA003.ant.amazon.com (10.252.50.160) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.37; Sun, 10 Sep 2023 07:43:34 +0000 Received: from EX19D022EUA002.ant.amazon.com ([fe80::7f87:7d63:def0:157d]) by EX19D022EUA002.ant.amazon.com ([fe80::7f87:7d63:def0:157d%3]) with mapi id 15.02.1118.037; Sun, 10 Sep 2023 07:43:34 +0000 From: "Kiyanovski, Arthur" To: Sebastian Andrzej Siewior , "netdev@vger.kernel.org" , "bpf@vger.kernel.org" CC: "David S. Miller" , Alexei Starovoitov , Daniel Borkmann , Eric Dumazet , Jakub Kicinski , "Jesper Dangaard Brouer" , John Fastabend , "Paolo Abeni" , Thomas Gleixner , AngeloGioacchino Del Regno , "Clark Wang" , Claudiu Manoil , "Arinzon, David" , Edward Cree , Felix Fietkau , Grygorii Strashko , Ilias Apalodimas , Jassi Brar , Jesse Brandeburg , John Crispin , Leon Romanovsky , "Lorenzo Bianconi" , Louis Peens , Marcin Wojtas , Mark Lee , Martin Habets , Matthias Brugger , NXP Linux Team , "Dagan, Noam" , Russell King , "Bshara, Saeed" , Saeed Mahameed , Sean Wang , "Agroskin, Shay" , Shenwei Wang , Thomas Petazzoni , Tony Nguyen , Vladimir Oltean , Wei Fang Thread-Index: AQHZ4mFsc9I3oLDtAUuW2Bf49PS0o7ATr4Hw Date: Sun, 10 Sep 2023 07:43:19 +0000 Deferred-Delivery: Sun, 10 Sep 2023 07:42:23 +0000 Message-ID: References: <20230908143215.869913-1-bigeasy@linutronix.de> <20230908143215.869913-2-bigeasy@linutronix.de> In-Reply-To: <20230908143215.869913-2-bigeasy@linutronix.de> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.85.143.179] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Precedence: Bulk X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net > -----Original Message----- > From: Sebastian Andrzej Siewior > Sent: Friday, September 8, 2023 5:32 PM > To: netdev@vger.kernel.org; bpf@vger.kernel.org > Cc: David S. Miller ; Alexei Starovoitov > ; Daniel Borkmann ; Eric Dumazet > ; Jakub Kicinski ; Jesper > Dangaard Brouer ; John Fastabend > ; Paolo Abeni ; Thomas > Gleixner ; Sebastian Andrzej Siewior > ; AngeloGioacchino Del Regno > ; Kiyanovski, Arthur > ; Clark Wang ; Claudiu > Manoil ; Arinzon, David > ; Edward Cree ; Felix > Fietkau ; Grygorii Strashko ; > Ilias Apalodimas ; Jassi Brar > ; Jesse Brandeburg > ; John Crispin ; Leon > Romanovsky ; Lorenzo Bianconi ; > Louis Peens ; Marcin Wojtas > ; Mark Lee ; Martin > Habets ; Matthias Brugger > ; NXP Linux Team ; Dagan, > Noam ; Russell King ; > Bshara, Saeed ; Saeed Mahameed > ; Sean Wang ; Agroskin, > Shay ; Shenwei Wang ; > Thomas Petazzoni ; Tony Nguyen > ; Vladimir Oltean > ; Wei Fang > Subject: [EXTERNAL] [PATCH net-next 1/2] net: Tree wide: Replace > xdp_do_flush_map() with xdp_do_flush(). >=20 > CAUTION: This email originated from outside of the organization. Do not c= lick > links or open attachments unless you can confirm the sender and know the > content is safe. >=20 >=20 >=20 > xdp_do_flush_map() is deprecated and new code should use xdp_do_flush() > instead. >=20 > Replace xdp_do_flush_map() with xdp_do_flush(). >=20 > Cc: AngeloGioacchino Del Regno > > Cc: Arthur Kiyanovski > Cc: Clark Wang > Cc: Claudiu Manoil > Cc: David Arinzon > Cc: Edward Cree > Cc: Felix Fietkau > Cc: Grygorii Strashko > Cc: Ilias Apalodimas > Cc: Jassi Brar > Cc: Jesse Brandeburg > Cc: John Crispin > Cc: Leon Romanovsky > Cc: Lorenzo Bianconi > Cc: Louis Peens > Cc: Marcin Wojtas > Cc: Mark Lee > Cc: Martin Habets > Cc: Matthias Brugger > Cc: NXP Linux Team > Cc: Noam Dagan > Cc: Russell King > Cc: Saeed Bishara > Cc: Saeed Mahameed > Cc: Sean Wang > Cc: Shay Agroskin > Cc: Shenwei Wang > Cc: Thomas Petazzoni > Cc: Tony Nguyen > Cc: Vladimir Oltean > Cc: Wei Fang > Signed-off-by: Sebastian Andrzej Siewior > --- > drivers/net/ethernet/amazon/ena/ena_netdev.c | 2 +- > drivers/net/ethernet/freescale/enetc/enetc.c | 2 +- > drivers/net/ethernet/freescale/fec_main.c | 2 +- > drivers/net/ethernet/intel/i40e/i40e_txrx.c | 2 +- > drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 2 +- > drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +- > drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 2 +- > drivers/net/ethernet/marvell/mvneta.c | 2 +- > drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 2 +- > drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 +- > drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 2 +- > drivers/net/ethernet/netronome/nfp/nfd3/xsk.c | 2 +- > drivers/net/ethernet/sfc/efx_channels.c | 2 +- > drivers/net/ethernet/sfc/siena/efx_channels.c | 2 +- > drivers/net/ethernet/socionext/netsec.c | 2 +- > drivers/net/ethernet/ti/cpsw_priv.c | 2 +- > 16 files changed, 16 insertions(+), 16 deletions(-) >=20 > diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c > b/drivers/net/ethernet/amazon/ena/ena_netdev.c > index ad32ca81f7ef4..69bc8dfa7d71b 100644 > --- a/drivers/net/ethernet/amazon/ena/ena_netdev.c > +++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c > @@ -1828,7 +1828,7 @@ static int ena_clean_rx_irq(struct ena_ring > *rx_ring, struct napi_struct *napi, > } >=20 > if (xdp_flags & ENA_XDP_REDIRECT) > - xdp_do_flush_map(); > + xdp_do_flush(); >=20 > return work_done; >=20 > diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c > b/drivers/net/ethernet/freescale/enetc/enetc.c > index 35461165de0d2..30bec47bc665b 100644 > --- a/drivers/net/ethernet/freescale/enetc/enetc.c > +++ b/drivers/net/ethernet/freescale/enetc/enetc.c > @@ -1655,7 +1655,7 @@ static int enetc_clean_rx_ring_xdp(struct > enetc_bdr *rx_ring, > rx_ring->stats.bytes +=3D rx_byte_cnt; >=20 > if (xdp_redirect_frm_cnt) > - xdp_do_flush_map(); > + xdp_do_flush(); >=20 > if (xdp_tx_frm_cnt) > enetc_update_tx_ring_tail(tx_ring); > diff --git a/drivers/net/ethernet/freescale/fec_main.c > b/drivers/net/ethernet/freescale/fec_main.c > index 77c8e9cfb4456..b833467088811 100644 > --- a/drivers/net/ethernet/freescale/fec_main.c > +++ b/drivers/net/ethernet/freescale/fec_main.c > @@ -1832,7 +1832,7 @@ fec_enet_rx_queue(struct net_device *ndev, int > budget, u16 queue_id) > rxq->bd.cur =3D bdp; >=20 > if (xdp_result & FEC_ENET_XDP_REDIR) > - xdp_do_flush_map(); > + xdp_do_flush(); >=20 > return pkt_received; > } > diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c > b/drivers/net/ethernet/intel/i40e/i40e_txrx.c > index 0b3a27f118fb9..d680df615ff95 100644 > --- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c > +++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c > @@ -2405,7 +2405,7 @@ void i40e_update_rx_stats(struct i40e_ring > *rx_ring, void i40e_finalize_xdp_rx(struct i40e_ring *rx_ring, unsigned = int > xdp_res) { > if (xdp_res & I40E_XDP_REDIR) > - xdp_do_flush_map(); > + xdp_do_flush(); >=20 > if (xdp_res & I40E_XDP_TX) { > struct i40e_ring *xdp_ring =3D diff --git > a/drivers/net/ethernet/intel/ice/ice_txrx_lib.c > b/drivers/net/ethernet/intel/ice/ice_txrx_lib.c > index c8322fb6f2b37..7e06373e14d98 100644 > --- a/drivers/net/ethernet/intel/ice/ice_txrx_lib.c > +++ b/drivers/net/ethernet/intel/ice/ice_txrx_lib.c > @@ -450,7 +450,7 @@ void ice_finalize_xdp_rx(struct ice_tx_ring *xdp_ring= , > unsigned int xdp_res, > struct ice_tx_buf *tx_buf =3D &xdp_ring->tx_buf[first_idx]; >=20 > if (xdp_res & ICE_XDP_REDIR) > - xdp_do_flush_map(); > + xdp_do_flush(); >=20 > if (xdp_res & ICE_XDP_TX) { > if (static_branch_unlikely(&ice_xdp_locking_key)) > diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c > b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c > index dd03b017dfc51..94bde2cad0f47 100644 > --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c > +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c > @@ -2421,7 +2421,7 @@ static int ixgbe_clean_rx_irq(struct ixgbe_q_vector > *q_vector, > } >=20 > if (xdp_xmit & IXGBE_XDP_REDIR) > - xdp_do_flush_map(); > + xdp_do_flush(); >=20 > if (xdp_xmit & IXGBE_XDP_TX) { > struct ixgbe_ring *ring =3D ixgbe_determine_xdp_ring(adap= ter); > diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c > b/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c > index 1703c640a434d..59798bc33298f 100644 > --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c > +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c > @@ -351,7 +351,7 @@ int ixgbe_clean_rx_irq_zc(struct ixgbe_q_vector > *q_vector, > } >=20 > if (xdp_xmit & IXGBE_XDP_REDIR) > - xdp_do_flush_map(); > + xdp_do_flush(); >=20 > if (xdp_xmit & IXGBE_XDP_TX) { > struct ixgbe_ring *ring =3D ixgbe_determine_xdp_ring(adap= ter); > diff --git a/drivers/net/ethernet/marvell/mvneta.c > b/drivers/net/ethernet/marvell/mvneta.c > index d483b8c00ec0e..7b2aa30de8222 100644 > --- a/drivers/net/ethernet/marvell/mvneta.c > +++ b/drivers/net/ethernet/marvell/mvneta.c > @@ -2520,7 +2520,7 @@ static int mvneta_rx_swbm(struct napi_struct > *napi, > mvneta_xdp_put_buff(pp, rxq, &xdp_buf, -1); >=20 > if (ps.xdp_redirect) > - xdp_do_flush_map(); > + xdp_do_flush(); >=20 > if (ps.rx_packets) > mvneta_update_stats(pp, &ps); diff --git > a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c > b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c > index eb74ccddb4409..60c53f66935a6 100644 > --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c > +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c > @@ -4027,7 +4027,7 @@ static int mvpp2_rx(struct mvpp2_port *port, > struct napi_struct *napi, > } >=20 > if (xdp_ret & MVPP2_XDP_REDIR) > - xdp_do_flush_map(); > + xdp_do_flush(); >=20 > if (ps.rx_packets) { > struct mvpp2_pcpu_stats *stats =3D this_cpu_ptr(port->sta= ts); diff --git > a/drivers/net/ethernet/mediatek/mtk_eth_soc.c > b/drivers/net/ethernet/mediatek/mtk_eth_soc.c > index 6ad42e3b488f7..0b8ee35d713d1 100644 > --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c > +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c > @@ -2209,7 +2209,7 @@ static int mtk_poll_rx(struct napi_struct *napi, in= t > budget, > net_dim(ð->rx_dim, dim_sample); >=20 > if (xdp_flush) > - xdp_do_flush_map(); > + xdp_do_flush(); >=20 > return done; > } > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c > b/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c > index 12f56d0db0af2..cc3fcd24b36d6 100644 > --- a/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c > +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c > @@ -893,7 +893,7 @@ void mlx5e_xdp_rx_poll_complete(struct mlx5e_rq > *rq) > mlx5e_xmit_xdp_doorbell(xdpsq); >=20 > if (test_bit(MLX5E_RQ_FLAG_XDP_REDIRECT, rq->flags)) { > - xdp_do_flush_map(); > + xdp_do_flush(); > __clear_bit(MLX5E_RQ_FLAG_XDP_REDIRECT, rq->flags); > } > } > diff --git a/drivers/net/ethernet/netronome/nfp/nfd3/xsk.c > b/drivers/net/ethernet/netronome/nfp/nfd3/xsk.c > index 5d9db8c2a5b43..45be6954d5aae 100644 > --- a/drivers/net/ethernet/netronome/nfp/nfd3/xsk.c > +++ b/drivers/net/ethernet/netronome/nfp/nfd3/xsk.c > @@ -256,7 +256,7 @@ nfp_nfd3_xsk_rx(struct nfp_net_rx_ring *rx_ring, int > budget, > nfp_net_xsk_rx_ring_fill_freelist(r_vec->rx_ring); >=20 > if (xdp_redir) > - xdp_do_flush_map(); > + xdp_do_flush(); >=20 > if (tx_ring->wr_ptr_add) > nfp_net_tx_xmit_more_flush(tx_ring); > diff --git a/drivers/net/ethernet/sfc/efx_channels.c > b/drivers/net/ethernet/sfc/efx_channels.c > index 8d2d7ea2ebefc..c9e17a8208a90 100644 > --- a/drivers/net/ethernet/sfc/efx_channels.c > +++ b/drivers/net/ethernet/sfc/efx_channels.c > @@ -1260,7 +1260,7 @@ static int efx_poll(struct napi_struct *napi, int > budget) >=20 > spent =3D efx_process_channel(channel, budget); >=20 > - xdp_do_flush_map(); > + xdp_do_flush(); >=20 > if (spent < budget) { > if (efx_channel_has_rx_queue(channel) && diff --git > a/drivers/net/ethernet/sfc/siena/efx_channels.c > b/drivers/net/ethernet/sfc/siena/efx_channels.c > index 1776f7f8a7a90..a7346e965bfe7 100644 > --- a/drivers/net/ethernet/sfc/siena/efx_channels.c > +++ b/drivers/net/ethernet/sfc/siena/efx_channels.c > @@ -1285,7 +1285,7 @@ static int efx_poll(struct napi_struct *napi, int > budget) >=20 > spent =3D efx_process_channel(channel, budget); >=20 > - xdp_do_flush_map(); > + xdp_do_flush(); >=20 > if (spent < budget) { > if (efx_channel_has_rx_queue(channel) && diff --git > a/drivers/net/ethernet/socionext/netsec.c > b/drivers/net/ethernet/socionext/netsec.c > index f358ea0031936..b834b129639f0 100644 > --- a/drivers/net/ethernet/socionext/netsec.c > +++ b/drivers/net/ethernet/socionext/netsec.c > @@ -780,7 +780,7 @@ static void netsec_finalize_xdp_rx(struct netsec_priv > *priv, u32 xdp_res, > u16 pkts) { > if (xdp_res & NETSEC_XDP_REDIR) > - xdp_do_flush_map(); > + xdp_do_flush(); >=20 > if (xdp_res & NETSEC_XDP_TX) > netsec_xdp_ring_tx_db(priv, pkts); diff --git > a/drivers/net/ethernet/ti/cpsw_priv.c b/drivers/net/ethernet/ti/cpsw_priv= .c > index 0ec85635dfd60..764ed298b5708 100644 > --- a/drivers/net/ethernet/ti/cpsw_priv.c > +++ b/drivers/net/ethernet/ti/cpsw_priv.c > @@ -1360,7 +1360,7 @@ int cpsw_run_xdp(struct cpsw_priv *priv, int ch, > struct xdp_buff *xdp, > * particular hardware is sharing a common queue, so the > * incoming device might change per packet. > */ > - xdp_do_flush_map(); > + xdp_do_flush(); > break; > default: > bpf_warn_invalid_xdp_action(ndev, prog, act); > -- > 2.40.1 Thanks for submitting this change. Acked-by: Arthur Kiyanovski