On 16-12-08 01:45 PM, Michael S. Tsirkin wrote: > On Thu, Dec 08, 2016 at 01:25:40PM -0800, John Fastabend wrote: >> On 16-12-08 01:18 PM, Michael S. Tsirkin wrote: >>> On Thu, Dec 08, 2016 at 10:18:22AM -0800, John Fastabend wrote: >>>>> I guess this helps because it just slows down the guest. >>>>> I don't much like it ... >>>> >>>> I left it like this copying the pattern in balloon and input drivers. I >>>> can change it back to the previous pattern where it is only called if >>>> there is no errors. It has been running fine with the old pattern now >>>> for an hour or so. >>>> >>>> .John >>> >>> I'd prefer internal consistency. Could be a patch on top >>> if this helps. I'm happy it isn't actually buggy. >>> Let me know whether you want to post v6 or >>> want me to ack this one. >>> >> >> I think because DaveM has closed net-next ACK'ing this set would be >> great to get it in Dave's tree. Then I can post a small "fix" so that it >> is consistent between normal stack and xdp tx path after that. >> >> Thanks, >> John > > I can merge it through my tree too - I don't think there's > any dependency on net-next, is there? >
Its all changes to virtio_net except for patch 2 which is against filter.c/filter.h which I guess you could possibly get a merge conflict on. But it would be fairly trivial. I don't have a preference on which tree it goes through whichever makes the most sense. .John
