| Message ID | 20191202134426.2220333-4-fbl@sysclose.org |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | Add support for TSO with DPDK | expand |
Bleep bloop. Greetings Flavio Leitner, I am a robot and I have tried out your patch. Thanks for your contribution. I encountered some error that I wasn't expecting. See the details below. git-am: fatal: sha1 information is lacking or useless (lib/dp-packet.h). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 dp-packet: handle new dpdk buffer flags The copy of the patch that failed is found in: /var/lib/jenkins/jobs/upstream_build_from_pw/workspace/.git/rebase-apply/patch When you have resolved this problem, run "git am --resolved". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Please check this out. If you feel there has been an error, please email aconole@redhat.com Thanks, 0-day Robot
diff --git a/lib/dp-packet.c b/lib/dp-packet.c index 62d7faa4c..e02891449 100644 --- a/lib/dp-packet.c +++ b/lib/dp-packet.c @@ -193,7 +193,9 @@ dp_packet_clone_with_headroom(const struct dp_packet *buffer, size_t headroom) offsetof(struct dp_packet, l2_pad_size)); #ifdef DPDK_NETDEV - new_buffer->mbuf.ol_flags = buffer->mbuf.ol_flags; + /* The new packet is linear, so copy only the offloading flags */ + new_buffer->mbuf.ol_flags = buffer->mbuf.ol_flags + & ~(EXT_ATTACHED_MBUF | IND_ATTACHED_MBUF); #endif if (dp_packet_rss_valid(buffer)) { diff --git a/lib/dp-packet.h b/lib/dp-packet.h index 1e5362304..325924eaa 100644 --- a/lib/dp-packet.h +++ b/lib/dp-packet.h @@ -538,7 +538,7 @@ dp_packet_rss_valid(const struct dp_packet *p) static inline void dp_packet_reset_offload(struct dp_packet *p) { - p->mbuf.ol_flags = 0; + p->mbuf.ol_flags &= (EXT_ATTACHED_MBUF | IND_ATTACHED_MBUF); } static inline bool
DPDK included a couple flags EXT_ATTACHED_MBUF and IND_ATTACHED_MBUF which are not really offloading flags, so this patch fixes to reset only offloading flags or to reset only those flags when needed. Signed-off-by: Flavio Leitner <fbl@sysclose.org> --- lib/dp-packet.c | 4 +++- lib/dp-packet.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-)