From: Alexander Lobakin <alexandr.lobakin@intel.com> To: intel-wired-lan@lists.osuosl.org Cc: "Alexander Lobakin" <alexandr.lobakin@intel.com>, "Jesse Brandeburg" <jesse.brandeburg@intel.com>, "Tony Nguyen" <anthony.l.nguyen@intel.com>, "David S. Miller" <davem@davemloft.net>, "Jakub Kicinski" <kuba@kernel.org>, "Alexei Starovoitov" <ast@kernel.org>, "Daniel Borkmann" <daniel@iogearbox.net>, "Jesper Dangaard Brouer" <hawk@kernel.org>, "John Fastabend" <john.fastabend@gmail.com>, "Björn Töpel" <bjorn@kernel.org>, "Maciej Fijalkowski" <maciej.fijalkowski@intel.com>, "Michal Swiatkowski" <michal.swiatkowski@linux.intel.com>, "Jithu Joseph" <jithu.joseph@intel.com>, "Martin KaFai Lau" <kafai@fb.com>, "Song Liu" <songliubraving@fb.com>, "KP Singh" <kpsingh@kernel.org>, "Yonghong Song" <yhs@fb.com>, "Andrii Nakryiko" <andrii@kernel.org>, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, "Jesper Dangaard Brouer" <brouer@redhat.com> Subject: [PATCH v4 net-next 3/9] ice: respect metadata in legacy-rx/ice_construct_skb() Date: Wed, 8 Dec 2021 15:06:56 +0100 [thread overview] Message-ID: <20211208140702.642741-4-alexandr.lobakin@intel.com> (raw) In-Reply-To: <20211208140702.642741-1-alexandr.lobakin@intel.com> In "legacy-rx" mode represented by ice_construct_skb(), we can still use XDP (and XDP metadata), but after XDP_PASS the metadata will be lost as it doesn't get copied to the skb. Copy it along with the frame headers. Account its size on skb allocation, and when copying just treat it as a part of the frame and do a pull after to "move" it to the "reserved" zone. Point net_prefetch() to xdp->data_meta instead of data. This won't change anything when the meta is not here, but will save some cache misses otherwise. Suggested-by: Jesper Dangaard Brouer <brouer@redhat.com> Suggested-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com> Signed-off-by: Alexander Lobakin <alexandr.lobakin@intel.com> Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com> --- drivers/net/ethernet/intel/ice/ice_txrx.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/intel/ice/ice_txrx.c b/drivers/net/ethernet/intel/ice/ice_txrx.c index bc3ba19dc88f..d724b6376c43 100644 --- a/drivers/net/ethernet/intel/ice/ice_txrx.c +++ b/drivers/net/ethernet/intel/ice/ice_txrx.c @@ -968,15 +968,17 @@ static struct sk_buff * ice_construct_skb(struct ice_rx_ring *rx_ring, struct ice_rx_buf *rx_buf, struct xdp_buff *xdp) { + unsigned int metasize = xdp->data - xdp->data_meta; unsigned int size = xdp->data_end - xdp->data; unsigned int headlen; struct sk_buff *skb; /* prefetch first cache line of first page */ - net_prefetch(xdp->data); + net_prefetch(xdp->data_meta); /* allocate a skb to store the frags */ - skb = __napi_alloc_skb(&rx_ring->q_vector->napi, ICE_RX_HDR_SIZE, + skb = __napi_alloc_skb(&rx_ring->q_vector->napi, + ICE_RX_HDR_SIZE + metasize, GFP_ATOMIC | __GFP_NOWARN); if (unlikely(!skb)) return NULL; @@ -988,8 +990,13 @@ ice_construct_skb(struct ice_rx_ring *rx_ring, struct ice_rx_buf *rx_buf, headlen = eth_get_headlen(skb->dev, xdp->data, ICE_RX_HDR_SIZE); /* align pull length to size of long to optimize memcpy performance */ - memcpy(__skb_put(skb, headlen), xdp->data, ALIGN(headlen, - sizeof(long))); + memcpy(__skb_put(skb, headlen + metasize), xdp->data_meta, + ALIGN(headlen + metasize, sizeof(long))); + + if (metasize) { + skb_metadata_set(skb, metasize); + __skb_pull(skb, metasize); + } /* if we exhaust the linear part then add what is left as a frag */ size -= headlen; -- 2.33.1
WARNING: multiple messages have this Message-ID (diff)
From: Alexander Lobakin <alexandr.lobakin@intel.com> To: intel-wired-lan@osuosl.org Subject: [Intel-wired-lan] [PATCH v4 net-next 3/9] ice: respect metadata in legacy-rx/ice_construct_skb() Date: Wed, 8 Dec 2021 15:06:56 +0100 [thread overview] Message-ID: <20211208140702.642741-4-alexandr.lobakin@intel.com> (raw) In-Reply-To: <20211208140702.642741-1-alexandr.lobakin@intel.com> In "legacy-rx" mode represented by ice_construct_skb(), we can still use XDP (and XDP metadata), but after XDP_PASS the metadata will be lost as it doesn't get copied to the skb. Copy it along with the frame headers. Account its size on skb allocation, and when copying just treat it as a part of the frame and do a pull after to "move" it to the "reserved" zone. Point net_prefetch() to xdp->data_meta instead of data. This won't change anything when the meta is not here, but will save some cache misses otherwise. Suggested-by: Jesper Dangaard Brouer <brouer@redhat.com> Suggested-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com> Signed-off-by: Alexander Lobakin <alexandr.lobakin@intel.com> Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com> --- drivers/net/ethernet/intel/ice/ice_txrx.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/intel/ice/ice_txrx.c b/drivers/net/ethernet/intel/ice/ice_txrx.c index bc3ba19dc88f..d724b6376c43 100644 --- a/drivers/net/ethernet/intel/ice/ice_txrx.c +++ b/drivers/net/ethernet/intel/ice/ice_txrx.c @@ -968,15 +968,17 @@ static struct sk_buff * ice_construct_skb(struct ice_rx_ring *rx_ring, struct ice_rx_buf *rx_buf, struct xdp_buff *xdp) { + unsigned int metasize = xdp->data - xdp->data_meta; unsigned int size = xdp->data_end - xdp->data; unsigned int headlen; struct sk_buff *skb; /* prefetch first cache line of first page */ - net_prefetch(xdp->data); + net_prefetch(xdp->data_meta); /* allocate a skb to store the frags */ - skb = __napi_alloc_skb(&rx_ring->q_vector->napi, ICE_RX_HDR_SIZE, + skb = __napi_alloc_skb(&rx_ring->q_vector->napi, + ICE_RX_HDR_SIZE + metasize, GFP_ATOMIC | __GFP_NOWARN); if (unlikely(!skb)) return NULL; @@ -988,8 +990,13 @@ ice_construct_skb(struct ice_rx_ring *rx_ring, struct ice_rx_buf *rx_buf, headlen = eth_get_headlen(skb->dev, xdp->data, ICE_RX_HDR_SIZE); /* align pull length to size of long to optimize memcpy performance */ - memcpy(__skb_put(skb, headlen), xdp->data, ALIGN(headlen, - sizeof(long))); + memcpy(__skb_put(skb, headlen + metasize), xdp->data_meta, + ALIGN(headlen + metasize, sizeof(long))); + + if (metasize) { + skb_metadata_set(skb, metasize); + __skb_pull(skb, metasize); + } /* if we exhaust the linear part then add what is left as a frag */ size -= headlen; -- 2.33.1
next prev parent reply other threads:[~2021-12-08 14:08 UTC|newest] Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-12-08 14:06 [PATCH v4 net-next 0/9] net: intel: napi_alloc_skb() vs metadata Alexander Lobakin 2021-12-08 14:06 ` [Intel-wired-lan] " Alexander Lobakin 2021-12-08 14:06 ` [PATCH v4 net-next 1/9] i40e: don't reserve excessive XDP_PACKET_HEADROOM on XSK Rx to skb Alexander Lobakin 2021-12-08 14:06 ` [Intel-wired-lan] " Alexander Lobakin 2021-12-09 8:19 ` Jesper Dangaard Brouer 2021-12-09 8:19 ` [Intel-wired-lan] " Jesper Dangaard Brouer 2021-12-09 17:33 ` Alexander Lobakin 2021-12-09 17:33 ` [Intel-wired-lan] " Alexander Lobakin 2021-12-10 13:31 ` Jesper Dangaard Brouer 2021-12-10 13:31 ` [Intel-wired-lan] " Jesper Dangaard Brouer 2022-01-29 8:55 ` Bhandare, KiranX 2022-01-29 8:55 ` Bhandare, KiranX 2021-12-08 14:06 ` [PATCH v4 net-next 2/9] i40e: respect metadata " Alexander Lobakin 2021-12-08 14:06 ` [Intel-wired-lan] " Alexander Lobakin 2021-12-09 8:27 ` Jesper Dangaard Brouer 2021-12-09 8:27 ` [Intel-wired-lan] " Jesper Dangaard Brouer 2021-12-09 17:38 ` Alexander Lobakin 2021-12-09 17:38 ` [Intel-wired-lan] " Alexander Lobakin 2021-12-09 18:50 ` Nguyen, Anthony L 2021-12-09 18:50 ` [Intel-wired-lan] " Nguyen, Anthony L 2021-12-10 11:08 ` Alexander Lobakin 2021-12-10 11:08 ` [Intel-wired-lan] " Alexander Lobakin 2022-01-10 11:24 ` Bhandare, KiranX 2022-01-10 11:24 ` Bhandare, KiranX 2021-12-08 14:06 ` Alexander Lobakin [this message] 2021-12-08 14:06 ` [Intel-wired-lan] [PATCH v4 net-next 3/9] ice: respect metadata in legacy-rx/ice_construct_skb() Alexander Lobakin 2022-01-10 10:16 ` Bhandare, KiranX 2022-01-10 10:16 ` Bhandare, KiranX 2021-12-08 14:06 ` [PATCH v4 net-next 4/9] ice: don't reserve excessive XDP_PACKET_HEADROOM on XSK Rx to skb Alexander Lobakin 2021-12-08 14:06 ` [Intel-wired-lan] " Alexander Lobakin 2022-01-10 10:13 ` Bhandare, KiranX 2022-01-10 10:13 ` Bhandare, KiranX 2021-12-08 14:06 ` [PATCH v4 net-next 5/9] ice: respect metadata " Alexander Lobakin 2021-12-08 14:06 ` [Intel-wired-lan] " Alexander Lobakin 2022-01-10 11:37 ` Bhandare, KiranX 2022-01-10 11:37 ` Bhandare, KiranX 2021-12-08 14:06 ` [PATCH v4 net-next 6/9] igc: don't reserve excessive XDP_PACKET_HEADROOM " Alexander Lobakin 2021-12-08 14:06 ` [Intel-wired-lan] " Alexander Lobakin 2021-12-27 20:34 ` Kraus, NechamaX 2021-12-27 20:34 ` Kraus, NechamaX 2021-12-08 14:07 ` [PATCH v4 net-next 7/9] ixgbe: pass bi->xdp to ixgbe_construct_skb_zc() directly Alexander Lobakin 2021-12-08 14:07 ` [Intel-wired-lan] " Alexander Lobakin 2022-01-11 7:30 ` Penigalapati, Sandeep 2022-01-11 7:30 ` Penigalapati, Sandeep 2021-12-08 14:07 ` [PATCH v4 net-next 8/9] ixgbe: don't reserve excessive XDP_PACKET_HEADROOM on XSK Rx to skb Alexander Lobakin 2021-12-08 14:07 ` [Intel-wired-lan] " Alexander Lobakin 2022-01-11 11:51 ` Penigalapati, Sandeep 2022-01-11 11:51 ` Penigalapati, Sandeep 2021-12-08 14:07 ` [PATCH v4 net-next 9/9] ixgbe: respect metadata " Alexander Lobakin 2021-12-08 14:07 ` [Intel-wired-lan] " Alexander Lobakin 2022-01-11 11:52 ` Penigalapati, Sandeep 2022-01-11 11:52 ` Penigalapati, Sandeep 2022-01-10 10:11 ` [Intel-wired-lan] [PATCH v4 net-next 0/9] net: intel: napi_alloc_skb() vs metadata Bhandare, KiranX 2022-01-10 10:11 ` Bhandare, KiranX
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20211208140702.642741-4-alexandr.lobakin@intel.com \ --to=alexandr.lobakin@intel.com \ --cc=andrii@kernel.org \ --cc=anthony.l.nguyen@intel.com \ --cc=ast@kernel.org \ --cc=bjorn@kernel.org \ --cc=bpf@vger.kernel.org \ --cc=brouer@redhat.com \ --cc=daniel@iogearbox.net \ --cc=davem@davemloft.net \ --cc=hawk@kernel.org \ --cc=intel-wired-lan@lists.osuosl.org \ --cc=jesse.brandeburg@intel.com \ --cc=jithu.joseph@intel.com \ --cc=john.fastabend@gmail.com \ --cc=kafai@fb.com \ --cc=kpsingh@kernel.org \ --cc=kuba@kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=maciej.fijalkowski@intel.com \ --cc=michal.swiatkowski@linux.intel.com \ --cc=netdev@vger.kernel.org \ --cc=songliubraving@fb.com \ --cc=yhs@fb.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.