* [PATCH net-next 0/3] mvneta: access skb_shared_info only on last frag
@ 2020-11-20 17:05 Lorenzo Bianconi
2020-11-20 17:05 ` [PATCH net-next 1/3] net: mvneta: avoid unnecessary xdp_buff initialization Lorenzo Bianconi
` (4 more replies)
0 siblings, 5 replies; 11+ messages in thread
From: Lorenzo Bianconi @ 2020-11-20 17:05 UTC (permalink / raw)
To: netdev; +Cc: lorenzo.bianconi, davem, kuba, brouer, echaudro, john.fastabend
Build skb_shared_info on mvneta_rx_swbm stack and sync it to xdp_buff
skb_shared_info area only on the last fragment.
Avoid avoid unnecessary xdp_buff initialization in mvneta_rx_swbm routine.
This a preliminary series to complete xdp multi-buff in mvneta driver.
Lorenzo Bianconi (3):
net: mvneta: avoid unnecessary xdp_buff initialization
net: mvneta: move skb_shared_info in mvneta_xdp_put_buff
net: mvneta: alloc skb_shared_info on the mvneta_rx_swbm stack
drivers/net/ethernet/marvell/mvneta.c | 55 +++++++++++++++++----------
1 file changed, 35 insertions(+), 20 deletions(-)
--
2.26.2
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH net-next 1/3] net: mvneta: avoid unnecessary xdp_buff initialization
2020-11-20 17:05 [PATCH net-next 0/3] mvneta: access skb_shared_info only on last frag Lorenzo Bianconi
@ 2020-11-20 17:05 ` Lorenzo Bianconi
2020-11-20 17:05 ` [PATCH net-next 2/3] net: mvneta: move skb_shared_info in mvneta_xdp_put_buff caller Lorenzo Bianconi
` (3 subsequent siblings)
4 siblings, 0 replies; 11+ messages in thread
From: Lorenzo Bianconi @ 2020-11-20 17:05 UTC (permalink / raw)
To: netdev; +Cc: lorenzo.bianconi, davem, kuba, brouer, echaudro, john.fastabend
Explicitly initialize mandatory fields defining xdp_buff struct
in mvneta_rx_swbm routine
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
drivers/net/ethernet/marvell/mvneta.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index 5d559117f78c..60a285f3a55f 100644
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -2347,13 +2347,14 @@ static int mvneta_rx_swbm(struct napi_struct *napi,
{
int rx_proc = 0, rx_todo, refill, size = 0;
struct net_device *dev = pp->dev;
- struct xdp_buff xdp_buf = {
- .frame_sz = PAGE_SIZE,
- .rxq = &rxq->xdp_rxq,
- };
struct mvneta_stats ps = {};
struct bpf_prog *xdp_prog;
u32 desc_status, frame_sz;
+ struct xdp_buff xdp_buf;
+
+ xdp_buf.data_hard_start = NULL;
+ xdp_buf.frame_sz = PAGE_SIZE;
+ xdp_buf.rxq = &rxq->xdp_rxq;
/* Get number of received packets */
rx_todo = mvneta_rxq_busy_desc_num_get(pp, rxq);
--
2.26.2
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH net-next 2/3] net: mvneta: move skb_shared_info in mvneta_xdp_put_buff caller
2020-11-20 17:05 [PATCH net-next 0/3] mvneta: access skb_shared_info only on last frag Lorenzo Bianconi
2020-11-20 17:05 ` [PATCH net-next 1/3] net: mvneta: avoid unnecessary xdp_buff initialization Lorenzo Bianconi
@ 2020-11-20 17:05 ` Lorenzo Bianconi
2020-11-20 17:05 ` [PATCH net-next 3/3] net: mvneta: alloc skb_shared_info on the mvneta_rx_swbm stack Lorenzo Bianconi
` (2 subsequent siblings)
4 siblings, 0 replies; 11+ messages in thread
From: Lorenzo Bianconi @ 2020-11-20 17:05 UTC (permalink / raw)
To: netdev; +Cc: lorenzo.bianconi, davem, kuba, brouer, echaudro, john.fastabend
Pass skb_shared_info pointer from mvneta_xdp_put_buff caller. This is a
preliminary patch to reduce accesses to skb_shared_info area and reduce
cache misses.
Remove napi parameter in mvneta_xdp_put_buff signature since it is always
run in NAPI context
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
drivers/net/ethernet/marvell/mvneta.c | 32 ++++++++++++++++++---------
1 file changed, 21 insertions(+), 11 deletions(-)
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index 60a285f3a55f..17c446b1cb94 100644
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -2033,16 +2033,16 @@ int mvneta_rx_refill_queue(struct mvneta_port *pp, struct mvneta_rx_queue *rxq)
static void
mvneta_xdp_put_buff(struct mvneta_port *pp, struct mvneta_rx_queue *rxq,
- struct xdp_buff *xdp, int sync_len, bool napi)
+ struct xdp_buff *xdp, struct skb_shared_info *sinfo,
+ int sync_len)
{
- struct skb_shared_info *sinfo = xdp_get_shared_info_from_buff(xdp);
int i;
for (i = 0; i < sinfo->nr_frags; i++)
page_pool_put_full_page(rxq->page_pool,
- skb_frag_page(&sinfo->frags[i]), napi);
+ skb_frag_page(&sinfo->frags[i]), true);
page_pool_put_page(rxq->page_pool, virt_to_head_page(xdp->data),
- sync_len, napi);
+ sync_len, true);
}
static int
@@ -2179,6 +2179,7 @@ mvneta_run_xdp(struct mvneta_port *pp, struct mvneta_rx_queue *rxq,
struct bpf_prog *prog, struct xdp_buff *xdp,
u32 frame_sz, struct mvneta_stats *stats)
{
+ struct skb_shared_info *sinfo = xdp_get_shared_info_from_buff(xdp);
unsigned int len, data_len, sync;
u32 ret, act;
@@ -2199,7 +2200,7 @@ mvneta_run_xdp(struct mvneta_port *pp, struct mvneta_rx_queue *rxq,
err = xdp_do_redirect(pp->dev, xdp, prog);
if (unlikely(err)) {
- mvneta_xdp_put_buff(pp, rxq, xdp, sync, true);
+ mvneta_xdp_put_buff(pp, rxq, xdp, sinfo, sync);
ret = MVNETA_XDP_DROPPED;
} else {
ret = MVNETA_XDP_REDIR;
@@ -2210,7 +2211,7 @@ mvneta_run_xdp(struct mvneta_port *pp, struct mvneta_rx_queue *rxq,
case XDP_TX:
ret = mvneta_xdp_xmit_back(pp, xdp);
if (ret != MVNETA_XDP_TX)
- mvneta_xdp_put_buff(pp, rxq, xdp, sync, true);
+ mvneta_xdp_put_buff(pp, rxq, xdp, sinfo, sync);
break;
default:
bpf_warn_invalid_xdp_action(act);
@@ -2219,7 +2220,7 @@ mvneta_run_xdp(struct mvneta_port *pp, struct mvneta_rx_queue *rxq,
trace_xdp_exception(pp->dev, prog, act);
fallthrough;
case XDP_DROP:
- mvneta_xdp_put_buff(pp, rxq, xdp, sync, true);
+ mvneta_xdp_put_buff(pp, rxq, xdp, sinfo, sync);
ret = MVNETA_XDP_DROPPED;
stats->xdp_drop++;
break;
@@ -2406,7 +2407,10 @@ static int mvneta_rx_swbm(struct napi_struct *napi,
continue;
if (size) {
- mvneta_xdp_put_buff(pp, rxq, &xdp_buf, -1, true);
+ struct skb_shared_info *sinfo;
+
+ sinfo = xdp_get_shared_info_from_buff(&xdp_buf);
+ mvneta_xdp_put_buff(pp, rxq, &xdp_buf, sinfo, -1);
goto next;
}
@@ -2417,8 +2421,10 @@ static int mvneta_rx_swbm(struct napi_struct *napi,
skb = mvneta_swbm_build_skb(pp, rxq, &xdp_buf, desc_status);
if (IS_ERR(skb)) {
struct mvneta_pcpu_stats *stats = this_cpu_ptr(pp->stats);
+ struct skb_shared_info *sinfo;
- mvneta_xdp_put_buff(pp, rxq, &xdp_buf, -1, true);
+ sinfo = xdp_get_shared_info_from_buff(&xdp_buf);
+ mvneta_xdp_put_buff(pp, rxq, &xdp_buf, sinfo, -1);
u64_stats_update_begin(&stats->syncp);
stats->es.skb_alloc_error++;
@@ -2438,8 +2444,12 @@ static int mvneta_rx_swbm(struct napi_struct *napi,
}
rcu_read_unlock();
- if (xdp_buf.data_hard_start)
- mvneta_xdp_put_buff(pp, rxq, &xdp_buf, -1, true);
+ if (xdp_buf.data_hard_start) {
+ struct skb_shared_info *sinfo;
+
+ sinfo = xdp_get_shared_info_from_buff(&xdp_buf);
+ mvneta_xdp_put_buff(pp, rxq, &xdp_buf, sinfo, -1);
+ }
if (ps.xdp_redirect)
xdp_do_flush_map();
--
2.26.2
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH net-next 3/3] net: mvneta: alloc skb_shared_info on the mvneta_rx_swbm stack
2020-11-20 17:05 [PATCH net-next 0/3] mvneta: access skb_shared_info only on last frag Lorenzo Bianconi
2020-11-20 17:05 ` [PATCH net-next 1/3] net: mvneta: avoid unnecessary xdp_buff initialization Lorenzo Bianconi
2020-11-20 17:05 ` [PATCH net-next 2/3] net: mvneta: move skb_shared_info in mvneta_xdp_put_buff caller Lorenzo Bianconi
@ 2020-11-20 17:05 ` Lorenzo Bianconi
2020-11-20 23:10 ` [PATCH net-next 0/3] mvneta: access skb_shared_info only on last frag Jesse Brandeburg
2020-11-24 20:26 ` Jakub Kicinski
4 siblings, 0 replies; 11+ messages in thread
From: Lorenzo Bianconi @ 2020-11-20 17:05 UTC (permalink / raw)
To: netdev; +Cc: lorenzo.bianconi, davem, kuba, brouer, echaudro, john.fastabend
Build skb_shared_info on mvneta_rx_swbm stack and sync it to xdp_buff
skb_shared_info area only on the last fragment. Leftover cache miss in
mvneta_swbm_rx_frame will be addressed introducing mb bit in
xdp_buff/xdp_frame struct
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
drivers/net/ethernet/marvell/mvneta.c | 42 +++++++++++++++------------
1 file changed, 23 insertions(+), 19 deletions(-)
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index 17c446b1cb94..b40804e421a7 100644
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -2278,9 +2278,9 @@ mvneta_swbm_add_rx_fragment(struct mvneta_port *pp,
struct mvneta_rx_desc *rx_desc,
struct mvneta_rx_queue *rxq,
struct xdp_buff *xdp, int *size,
+ struct skb_shared_info *xdp_sinfo,
struct page *page)
{
- struct skb_shared_info *sinfo = xdp_get_shared_info_from_buff(xdp);
struct net_device *dev = pp->dev;
enum dma_data_direction dma_dir;
int data_len, len;
@@ -2298,13 +2298,22 @@ mvneta_swbm_add_rx_fragment(struct mvneta_port *pp,
len, dma_dir);
rx_desc->buf_phys_addr = 0;
- if (data_len > 0 && sinfo->nr_frags < MAX_SKB_FRAGS) {
- skb_frag_t *frag = &sinfo->frags[sinfo->nr_frags];
+ if (data_len > 0 && xdp_sinfo->nr_frags < MAX_SKB_FRAGS) {
+ skb_frag_t *frag = &xdp_sinfo->frags[xdp_sinfo->nr_frags++];
skb_frag_off_set(frag, pp->rx_offset_correction);
skb_frag_size_set(frag, data_len);
__skb_frag_set_page(frag, page);
- sinfo->nr_frags++;
+
+ /* last fragment */
+ if (len == *size) {
+ struct skb_shared_info *sinfo;
+
+ sinfo = xdp_get_shared_info_from_buff(xdp);
+ sinfo->nr_frags = xdp_sinfo->nr_frags;
+ memcpy(sinfo->frags, xdp_sinfo->frags,
+ sinfo->nr_frags * sizeof(skb_frag_t));
+ }
} else {
page_pool_put_full_page(rxq->page_pool, page, true);
}
@@ -2348,6 +2357,7 @@ static int mvneta_rx_swbm(struct napi_struct *napi,
{
int rx_proc = 0, rx_todo, refill, size = 0;
struct net_device *dev = pp->dev;
+ struct skb_shared_info sinfo;
struct mvneta_stats ps = {};
struct bpf_prog *xdp_prog;
u32 desc_status, frame_sz;
@@ -2357,6 +2367,8 @@ static int mvneta_rx_swbm(struct napi_struct *napi,
xdp_buf.frame_sz = PAGE_SIZE;
xdp_buf.rxq = &rxq->xdp_rxq;
+ sinfo.nr_frags = 0;
+
/* Get number of received packets */
rx_todo = mvneta_rxq_busy_desc_num_get(pp, rxq);
@@ -2395,11 +2407,11 @@ static int mvneta_rx_swbm(struct napi_struct *napi,
rx_desc->buf_phys_addr = 0;
page_pool_put_full_page(rxq->page_pool, page,
true);
- continue;
+ goto next;
}
mvneta_swbm_add_rx_fragment(pp, rx_desc, rxq, &xdp_buf,
- &size, page);
+ &size, &sinfo, page);
} /* Middle or Last descriptor */
if (!(rx_status & MVNETA_RXD_LAST_DESC))
@@ -2407,10 +2419,7 @@ static int mvneta_rx_swbm(struct napi_struct *napi,
continue;
if (size) {
- struct skb_shared_info *sinfo;
-
- sinfo = xdp_get_shared_info_from_buff(&xdp_buf);
- mvneta_xdp_put_buff(pp, rxq, &xdp_buf, sinfo, -1);
+ mvneta_xdp_put_buff(pp, rxq, &xdp_buf, &sinfo, -1);
goto next;
}
@@ -2421,10 +2430,8 @@ static int mvneta_rx_swbm(struct napi_struct *napi,
skb = mvneta_swbm_build_skb(pp, rxq, &xdp_buf, desc_status);
if (IS_ERR(skb)) {
struct mvneta_pcpu_stats *stats = this_cpu_ptr(pp->stats);
- struct skb_shared_info *sinfo;
- sinfo = xdp_get_shared_info_from_buff(&xdp_buf);
- mvneta_xdp_put_buff(pp, rxq, &xdp_buf, sinfo, -1);
+ mvneta_xdp_put_buff(pp, rxq, &xdp_buf, &sinfo, -1);
u64_stats_update_begin(&stats->syncp);
stats->es.skb_alloc_error++;
@@ -2441,15 +2448,12 @@ static int mvneta_rx_swbm(struct napi_struct *napi,
napi_gro_receive(napi, skb);
next:
xdp_buf.data_hard_start = NULL;
+ sinfo.nr_frags = 0;
}
rcu_read_unlock();
- if (xdp_buf.data_hard_start) {
- struct skb_shared_info *sinfo;
-
- sinfo = xdp_get_shared_info_from_buff(&xdp_buf);
- mvneta_xdp_put_buff(pp, rxq, &xdp_buf, sinfo, -1);
- }
+ if (xdp_buf.data_hard_start)
+ mvneta_xdp_put_buff(pp, rxq, &xdp_buf, &sinfo, -1);
if (ps.xdp_redirect)
xdp_do_flush_map();
--
2.26.2
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH net-next 0/3] mvneta: access skb_shared_info only on last frag
2020-11-20 17:05 [PATCH net-next 0/3] mvneta: access skb_shared_info only on last frag Lorenzo Bianconi
` (2 preceding siblings ...)
2020-11-20 17:05 ` [PATCH net-next 3/3] net: mvneta: alloc skb_shared_info on the mvneta_rx_swbm stack Lorenzo Bianconi
@ 2020-11-20 23:10 ` Jesse Brandeburg
2020-11-24 20:26 ` Jakub Kicinski
4 siblings, 0 replies; 11+ messages in thread
From: Jesse Brandeburg @ 2020-11-20 23:10 UTC (permalink / raw)
To: Lorenzo Bianconi
Cc: netdev, lorenzo.bianconi, davem, kuba, brouer, echaudro, john.fastabend
Lorenzo Bianconi wrote:
> Build skb_shared_info on mvneta_rx_swbm stack and sync it to xdp_buff
> skb_shared_info area only on the last fragment.
> Avoid avoid unnecessary xdp_buff initialization in mvneta_rx_swbm routine.
> This a preliminary series to complete xdp multi-buff in mvneta driver.
>
> Lorenzo Bianconi (3):
> net: mvneta: avoid unnecessary xdp_buff initialization
> net: mvneta: move skb_shared_info in mvneta_xdp_put_buff
> net: mvneta: alloc skb_shared_info on the mvneta_rx_swbm stack
>
> drivers/net/ethernet/marvell/mvneta.c | 55 +++++++++++++++++----------
> 1 file changed, 35 insertions(+), 20 deletions(-)
>
For the series:
Reviewed-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH net-next 0/3] mvneta: access skb_shared_info only on last frag
2020-11-20 17:05 [PATCH net-next 0/3] mvneta: access skb_shared_info only on last frag Lorenzo Bianconi
` (3 preceding siblings ...)
2020-11-20 23:10 ` [PATCH net-next 0/3] mvneta: access skb_shared_info only on last frag Jesse Brandeburg
@ 2020-11-24 20:26 ` Jakub Kicinski
2020-11-24 22:18 ` Lorenzo Bianconi
4 siblings, 1 reply; 11+ messages in thread
From: Jakub Kicinski @ 2020-11-24 20:26 UTC (permalink / raw)
To: Lorenzo Bianconi
Cc: netdev, lorenzo.bianconi, davem, brouer, echaudro, john.fastabend
On Fri, 20 Nov 2020 18:05:41 +0100 Lorenzo Bianconi wrote:
> Build skb_shared_info on mvneta_rx_swbm stack and sync it to xdp_buff
> skb_shared_info area only on the last fragment.
> Avoid avoid unnecessary xdp_buff initialization in mvneta_rx_swbm routine.
> This a preliminary series to complete xdp multi-buff in mvneta driver.
Looks fine, but since you need this for XDP multi-buff it should
probably go via bpf-next, right?
Reviewed-by: Jakub Kicinski <kuba@kernel.org>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH net-next 0/3] mvneta: access skb_shared_info only on last frag
2020-11-24 20:26 ` Jakub Kicinski
@ 2020-11-24 22:18 ` Lorenzo Bianconi
2020-11-24 22:25 ` Daniel Borkmann
0 siblings, 1 reply; 11+ messages in thread
From: Lorenzo Bianconi @ 2020-11-24 22:18 UTC (permalink / raw)
To: Jakub Kicinski
Cc: netdev, lorenzo.bianconi, davem, brouer, echaudro,
john.fastabend, borkmann, alexei.starovoitov
[-- Attachment #1: Type: text/plain, Size: 731 bytes --]
> On Fri, 20 Nov 2020 18:05:41 +0100 Lorenzo Bianconi wrote:
> > Build skb_shared_info on mvneta_rx_swbm stack and sync it to xdp_buff
> > skb_shared_info area only on the last fragment.
> > Avoid avoid unnecessary xdp_buff initialization in mvneta_rx_swbm routine.
> > This a preliminary series to complete xdp multi-buff in mvneta driver.
>
> Looks fine, but since you need this for XDP multi-buff it should
> probably go via bpf-next, right?
>
> Reviewed-by: Jakub Kicinski <kuba@kernel.org>
Hi Jakub,
thx for the review. Since the series changes networking-only bits I sent it for
net-next, but I agree bpf-next is better.
@Alexei, Daniel: is it fine to merge the series in bpf-next?
Regards,
Lorenzo
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH net-next 0/3] mvneta: access skb_shared_info only on last frag
2020-11-24 22:18 ` Lorenzo Bianconi
@ 2020-11-24 22:25 ` Daniel Borkmann
2020-11-24 22:30 ` Jakub Kicinski
0 siblings, 1 reply; 11+ messages in thread
From: Daniel Borkmann @ 2020-11-24 22:25 UTC (permalink / raw)
To: Lorenzo Bianconi, Jakub Kicinski
Cc: netdev, lorenzo.bianconi, davem, brouer, echaudro,
john.fastabend, alexei.starovoitov
On 11/24/20 11:18 PM, Lorenzo Bianconi wrote:
>> On Fri, 20 Nov 2020 18:05:41 +0100 Lorenzo Bianconi wrote:
>>> Build skb_shared_info on mvneta_rx_swbm stack and sync it to xdp_buff
>>> skb_shared_info area only on the last fragment.
>>> Avoid avoid unnecessary xdp_buff initialization in mvneta_rx_swbm routine.
>>> This a preliminary series to complete xdp multi-buff in mvneta driver.
>>
>> Looks fine, but since you need this for XDP multi-buff it should
>> probably go via bpf-next, right?
>>
>> Reviewed-by: Jakub Kicinski <kuba@kernel.org>
>
> Hi Jakub,
>
> thx for the review. Since the series changes networking-only bits I sent it for
> net-next, but I agree bpf-next is better.
>
> @Alexei, Daniel: is it fine to merge the series in bpf-next?
Yeah totally fine, will take it into bpf-next in a bit.
Thanks,
Daniel
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH net-next 0/3] mvneta: access skb_shared_info only on last frag
2020-11-24 22:25 ` Daniel Borkmann
@ 2020-11-24 22:30 ` Jakub Kicinski
2020-11-24 23:00 ` Daniel Borkmann
0 siblings, 1 reply; 11+ messages in thread
From: Jakub Kicinski @ 2020-11-24 22:30 UTC (permalink / raw)
To: Daniel Borkmann
Cc: Lorenzo Bianconi, netdev, lorenzo.bianconi, davem, brouer,
echaudro, john.fastabend, alexei.starovoitov
On Tue, 24 Nov 2020 23:25:11 +0100 Daniel Borkmann wrote:
> On 11/24/20 11:18 PM, Lorenzo Bianconi wrote:
> >> On Fri, 20 Nov 2020 18:05:41 +0100 Lorenzo Bianconi wrote:
> >>> Build skb_shared_info on mvneta_rx_swbm stack and sync it to xdp_buff
> >>> skb_shared_info area only on the last fragment.
> >>> Avoid avoid unnecessary xdp_buff initialization in mvneta_rx_swbm routine.
> >>> This a preliminary series to complete xdp multi-buff in mvneta driver.
> >>
> >> Looks fine, but since you need this for XDP multi-buff it should
> >> probably go via bpf-next, right?
> >>
> >> Reviewed-by: Jakub Kicinski <kuba@kernel.org>
> >
> > Hi Jakub,
> >
> > thx for the review. Since the series changes networking-only bits I sent it for
> > net-next, but I agree bpf-next is better.
> >
> > @Alexei, Daniel: is it fine to merge the series in bpf-next?
>
> Yeah totally fine, will take it into bpf-next in a bit.
FWIW watch out with the Link:s, it wasn't CCed to bpf@vger.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH net-next 0/3] mvneta: access skb_shared_info only on last frag
2020-11-24 22:30 ` Jakub Kicinski
@ 2020-11-24 23:00 ` Daniel Borkmann
2020-11-24 23:10 ` Jakub Kicinski
0 siblings, 1 reply; 11+ messages in thread
From: Daniel Borkmann @ 2020-11-24 23:00 UTC (permalink / raw)
To: Jakub Kicinski
Cc: Lorenzo Bianconi, netdev, lorenzo.bianconi, davem, brouer,
echaudro, john.fastabend, alexei.starovoitov
On 11/24/20 11:30 PM, Jakub Kicinski wrote:
> On Tue, 24 Nov 2020 23:25:11 +0100 Daniel Borkmann wrote:
>> On 11/24/20 11:18 PM, Lorenzo Bianconi wrote:
>>>> On Fri, 20 Nov 2020 18:05:41 +0100 Lorenzo Bianconi wrote:
>>>>> Build skb_shared_info on mvneta_rx_swbm stack and sync it to xdp_buff
>>>>> skb_shared_info area only on the last fragment.
>>>>> Avoid avoid unnecessary xdp_buff initialization in mvneta_rx_swbm routine.
>>>>> This a preliminary series to complete xdp multi-buff in mvneta driver.
>>>>
>>>> Looks fine, but since you need this for XDP multi-buff it should
>>>> probably go via bpf-next, right?
>>>>
>>>> Reviewed-by: Jakub Kicinski <kuba@kernel.org>
>>>
>>> Hi Jakub,
>>>
>>> thx for the review. Since the series changes networking-only bits I sent it for
>>> net-next, but I agree bpf-next is better.
>>>
>>> @Alexei, Daniel: is it fine to merge the series in bpf-next?
>>
>> Yeah totally fine, will take it into bpf-next in a bit.
>
> FWIW watch out with the Link:s, it wasn't CCed to bpf@vger.
@Jakub, I think it's less hassle if you take the series in. Looking closer, net-next has
commit 9c79a8ab5f12 ("net: mvneta: fix possible memory leak in mvneta_swbm_add_rx_fragment")
which bpf-next is currently lacking, and this series here is touching the part of this
code, so it will create unnecessary merge conflicts. I'll likely flush out bpf-next PR
on Thurs/Fri at latest, so bpf-next will then have everything needed once we sync back
from net-next after merge.
Thanks,
Daniel
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH net-next 0/3] mvneta: access skb_shared_info only on last frag
2020-11-24 23:00 ` Daniel Borkmann
@ 2020-11-24 23:10 ` Jakub Kicinski
0 siblings, 0 replies; 11+ messages in thread
From: Jakub Kicinski @ 2020-11-24 23:10 UTC (permalink / raw)
To: Daniel Borkmann
Cc: Lorenzo Bianconi, netdev, lorenzo.bianconi, davem, brouer,
echaudro, john.fastabend, alexei.starovoitov
On Wed, 25 Nov 2020 00:00:33 +0100 Daniel Borkmann wrote:
> On 11/24/20 11:30 PM, Jakub Kicinski wrote:
> > On Tue, 24 Nov 2020 23:25:11 +0100 Daniel Borkmann wrote:
> >> On 11/24/20 11:18 PM, Lorenzo Bianconi wrote:
> >>>> On Fri, 20 Nov 2020 18:05:41 +0100 Lorenzo Bianconi wrote:
> >>>>> Build skb_shared_info on mvneta_rx_swbm stack and sync it to xdp_buff
> >>>>> skb_shared_info area only on the last fragment.
> >>>>> Avoid avoid unnecessary xdp_buff initialization in mvneta_rx_swbm routine.
> >>>>> This a preliminary series to complete xdp multi-buff in mvneta driver.
> >>>>
> >>>> Looks fine, but since you need this for XDP multi-buff it should
> >>>> probably go via bpf-next, right?
> >>>>
> >>>> Reviewed-by: Jakub Kicinski <kuba@kernel.org>
> >>>
> >>> Hi Jakub,
> >>>
> >>> thx for the review. Since the series changes networking-only bits I sent it for
> >>> net-next, but I agree bpf-next is better.
> >>>
> >>> @Alexei, Daniel: is it fine to merge the series in bpf-next?
> >>
> >> Yeah totally fine, will take it into bpf-next in a bit.
> >
> > FWIW watch out with the Link:s, it wasn't CCed to bpf@vger.
>
> @Jakub, I think it's less hassle if you take the series in. Looking closer, net-next has
> commit 9c79a8ab5f12 ("net: mvneta: fix possible memory leak in mvneta_swbm_add_rx_fragment")
> which bpf-next is currently lacking, and this series here is touching the part of this
> code, so it will create unnecessary merge conflicts. I'll likely flush out bpf-next PR
> on Thurs/Fri at latest, so bpf-next will then have everything needed once we sync back
> from net-next after merge.
I see, applied to net-next then. Thanks!
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2020-11-24 23:10 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-20 17:05 [PATCH net-next 0/3] mvneta: access skb_shared_info only on last frag Lorenzo Bianconi
2020-11-20 17:05 ` [PATCH net-next 1/3] net: mvneta: avoid unnecessary xdp_buff initialization Lorenzo Bianconi
2020-11-20 17:05 ` [PATCH net-next 2/3] net: mvneta: move skb_shared_info in mvneta_xdp_put_buff caller Lorenzo Bianconi
2020-11-20 17:05 ` [PATCH net-next 3/3] net: mvneta: alloc skb_shared_info on the mvneta_rx_swbm stack Lorenzo Bianconi
2020-11-20 23:10 ` [PATCH net-next 0/3] mvneta: access skb_shared_info only on last frag Jesse Brandeburg
2020-11-24 20:26 ` Jakub Kicinski
2020-11-24 22:18 ` Lorenzo Bianconi
2020-11-24 22:25 ` Daniel Borkmann
2020-11-24 22:30 ` Jakub Kicinski
2020-11-24 23:00 ` Daniel Borkmann
2020-11-24 23:10 ` Jakub Kicinski
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.