diff for duplicates of <390f80fc-3f8a-a9ed-6ac7-8a1a41621559@mellanox.com>
diff --git a/a/1.txt b/N1/1.txt
index 5ccf72c..5ff960f 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -31,15 +31,15 @@ Please also don't forget to fix the s/_handle_/_adjust_/ typo.
>> ---
>> v3:
->> - Use new helper function to handle offset
+>> ?? - Use new helper function to handle offset
>>
>> v4:
->> - fixed headroom addition to handle. Using xsk_umem_adjust_headroom()
->> now.
+>> ?? - fixed headroom addition to handle. Using xsk_umem_adjust_headroom()
+>> ???? now.
>> ---
->> drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 8 ++++++--
->> drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c | 3 ++-
->> 2 files changed, 8 insertions(+), 3 deletions(-)
+>> ? drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c??? | 8 ++++++--
+>> ? drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c | 3 ++-
+>> ? 2 files changed, 8 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c
>> b/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c
@@ -48,40 +48,40 @@ Please also don't forget to fix the s/_handle_/_adjust_/ typo.
>> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c
>> @@ -122,6 +122,7 @@ bool mlx5e_xdp_handle(struct mlx5e_rq *rq, struct
>> mlx5e_dma_info *di,
->> void *va, u16 *rx_headroom, u32 *len, bool xsk)
->> {
->> struct bpf_prog *prog = READ_ONCE(rq->xdp_prog);
->> + struct xdp_umem *umem = rq->umem;
->> struct xdp_buff xdp;
->> u32 act;
->> int err;
+>> ??????????????? void *va, u16 *rx_headroom, u32 *len, bool xsk)
+>> ? {
+>> ????? struct bpf_prog *prog = READ_ONCE(rq->xdp_prog);
+>> +??? struct xdp_umem *umem = rq->umem;
+>> ????? struct xdp_buff xdp;
+>> ????? u32 act;
+>> ????? int err;
>> @@ -138,8 +139,11 @@ bool mlx5e_xdp_handle(struct mlx5e_rq *rq, struct
>> mlx5e_dma_info *di,
->> xdp.rxq = &rq->xdp_rxq;
->> act = bpf_prog_run_xdp(prog, &xdp);
->> - if (xsk)
->> - xdp.handle += xdp.data - xdp.data_hard_start;
->> + if (xsk) {
->> + u64 off = xdp.data - xdp.data_hard_start;
+>> ????? xdp.rxq = &rq->xdp_rxq;
+>> ????? act = bpf_prog_run_xdp(prog, &xdp);
+>> -??? if (xsk)
+>> -??????? xdp.handle += xdp.data - xdp.data_hard_start;
+>> +??? if (xsk) {
+>> +??????? u64 off = xdp.data - xdp.data_hard_start;
>> +
->> + xdp.handle = xsk_umem_handle_offset(umem, xdp.handle, off);
->> + }
->> switch (act) {
->> case XDP_PASS:
->> *rx_headroom = xdp.data - xdp.data_hard_start;
+>> +??????? xdp.handle = xsk_umem_handle_offset(umem, xdp.handle, off);
+>> +??? }
+>> ????? switch (act) {
+>> ????? case XDP_PASS:
+>> ????????? *rx_headroom = xdp.data - xdp.data_hard_start;
>> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c
>> b/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c
>> index 6a55573ec8f2..7c49a66d28c9 100644
>> --- a/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c
>> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c
>> @@ -24,7 +24,8 @@ int mlx5e_xsk_page_alloc_umem(struct mlx5e_rq *rq,
->> if (!xsk_umem_peek_addr_rq(umem, &handle))
->> return -ENOMEM;
->> - dma_info->xsk.handle = handle + rq->buff.umem_headroom;
->> + dma_info->xsk.handle = xsk_umem_adjust_offset(umem, handle,
->> + rq->buff.umem_headroom);
->> dma_info->xsk.data = xdp_umem_get_data(umem, dma_info->xsk.handle);
->> /* No need to add headroom to the DMA address. In striding RQ
+>> ????? if (!xsk_umem_peek_addr_rq(umem, &handle))
+>> ????????? return -ENOMEM;
+>> -??? dma_info->xsk.handle = handle + rq->buff.umem_headroom;
+>> +??? dma_info->xsk.handle = xsk_umem_adjust_offset(umem, handle,
+>> +????????????????????????????? rq->buff.umem_headroom);
+>> ????? dma_info->xsk.data = xdp_umem_get_data(umem, dma_info->xsk.handle);
+>> ????? /* No need to add headroom to the DMA address. In striding RQ
>> case, we
>>
>
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index aa59bd0..eb13b76 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -14,28 +14,13 @@
"From\0Maxim Mikityanskiy <maximmi\@mellanox.com>\0"
]
[
- "Subject\0Re: [PATCH bpf-next v4 07/11] mlx5e: modify driver for handling offsets\0"
+ "Subject\0[Intel-wired-lan] [PATCH bpf-next v4 07/11] mlx5e: modify driver for handling offsets\0"
]
[
"Date\0Mon, 19 Aug 2019 14:36:01 +0000\0"
]
[
- "To\0Kevin Laatz <kevin.laatz\@intel.com>\0"
-]
-[
- "Cc\0netdev\@vger.kernel.org <netdev\@vger.kernel.org>",
- " ast\@kernel.org <ast\@kernel.org>",
- " daniel\@iogearbox.net <daniel\@iogearbox.net>",
- " bjorn.topel\@intel.com <bjorn.topel\@intel.com>",
- " magnus.karlsson\@intel.com <magnus.karlsson\@intel.com>",
- " jakub.kicinski\@netronome.com <jakub.kicinski\@netronome.com>",
- " jonathan.lemon\@gmail.com <jonathan.lemon\@gmail.com>",
- " Saeed Mahameed <saeedm\@mellanox.com>",
- " stephen\@networkplumber.org <stephen\@networkplumber.org>",
- " bruce.richardson\@intel.com <bruce.richardson\@intel.com>",
- " ciara.loftus\@intel.com <ciara.loftus\@intel.com>",
- " bpf\@vger.kernel.org <bpf\@vger.kernel.org>",
- " intel-wired-lan\@lists.osuosl.org <intel-wired-lan\@lists.osuosl.org>\0"
+ "To\0intel-wired-lan\@osuosl.org\0"
]
[
"\0000:1\0"
@@ -77,15 +62,15 @@
"\n",
">> ---\n",
">> v3:\n",
- ">> \302\240\302\240 - Use new helper function to handle offset\n",
+ ">> ?? - Use new helper function to handle offset\n",
">>\n",
">> v4:\n",
- ">> \302\240\302\240 - fixed headroom addition to handle. Using xsk_umem_adjust_headroom()\n",
- ">> \302\240\302\240\302\240\302\240 now.\n",
+ ">> ?? - fixed headroom addition to handle. Using xsk_umem_adjust_headroom()\n",
+ ">> ???? now.\n",
">> ---\n",
- ">> \302\240 drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c\302\240\302\240\302\240 | 8 ++++++--\n",
- ">> \302\240 drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c | 3 ++-\n",
- ">> \302\240 2 files changed, 8 insertions(+), 3 deletions(-)\n",
+ ">> ? drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c??? | 8 ++++++--\n",
+ ">> ? drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c | 3 ++-\n",
+ ">> ? 2 files changed, 8 insertions(+), 3 deletions(-)\n",
">>\n",
">> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c \n",
">> b/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c\n",
@@ -94,43 +79,43 @@
">> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c\n",
">> \@\@ -122,6 +122,7 \@\@ bool mlx5e_xdp_handle(struct mlx5e_rq *rq, struct \n",
">> mlx5e_dma_info *di,\n",
- ">> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 void *va, u16 *rx_headroom, u32 *len, bool xsk)\n",
- ">> \302\240 {\n",
- ">> \302\240\302\240\302\240\302\240\302\240 struct bpf_prog *prog = READ_ONCE(rq->xdp_prog);\n",
- ">> +\302\240\302\240\302\240 struct xdp_umem *umem = rq->umem;\n",
- ">> \302\240\302\240\302\240\302\240\302\240 struct xdp_buff xdp;\n",
- ">> \302\240\302\240\302\240\302\240\302\240 u32 act;\n",
- ">> \302\240\302\240\302\240\302\240\302\240 int err;\n",
+ ">> ??????????????? void *va, u16 *rx_headroom, u32 *len, bool xsk)\n",
+ ">> ? {\n",
+ ">> ????? struct bpf_prog *prog = READ_ONCE(rq->xdp_prog);\n",
+ ">> +??? struct xdp_umem *umem = rq->umem;\n",
+ ">> ????? struct xdp_buff xdp;\n",
+ ">> ????? u32 act;\n",
+ ">> ????? int err;\n",
">> \@\@ -138,8 +139,11 \@\@ bool mlx5e_xdp_handle(struct mlx5e_rq *rq, struct \n",
">> mlx5e_dma_info *di,\n",
- ">> \302\240\302\240\302\240\302\240\302\240 xdp.rxq = &rq->xdp_rxq;\n",
- ">> \302\240\302\240\302\240\302\240\302\240 act = bpf_prog_run_xdp(prog, &xdp);\n",
- ">> -\302\240\302\240\302\240 if (xsk)\n",
- ">> -\302\240\302\240\302\240\302\240\302\240\302\240\302\240 xdp.handle += xdp.data - xdp.data_hard_start;\n",
- ">> +\302\240\302\240\302\240 if (xsk) {\n",
- ">> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240 u64 off = xdp.data - xdp.data_hard_start;\n",
+ ">> ????? xdp.rxq = &rq->xdp_rxq;\n",
+ ">> ????? act = bpf_prog_run_xdp(prog, &xdp);\n",
+ ">> -??? if (xsk)\n",
+ ">> -??????? xdp.handle += xdp.data - xdp.data_hard_start;\n",
+ ">> +??? if (xsk) {\n",
+ ">> +??????? u64 off = xdp.data - xdp.data_hard_start;\n",
">> +\n",
- ">> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240 xdp.handle = xsk_umem_handle_offset(umem, xdp.handle, off);\n",
- ">> +\302\240\302\240\302\240 }\n",
- ">> \302\240\302\240\302\240\302\240\302\240 switch (act) {\n",
- ">> \302\240\302\240\302\240\302\240\302\240 case XDP_PASS:\n",
- ">> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 *rx_headroom = xdp.data - xdp.data_hard_start;\n",
+ ">> +??????? xdp.handle = xsk_umem_handle_offset(umem, xdp.handle, off);\n",
+ ">> +??? }\n",
+ ">> ????? switch (act) {\n",
+ ">> ????? case XDP_PASS:\n",
+ ">> ????????? *rx_headroom = xdp.data - xdp.data_hard_start;\n",
">> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c \n",
">> b/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c\n",
">> index 6a55573ec8f2..7c49a66d28c9 100644\n",
">> --- a/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c\n",
">> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c\n",
">> \@\@ -24,7 +24,8 \@\@ int mlx5e_xsk_page_alloc_umem(struct mlx5e_rq *rq,\n",
- ">> \302\240\302\240\302\240\302\240\302\240 if (!xsk_umem_peek_addr_rq(umem, &handle))\n",
- ">> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 return -ENOMEM;\n",
- ">> -\302\240\302\240\302\240 dma_info->xsk.handle = handle + rq->buff.umem_headroom;\n",
- ">> +\302\240\302\240\302\240 dma_info->xsk.handle = xsk_umem_adjust_offset(umem, handle,\n",
- ">> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 rq->buff.umem_headroom);\n",
- ">> \302\240\302\240\302\240\302\240\302\240 dma_info->xsk.data = xdp_umem_get_data(umem, dma_info->xsk.handle);\n",
- ">> \302\240\302\240\302\240\302\240\302\240 /* No need to add headroom to the DMA address. In striding RQ \n",
+ ">> ????? if (!xsk_umem_peek_addr_rq(umem, &handle))\n",
+ ">> ????????? return -ENOMEM;\n",
+ ">> -??? dma_info->xsk.handle = handle + rq->buff.umem_headroom;\n",
+ ">> +??? dma_info->xsk.handle = xsk_umem_adjust_offset(umem, handle,\n",
+ ">> +????????????????????????????? rq->buff.umem_headroom);\n",
+ ">> ????? dma_info->xsk.data = xdp_umem_get_data(umem, dma_info->xsk.handle);\n",
+ ">> ????? /* No need to add headroom to the DMA address. In striding RQ \n",
">> case, we\n",
">>\n",
">"
]
-eb050da1f49d05a87f82589ff37a74d8448950d3341b06eb65e363e36375271f
+f1fcf062f44af2d38274806818e0c569dbea140eb0c3be4c2dad5dc9f0ffb203
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.