On 10/7/2016 12:49 PM, Bart Van Assche wrote: > On 10/06/16 20:28, Parav Pandit wrote: >> On Fri, Oct 7, 2016 at 4:53 AM, <bugzilla-daemon@xxxxxxxxxxxxxxxxxxx> >> wrote: >>> https://bugzilla.kernel.org/show_bug.cgi?id=176901 >> This bug is fixed with my patch [1] and Doug ack also about merging fix. >> >> [1] https://patchwork.kernel.org/patch/9354863/ > > Hello Parav, > > Thank you for the feedback. Do you perhaps know which branch Doug will > send to Linus? I haven't found any post-v4.8 rxe changes in Doug's > for-4.9-good branch: I had to rebase my k.o/for-4.9 branch. So, k.o/for-4.9 became k.o/for-4.9-bad (which has Parav's patches in it), and I made a new k.o/for-4.9-good that does not have Parav's patches in it. I then had to add Parav's patches to my k.o/for-4.9-hfi1 branch (I know, that makes no sense, but bear with me). The issue is that the k.o/for-4.9-hfi1 branch needed a very late 4.7-rc base (4.7-rc7 I think) in order for the hfi1 patches to apply cleanly. I put Parav's patches into my for-4.9 branch originally, but when I did a merge test with Linus tree, I found that one of them in particular conflicts with patches that were also late in the 4.7-rc cycle. By putting Parav's patches into the hfi1 branch, I can resolve that conflict myself and will be able to send a clean pull request of just the rxe patches to Linus. So, long story short, pull my k.o/for-4.9-hfi1 branch and test against it. > $ git log --format=oneline v4.8..dledford/k.o/for-4.9-good > drivers/infiniband/sw include/uapi/rdma/*rxe* > 60747ef4d173c2747bf7f0377fb22846cb422195 Merge > git://git.kernel.org/pub/scm/linux/kernel/git/davem/net > > Something else I was wondering about is whether or not the rdma_rxe > driver should allow being attached to a bridge interface? Apparently the > rdma_rxe driver allows attaching to both the non-bridged and the bridged > interfaces, resulting in duplicate GIDs: > > # modprobe rdma_rxe > # brctl addbr virbr0 > # brctl addif virbr0 eth1 > # rxe_cfg add eth1 > # rxe_cfg add virbr0 > # rxe_cfg > Name Link Driver Speed NMTU IPv4_addr RDEV RMTU > eth0 yes virtio_net 1500 192.168.1.123 > eth1 no virtio_net 1500 rxe0 > virbr0 no bridge 1500 rxe1 > # (cd /sys/class/infiniband && grep -aH '' */ports/*/gids/0) > rxe0/ports/1/gids/0:fe80:0000:0000:0000:5054:00ff:fefd:2e4e > rxe1/ports/1/gids/0:fe80:0000:0000:0000:5054:00ff:fefd:2e4e > > Should it ever be allowed that two different ports have the same GID? -- Doug Ledford <dledford@xxxxxxxxxx> GPG Key ID: 0E572FDD
Attachment:
signature.asc
Description: OpenPGP digital signature
