* Re: assert_cfg80211_lock warning with Linux v3.5-8833-g2d53492
From: Arend van Spriel @ 2012-08-01 15:38 UTC (permalink / raw)
To: John W. Linville
Cc: Josh Boyer, Johannes Berg, Brett Rudley, Roland Vossen,
linux-wireless-u79uwXL29TY76Z2rM5mHXA,
netdev-u79uwXL29TY76Z2rM5mHXA, Seth Forshee
In-Reply-To: <20120801141810.GB27433-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
On 08/01/2012 04:18 PM, John W. Linville wrote:
> On Wed, Aug 01, 2012 at 09:12:33AM -0400, Josh Boyer wrote:
>
>> > [ 26.573028] ------------[ cut here ]------------
>> > [ 26.573042] WARNING: at net/wireless/core.h:125 assert_cfg80211_lock.part.8+0x15/0x17 [cfg80211]()
>> > [ 26.573045] Hardware name: XPS 8300
>> > [ 26.573046] Modules linked in: xt_CHECKSUM iptable_mangle bridge stp llc ip6t_REJECT nf_conntrack_ipv4 nf_conntrack_ipv6 nf_defrag_ipv6 nf_defrag_ipv4 xt_state nf_conntrack ib_iser rdma_cm ib_addr ip6table_filter tpm_bios ip6_tables iw_cm ib_cm ib_sa ib_mad ib_core iscsi_tcp snd_hda_codec_hdmi snd_hda_codec_realtek snd_hda_intel arc4 brcmsmac snd_hda_codec cordic brcmutil snd_hwdep mac80211 snd_pcm snd_page_alloc snd_timer cfg80211 snd coretemp rfkill serio_raw i2c_i801 soundcore lpc_ich bcma dcdbas microcode mfd_core mei vhost_net tun macvtap macvlan kvm_intel nfsd kvm auth_rpcgss nfs_acl lockd uinput crc32c_intel ghash_clmulni_intel broadcom tg3 usb_storage uas radeon i2c_algo_bit drm_kms_helper ttm drm i2c_core sunrpc be2iscsi bnx2i cnic uio cxgb4i cxgb4 cxgb3i cxgb3 mdio libcxg
bi libiscsi_tcp qla4xxx iscsi_boot_sysfs libiscsi scsi_transport_iscsi
>> > [ 26.573143] Pid: 757, comm: NetworkManager Not tainted 3.6.0-0.rc0.git8.1.fc18.x86_64 #1
>> > [ 26.573145] Call Trace:
>> > [ 26.573153] [<ffffffff8106782f>] warn_slowpath_common+0x7f/0xc0
>> > [ 26.573159] [<ffffffff8106788a>] warn_slowpath_null+0x1a/0x20
>> > [ 26.573170] [<ffffffffa04c730d>] assert_cfg80211_lock.part.8+0x15/0x17 [cfg80211]
>> > [ 26.573181] [<ffffffffa04a8dcb>] freq_reg_info+0x6b/0x80 [cfg80211]
> brcmsmac needs to hold cfg80211_mutex before calling freq_reg_info...
>
> It looks like those calls were added in mid-June.
>
I think mid-june sounds about right. We never observed the warning when
changes to use regulatory infrastructure were tested/reviewed. Should
this precondition be mentioned in cfg80211.h?
Gr. AvS
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: Build failure when installing atm ambassador firmware
From: Shea Levy @ 2012-08-01 15:40 UTC (permalink / raw)
To: chas williams - CONTRACTOR; +Cc: netdev, linux-kernel@vger.kernel.org
In-Reply-To: <20120801072247.589c7162@thirdoffive.cmf.nrl.navy.mil>
Hi Chas,
On 08/01/2012 07:22 AM, chas williams - CONTRACTOR wrote:
> On Tue, 31 Jul 2012 21:59:37 -0400
> Shea Levy<shea@shealevy.com> wrote:
>
>> Hello,
>>
>> When building with
>> MODLIB=/nix/store/ghx6s9hnk9irim7c7f63zrxqiv6xjh3w-linux-3.5/lib/modules/3.5.0
>> and
>> ="/nix/store/ghx6s9hnk9irim7c7f63zrxqiv6xjh3w-linux-3.5/lib/firmware",
>> building Linux 3.5 with CONFIG_ATM_AMBASSADOR=m fails with:
>>
>> "make[2]: *** No rule to make target
>> `"/nix/store/ghx6s9hnk9irim7c7f63zrxqiv6xjh3w-linux-3.5/lib/firmware"/./',
>> needed by
>> `"/nix/store/ghx6s9hnk9irim7c7f63zrxqiv6xjh3w-linux-3.5/lib/firmware"/atmsar11.fw'.
>> Stop."
>
> i think it might be trying to tell you that the target directory
> $INSTALL_FW_PATH doesn't exist and is a prerequisite to actually
> perform the action.
>
Indeed, creating the directory first fixes the issue. Is this expected
behaviour, or a bug in the build system?
>
> it complains about atmsar11.fw first because it just happens to be the
> first firmware that needs to be installed.
>
> /scratch/chas/net-next relax.53% ls -ld /tmp/funk
> ls: cannot access /tmp/funk: No such file or directory
> /scratch/chas/net-next relax.54% make INSTALL_FW_PATH="/tmp/funk" firmware_install
> make[1]: *** No rule to make target `/tmp/funk/./', needed by `/tmp/funk/atmsar11.fw'. Stop.
> make: *** [firmware_install] Error 2
> /scratch/chas/net-next relax.55% mkdir /tmp/funk
> /scratch/chas/net-next relax.56% make INSTALL_FW_PATH="/tmp/funk" firmware_install
> INSTALL /tmp/funk/atmsar11.fw
> MKDIR /tmp/funk/e100/
> INSTALL /tmp/funk/e100/d101m_ucode.bin
> INSTALL /tmp/funk/e100/d101s_ucode.bin
> INSTALL /tmp/funk/e100/d102e_ucode.bin
> ...
>
> i am somewhat concerned that it appears to have an extra set of "'s in
> the path as well. how are you passing in INSTALL_FW_PATH? i can get
> the same result with:
>
> /scratch/chas/net-next relax.57% make 'INSTALL_FW_PATH="/tmp/funk"' firmware_install
> make[1]: *** No rule to make target `"/tmp/funk"/./', needed by `"/tmp/funk"/atmsar11.fw'. Stop.
> make: *** [firmware_install] Error 2
>
> but it would be wrong to do it this way.
Yeah, I had an extra bit of quotation that I've now removed. Thanks!
Cheers,
Shea Levy
^ permalink raw reply
* [PATCH 1/6] tracepath: re-use printf return in print_host
From: Mike Frysinger @ 2012-08-01 15:45 UTC (permalink / raw)
To: YOSHIFUJI Hideaki; +Cc: netdev
Since the printf funcs already return the length of chars displayed,
use that value instead of re-calculating the length with strlen.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
tracepath.c | 11 ++++-------
tracepath6.c | 11 ++++-------
2 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/tracepath.c b/tracepath.c
index bcec20d..ca84a69 100644
--- a/tracepath.c
+++ b/tracepath.c
@@ -68,13 +68,10 @@ void data_wait(int fd)
void print_host(const char *a, const char *b, int both)
{
- int plen = 0;
- printf("%s", a);
- plen = strlen(a);
- if (both) {
- printf(" (%s)", b);
- plen += strlen(b) + 3;
- }
+ int plen;
+ plen = printf("%s", a);
+ if (both)
+ plen += printf(" (%s)", b);
if (plen >= HOST_COLUMN_SIZE)
plen = HOST_COLUMN_SIZE - 1;
printf("%*s", HOST_COLUMN_SIZE - plen, "");
diff --git a/tracepath6.c b/tracepath6.c
index 0cbe3a1..5c2db8f 100644
--- a/tracepath6.c
+++ b/tracepath6.c
@@ -80,13 +80,10 @@ void data_wait(int fd)
void print_host(const char *a, const char *b, int both)
{
- int plen = 0;
- printf("%s", a);
- plen = strlen(a);
- if (both) {
- printf(" (%s)", b);
- plen += strlen(b) + 3;
- }
+ int plen;
+ plen = printf("%s", a);
+ if (both)
+ plen += printf(" (%s)", b);
if (plen >= HOST_COLUMN_SIZE)
plen = HOST_COLUMN_SIZE - 1;
printf("%*s", HOST_COLUMN_SIZE - plen, "");
--
1.7.9.7
^ permalink raw reply related
* [PATCH 2/6] fix up strict-aliasing warnings
From: Mike Frysinger @ 2012-08-01 15:45 UTC (permalink / raw)
To: YOSHIFUJI Hideaki; +Cc: netdev
In-Reply-To: <1343835928-21541-1-git-send-email-vapier@gentoo.org>
Current build of some tools results in gcc warning about strict-aliasing
violations. So change those freaky casts to memcpy's. When the pointer
types work out, gcc will optimize this away anyways.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
ping.c | 4 ++--
ping6.c | 13 +++++++++----
tracepath.c | 2 +-
tracepath6.c | 2 +-
4 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/ping.c b/ping.c
index 1425d1d..1110a1a 100644
--- a/ping.c
+++ b/ping.c
@@ -444,7 +444,7 @@ main(int argc, char **argv)
int i;
rspace[1] = 4+nroute*8;
for (i=0; i<nroute; i++)
- *(__u32*)&rspace[4+i*8] = route[i];
+ memcpy(&rspace[4+i*8], &route[i], 4);
}
if (setsockopt(icmp_sock, IPPROTO_IP, IP_OPTIONS, rspace, rspace[1]) < 0) {
rspace[3] = 2;
@@ -464,7 +464,7 @@ main(int argc, char **argv)
rspace[1+IPOPT_OLEN] = 3 + nroute*4;
rspace[1+IPOPT_OFFSET] = IPOPT_MINOFF;
for (i=0; i<nroute; i++)
- *(__u32*)&rspace[4+i*4] = route[i];
+ memcpy(&rspace[4+i*4], &route[i], 4);
if (setsockopt(icmp_sock, IPPROTO_IP, IP_OPTIONS, rspace, 4 + nroute*4) < 0) {
perror("ping: record route");
diff --git a/ping6.c b/ping6.c
index 1673937..ce102d0 100644
--- a/ping6.c
+++ b/ping6.c
@@ -1142,18 +1142,21 @@ int build_niquery(__u8 *_nih)
{
struct ni_hdr *nih;
int cc;
+ __u16 this_nonce;
nih = (struct ni_hdr *)_nih;
nih->ni_cksum = 0;
- CLR(ntohs((*(__u16*)(nih->ni_nonce))) % mx_dup_ck);
+ memcpy(&this_nonce, &nih->ni_nonce, sizeof(this_nonce));
+ CLR(ntohs(this_nonce) % mx_dup_ck);
nih->ni_type = ICMPV6_NI_QUERY;
cc = sizeof(*nih);
datalen = 0;
memcpy(nih->ni_nonce, ni_nonce, sizeof(nih->ni_nonce));
- *(__u16*)(nih->ni_nonce) = htons(ntransmitted + 1);
+ this_nonce = htons(ntransmitted + 1);
+ memcpy(&nih->ni_nonce, &this_nonce, sizeof(this_nonce));
nih->ni_code = ni_subject_type;
nih->ni_qtype = htons(ni_query);
@@ -1367,7 +1370,7 @@ parse_reply(struct msghdr *msg, int cc, void *addr, struct timeval *tv)
#endif
if (c->cmsg_len < CMSG_LEN(sizeof(int)))
continue;
- hops = *(int*)CMSG_DATA(c);
+ memcpy(&hops, CMSG_DATA(c), sizeof(int));
}
}
@@ -1391,7 +1394,9 @@ parse_reply(struct msghdr *msg, int cc, void *addr, struct timeval *tv)
return 0;
} else if (icmph->icmp6_type == ICMPV6_NI_REPLY) {
struct ni_hdr *nih = (struct ni_hdr *)icmph;
- __u16 seq = ntohs(*(__u16 *)nih->ni_nonce);
+ __u16 seq;
+ memcpy(&seq, &nih->ni_nonce, sizeof(seq));
+ seq = ntohs(seq);
if (memcmp(&nih->ni_nonce[2], &ni_nonce[2], sizeof(ni_nonce) - sizeof(__u16)))
return 1;
if (gather_statistics((__u8*)icmph, sizeof(*icmph), cc,
diff --git a/tracepath.c b/tracepath.c
index ca84a69..0a14b1b 100644
--- a/tracepath.c
+++ b/tracepath.c
@@ -142,7 +142,7 @@ restart:
if (cmsg->cmsg_type == IP_RECVERR) {
e = (struct sock_extended_err *) CMSG_DATA(cmsg);
} else if (cmsg->cmsg_type == IP_TTL) {
- rethops = *(int*)CMSG_DATA(cmsg);
+ memcpy(&rethops, CMSG_DATA(cmsg), sizeof(int));
} else {
printf("cmsg:%d\n ", cmsg->cmsg_type);
}
diff --git a/tracepath6.c b/tracepath6.c
index 5c2db8f..77a3563 100644
--- a/tracepath6.c
+++ b/tracepath6.c
@@ -170,7 +170,7 @@ restart:
#ifdef IPV6_2292HOPLIMIT
case IPV6_2292HOPLIMIT:
#endif
- rethops = *(int*)CMSG_DATA(cmsg);
+ memcpy(&rethops, CMSG_DATA(cmsg), sizeof(int));
break;
default:
printf("cmsg6:%d\n ", cmsg->cmsg_type);
--
1.7.9.7
^ permalink raw reply related
* [PATCH 3/6] tracepath: fix typo in -l error message
From: Mike Frysinger @ 2012-08-01 15:45 UTC (permalink / raw)
To: YOSHIFUJI Hideaki; +Cc: netdev, Jeroen Roovers
In-Reply-To: <1343835928-21541-1-git-send-email-vapier@gentoo.org>
From: Jeroen Roovers <jer@gentoo.org>
Signed-off-by: Jeroen Roovers <jer@gentoo.org>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
tracepath.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tracepath.c b/tracepath.c
index 0a14b1b..90e1b28 100644
--- a/tracepath.c
+++ b/tracepath.c
@@ -306,7 +306,7 @@ main(int argc, char **argv)
break;
case 'l':
if ((mtu = atoi(optarg)) <= overhead) {
- fprintf(stderr, "Error: length must be >= %d\n", overhead);
+ fprintf(stderr, "Error: length must be > %d\n", overhead);
exit(1);
}
break;
--
1.7.9.7
^ permalink raw reply related
* [PATCH 5/6] start gitignore files
From: Mike Frysinger @ 2012-08-01 15:45 UTC (permalink / raw)
To: YOSHIFUJI Hideaki; +Cc: netdev
In-Reply-To: <1343835928-21541-1-git-send-email-vapier@gentoo.org>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
.gitignore | 22 ++++++++++++++++++++++
doc/.gitignore | 2 ++
2 files changed, 24 insertions(+)
create mode 100644 .gitignore
create mode 100644 doc/.gitignore
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..30ed00c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,22 @@
+*~
+*.o
+
+*.diff
+*.orig
+*.patch
+*.rej
+
+core
+.gdb_history
+.gdbinit
+
+/arping
+/clockdiff
+/ping
+/ping6
+/rarpd
+/rdisc
+/tftpd
+/tracepath
+/tracepath6
+/traceroute6
diff --git a/doc/.gitignore b/doc/.gitignore
new file mode 100644
index 0000000..085639f
--- /dev/null
+++ b/doc/.gitignore
@@ -0,0 +1,2 @@
+*.html
+*.8
--
1.7.9.7
^ permalink raw reply related
* [PATCH 4/6] ping: fix building on older systems
From: Mike Frysinger @ 2012-08-01 15:45 UTC (permalink / raw)
To: YOSHIFUJI Hideaki; +Cc: netdev
In-Reply-To: <1343835928-21541-1-git-send-email-vapier@gentoo.org>
The SO_MARK define is somewhat recent (linux-2.6.25), so check for its
existence before we try to use it.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
ping_common.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/ping_common.c b/ping_common.c
index 287d0e6..6fd252d 100644
--- a/ping_common.c
+++ b/ping_common.c
@@ -486,6 +486,7 @@ void setup(int icmp_sock)
fprintf(stderr, "Warning: no SO_TIMESTAMP support, falling back to SIOCGSTAMP\n");
}
#endif
+#ifdef SO_MARK
if (options & F_MARK) {
if (setsockopt(icmp_sock, SOL_SOCKET, SO_MARK,
&mark, sizeof(mark)) == -1) {
@@ -499,6 +500,7 @@ void setup(int icmp_sock)
#endif
}
}
+#endif
/* Set some SNDTIMEO to prevent blocking forever
* on sends, when device is too slow or stalls. Just put limit
--
1.7.9.7
^ permalink raw reply related
* [PATCH 6/6] doc: fix parallel build of html/man pages
From: Mike Frysinger @ 2012-08-01 15:45 UTC (permalink / raw)
To: YOSHIFUJI Hideaki; +Cc: netdev
In-Reply-To: <1343835928-21541-1-git-send-email-vapier@gentoo.org>
The use of the same tempdir prevents building of these files in parallel.
So build all of them in unique tempdirs so we can do them in parallel.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
doc/Makefile | 37 ++++++++++++++++++++++++-------------
1 file changed, 24 insertions(+), 13 deletions(-)
diff --git a/doc/Makefile b/doc/Makefile
index 7ec4f1c..a9c303e 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -12,29 +12,40 @@ man: $(MANFILES)
# lots of some strange temporary junk directories and files.
# So, scope it to a temporary dir and clean all after each run.
-$(HTMLFILES): index.db
- @-rm -rf tmp.db2html
- @mkdir tmp.db2html
- @set -e; cd tmp.db2html; docbook2html ../$< ; mv *.html ..
- @-rm -rf tmp.db2html
+SETUP_TMPDIR = \
+ t="tmp.db2html.$@"; \
+ rm -rf $$t; \
+ mkdir $$t; \
+ pushd $$t >/dev/null
+CLEAN_TMPDIR = \
+ popd >/dev/null; \
+ rm -rf $$t
+
+MAKE_HTML = \
+ @set -e; \
+ $(SETUP_TMPDIR); \
+ docbook2html ../$<; \
+ mv *.html ..; \
+ $(CLEAN_TMPDIR)
+$(HTMLFILES): index.db
+ $(MAKE_HTML)
iputils.html: iputils.db
- @-rm -rf tmp.db2html
- @mkdir tmp.db2html
- @set -e; cd tmp.db2html; docbook2html -u -o html ../$< ; mv html/$@ ..
- @-rm -rf tmp.db2html
+ $(MAKE_HTML)
# docbook2man produces utterly ugly output and I did not find
# any way to customize this but hacking backend perl script a little.
# Well, hence...
$(MANFILES): index.db
- @-mkdir tmp.db2man
- @set -e; cd tmp.db2man; nsgmls ../$< | sgmlspl ../docbook2man-spec.pl ; mv $@ ..
- @-rm -rf tmp.db2man
+ @set -e; \
+ $(SETUP_TMPDIR); \
+ nsgmls ../$< | sgmlspl ../docbook2man-spec.pl; \
+ mv $@ ..; \
+ $(CLEAN_TMPDIR)
clean:
- @rm -rf $(MANFILES) $(HTMLFILES) iputils.html tmp.db2html tmp.db2man
+ @rm -rf $(MANFILES) $(HTMLFILES) iputils.html tmp.db2html* tmp.db2man*
snapshot:
@date "+%y%m%d" > snapshot.db
--
1.7.9.7
^ permalink raw reply related
* Re: assert_cfg80211_lock warning with Linux v3.5-8833-g2d53492
From: Arend van Spriel @ 2012-08-01 15:51 UTC (permalink / raw)
To: John W. Linville
Cc: Josh Boyer, Johannes Berg, Brett Rudley, Roland Vossen,
linux-wireless, netdev, Seth Forshee
In-Reply-To: <50194D7A.6060400@broadcom.com>
On 08/01/2012 05:38 PM, Arend van Spriel wrote:
>> brcmsmac needs to hold cfg80211_mutex before calling freq_reg_info...
>> >
>> > It looks like those calls were added in mid-June.
>> >
> I think mid-june sounds about right. We never observed the warning when
> changes to use regulatory infrastructure were tested/reviewed. Should
> this precondition be mentioned in cfg80211.h?
>
> Gr. AvS
Diving in further it seems brcmsmac can not grab the cfg80211_mutex. So
another solution is needed.
Gr. AvS
^ permalink raw reply
* Re: assert_cfg80211_lock warning with Linux v3.5-8833-g2d53492
From: Johannes Berg @ 2012-08-01 15:53 UTC (permalink / raw)
To: Arend van Spriel
Cc: John W. Linville, Josh Boyer, Brett Rudley, Roland Vossen,
linux-wireless-u79uwXL29TY76Z2rM5mHXA,
netdev-u79uwXL29TY76Z2rM5mHXA, Seth Forshee
In-Reply-To: <5019506C.6020707-dY08KVG/lbpWk0Htik3J/w@public.gmane.org>
On Wed, 2012-08-01 at 17:51 +0200, Arend van Spriel wrote:
> On 08/01/2012 05:38 PM, Arend van Spriel wrote:
> >> brcmsmac needs to hold cfg80211_mutex before calling freq_reg_info...
> >> >
> >> > It looks like those calls were added in mid-June.
> >> >
> > I think mid-june sounds about right. We never observed the warning when
> > changes to use regulatory infrastructure were tested/reviewed. Should
> > this precondition be mentioned in cfg80211.h?
> >
> > Gr. AvS
>
> Diving in further it seems brcmsmac can not grab the cfg80211_mutex. So
> another solution is needed.
Yeah I was going to say -- how can it possibly access that? It seems
that in some patch the API got broken, it should be taking the lock or
whatever ... I'll leave it to Luis to sort out though :-P
johannes
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: assert_cfg80211_lock warning with Linux v3.5-8833-g2d53492
From: John W. Linville @ 2012-08-01 15:52 UTC (permalink / raw)
To: Arend van Spriel
Cc: Josh Boyer, Johannes Berg, Brett Rudley, Roland Vossen,
linux-wireless, netdev, Seth Forshee
In-Reply-To: <5019506C.6020707@broadcom.com>
On Wed, Aug 01, 2012 at 05:51:08PM +0200, Arend van Spriel wrote:
> On 08/01/2012 05:38 PM, Arend van Spriel wrote:
> >> brcmsmac needs to hold cfg80211_mutex before calling freq_reg_info...
> >> >
> >> > It looks like those calls were added in mid-June.
> >> >
> > I think mid-june sounds about right. We never observed the warning when
> > changes to use regulatory infrastructure were tested/reviewed. Should
> > this precondition be mentioned in cfg80211.h?
> >
> > Gr. AvS
>
> Diving in further it seems brcmsmac can not grab the cfg80211_mutex. So
> another solution is needed.
Do we need to revert those patches?
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
^ permalink raw reply
* Re: assert_cfg80211_lock warning with Linux v3.5-8833-g2d53492
From: Seth Forshee @ 2012-08-01 16:19 UTC (permalink / raw)
To: Johannes Berg
Cc: Arend van Spriel, John W. Linville, Josh Boyer, Brett Rudley,
Roland Vossen, linux-wireless, netdev
In-Reply-To: <1343836438.4638.5.camel@jlt3.sipsolutions.net>
On Wed, Aug 01, 2012 at 05:53:58PM +0200, Johannes Berg wrote:
> On Wed, 2012-08-01 at 17:51 +0200, Arend van Spriel wrote:
> > On 08/01/2012 05:38 PM, Arend van Spriel wrote:
> > >> brcmsmac needs to hold cfg80211_mutex before calling freq_reg_info...
> > >> >
> > >> > It looks like those calls were added in mid-June.
> > >> >
> > > I think mid-june sounds about right. We never observed the warning when
> > > changes to use regulatory infrastructure were tested/reviewed. Should
> > > this precondition be mentioned in cfg80211.h?
> > >
> > > Gr. AvS
> >
> > Diving in further it seems brcmsmac can not grab the cfg80211_mutex. So
> > another solution is needed.
>
> Yeah I was going to say -- how can it possibly access that? It seems
> that in some patch the API got broken, it should be taking the lock or
> whatever ... I'll leave it to Luis to sort out though :-P
In other drivers freq_reg_info only seems to get used by the regulatory
notifiers, which get called with the lock held. brcmsmac is wanting to
know whether or not OFDM is allowed when setting the channel though, and
I didn't find that information anywhere outside the regulatory
information. If there's another way then calling freq_reg_info() could
be avoided. Or maybe we could add an OFDM flag to the channel
information?
Seth
^ permalink raw reply
* Re: assert_cfg80211_lock warning with Linux v3.5-8833-g2d53492
From: Arend van Spriel @ 2012-08-01 16:40 UTC (permalink / raw)
To: John W. Linville
Cc: Josh Boyer, Johannes Berg, Brett Rudley, Roland Vossen,
linux-wireless-u79uwXL29TY76Z2rM5mHXA,
netdev-u79uwXL29TY76Z2rM5mHXA, Seth Forshee
In-Reply-To: <20120801155252.GE27433-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
On 08/01/2012 05:52 PM, John W. Linville wrote:
> On Wed, Aug 01, 2012 at 05:51:08PM +0200, Arend van Spriel wrote:
>> On 08/01/2012 05:38 PM, Arend van Spriel wrote:
>>>> brcmsmac needs to hold cfg80211_mutex before calling freq_reg_info...
>>>>>
>>>>> It looks like those calls were added in mid-June.
>>>>>
>>> I think mid-june sounds about right. We never observed the warning when
>>> changes to use regulatory infrastructure were tested/reviewed. Should
>>> this precondition be mentioned in cfg80211.h?
>>>
>>> Gr. AvS
>>
>> Diving in further it seems brcmsmac can not grab the cfg80211_mutex. So
>> another solution is needed.
>
> Do we need to revert those patches?
>
either that or fix it.
Gr. AvS
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* [PATCH V2 03/12] include/linux: Add private flags for IPoIB interfaces
From: Or Gerlitz @ 2012-08-01 17:09 UTC (permalink / raw)
To: davem; +Cc: roland, netdev, ali, sean.hefty, Erez Shitrit, Or Gerlitz
In-Reply-To: <1343840975-3252-1-git-send-email-ogerlitz@mellanox.com>
From: Erez Shitrit <erezsh@mellanox.co.il>
The new 2 bits indicates whenever a device is considered PIF interface,
which means the "main" interfaces (ib0, ib1 etc), or cloned interfaces
(ib0.1, ib1.2 etc.) that is now in use by the eIPoIB driver.
Signed-off-by: Erez Shitrit <erezsh@mellanox.co.il>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
---
include/linux/if.h | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/include/linux/if.h b/include/linux/if.h
index 1ec407b..f50dbf2 100644
--- a/include/linux/if.h
+++ b/include/linux/if.h
@@ -84,6 +84,8 @@
#define IFF_LIVE_ADDR_CHANGE 0x100000 /* device supports hardware address
* change when it's running */
+#define IFF_EIPOIB_PIF 0x200000 /* IPoIB PIF intf (ib0, ib1 etc.) */
+#define IFF_EIPOIB_VIF 0x400000 /* IPoIB VIF intf (ib0.x, ib1.x etc.) */
#define IF_GET_IFACE 0x0001 /* for querying only */
#define IF_GET_PROTO 0x0002
--
1.7.1
^ permalink raw reply related
* [PATCH V2 06/12] net/core: Add rtnetlink support to vif parameters
From: Or Gerlitz @ 2012-08-01 17:09 UTC (permalink / raw)
To: davem; +Cc: roland, netdev, ali, sean.hefty, Erez Shitrit, Or Gerlitz
In-Reply-To: <1343840975-3252-1-git-send-email-ogerlitz@mellanox.com>
From: Erez Shitrit <erezsh@mellanox.co.il>
Add IFLA_VIF_INFO which allows user space to configure mac/vlan for a VIF
Signed-off-by: Erez Shitrit <erezsh@mellanox.co.il>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
---
include/linux/if_link.h | 16 ++++++++++++++++
net/core/rtnetlink.c | 42 +++++++++++++++++++++++++++++++++++++++++-
2 files changed, 57 insertions(+), 1 deletions(-)
diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index ac173bd..2a401f3 100644
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -142,6 +142,7 @@ enum {
#define IFLA_PROMISCUITY IFLA_PROMISCUITY
IFLA_NUM_TX_QUEUES,
IFLA_NUM_RX_QUEUES,
+ IFLA_VIFINFO_LIST,/* config virtual interface, gives it mac/vlan */
__IFLA_MAX
};
@@ -398,4 +399,19 @@ struct ifla_port_vsi {
__u8 pad[3];
};
+/* support vif configuration. */
+enum {
+ IFLA_VIF_INFO_UNSPEC,
+ IFLA_VIF_INFO,
+ __IFLA_VIF_INFO_MAX,
+};
+
+#define IFLA_VIF_INFO_MAX (__IFLA_VIF_INFO_MAX - 1)
+
+struct ifla_vif_param {
+ __u32 vif;
+ __u8 mac[32]; /* MAX_ADDR_LEN */
+ __u16 vlan;
+};
+
#endif /* _LINUX_IF_LINK_H */
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 334b930..751e55d 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -780,7 +780,8 @@ static noinline size_t if_nlmsg_size(const struct net_device *dev,
+ rtnl_vfinfo_size(dev, ext_filter_mask) /* IFLA_VFINFO_LIST */
+ rtnl_port_size(dev) /* IFLA_VF_PORTS + IFLA_PORT_SELF */
+ rtnl_link_get_size(dev) /* IFLA_LINKINFO */
- + rtnl_link_get_af_size(dev); /* IFLA_AF_SPEC */
+ + rtnl_link_get_af_size(dev) /* IFLA_AF_SPEC */
+ + nla_total_size(sizeof(struct ifla_vif_param)); /* IFLA_VIF_INFO */
}
static int rtnl_vf_ports_fill(struct sk_buff *skb, struct net_device *dev)
@@ -1114,6 +1115,7 @@ const struct nla_policy ifla_policy[IFLA_MAX+1] = {
[IFLA_PROMISCUITY] = { .type = NLA_U32 },
[IFLA_NUM_TX_QUEUES] = { .type = NLA_U32 },
[IFLA_NUM_RX_QUEUES] = { .type = NLA_U32 },
+ [IFLA_VIFINFO_LIST] = {. type = NLA_NESTED },
};
EXPORT_SYMBOL(ifla_policy);
@@ -1137,6 +1139,11 @@ static const struct nla_policy ifla_vf_policy[IFLA_VF_MAX+1] = {
.len = sizeof(struct ifla_vf_spoofchk) },
};
+static const struct nla_policy ifla_vifinfo_policy[IFLA_VIF_INFO_MAX+1] = {
+ [IFLA_VIF_INFO] = { .type = NLA_BINARY,
+ .len = sizeof(struct ifla_vif_param)},
+};
+
static const struct nla_policy ifla_port_policy[IFLA_PORT_MAX+1] = {
[IFLA_PORT_VF] = { .type = NLA_U32 },
[IFLA_PORT_PROFILE] = { .type = NLA_STRING,
@@ -1258,6 +1265,22 @@ static int do_setvfinfo(struct net_device *dev, struct nlattr *attr)
return err;
}
+static int do_setvifinfo(struct net_device *dev, struct ifla_vif_param *ivp)
+{
+ int err = -EINVAL;
+ struct net_device *vif_dev = __dev_get_by_index(dev_net(dev),
+ ivp->vif);
+ const struct net_device_ops *ops = dev->netdev_ops;
+
+ if (ops->ndo_set_vif_param)
+ err = ops->ndo_set_vif_param(dev,
+ vif_dev,
+ ivp->vlan,
+ ivp->mac);
+
+ return err;
+}
+
static int do_set_master(struct net_device *dev, int ifindex)
{
struct net_device *master_dev;
@@ -1449,8 +1472,25 @@ static int do_setlink(struct net_device *dev, struct ifinfomsg *ifm,
modified = 1;
}
}
+
err = 0;
+ if (tb[IFLA_VIFINFO_LIST]) {
+ struct nlattr *vif_param_info[IFLA_VIF_INFO_MAX + 1];
+ struct ifla_vif_param ivp;
+ err = nla_parse_nested(vif_param_info, IFLA_VIF_INFO_MAX,
+ tb[IFLA_VIFINFO_LIST], ifla_vifinfo_policy);
+ if (err < 0)
+ return err;
+ if (vif_param_info[IFLA_VIF_INFO]) {
+ nla_memcpy(&ivp, vif_param_info[IFLA_VIF_INFO], sizeof(ivp));
+ err = do_setvifinfo(dev, &ivp);
+ if (err < 0)
+ goto errout;
+ modified = 1;
+ }
+ }
+ err = 0;
if (tb[IFLA_VF_PORTS]) {
struct nlattr *port[IFLA_PORT_MAX+1];
struct nlattr *attr;
--
1.7.1
^ permalink raw reply related
* [PATCH V2 04/12] IB/ipoib: Add support for acting as VIF
From: Or Gerlitz @ 2012-08-01 17:09 UTC (permalink / raw)
To: davem; +Cc: roland, netdev, ali, sean.hefty, Erez Shitrit, Or Gerlitz
In-Reply-To: <1343840975-3252-1-git-send-email-ogerlitz@mellanox.com>
From: Erez Shitrit <erezsh@mellanox.co.il>
When IPoIB interface acts as a VIF for an eIPoIB interface, it uses
the skb cb storage area on the RX flow, to place information which
can be of use to the upper layer device.
One such usage example, is when an eIPoIB inteface needs to generate
a source mac for incoming Ethernet frames.
The IPoIB code checks the VIF private flag on the RX path, and according
to the value of the flag prepares the skb CB data, etc.
Signed-off-by: Erez Shitrit <erezsh@mellanox.co.il>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
---
drivers/infiniband/ulp/ipoib/ipoib.h | 5 +++
drivers/infiniband/ulp/ipoib/ipoib_cm.c | 9 +++++
drivers/infiniband/ulp/ipoib/ipoib_ib.c | 8 ++++-
drivers/infiniband/ulp/ipoib/ipoib_main.c | 21 +++++++++++
include/rdma/e_ipoib.h | 54 +++++++++++++++++++++++++++++
5 files changed, 96 insertions(+), 1 deletions(-)
create mode 100644 include/rdma/e_ipoib.h
diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h
index 0df6668..3235033 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib.h
+++ b/drivers/infiniband/ulp/ipoib/ipoib.h
@@ -52,6 +52,7 @@
#include <rdma/ib_pack.h>
#include <rdma/ib_sa.h>
#include <linux/sched.h>
+#include <rdma/e_ipoib.h>
/* constants */
@@ -209,6 +210,7 @@ struct ipoib_cm_rx {
unsigned long jiffies;
enum ipoib_cm_state state;
int recv_count;
+ u32 qpn;
};
struct ipoib_cm_tx {
@@ -703,6 +705,9 @@ extern int ipoib_recvq_size;
extern struct ib_sa_client ipoib_sa_client;
+void set_skb_oob_cb_data(struct sk_buff *skb, struct ib_wc *wc,
+ struct napi_struct *napi);
+
#ifdef CONFIG_INFINIBAND_IPOIB_DEBUG
extern int ipoib_debug_level;
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index 6d66ab0..c561956 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -440,6 +440,7 @@ static int ipoib_cm_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *even
struct net_device *dev = cm_id->context;
struct ipoib_dev_priv *priv = netdev_priv(dev);
struct ipoib_cm_rx *p;
+ struct ipoib_cm_data *data = event->private_data;
unsigned psn;
int ret;
@@ -452,6 +453,10 @@ static int ipoib_cm_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *even
cm_id->context = p;
p->state = IPOIB_CM_RX_LIVE;
p->jiffies = jiffies;
+
+ /* used to keep track of base qpn in CM mode */
+ p->qpn = be32_to_cpu(data->qpn);
+
INIT_LIST_HEAD(&p->list);
p->qp = ipoib_cm_create_rx_qp(dev, p);
@@ -669,6 +674,10 @@ copied:
skb->dev = dev;
/* XXX get correct PACKET_ type here */
skb->pkt_type = PACKET_HOST;
+ /* if handler is registered on top of ipoib, set skb oob data. */
+ if (skb->dev->priv_flags & IFF_EIPOIB_VIF)
+ set_skb_oob_cb_data(skb, wc, NULL);
+
netif_receive_skb(skb);
repost:
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
index f10221f..f248e6e 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
@@ -304,7 +304,13 @@ static void ipoib_ib_handle_rx_wc(struct net_device *dev, struct ib_wc *wc)
likely(wc->wc_flags & IB_WC_IP_CSUM_OK))
skb->ip_summed = CHECKSUM_UNNECESSARY;
- napi_gro_receive(&priv->napi, skb);
+ /* if handler is registered on top of ipoib, set skb oob data */
+ if (dev->priv_flags & IFF_EIPOIB_VIF) {
+ set_skb_oob_cb_data(skb, wc, &priv->napi);
+ /* the registered handler will take care of the skb */
+ netif_receive_skb(skb);
+ } else
+ napi_gro_receive(&priv->napi, skb);
repost:
if (unlikely(ipoib_ib_post_receive(dev, wr_id)))
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 637980b..47034b4 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -91,6 +91,24 @@ static struct ib_client ipoib_client = {
.remove = ipoib_remove_one
};
+void set_skb_oob_cb_data(struct sk_buff *skb, struct ib_wc *wc,
+ struct napi_struct *napi)
+{
+ struct ipoib_cm_rx *p_cm_ctx = NULL;
+ struct eipoib_cb_data *data = NULL;
+
+ p_cm_ctx = wc->qp->qp_context;
+ data = IPOIB_HANDLER_CB(skb);
+
+ data->rx.slid = wc->slid;
+ data->rx.sqpn = wc->src_qp;
+ data->rx.napi = napi;
+
+ /* in CM mode, use the "base" qpn as sqpn */
+ if (p_cm_ctx)
+ data->rx.sqpn = p_cm_ctx->qpn;
+}
+
int ipoib_open(struct net_device *dev)
{
struct ipoib_dev_priv *priv = netdev_priv(dev);
@@ -1253,6 +1271,9 @@ static struct net_device *ipoib_add_port(const char *format,
goto event_failed;
}
+ /* indicates pif port */
+ priv->dev->priv_flags |= IFF_EIPOIB_PIF;
+
result = register_netdev(priv->dev);
if (result) {
printk(KERN_WARNING "%s: couldn't register ipoib port %d; error %d\n",
diff --git a/include/rdma/e_ipoib.h b/include/rdma/e_ipoib.h
new file mode 100644
index 0000000..7249334
--- /dev/null
+++ b/include/rdma/e_ipoib.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2012 Mellanox Technologies. All rights reserved
+ *
+ * This software is available to you under a choice of one of two
+ * licenses. You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * openfabric.org BSD license below:
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef _LINUX_ETH_IB_IPOIB_H
+#define _LINUX_ETH_IB_IPOIB_H
+
+#include <net/sch_generic.h>
+
+struct eipoib_cb_data {
+ /*
+ * extra care taken not to collide with the usage done
+ * by the qdisc layer in struct skb cb data.
+ */
+ struct qdisc_skb_cb qdisc_cb;
+ struct { /* must be <= 20 bytes */
+ u32 sqpn;
+ struct napi_struct *napi;
+ u16 slid;
+ u8 data[6];
+ } __packed rx;
+};
+
+#define IPOIB_HANDLER_CB(skb) ((struct eipoib_cb_data *)(skb)->cb)
+
+#endif /* _LINUX_ETH_IB_IPOIB_H */
--
1.7.1
^ permalink raw reply related
* [PATCH V2 11/12] net/eipoib: Add Makefile, Kconfig and MAINTAINERS entries
From: Or Gerlitz @ 2012-08-01 17:09 UTC (permalink / raw)
To: davem; +Cc: roland, netdev, ali, sean.hefty, Erez Shitrit, Or Gerlitz
In-Reply-To: <1343840975-3252-1-git-send-email-ogerlitz@mellanox.com>
From: Erez Shitrit <erezsh@mellanox.co.il>
Add Kconfig entry under drivers/net and MAINTAINERS entry for eIPoIB, also
add the driver makefile.
Signed-off-by: Erez Shitrit <erezsh@mellanox.co.il>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
---
MAINTAINERS | 6 ++++++
drivers/net/Kconfig | 15 +++++++++++++++
drivers/net/Makefile | 1 +
drivers/net/eipoib/Makefile | 4 ++++
4 files changed, 26 insertions(+), 0 deletions(-)
create mode 100644 drivers/net/eipoib/Makefile
diff --git a/MAINTAINERS b/MAINTAINERS
index bd45164..09cc33a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2645,6 +2645,12 @@ L: netdev@vger.kernel.org
S: Maintained
F: drivers/net/ethernet/ibm/ehea/
+EIPoIB (Ethernet services over IPoIB) DRIVER
+M: Erez Shitrit <erezsh@mellanox.com>
+L: netdev@vger.kernel.org
+S: Supported
+F: drivers/net/eipoib/
+
EMBEDDED LINUX
M: Paul Gortmaker <paul.gortmaker@windriver.com>
M: Matt Mackall <mpm@selenic.com>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 0c2bd80..ba98f61 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -68,6 +68,21 @@ config DUMMY
To compile this driver as a module, choose M here: the module
will be called dummy.
+config E_IPOIB
+ tristate "Ethernet Services over IPoIB"
+ depends on INFINIBAND_IPOIB
+ ---help---
+ This driver supports Ethernet protocol over InfiniBand IPoIB devices.
+ Some services can run only on top of Ethernet L2 interfaces, and
+ cannot be bound to an IPoIB interface.
+ With this new driver, these services can run seamlessly.
+
+ Main use case of the driver is the Ethernet Virtual Switching used in
+ virtualized environments, where an eipoib netdevice can be used as a
+ Physical Interface (PIF) in the hypervisor domain, and allow other guests
+ Virtual Interfaces (VIF) connected to the same Virtual Switch to run over
+ the InfiniBand fabric.
+
config EQUALIZER
tristate "EQL (serial line load balancing) support"
---help---
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 3d375ca..2c3409e 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -31,6 +31,7 @@ obj-$(CONFIG_CAIF) += caif/
obj-$(CONFIG_CAN) += can/
obj-$(CONFIG_ETRAX_ETHERNET) += cris/
obj-$(CONFIG_NET_DSA) += dsa/
+obj-$(CONFIG_E_IPOIB) += eipoib/
obj-$(CONFIG_ETHERNET) += ethernet/
obj-$(CONFIG_FDDI) += fddi/
obj-$(CONFIG_HIPPI) += hippi/
diff --git a/drivers/net/eipoib/Makefile b/drivers/net/eipoib/Makefile
new file mode 100644
index 0000000..b64e96e
--- /dev/null
+++ b/drivers/net/eipoib/Makefile
@@ -0,0 +1,4 @@
+obj-$(CONFIG_E_IPOIB) := eth_ipoib.o
+eth_ipoib-y := eth_ipoib_main.o \
+ eth_ipoib_sysfs.o \
+ eth_ipoib_ethtool.o
--
1.7.1
^ permalink raw reply related
* [PATCH V2 02/12] IB/ipoib: Add support for clones / multiple childs on the same partition
From: Or Gerlitz @ 2012-08-01 17:09 UTC (permalink / raw)
To: davem; +Cc: roland, netdev, ali, sean.hefty, Or Gerlitz, Erez Shitrit
In-Reply-To: <1343840975-3252-1-git-send-email-ogerlitz@mellanox.com>
Allow creating "clone" child interfaces which further partition an
IPoIB interface to sub interfaces who either use the same pkey as
their parent or use the same pkey as already created child interface.
Each child now has a child index, which together with the pkey is
used as the identifier of the created network device.
Clone interfaces can only be created using rtnl_link_ops, where the user
is allowed to provide a pkey and index. If no pkey is provided, the
parent pkey is used and if no index is provided an index of zero
is used.
A major use case for clone childs is for virtualization purposes, where
a per VM NIC is desired at the hypervisor level, such as the solution
provided by the newly introduced Ethernet IPoIB driver.
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Erez Shitrit <erezsh@mellanox.co.il>
---
Documentation/infiniband/ipoib.txt | 12 ++++++++++++
drivers/infiniband/ulp/ipoib/ipoib.h | 7 +++++--
drivers/infiniband/ulp/ipoib/ipoib_netlink.c | 21 +++++++++++++++------
drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 19 +++++++++++--------
4 files changed, 43 insertions(+), 16 deletions(-)
diff --git a/Documentation/infiniband/ipoib.txt b/Documentation/infiniband/ipoib.txt
index f2cfe26..6ef87bb 100644
--- a/Documentation/infiniband/ipoib.txt
+++ b/Documentation/infiniband/ipoib.txt
@@ -27,6 +27,18 @@ Partitions and P_Keys
Child interface create/delete can also be done using IPoIB's
rtnl_link_ops, where childs created using either way behave the same.
+Clones
+ Its possible to further partition an IPoIB interfaces, and create
+ "clone" child interfaces which either use the same pkey as their
+ parent, or as an already created child interface. Each child now has
+ a child index, which together with the pkey is used as the identifier
+ of the created network device.
+
+ Clone interfaces can only be created using rtnl_link_ops, where the user
+ is allowed to provide a pkey and index. If no pkey is provided, the
+ parent pkey is used and if no index is provided an index of zero
+ is used.
+
Datagram vs Connected modes
The IPoIB driver supports two modes of operation: datagram and
diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h
index adcfa66..0df6668 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib.h
+++ b/drivers/infiniband/ulp/ipoib/ipoib.h
@@ -332,6 +332,7 @@ struct ipoib_dev_priv {
struct net_device *parent;
struct list_head child_intfs;
struct list_head list;
+ u16 child_index;
#ifdef CONFIG_INFINIBAND_IPOIB_CM
struct ipoib_cm_dev_priv cm;
@@ -493,8 +494,10 @@ void ipoib_event(struct ib_event_handler *handler,
int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey);
int ipoib_vlan_delete(struct net_device *pdev, unsigned short pkey);
-int __ipoib_vlan_add(struct ipoib_dev_priv *ppriv, struct ipoib_dev_priv *priv, u16 pkey);
-struct net_device * __ipoib_vlan_delete(struct net_device *pdev, u16 pkey);
+int __ipoib_vlan_add(struct ipoib_dev_priv *ppriv, struct ipoib_dev_priv *priv,
+ u16 pkey, u16 child_index);
+struct net_device * __ipoib_vlan_delete(struct net_device *pdev, u16 pkey,
+ u16 child_index);
int __init ipoib_netlink_init(void);
void __exit ipoib_netlink_fini(void);
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
index 2b8905e..d902e04 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
@@ -38,6 +38,7 @@
enum {
IFLA_IPOIB_UNSPEC,
IFLA_IPOIB_CHILD_PKEY,
+ IFLA_IPOIB_CHILD_INDEX,
__IFLA_IPOIB_MAX
};
@@ -45,6 +46,7 @@ enum {
static const struct nla_policy ipoib_policy[IFLA_IPOIB_MAX + 1] = {
[IFLA_IPOIB_CHILD_PKEY] = { .type = NLA_U16 },
+ [IFLA_IPOIB_CHILD_INDEX] = { .type = NLA_U16 },
};
static int ipoib_new_child_link(struct net *src_net, struct net_device *dev,
@@ -52,7 +54,7 @@ static int ipoib_new_child_link(struct net *src_net, struct net_device *dev,
{
struct net_device *pdev;
struct ipoib_dev_priv *ppriv;
- u16 child_pkey;
+ u16 child_pkey, child_index;
int err;
if (!tb[IFLA_LINK])
@@ -64,12 +66,18 @@ static int ipoib_new_child_link(struct net *src_net, struct net_device *dev,
ppriv = netdev_priv(pdev);
if (!data || !data[IFLA_IPOIB_CHILD_PKEY]) {
- ipoib_warn(ppriv, "no pkey specified, failing request\n");
- return -EINVAL;
+ ipoib_warn(ppriv, "no pkey specified, using parent pkey\n");
+ child_pkey = ppriv->pkey;
} else
child_pkey = nla_get_u16(data[IFLA_IPOIB_CHILD_PKEY]);
- err = __ipoib_vlan_add(ppriv, netdev_priv(dev), child_pkey);
+ if (!data || !data[IFLA_IPOIB_CHILD_INDEX]) {
+ ipoib_warn(ppriv, "no index specified, using 0\n");
+ child_index = 0;
+ } else
+ child_index = nla_get_u16(data[IFLA_IPOIB_CHILD_INDEX]);
+
+ err = __ipoib_vlan_add(ppriv, netdev_priv(dev), child_pkey, child_index);
return err;
}
@@ -78,12 +86,13 @@ static void ipoib_unregister_child_dev(struct net_device *dev, struct list_head
{
struct ipoib_dev_priv *priv = netdev_priv(dev);
- (void)__ipoib_vlan_delete(priv->parent, priv->pkey);
+ (void)__ipoib_vlan_delete(priv->parent, priv->pkey, priv->child_index);
}
static size_t ipoib_get_size(const struct net_device *dev)
{
- return nla_total_size(2); /* IFLA_IPOIB_CHILD_PKEY */
+ return nla_total_size(2) + /* IFLA_IPOIB_CHILD_PKEY */
+ nla_total_size(2); /* IFLA_IPOIB_CHILD_INDEX */
}
static struct rtnl_link_ops ipoib_link_ops __read_mostly = {
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
index 4a9b7e6..5f6e07d 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
@@ -51,7 +51,7 @@ static DEVICE_ATTR(parent, S_IRUGO, show_parent, NULL);
int __ipoib_vlan_add(struct ipoib_dev_priv *ppriv, struct ipoib_dev_priv *priv,
- u16 pkey)
+ u16 pkey, u16 child_index)
{
int result;
struct ipoib_dev_priv *tpriv;
@@ -60,15 +60,16 @@ int __ipoib_vlan_add(struct ipoib_dev_priv *ppriv, struct ipoib_dev_priv *priv,
/*
* First ensure this isn't a duplicate. We check the parent device and
- * then all of the child interfaces to make sure the Pkey doesn't match.
+ * then all of the child interfaces to make sure the Pkey AND the child
+ * index don't match.
*/
- if (ppriv->pkey == pkey) {
+ if (ppriv->pkey == pkey && ppriv->child_index == child_index) {
result = -ENOTUNIQ;
goto err;
}
list_for_each_entry(tpriv, &ppriv->child_intfs, list) {
- if (tpriv->pkey == pkey) {
+ if (tpriv->pkey == pkey && tpriv->child_index == child_index) {
result = -ENOTUNIQ;
goto err;
}
@@ -85,6 +86,7 @@ int __ipoib_vlan_add(struct ipoib_dev_priv *ppriv, struct ipoib_dev_priv *priv,
goto err;
priv->pkey = pkey;
+ priv->child_index = child_index;
memcpy(priv->dev->dev_addr, ppriv->dev->dev_addr, INFINIBAND_ALEN);
priv->dev->broadcast[8] = pkey >> 8;
@@ -156,7 +158,7 @@ int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey)
if (!rtnl_trylock())
return restart_syscall();
- result = __ipoib_vlan_add(ppriv, priv, pkey);
+ result = __ipoib_vlan_add(ppriv, priv, pkey, 0);
if (result)
free_netdev(priv->dev);
@@ -166,7 +168,8 @@ int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey)
return result;
}
-struct net_device * __ipoib_vlan_delete(struct net_device *pdev, u16 pkey)
+struct net_device * __ipoib_vlan_delete(struct net_device *pdev, u16 pkey,
+ u16 child_index)
{
struct ipoib_dev_priv *ppriv, *priv, *tpriv;
struct net_device *dev = NULL;
@@ -175,7 +178,7 @@ struct net_device * __ipoib_vlan_delete(struct net_device *pdev, u16 pkey)
mutex_lock(&ppriv->vlan_mutex);
list_for_each_entry_safe(priv, tpriv, &ppriv->child_intfs, list) {
- if (priv->pkey == pkey) {
+ if (priv->pkey == pkey && priv->child_index == child_index) {
unregister_netdevice(priv->dev);
ipoib_dev_cleanup(priv->dev);
list_del(&priv->list);
@@ -197,7 +200,7 @@ int ipoib_vlan_delete(struct net_device *pdev, unsigned short pkey)
if (!rtnl_trylock())
return restart_syscall();
- dev = __ipoib_vlan_delete(pdev, pkey);
+ dev = __ipoib_vlan_delete(pdev, pkey, 0);
rtnl_unlock();
if (dev) {
--
1.7.1
^ permalink raw reply related
* [PATCH V2 05/12] net: Add ndo_set_vif_param operation to serve eIPoIB VIFs
From: Or Gerlitz @ 2012-08-01 17:09 UTC (permalink / raw)
To: davem; +Cc: roland, netdev, ali, sean.hefty, Erez Shitrit, Or Gerlitz
In-Reply-To: <1343840975-3252-1-git-send-email-ogerlitz@mellanox.com>
From: Erez Shitrit <erezsh@mellanox.co.il>
The Ethernet IPoIB driver enslaves IPoIB devices and uses them as
VIFs (Virtual Interface) which serve an Ethernet NIC e.g present in a
guest OS. For each such slave that acts as a VIF, eIPoIB needs to know
the mac and optionally the vlan uses by that NIC, the new ndo opertaion
is used to associate the mac/vlan for that slave.
Signed-off-by: Erez Shitrit <erezsh@mellanox.co.il>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
---
include/linux/netdevice.h | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index eb06e58..2709551 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1013,7 +1013,10 @@ struct net_device_ops {
netdev_features_t features);
int (*ndo_neigh_construct)(struct neighbour *n);
void (*ndo_neigh_destroy)(struct neighbour *n);
-
+ int (*ndo_set_vif_param) (struct net_device *dev,
+ struct net_device *vif,
+ u16 vlan,
+ u8 *mac);
int (*ndo_fdb_add)(struct ndmsg *ndm,
struct net_device *dev,
unsigned char *addr,
--
1.7.1
^ permalink raw reply related
* [PATCH V2 01/12] IB/ipoib: Add rtnl_link_ops support
From: Or Gerlitz @ 2012-08-01 17:09 UTC (permalink / raw)
To: davem; +Cc: roland, netdev, ali, sean.hefty, Or Gerlitz, Erez Shitrit
In-Reply-To: <1343840975-3252-1-git-send-email-ogerlitz@mellanox.com>
Add rtnl_link_ops to IPoIB, with the first usage being child device
create/delete through them. For that end, did little refactoring
of the ipoib_vlan_add/delete code which is now used by both the
sysfs and the rtnl_link_ops code.
Signed-off-by: Erez Shitrit <erezsh@mellanox.co.il>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
---
Documentation/infiniband/ipoib.txt | 3 +
drivers/infiniband/ulp/ipoib/Makefile | 3 +-
drivers/infiniband/ulp/ipoib/ipoib.h | 8 ++
drivers/infiniband/ulp/ipoib/ipoib_main.c | 10 ++-
drivers/infiniband/ulp/ipoib/ipoib_netlink.c | 110 ++++++++++++++++++++++++++
drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 80 ++++++++++++-------
6 files changed, 181 insertions(+), 33 deletions(-)
create mode 100644 drivers/infiniband/ulp/ipoib/ipoib_netlink.c
diff --git a/Documentation/infiniband/ipoib.txt b/Documentation/infiniband/ipoib.txt
index 64eeb55..f2cfe26 100644
--- a/Documentation/infiniband/ipoib.txt
+++ b/Documentation/infiniband/ipoib.txt
@@ -24,6 +24,9 @@ Partitions and P_Keys
The P_Key for any interface is given by the "pkey" file, and the
main interface for a subinterface is in "parent."
+ Child interface create/delete can also be done using IPoIB's
+ rtnl_link_ops, where childs created using either way behave the same.
+
Datagram vs Connected modes
The IPoIB driver supports two modes of operation: datagram and
diff --git a/drivers/infiniband/ulp/ipoib/Makefile b/drivers/infiniband/ulp/ipoib/Makefile
index 3090100..e5430dd 100644
--- a/drivers/infiniband/ulp/ipoib/Makefile
+++ b/drivers/infiniband/ulp/ipoib/Makefile
@@ -5,7 +5,8 @@ ib_ipoib-y := ipoib_main.o \
ipoib_multicast.o \
ipoib_verbs.o \
ipoib_vlan.o \
- ipoib_ethtool.o
+ ipoib_ethtool.o \
+ ipoib_netlink.o
ib_ipoib-$(CONFIG_INFINIBAND_IPOIB_CM) += ipoib_cm.o
ib_ipoib-$(CONFIG_INFINIBAND_IPOIB_DEBUG) += ipoib_fs.o
diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h
index 86df632..adcfa66 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib.h
+++ b/drivers/infiniband/ulp/ipoib/ipoib.h
@@ -493,6 +493,14 @@ void ipoib_event(struct ib_event_handler *handler,
int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey);
int ipoib_vlan_delete(struct net_device *pdev, unsigned short pkey);
+int __ipoib_vlan_add(struct ipoib_dev_priv *ppriv, struct ipoib_dev_priv *priv, u16 pkey);
+struct net_device * __ipoib_vlan_delete(struct net_device *pdev, u16 pkey);
+
+int __init ipoib_netlink_init(void);
+void __exit ipoib_netlink_fini(void);
+
+void ipoib_setup(struct net_device *dev);
+
void ipoib_pkey_poll(struct work_struct *work);
int ipoib_pkey_dev_delay_open(struct net_device *dev);
void ipoib_drain_cq(struct net_device *dev);
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index bbee4b2..637980b 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -995,7 +995,7 @@ static const struct net_device_ops ipoib_netdev_ops = {
.ndo_neigh_setup = ipoib_neigh_setup_dev,
};
-static void ipoib_setup(struct net_device *dev)
+void ipoib_setup(struct net_device *dev)
{
struct ipoib_dev_priv *priv = netdev_priv(dev);
@@ -1402,8 +1402,15 @@ static int __init ipoib_init_module(void)
if (ret)
goto err_sa;
+ ret = ipoib_netlink_init();
+ if (ret)
+ goto err_client;
+
return 0;
+err_client:
+ ib_unregister_client(&ipoib_client);
+
err_sa:
ib_sa_unregister_client(&ipoib_sa_client);
destroy_workqueue(ipoib_workqueue);
@@ -1416,6 +1423,7 @@ err_fs:
static void __exit ipoib_cleanup_module(void)
{
+ ipoib_netlink_fini();
ib_unregister_client(&ipoib_client);
ib_sa_unregister_client(&ipoib_sa_client);
ipoib_unregister_debugfs();
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
new file mode 100644
index 0000000..2b8905e
--- /dev/null
+++ b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2012 Mellanox Technologies. - All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses. You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <linux/netdevice.h>
+#include <linux/module.h>
+#include <net/rtnetlink.h>
+#include "ipoib.h"
+
+enum {
+ IFLA_IPOIB_UNSPEC,
+ IFLA_IPOIB_CHILD_PKEY,
+ __IFLA_IPOIB_MAX
+};
+
+#define IFLA_IPOIB_MAX (__IFLA_IPOIB_MAX - 1)
+
+static const struct nla_policy ipoib_policy[IFLA_IPOIB_MAX + 1] = {
+ [IFLA_IPOIB_CHILD_PKEY] = { .type = NLA_U16 },
+};
+
+static int ipoib_new_child_link(struct net *src_net, struct net_device *dev,
+ struct nlattr *tb[], struct nlattr *data[])
+{
+ struct net_device *pdev;
+ struct ipoib_dev_priv *ppriv;
+ u16 child_pkey;
+ int err;
+
+ if (!tb[IFLA_LINK])
+ return -EINVAL;
+
+ pdev = __dev_get_by_index(src_net, nla_get_u32(tb[IFLA_LINK]));
+ if (!pdev)
+ return -ENODEV;
+ ppriv = netdev_priv(pdev);
+
+ if (!data || !data[IFLA_IPOIB_CHILD_PKEY]) {
+ ipoib_warn(ppriv, "no pkey specified, failing request\n");
+ return -EINVAL;
+ } else
+ child_pkey = nla_get_u16(data[IFLA_IPOIB_CHILD_PKEY]);
+
+ err = __ipoib_vlan_add(ppriv, netdev_priv(dev), child_pkey);
+
+ return err;
+}
+
+static void ipoib_unregister_child_dev(struct net_device *dev, struct list_head *head)
+{
+ struct ipoib_dev_priv *priv = netdev_priv(dev);
+
+ (void)__ipoib_vlan_delete(priv->parent, priv->pkey);
+}
+
+static size_t ipoib_get_size(const struct net_device *dev)
+{
+ return nla_total_size(2); /* IFLA_IPOIB_CHILD_PKEY */
+}
+
+static struct rtnl_link_ops ipoib_link_ops __read_mostly = {
+ .kind = "ipoib",
+ .maxtype = IFLA_IPOIB_MAX,
+ .policy = ipoib_policy,
+ .priv_size = sizeof(struct ipoib_dev_priv),
+ .setup = ipoib_setup,
+ .newlink = ipoib_new_child_link,
+ .dellink = ipoib_unregister_child_dev,
+ .get_size = ipoib_get_size,
+};
+
+int __init ipoib_netlink_init(void)
+{
+ return rtnl_link_register(&ipoib_link_ops);
+}
+
+void __exit ipoib_netlink_fini(void)
+{
+ rtnl_link_unregister(&ipoib_link_ops);
+}
+
+MODULE_ALIAS_RTNL_LINK("ipoib");
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
index d7e9740..4a9b7e6 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
@@ -49,19 +49,13 @@ static ssize_t show_parent(struct device *d, struct device_attribute *attr,
}
static DEVICE_ATTR(parent, S_IRUGO, show_parent, NULL);
-int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey)
+
+int __ipoib_vlan_add(struct ipoib_dev_priv *ppriv, struct ipoib_dev_priv *priv,
+ u16 pkey)
{
- struct ipoib_dev_priv *ppriv, *priv;
- char intf_name[IFNAMSIZ];
int result;
+ struct ipoib_dev_priv *tpriv;
- if (!capable(CAP_NET_ADMIN))
- return -EPERM;
-
- ppriv = netdev_priv(pdev);
-
- if (!rtnl_trylock())
- return restart_syscall();
mutex_lock(&ppriv->vlan_mutex);
/*
@@ -70,26 +64,16 @@ int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey)
*/
if (ppriv->pkey == pkey) {
result = -ENOTUNIQ;
- priv = NULL;
goto err;
}
- list_for_each_entry(priv, &ppriv->child_intfs, list) {
- if (priv->pkey == pkey) {
+ list_for_each_entry(tpriv, &ppriv->child_intfs, list) {
+ if (tpriv->pkey == pkey) {
result = -ENOTUNIQ;
- priv = NULL;
goto err;
}
}
- snprintf(intf_name, sizeof intf_name, "%s.%04x",
- ppriv->dev->name, pkey);
- priv = ipoib_intf_alloc(intf_name);
- if (!priv) {
- result = -ENOMEM;
- goto err;
- }
-
priv->max_ib_mtu = ppriv->max_ib_mtu;
/* MTU will be reset when mcast join happens */
priv->dev->mtu = IPOIB_UD_MTU(priv->max_ib_mtu);
@@ -137,11 +121,10 @@ int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey)
list_add_tail(&priv->list, &ppriv->child_intfs);
mutex_unlock(&ppriv->vlan_mutex);
- rtnl_unlock();
-
return 0;
sysfs_failed:
+ result = -ENOMEM;
ipoib_delete_debug_files(priv->dev);
unregister_netdevice(priv->dev);
@@ -150,25 +133,46 @@ register_failed:
err:
mutex_unlock(&ppriv->vlan_mutex);
- rtnl_unlock();
- if (priv)
- free_netdev(priv->dev);
-
return result;
}
-int ipoib_vlan_delete(struct net_device *pdev, unsigned short pkey)
+int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey)
{
- struct ipoib_dev_priv *ppriv, *priv, *tpriv;
- struct net_device *dev = NULL;
+ struct ipoib_dev_priv *ppriv, *priv;
+ char intf_name[IFNAMSIZ];
+ int result;
if (!capable(CAP_NET_ADMIN))
return -EPERM;
ppriv = netdev_priv(pdev);
+ snprintf(intf_name, sizeof intf_name, "%s.%04x",
+ ppriv->dev->name, pkey);
+ priv = ipoib_intf_alloc(intf_name);
+ if (!priv)
+ return -ENOMEM;
+
if (!rtnl_trylock())
return restart_syscall();
+
+ result = __ipoib_vlan_add(ppriv, priv, pkey);
+
+ if (result)
+ free_netdev(priv->dev);
+
+ rtnl_unlock();
+
+ return result;
+}
+
+struct net_device * __ipoib_vlan_delete(struct net_device *pdev, u16 pkey)
+{
+ struct ipoib_dev_priv *ppriv, *priv, *tpriv;
+ struct net_device *dev = NULL;
+
+ ppriv = netdev_priv(pdev);
+
mutex_lock(&ppriv->vlan_mutex);
list_for_each_entry_safe(priv, tpriv, &ppriv->child_intfs, list) {
if (priv->pkey == pkey) {
@@ -180,6 +184,20 @@ int ipoib_vlan_delete(struct net_device *pdev, unsigned short pkey)
}
}
mutex_unlock(&ppriv->vlan_mutex);
+
+ return dev;
+}
+
+int ipoib_vlan_delete(struct net_device *pdev, unsigned short pkey)
+{
+ struct net_device *dev;
+
+ if (!capable(CAP_NET_ADMIN))
+ return -EPERM;
+
+ if (!rtnl_trylock())
+ return restart_syscall();
+ dev = __ipoib_vlan_delete(pdev, pkey);
rtnl_unlock();
if (dev) {
--
1.7.1
^ permalink raw reply related
* [PATCH V2 08/12] net/eipoib: Add ethtool file support
From: Or Gerlitz @ 2012-08-01 17:09 UTC (permalink / raw)
To: davem; +Cc: roland, netdev, ali, sean.hefty, Erez Shitrit, Or Gerlitz
In-Reply-To: <1343840975-3252-1-git-send-email-ogerlitz@mellanox.com>
From: Erez Shitrit <erezsh@mellanox.co.il>
Via ethtool the driver describes its version, ABI version, on what PIF
interface it runs and various statistics.
Signed-off-by: Erez Shitrit <erezsh@mellanox.co.il>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
---
drivers/net/eipoib/eth_ipoib_ethtool.c | 114 ++++++++++++++++++++++++++++++++
1 files changed, 114 insertions(+), 0 deletions(-)
create mode 100644 drivers/net/eipoib/eth_ipoib_ethtool.c
diff --git a/drivers/net/eipoib/eth_ipoib_ethtool.c b/drivers/net/eipoib/eth_ipoib_ethtool.c
new file mode 100644
index 0000000..0731d94
--- /dev/null
+++ b/drivers/net/eipoib/eth_ipoib_ethtool.c
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2012 Mellanox Technologies. All rights reserved
+ *
+ * This software is available to you under a choice of one of two
+ * licenses. You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * openfabric.org BSD license below:
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include "eth_ipoib.h"
+
+static void parent_ethtool_get_drvinfo(struct net_device *parent_dev,
+ struct ethtool_drvinfo *drvinfo)
+{
+ struct parent *parent = netdev_priv(parent_dev);
+
+ strncpy(drvinfo->driver, DRV_NAME, 32);
+
+ strncpy(drvinfo->version, DRV_VERSION, 32);
+
+ strncpy(drvinfo->bus_info, parent->ipoib_main_interface,
+ ETHTOOL_BUSINFO_LEN);
+
+ /* indicates ABI version */
+ snprintf(drvinfo->fw_version, 32, "%d", EIPOIB_ABI_VER);
+}
+
+static const char parent_strings[][ETH_GSTRING_LEN] = {
+ /* private statistics */
+ "tx_parent_dropped",
+ "tx_vif_miss",
+ "tx_neigh_miss",
+ "tx_vlan",
+ "tx_shared",
+ "tx_proto_errors",
+ "tx_skb_errors",
+ "tx_slave_err",
+
+ "rx_parent_dropped",
+ "rx_vif_miss",
+ "rx_neigh_miss",
+ "rx_vlan",
+ "rx_shared",
+ "rx_proto_errors",
+ "rx_skb_errors",
+ "rx_slave_err",
+};
+
+#define PORT_STATS_LEN (sizeof(parent_strings) / ETH_GSTRING_LEN)
+
+static void parent_get_strings(struct net_device *parent_dev,
+ uint32_t stringset, uint8_t *data)
+{
+ if (stringset != ETH_SS_STATS)
+ return;
+ memcpy(data, parent_strings, sizeof(parent_strings));
+}
+
+static void parent_get_ethtool_stats(struct net_device *parent_dev,
+ struct ethtool_stats *stats,
+ uint64_t *data)
+{
+ struct parent *parent = netdev_priv(parent_dev);
+
+ read_lock_bh(&parent->lock);
+ memcpy(data, &parent->port_stats, sizeof(parent->port_stats));
+ read_unlock_bh(&parent->lock);
+}
+
+static int parent_get_sset_count(struct net_device *parent_dev, int sset)
+{
+ switch (sset) {
+ case ETH_SS_STATS:
+ return PORT_STATS_LEN;
+ default:
+ return -EOPNOTSUPP;
+ }
+}
+
+static const struct ethtool_ops parent_ethtool_ops = {
+ .get_drvinfo = parent_ethtool_get_drvinfo,
+ .get_strings = parent_get_strings,
+ .get_ethtool_stats = parent_get_ethtool_stats,
+ .get_sset_count = parent_get_sset_count,
+ .get_link = ethtool_op_get_link,
+};
+
+void parent_set_ethtool_ops(struct net_device *dev)
+{
+ SET_ETHTOOL_OPS(dev, &parent_ethtool_ops);
+}
--
1.7.1
^ permalink raw reply related
* [PATCH V2 07/12] net/eipoib: Add private header file
From: Or Gerlitz @ 2012-08-01 17:09 UTC (permalink / raw)
To: davem; +Cc: roland, netdev, ali, sean.hefty, Erez Shitrit, Or Gerlitz
In-Reply-To: <1343840975-3252-1-git-send-email-ogerlitz@mellanox.com>
From: Erez Shitrit <erezsh@mellanox.co.il>
The header file includes all structures, macros and non-static
functions which are of use by the driver.
Signed-off-by: Erez Shitrit <erezsh@mellanox.co.il>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
---
drivers/net/eipoib/eth_ipoib.h | 215 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 215 insertions(+), 0 deletions(-)
create mode 100644 drivers/net/eipoib/eth_ipoib.h
diff --git a/drivers/net/eipoib/eth_ipoib.h b/drivers/net/eipoib/eth_ipoib.h
new file mode 100644
index 0000000..9a23f7d
--- /dev/null
+++ b/drivers/net/eipoib/eth_ipoib.h
@@ -0,0 +1,215 @@
+/*
+ * Copyright (c) 2012 Mellanox Technologies. All rights reserved
+ *
+ * This software is available to you under a choice of one of two
+ * licenses. You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * openfabric.org BSD license below:
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef _LINUX_ETH_IPOIB_H
+#define _LINUX_ETH_IPOIB_H
+
+#include <linux/module.h>
+#include <linux/errno.h>
+#include <linux/netdevice.h>
+#include <linux/skbuff.h>
+#include <net/arp.h>
+#include <linux/if_vlan.h>
+#include <net/net_namespace.h>
+#include <net/netns/generic.h>
+#include <linux/if_infiniband.h>
+#include <rdma/ib_verbs.h>
+
+#include <rdma/e_ipoib.h>
+
+/* macros and definitions */
+#define DRV_VERSION "1.0.0"
+#define DRV_RELDATE "June 1, 2012"
+#define DRV_NAME "eth_ipoib"
+#define SDRV_NAME "ipoib"
+#define DRV_DESCRIPTION "IP-over-InfiniBand Para Virtualized Driver"
+#define EIPOIB_ABI_VER 1
+
+#undef pr_fmt
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#define GID_LEN 16
+#define GUID_LEN 8
+
+#define PARENT_VLAN_FEATURES (NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX)
+
+#define parent_for_each_slave(_parent, slave) \
+ list_for_each_entry(slave, &(_parent)->slave_list, list)\
+
+#define PARENT_IS_OK(_parent) \
+ (((_parent)->dev->flags & IFF_UP) && \
+ netif_running((_parent)->dev) && \
+ ((_parent)->slave_cnt > 0))
+
+#define IS_E_IPOIB_PROTO(_proto) \
+ (((_proto) == htons(ETH_P_ARP)) || \
+ ((_proto) == htons(ETH_P_RARP)) || \
+ ((_proto) == htons(ETH_P_IP)))
+
+enum eipoib_emac_guest_info {
+ VALID,
+ MIGRATED_OUT,
+ INVALID,
+};
+
+/* structs */
+struct eth_arp_data {
+ u8 arp_sha[ETH_ALEN];
+ __be32 arp_sip;
+ u8 arp_dha[ETH_ALEN];
+ __be32 arp_dip;
+} __packed;
+
+struct ipoib_arp_data {
+ u8 arp_sha[INFINIBAND_ALEN];
+ __be32 arp_sip;
+ u8 arp_dha[INFINIBAND_ALEN];
+ __be32 arp_dip;
+} __packed;
+
+/* live migration support structures: */
+struct ip_member {
+ __be32 ip;
+ struct list_head list;
+};
+
+/*
+ * for each slave (emac) saves all the ip over that mac.
+ * the parent keeps that list for live migration.
+ */
+struct guest_emac_info {
+ u8 emac[ETH_ALEN];
+ u16 vlan;
+ struct list_head ip_list;
+ struct list_head list;
+ enum eipoib_emac_guest_info rec_state;
+ int num_of_retries;
+};
+
+struct neigh {
+ struct list_head list;
+ u8 emac[ETH_ALEN];
+ u8 imac[INFINIBAND_ALEN];
+ /* this part is used for neigh_add_list */
+ char cmd[PAGE_SIZE];
+};
+
+struct slave {
+ struct net_device *dev;
+ struct list_head list;
+ u16 pkey;
+ u16 vlan;
+ u8 emac[ETH_ALEN];
+ u8 imac[INFINIBAND_ALEN];
+ struct list_head neigh_list;
+};
+
+struct port_stats {
+ /* update PORT_STATS_LEN (number of stat fields)accordingly */
+ uint64_t tx_parent_dropped;
+ uint64_t tx_vif_miss;
+ uint64_t tx_neigh_miss;
+ uint64_t tx_vlan;
+ uint64_t tx_shared;
+ uint64_t tx_proto_errors;
+ uint64_t tx_skb_errors;
+ uint64_t tx_slave_err;
+
+ uint64_t rx_parent_dropped;
+ uint64_t rx_vif_miss;
+ uint64_t rx_neigh_miss;
+ uint64_t rx_vlan;
+ uint64_t rx_shared;
+ uint64_t rx_proto_errors;
+ uint64_t rx_skb_errors;
+ uint64_t rx_slave_err;
+};
+
+struct parent {
+ struct net_device *dev;
+ int index;
+ struct neigh_parms nparms;
+ struct list_head slave_list;
+ /* never change this value outside the attach/detach wrappers */
+ s32 slave_cnt;
+ rwlock_t lock;
+ struct port_stats port_stats;
+ struct list_head parent_list;
+ u16 flags;
+ struct workqueue_struct *wq;
+ s8 kill_timers;
+ struct delayed_work neigh_learn_work;
+ struct delayed_work vif_learn_work;
+ struct list_head neigh_add_list;
+ union ib_gid gid;
+ char ipoib_main_interface[IFNAMSIZ];
+ /* live migration and bonding support */
+ struct list_head emac_ip_list;
+ struct delayed_work emac_ip_work;
+ struct delayed_work migrate_out_work;
+};
+
+#define eipoib_slave_get_rcu(dev) \
+ ((struct slave *) rcu_dereference(dev->rx_handler_data))
+
+/* name space support for sys/fs */
+struct eipoib_net {
+ struct net *net; /* Associated network namespace */
+ struct class_attribute class_attr_eipoib_interfaces;
+};
+
+/* exported from main.c */
+extern int eipoib_net_id;
+extern struct list_head parent_dev_list;
+
+/* functions prototypes */
+int mod_create_sysfs(struct eipoib_net *eipoib_n);
+void mod_destroy_sysfs(struct eipoib_net *eipoib_n);
+void parent_destroy_sysfs_entry(struct parent *parent);
+int parent_create_sysfs_entry(struct parent *parent);
+int create_slave_symlinks(struct net_device *master,
+ struct net_device *slave);
+void destroy_slave_symlinks(struct net_device *master,
+ struct net_device *slave);
+int parent_enslave(struct net_device *parent_dev,
+ struct net_device *slave_dev);
+int parent_release_slave(struct net_device *parent_dev,
+ struct net_device *slave_dev);
+struct neigh *parent_get_neigh_cmd(char op, char *ifname,
+ u8 *remac, u8 *rimac);
+struct slave *parent_get_vif_cmd(char op, char *ifname, u8 *lemac);
+ssize_t __parent_store_neighs(struct device *d,
+ struct device_attribute *attr,
+ const char *buffer, size_t count);
+void parent_set_ethtool_ops(struct net_device *dev);
+
+#endif /* _LINUX_ETH_IPOIB_H */
--
1.7.1
^ permalink raw reply related
* [PATCH V2 00/12] Add Ethernet IPoIB driver
From: Or Gerlitz @ 2012-08-01 17:09 UTC (permalink / raw)
To: davem; +Cc: roland, netdev, ali, sean.hefty, Or Gerlitz, Erez Shitrit
Changes from V1:
- applied feedback from Ben H.
- add stats64
- use memcpy on ethtool
- remove double indexing on ethtool and unused variables
- remove extra tab ...
- remove HW_VLAN_FILTER and the add/kill_vid ndo entries
- applied feedback from Dave Miller to avoid using sysfs
- added rtnl_link_ops support in ipoib and use them to add/delete childs
- added usage to ndo_add/remove_slave in eipoib
- added support for eipoib VIFs in rtnetlink and new ndo op to configure
that to the eipoib device
- some more little cleanups of unused variables
changes from V0:
- applied feedback from Eric/Dave - RX flow uses only the last 20 bytes of skb->cb[]
- applied feedback from Ben H. on ethtool changes
- fix sparse error on function which should be made static
- made the netdev features related code of the driver more elegant/robust
- used _bh locking in some paths which used plain rw locking in V0
- some code rearrangements in flows that send ARPs
The eIPoIB driver provides a standard Ethernet netdevice over
the InfiniBand IPoIB interface.
Some services can run only on top of Ethernet L2 interfaces, and cannot be
bound to an IPoIB interface. With this new driver, these services can run
seamlessly.
Main use case of the driver is the Ethernet Virtual Switching used in
virtualized environments, where an eipoib netdevice can be used as a
Physical Interface (PIF) in the hypervisor domain, and allow other
guests Virtual Interfaces (VIF) connected to the same Virtual Switch
to run over the InfiniBand fabric.
This driver supports L2 Switching (Direct Bridging) as well as other L3
Switching modes (e.g. NAT).
Whenever an IPoIB interface is created, one eIPoIB PIF netdevice
will be created. The default naming scheme is as in other Ethernet
interfaces: ethX, for example, on a system with two IPoIB interfaces,
ib0 and ib1, two interfaces will be created ethX and ethX+1 When "X"
is the next free Ethernet number in the system.
Using "ethtool -i " over the new interface can tell on which IPoIB
PIF interface that interface is above. For example: driver: eth_ipoib:ib0
indicates that eth3 is the Ethernet interface over the ib0 IPoIB interface.
The driver can be used as independent interface or to serve in
virtualization environment as the physical layer for the virtual
interfaces on the virtual guest.
The driver interface (eipoib interface or which is also referred to as parent)
uses slave interfaces, IPoIB clones, which are the VIFs described above.
VIFs interfaces are enslaved/released from the eipoib driver on demand, according
to the management interface provided to user space.
The management interface for the driver uses rtnl interface. Via these interfaces
the driver gets details on new VIF's to manage. The driver can
enslave new VIF (IPoIB cloned interface) or detaches from it.
The driver can also configure the slave to support specific mac/vlan of virtual guest.
Here's an example script on how the managment interface looks
like with the new rtnetlink code we added, this is based
on a patch to iproute2 which will be posted once the interface
is agreed.
#!/bin/bash
# create IPoIB clone (ib0.1), enslave it to eIPoIB (eth4), add VIF to
# serve the master, the provided MAC is the master's one
ip link add link ib0 name ib0.1 type ipoib index 1
ip link set dev ib0.1 master eth4
ip link set dev eth4 vif ib0.1 mac 00:02:C9:43:3B:F1
# add a bridge whose uplink is the eIPOIB device
brctl addbr br2
brctl addif br2 eth4
ifconfig br2 12.134.41.1/16 up
# create IPoIB clone (ib0.2), enslave it to eIPoIB (eth4), add VIF to
# serve a guest, the provided MAC is the guest's one, vnet1 is a hypervisor
# NIC (e.g tap) that serves that guest
ip link add link ib0 name ib0.2 type ipoib index 2
ip link set dev ib0.2 master eth4
ip link set dev eth4 vif ib0.2 mac 52:54:00:67:E9:BD
brctl addif br2 vnet1
# repeat the above with vlan
ip link add link ib0 name ib0.8003 type ipoib pkey 0x8003
ip link set dev ib0.8003 master eth4
ip link set dev eth4 vif ib0.8003 mac 00:02:C9:43:3B:F1 vlan 3
vconfig add eth4 3
ifconfig eth4.3 up
brctl addbr br3
brctl addif br3 eth4.3
ifconfig br3 13.134.41.1/16 up
ip link add link ib0 name ib0.8003.1 type ipoib pkey 0x8003 index 1
ip link set dev ib0.8003.1 master eth4
ip link set dev eth4 vif ib0.8003.1 mac 52:54:00:DE:3A:23 vlan 3
cat /sys/class/net/eth4/eth/vifs
============= END OF SCRIPT =======
Note: Each ethX interface has at least one ibX.Y slave to serve the PIF
itself, in the VIFs list of ethX you'll notice that ibX.1 is always created
to serve applications running from the Hypervisor on top of ethX interface directly.
For IB applications that require native IPoIB interfaces (e.g. RDMA-CM), the
original ipoib interfaces ibX can still be used. For example, RDMA-CM and
eth_ipoib drivers can co-exist and make use of IPoIB
The last patch of this series was made such that the series works as is over net-next.
In parallel to effort a patch to modify IPoIB such that it doesn't assume dst/neighbour
on the skb was pushed upstream, its commit b63b70d87741 "IPoIB: Use a private hash table
for path lookup in xmit path", once present in net-next this patch can simply be dropped.
Erez Shitrit (10):
include/linux: Add private flags for IPoIB interfaces
IB/ipoib: Add support for acting as VIF
net: Add ndo_set_vif_param operation to serve eIPoIB VIFs
net/core: Add rtnetlink support to vif parameters
net/eipoib: Add private header file
net/eipoib: Add ethtool file support
net/eipoib: Add main driver functionality
net/eipoib: Add sysfs support
net/eipoib: Add Makefile, Kconfig and MAINTAINERS entries
IB/ipoib: Add support for transmission of skbs w.o dst/neighbour
Or Gerlitz (2):
IB/ipoib: Add rtnl_link_ops support
IB/ipoib: Add support for clones / multiple childs on the same partition
Documentation/infiniband/ipoib.txt | 15 +
MAINTAINERS | 6 +
drivers/infiniband/ulp/ipoib/Makefile | 3 +-
drivers/infiniband/ulp/ipoib/ipoib.h | 16 +
drivers/infiniband/ulp/ipoib/ipoib_cm.c | 9 +
drivers/infiniband/ulp/ipoib/ipoib_ib.c | 8 +-
drivers/infiniband/ulp/ipoib/ipoib_main.c | 38 +-
drivers/infiniband/ulp/ipoib/ipoib_netlink.c | 119 ++
drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 89 +-
drivers/net/Kconfig | 15 +
drivers/net/Makefile | 1 +
drivers/net/eipoib/Makefile | 4 +
drivers/net/eipoib/eth_ipoib.h | 215 +++
drivers/net/eipoib/eth_ipoib_ethtool.c | 114 ++
drivers/net/eipoib/eth_ipoib_main.c | 1953 ++++++++++++++++++++++++++
drivers/net/eipoib/eth_ipoib_sysfs.c | 435 ++++++
include/linux/if.h | 2 +
include/linux/if_link.h | 16 +
include/linux/netdevice.h | 5 +-
include/rdma/e_ipoib.h | 54 +
net/core/rtnetlink.c | 42 +-
21 files changed, 3117 insertions(+), 42 deletions(-)
create mode 100644 drivers/infiniband/ulp/ipoib/ipoib_netlink.c
create mode 100644 drivers/net/eipoib/Makefile
create mode 100644 drivers/net/eipoib/eth_ipoib.h
create mode 100644 drivers/net/eipoib/eth_ipoib_ethtool.c
create mode 100644 drivers/net/eipoib/eth_ipoib_main.c
create mode 100644 drivers/net/eipoib/eth_ipoib_sysfs.c
create mode 100644 include/rdma/e_ipoib.h
Cc: Erez Shitrit <erezsh@mellanox.co.il>
^ permalink raw reply
* [PATCH V2 12/12] IB/ipoib: Add support for transmission of skbs w.o dst/neighbour
From: Or Gerlitz @ 2012-08-01 17:09 UTC (permalink / raw)
To: davem; +Cc: roland, netdev, ali, sean.hefty, Erez Shitrit, Or Gerlitz
In-Reply-To: <1343840975-3252-1-git-send-email-ogerlitz@mellanox.com>
From: Erez Shitrit <erezsh@mellanox.co.il>
Guest IP packets sent by eIPoIB over an IPoIB VIF interface do not point
to dst or neighbour. This patch modifies IPoIB such that trasnmission
of such packets is possible. It does so by extending an already existing
path in the driver which was used so far only for unicast ARP probes.
This patch was made such that the series works as is over net-next, in
parallel to this driver a patch to modify IPoIB such that it doesn't
assume dst/neighbour on the skb was pushed upstream, its commit b63b70d87741
"IPoIB: Use a private hash table for path lookup in xmit path", once
present in net-next this patch can simply be dropped.
Signed-off-by: Erez Shitrit <erezsh@mellanox.co.il>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
---
drivers/infiniband/ulp/ipoib/ipoib_main.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 47034b4..fc4a1f0 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -732,7 +732,7 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev)
unsigned long flags;
rcu_read_lock();
- if (likely(skb_dst(skb))) {
+ if (likely(skb_dst(skb)) && !(dev->priv_flags & IFF_EIPOIB_VIF)) {
n = dst_neigh_lookup_skb(skb_dst(skb), skb);
if (!n) {
++dev->stats.tx_dropped;
@@ -800,7 +800,8 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev)
/* unicast GID -- should be ARP or RARP reply */
if ((be16_to_cpup((__be16 *) skb->data) != ETH_P_ARP) &&
- (be16_to_cpup((__be16 *) skb->data) != ETH_P_RARP)) {
+ (be16_to_cpup((__be16 *) skb->data) != ETH_P_RARP) &&
+ !(dev->priv_flags & IFF_EIPOIB_VIF)) {
ipoib_warn(priv, "Unicast, no %s: type %04x, QPN %06x %pI6\n",
skb_dst(skb) ? "neigh" : "dst",
be16_to_cpup((__be16 *) skb->data),
@@ -850,7 +851,7 @@ static int ipoib_hard_header(struct sk_buff *skb,
* destination address into skb->cb so we can figure out where
* to send the packet later.
*/
- if (!skb_dst(skb)) {
+ if (!skb_dst(skb) || dev->priv_flags & IFF_EIPOIB_VIF) {
struct ipoib_cb *cb = (struct ipoib_cb *) skb->cb;
memcpy(cb->hwaddr, daddr, INFINIBAND_ALEN);
}
--
1.7.1
^ permalink raw reply related
* [PATCH V2 09/12] net/eipoib: Add main driver functionality
From: Or Gerlitz @ 2012-08-01 17:09 UTC (permalink / raw)
To: davem; +Cc: roland, netdev, ali, sean.hefty, Erez Shitrit, Or Gerlitz
In-Reply-To: <1343840975-3252-1-git-send-email-ogerlitz@mellanox.com>
From: Erez Shitrit <erezsh@mellanox.co.il>
The eipoib driver provides a standard Ethernet netdevice over
the InfiniBand IPoIB interface .
Some services can run only on top of Ethernet L2 interfaces, and cannot be
bound to an IPoIB interface. With this new driver, these services can run
seamlessly.
Main use case of the driver is the Ethernet Virtual Switching used in
virtualized environments, where an eipoib netdevice can be used as a
Physical Interface (PIF) in the hypervisor domain, and allow other
guests Virtual Interfaces (VIF) connected to the same Virtual Switch
to run over the InfiniBand fabric.
This driver supports L2 Switching (Direct Bridging) as well as other L3
Switching modes (e.g. NAT).
Whenever an IPoIB interface is created, one eIPoIB PIF netdevice
will be created. The default naming scheme is as in other Ethernet
interfaces: ethX, for example, on a system with two IPoIB interfaces,
ib0 and ib1, two interfaces will be created ethX and ethX+1 When "X"
is the next free Ethernet number in the system.
Using "ethtool -i " over the new interface can tell on which IPoIB
PIF interface that interface is above. For example: driver: eth_ipoib:ib0
indicates that eth3 is the Ethernet interface over the ib0 IPoIB interface.
The driver can be used as independent interface or to serve in
virtualization environment as the physical layer for the virtual
interfaces on the virtual guest.
The driver interface (eipoib interface or which is also referred to as parent)
uses slave interfaces, IPoIB clones, which are the VIFs described above.
VIFs interfaces are enslaved/released from the eipoib driver on demand, according
to the management interface provided to user space.
Note: Each ethX interface has at least one ibX.Y slave to serve the PIF
itself, in the VIFs list of ethX you'll notice that ibX.1 is always created
to serve applications running from the Hypervisor on top of ethX interface directly.
For IB applications that require native IPoIB interfaces (e.g. RDMA-CM), the
original ipoib interfaces ibX can still be used. For example, RDMA-CM and
eth_ipoib drivers can co-exist and make use of IPoIB
Support for Live migration:
The driver expose sysfs interface through which the manager can notify on
migrated out guests ("detached VIF"). The abandoned eIPoIB driver instance
sends ARP requests (defined number) to the network in order to triger the migrated
guest to publish its mac address of the new VIF that hosts it. When the guest
responds to that ARP, the eIPoIB driver on the host that owns that guest, sends
Gratuitous ARP in behalf of that guest such that all the peers on the network
which communicate with this VM are noticed on the new VIF address which is
used by the guest.
Signed-off-by: Erez Shitrit <erezsh@mellanox.co.il>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
---
drivers/net/eipoib/eth_ipoib_main.c | 1953 +++++++++++++++++++++++++++++++++++
1 files changed, 1953 insertions(+), 0 deletions(-)
create mode 100644 drivers/net/eipoib/eth_ipoib_main.c
diff --git a/drivers/net/eipoib/eth_ipoib_main.c b/drivers/net/eipoib/eth_ipoib_main.c
new file mode 100644
index 0000000..0a8e7f4
--- /dev/null
+++ b/drivers/net/eipoib/eth_ipoib_main.c
@@ -0,0 +1,1953 @@
+/*
+ * Copyright (c) 2012 Mellanox Technologies. All rights reserved
+ *
+ * This software is available to you under a choice of one of two
+ * licenses. You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * openfabric.org BSD license below:
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include "eth_ipoib.h"
+#include <net/ip.h>
+#include <linux/if_link.h>
+
+#define EMAC_IP_GC_TIME (10 * HZ)
+
+#define MIG_OUT_ARP_REQ_ISSUE_TIME (0.5 * HZ)
+
+#define MIG_OUT_MAX_ARP_RETRIES 5
+
+#define LIVE_MIG_PACKET 1
+
+#define PARENT_MAC_MASK 0xe7
+
+/* forward declaration */
+static rx_handler_result_t eipoib_handle_frame(struct sk_buff **pskb);
+static int eipoib_device_event(struct notifier_block *unused,
+ unsigned long event, void *ptr);
+static void free_ip_mem_in_rec(struct guest_emac_info *emac_info);
+
+static const char * const version =
+ DRV_DESCRIPTION ": v" DRV_VERSION " (" DRV_RELDATE ")\n";
+
+LIST_HEAD(parent_dev_list);
+
+/* name space sys/fs functions */
+int eipoib_net_id __read_mostly;
+
+static int __net_init eipoib_net_init(struct net *net)
+{
+ int rc;
+ struct eipoib_net *eipoib_n = net_generic(net, eipoib_net_id);
+
+ eipoib_n->net = net;
+ rc = mod_create_sysfs(eipoib_n);
+
+ return rc;
+}
+
+static void __net_exit eipoib_net_exit(struct net *net)
+{
+ struct eipoib_net *eipoib_n = net_generic(net, eipoib_net_id);
+
+ mod_destroy_sysfs(eipoib_n);
+}
+
+static struct pernet_operations eipoib_net_ops = {
+ .init = eipoib_net_init,
+ .exit = eipoib_net_exit,
+ .id = &eipoib_net_id,
+ .size = sizeof(struct eipoib_net),
+};
+
+/* set mac fields emac=<qpn><lid> */
+static inline
+void build_neigh_mac(u8 *_mac, u32 _qpn, u16 _lid)
+{
+ /* _qpn: 3B _lid: 2B */
+ *((__be32 *)(_mac)) = cpu_to_be32(_qpn);
+ *(u8 *)(_mac) = 0x2; /* set LG bit */
+ *(__be16 *)(_mac + sizeof(_qpn)) = cpu_to_be16(_lid);
+}
+
+static inline
+struct slave *get_slave_by_dev(struct parent *parent,
+ struct net_device *slave_dev)
+{
+ struct slave *slave, *slave_tmp;
+ int found = 0;
+
+ parent_for_each_slave(parent, slave_tmp) {
+ if (slave_tmp->dev == slave_dev) {
+ found = 1;
+ slave = slave_tmp;
+ break;
+ }
+ }
+
+ return found ? slave : NULL;
+}
+
+static inline
+struct slave *get_slave_by_mac_and_vlan(struct parent *parent, u8 *mac,
+ u16 vlan)
+{
+ struct slave *slave, *slave_tmp;
+ int found = 0;
+
+ parent_for_each_slave(parent, slave_tmp) {
+ if ((!memcmp(slave_tmp->emac, mac, ETH_ALEN)) &&
+ (slave_tmp->vlan == vlan)) {
+ found = 1;
+ slave = slave_tmp;
+ break;
+ }
+ }
+
+ return found ? slave : NULL;
+}
+
+
+static inline
+struct guest_emac_info *get_mac_ip_info_by_mac_and_vlan(struct parent *parent,
+ u8 *mac, u16 vlan)
+{
+ struct guest_emac_info *emac_info, *emac_info_ret;
+ int found = 0;
+
+ list_for_each_entry(emac_info, &parent->emac_ip_list, list) {
+ if ((!memcmp(emac_info->emac, mac, ETH_ALEN)) &&
+ vlan == emac_info->vlan) {
+ found = 1;
+ emac_info_ret = emac_info;
+ break;
+ }
+ }
+
+ return found ? emac_info_ret : NULL;
+}
+
+/*
+ * searches for the relevant guest_emac_info in the parent.
+ * if found it, check if it contains the required ip
+ * if no such guest_emac_info object or no ip return 0,
+ * otherwise return 1 and if exist set the guest_emac_info obj.
+ */
+static inline
+int is_mac_info_contain_ip(struct parent *parent, u8 *mac, __be32 ip,
+ struct guest_emac_info *emac_info, u16 vlan)
+{
+ struct ip_member *ipm;
+ int found = 0;
+
+ emac_info = get_mac_ip_info_by_mac_and_vlan(parent, mac, vlan);
+ if (!emac_info)
+ return 0;
+
+ list_for_each_entry(ipm, &emac_info->ip_list, list) {
+ if (ipm->ip == ip) {
+ found = 1;
+ break;
+ }
+ }
+
+ return found;
+}
+
+static inline int netdev_set_parent_master(struct net_device *slave,
+ struct net_device *master)
+{
+ int err;
+
+ ASSERT_RTNL();
+
+ err = netdev_set_master(slave, master);
+ if (err)
+ return err;
+ if (master) {
+ slave->priv_flags |= IFF_EIPOIB_VIF;
+ /* deny bonding from enslaving it. */;
+ slave->flags |= IFF_SLAVE;
+ } else {
+ slave->priv_flags &= ~(IFF_EIPOIB_VIF);
+ slave->flags &= ~(IFF_SLAVE);
+ }
+
+ return 0;
+}
+
+static inline int is_driver_owner(struct net_device *dev, char *name)
+{
+ struct ethtool_drvinfo drvinfo;
+
+ if (dev->ethtool_ops && dev->ethtool_ops->get_drvinfo) {
+ memset(&drvinfo, 0, sizeof(drvinfo));
+ dev->ethtool_ops->get_drvinfo(dev, &drvinfo);
+ if (!strstr(drvinfo.driver, name))
+ return 0;
+ } else
+ return 0;
+
+ return 1;
+}
+
+static inline int is_parent(struct net_device *dev)
+{
+ return (dev->priv_flags & IFF_EIPOIB_PIF) &&
+ is_driver_owner(dev, DRV_NAME);
+}
+
+static inline int is_parent_mac(struct net_device *dev, u8 *mac)
+{
+ return is_parent(dev) && !memcmp(mac, dev->dev_addr, dev->addr_len);
+}
+
+static inline int __is_slave(struct net_device *dev)
+{
+ return dev->master && is_parent(dev->master);
+}
+
+static inline int is_slave(struct net_device *dev)
+{
+ return (dev->priv_flags & IFF_EIPOIB_VIF) &&
+ is_driver_owner(dev, SDRV_NAME) && __is_slave(dev);
+}
+
+/*
+ * ------------------------------- Link status ------------------
+ * set parent carrier:
+ * link is up if at least one slave has link up
+ * otherwise, bring link down
+ * return 1 if parent carrier changed, zero otherwise
+ */
+static int parent_set_carrier(struct parent *parent)
+{
+ struct slave *slave;
+
+ if (parent->slave_cnt == 0)
+ goto down;
+
+ /* bring parent link up if one slave (at least) is up */
+ parent_for_each_slave(parent, slave) {
+ if (netif_carrier_ok(slave->dev)) {
+ if (!netif_carrier_ok(parent->dev)) {
+ netif_carrier_on(parent->dev);
+ return 1;
+ }
+ return 0;
+ }
+ }
+
+down:
+ if (netif_carrier_ok(parent->dev)) {
+ pr_info("bring down carrier\n");
+ netif_carrier_off(parent->dev);
+ return 1;
+ }
+ return 0;
+}
+
+static int parent_set_mtu(struct parent *parent)
+{
+ struct slave *slave, *f_slave;
+ unsigned int mtu;
+
+ if (parent->slave_cnt == 0)
+ return 0;
+
+ /* find min mtu */
+ f_slave = list_first_entry(&parent->slave_list, struct slave, list);
+ mtu = f_slave->dev->mtu;
+
+ parent_for_each_slave(parent, slave)
+ mtu = min(slave->dev->mtu, mtu);
+
+ if (parent->dev->mtu != mtu) {
+ dev_set_mtu(parent->dev, mtu);
+ return 1;
+ }
+
+ return 0;
+}
+
+/*
+ *--------------------------- slave list handling ------
+ *
+ * This function attaches the slave to the end of list.
+ * pay attention, the caller should held paren->lock
+ */
+static void parent_attach_slave(struct parent *parent,
+ struct slave *new_slave)
+{
+ list_add_tail(&new_slave->list, &parent->slave_list);
+ parent->slave_cnt++;
+}
+
+static void parent_detach_slave(struct parent *parent, struct slave *slave)
+{
+ list_del(&slave->list);
+ parent->slave_cnt--;
+}
+
+static netdev_features_t parent_fix_features(struct net_device *dev,
+ netdev_features_t features)
+{
+ struct slave *slave;
+ struct parent *parent = netdev_priv(dev);
+ netdev_features_t mask;
+
+ read_lock_bh(&parent->lock);
+
+ mask = features;
+ features &= ~NETIF_F_ONE_FOR_ALL;
+ features |= NETIF_F_ALL_FOR_ALL;
+
+ parent_for_each_slave(parent, slave)
+ features = netdev_increment_features(features,
+ slave->dev->features,
+ mask);
+
+ features &= ~NETIF_F_VLAN_CHALLENGED;
+ read_unlock_bh(&parent->lock);
+ return features;
+}
+
+static int parent_compute_features(struct parent *parent)
+{
+ struct net_device *parent_dev = parent->dev;
+ u64 hw_features, features;
+ struct slave *slave;
+
+ if (list_empty(&parent->slave_list))
+ goto done;
+
+ /* starts with the max set of features mask */
+ hw_features = features = ~0LL;
+
+ /* gets the common features from all slaves */
+ parent_for_each_slave(parent, slave) {
+ features &= slave->dev->features;
+ hw_features &= slave->dev->hw_features;
+ }
+
+ features = features | PARENT_VLAN_FEATURES;
+ hw_features = hw_features | PARENT_VLAN_FEATURES;
+
+ hw_features &= ~NETIF_F_VLAN_CHALLENGED;
+ features &= hw_features;
+
+ parent_dev->hw_features = hw_features;
+ parent_dev->features = features;
+ parent_dev->vlan_features = parent_dev->features & ~PARENT_VLAN_FEATURES;
+done:
+ pr_info("%s: %s: Features: 0x%llx\n",
+ __func__, parent_dev->name, parent_dev->features);
+
+ return 0;
+}
+
+static inline u16 slave_get_pkey(struct net_device *dev)
+{
+ u16 pkey = (dev->broadcast[8] << 8) + dev->broadcast[9];
+
+ return pkey;
+}
+
+static void parent_setup_by_slave(struct net_device *parent_dev,
+ struct net_device *slave_dev)
+{
+ struct parent *parent = netdev_priv(parent_dev);
+ const struct net_device_ops *slave_ops = slave_dev->netdev_ops;
+
+ parent_dev->mtu = slave_dev->mtu;
+ parent_dev->hard_header_len = slave_dev->hard_header_len;
+
+ slave_ops->ndo_neigh_setup(slave_dev, &parent->nparms);
+
+}
+
+/* enslave device <slave> to parent device <master> */
+int parent_enslave(struct net_device *parent_dev, struct net_device *slave_dev)
+{
+ struct parent *parent = netdev_priv(parent_dev);
+ struct slave *new_slave = NULL;
+ int old_features = parent_dev->features;
+ int res = 0;
+ /* slave must be claimed by ipoib */
+ if (!is_driver_owner(slave_dev, SDRV_NAME))
+ return -EOPNOTSUPP;
+
+ /* parent must be initialized by parent_open() before enslaving */
+ if (!(parent_dev->flags & IFF_UP)) {
+ pr_warn("%s parent is not up in "
+ "parent_enslave\n",
+ parent_dev->name);
+ return -EPERM;
+ }
+
+ /* already enslaved */
+ if ((slave_dev->flags & IFF_SLAVE) ||
+ (slave_dev->priv_flags & IFF_EIPOIB_VIF)) {
+ pr_err("%s was already enslaved!!!\n", slave_dev->name);
+ return -EBUSY;
+ }
+
+ /* mark it as ipoib clone vif */
+ slave_dev->priv_flags |= IFF_EIPOIB_VIF;
+
+ /* set parent netdev attributes */
+ if (parent->slave_cnt == 0)
+ parent_setup_by_slave(parent_dev, slave_dev);
+ else {
+ /* check netdev attr match */
+ if (slave_dev->hard_header_len != parent_dev->hard_header_len) {
+ pr_err("%s slave %s has different HDR len %d != %d\n",
+ parent_dev->name, slave_dev->name,
+ slave_dev->hard_header_len,
+ parent_dev->hard_header_len);
+ res = -EINVAL;
+ goto err_undo_flags;
+ }
+
+ if (slave_dev->type != ARPHRD_INFINIBAND ||
+ slave_dev->addr_len != INFINIBAND_ALEN) {
+ pr_err("%s slave type/addr_len is invalid (%d/%d)\n",
+ parent_dev->name, slave_dev->type,
+ slave_dev->addr_len);
+ res = -EINVAL;
+ goto err_undo_flags;
+ }
+ }
+ /*
+ * verfiy that this (slave) device belongs to the relevant PIF
+ * abort if the name of the slave is not as the regular way in ipoib
+ */
+ if (!strstr(slave_dev->name, parent->ipoib_main_interface)) {
+ pr_err("%s slave name (%s) doesn't contain parent name (%s) ",
+ parent_dev->name, slave_dev->name,
+ parent->ipoib_main_interface);
+ res = -EINVAL;
+ goto err_undo_flags;
+ }
+
+ new_slave = kzalloc(sizeof(struct slave), GFP_KERNEL);
+ if (!new_slave) {
+ res = -ENOMEM;
+ goto err_undo_flags;
+ }
+
+ INIT_LIST_HEAD(&new_slave->neigh_list);
+
+ /* save slave's vlan */
+ new_slave->pkey = slave_get_pkey(slave_dev);
+
+ res = netdev_set_parent_master(slave_dev, parent_dev);
+ if (res) {
+ pr_err("%s %d calling netdev_set_master\n",
+ slave_dev->name, res);
+ goto err_free;
+ }
+
+ res = dev_open(slave_dev);
+ if (res) {
+ pr_info("open failed %s\n",
+ slave_dev->name);
+ goto err_unset_master;
+ }
+
+ new_slave->dev = slave_dev;
+
+ write_lock_bh(&parent->lock);
+
+ parent_attach_slave(parent, new_slave);
+
+ parent_compute_features(parent);
+
+ write_unlock_bh(&parent->lock);
+
+ read_lock_bh(&parent->lock);
+
+ parent_set_carrier(parent);
+
+ read_unlock_bh(&parent->lock);
+
+ res = create_slave_symlinks(parent_dev, slave_dev);
+ if (res)
+ goto err_close;
+
+ /* register handler */
+ res = netdev_rx_handler_register(slave_dev, eipoib_handle_frame,
+ new_slave);
+ if (res) {
+ pr_warn("%s %d calling netdev_rx_handler_register\n",
+ parent_dev->name, res);
+ goto err_close;
+ }
+
+ pr_info("%s: enslaving %s\n", parent_dev->name, slave_dev->name);
+
+ /* enslave is successful */
+ return 0;
+
+/* Undo stages on error */
+err_close:
+ dev_close(slave_dev);
+
+err_unset_master:
+ netdev_set_parent_master(slave_dev, NULL);
+
+err_free:
+ kfree(new_slave);
+
+err_undo_flags:
+ parent_dev->features = old_features;
+
+ return res;
+}
+
+static void slave_free(struct parent *parent, struct slave *slave)
+{
+ struct neigh *neigh, *neigh_tmp;
+
+ list_for_each_entry_safe(neigh, neigh_tmp, &slave->neigh_list, list) {
+ list_del(&neigh->list);
+ kfree(neigh);
+ }
+
+ netdev_rx_handler_unregister(slave->dev);
+
+ kfree(slave);
+}
+
+int parent_release_slave(struct net_device *parent_dev,
+ struct net_device *slave_dev)
+{
+ struct parent *parent = netdev_priv(parent_dev);
+ struct slave *slave;
+ struct guest_emac_info *emac_info;
+
+ /* slave is not a slave or master is not master of this slave */
+ if (!(slave_dev->flags & IFF_SLAVE) ||
+ (slave_dev->master != parent_dev)) {
+ pr_err("%s cannot release %s.\n",
+ parent_dev->name, slave_dev->name);
+ return -EINVAL;
+ }
+
+ write_lock_bh(&parent->lock);
+
+ slave = get_slave_by_dev(parent, slave_dev);
+ if (!slave) {
+ /* not a slave of this parent */
+ pr_warn("%s not enslaved %s\n",
+ parent_dev->name, slave_dev->name);
+ write_unlock_bh(&parent->lock);
+ return -EINVAL;
+ }
+
+ pr_info("%s: releasing interface %s\n", parent_dev->name,
+ slave_dev->name);
+
+ /* for live migration, mark its mac_ip record as invalid */
+ emac_info = get_mac_ip_info_by_mac_and_vlan(parent, slave->emac, slave->vlan);
+ if (!emac_info)
+ pr_warn("%s %s didn't find emac: %pM\n",
+ parent_dev->name, slave_dev->name, slave->emac);
+ else {
+ emac_info->rec_state = MIGRATED_OUT;
+ /* start GC work */
+ pr_info("%s: sending clean task for slave mac: %pM\n",
+ __func__, slave->emac);
+ queue_delayed_work(parent->wq, &parent->migrate_out_work, 0);
+ queue_delayed_work(parent->wq, &parent->emac_ip_work,
+ EMAC_IP_GC_TIME);
+ }
+
+ /* release the slave from its parent */
+ parent_detach_slave(parent, slave);
+
+ parent_compute_features(parent);
+
+ if (parent->slave_cnt == 0)
+ parent_set_carrier(parent);
+
+ write_unlock_bh(&parent->lock);
+
+ /* must do this from outside any spinlocks */
+ destroy_slave_symlinks(parent_dev, slave_dev);
+
+ netdev_set_parent_master(slave_dev, NULL);
+
+ dev_close(slave_dev);
+
+ slave_free(parent, slave);
+
+ return 0; /* deletion OK */
+}
+
+static int parent_release_all(struct net_device *parent_dev)
+{
+ struct parent *parent = netdev_priv(parent_dev);
+ struct slave *slave, *slave_tmp;
+ struct net_device *slave_dev;
+ struct neigh *neigh_cmd, *neigh_cmd_tmp;
+ struct guest_emac_info *emac_info, *emac_info_tmp;
+ struct slave;
+
+ write_lock_bh(&parent->lock);
+
+ netif_carrier_off(parent_dev);
+
+ if (parent->slave_cnt == 0)
+ goto out;
+
+ list_for_each_entry_safe(slave, slave_tmp, &parent->slave_list, list) {
+ slave_dev = slave->dev;
+
+ /* remove slave from parent's slave-list */
+ parent_detach_slave(parent, slave);
+
+ parent_compute_features(parent);
+
+ write_unlock_bh(&parent->lock);
+
+ destroy_slave_symlinks(parent_dev, slave_dev);
+
+ netdev_set_parent_master(slave_dev, NULL);
+
+ dev_close(slave_dev);
+
+ slave_free(parent, slave);
+
+ write_lock_bh(&parent->lock);
+ }
+
+ list_for_each_entry_safe(neigh_cmd, neigh_cmd_tmp,
+ &parent->neigh_add_list, list) {
+ list_del(&neigh_cmd->list);
+ kfree(neigh_cmd);
+ }
+
+ list_for_each_entry_safe(emac_info, emac_info_tmp,
+ &parent->emac_ip_list, list) {
+ free_ip_mem_in_rec(emac_info);
+ list_del(&emac_info->list);
+ kfree(emac_info);
+ }
+
+ pr_info("%s: released all slaves\n", parent_dev->name);
+
+out:
+ write_unlock_bh(&parent->lock);
+
+ return 0;
+}
+
+/* -------------------------- Device entry points --------------------------- */
+static struct rtnl_link_stats64 *parent_get_stats(struct net_device *parent_dev,
+ struct rtnl_link_stats64 *stats)
+{
+ struct parent *parent = netdev_priv(parent_dev);
+ struct slave *slave;
+ struct rtnl_link_stats64 temp;
+
+ memset(stats, 0, sizeof(*stats));
+
+ read_lock_bh(&parent->lock);
+
+ parent_for_each_slave(parent, slave) {
+ const struct rtnl_link_stats64 *sstats =
+ dev_get_stats(slave->dev, &temp);
+
+ stats->rx_packets += sstats->rx_packets;
+ stats->rx_bytes += sstats->rx_bytes;
+ stats->rx_errors += sstats->rx_errors;
+ stats->rx_dropped += sstats->rx_dropped;
+
+ stats->tx_packets += sstats->tx_packets;
+ stats->tx_bytes += sstats->tx_bytes;
+ stats->tx_errors += sstats->tx_errors;
+ stats->tx_dropped += sstats->tx_dropped;
+
+ stats->multicast += sstats->multicast;
+ stats->collisions += sstats->collisions;
+
+ stats->rx_length_errors += sstats->rx_length_errors;
+ stats->rx_over_errors += sstats->rx_over_errors;
+ stats->rx_crc_errors += sstats->rx_crc_errors;
+ stats->rx_frame_errors += sstats->rx_frame_errors;
+ stats->rx_fifo_errors += sstats->rx_fifo_errors;
+ stats->rx_missed_errors += sstats->rx_missed_errors;
+
+ stats->tx_aborted_errors += sstats->tx_aborted_errors;
+ stats->tx_carrier_errors += sstats->tx_carrier_errors;
+ stats->tx_fifo_errors += sstats->tx_fifo_errors;
+ stats->tx_heartbeat_errors += sstats->tx_heartbeat_errors;
+ stats->tx_window_errors += sstats->tx_window_errors;
+ }
+
+ read_unlock_bh(&parent->lock);
+
+ return stats;
+}
+
+/* ---------------------------- Main funcs ---------------------------------- */
+static struct neigh *neigh_cmd_find_by_mac(struct slave *slave, u8 *mac)
+{
+ struct net_device *dev = slave->dev;
+ struct net_device *parent_dev = dev->master;
+ struct parent *parent = netdev_priv(parent_dev);
+ struct neigh *neigh;
+ int found = 0;
+
+ list_for_each_entry(neigh, &parent->neigh_add_list, list) {
+ if (!memcmp(neigh->emac, mac, ETH_ALEN)) {
+ found = 1;
+ break;
+ }
+ }
+
+ return found ? neigh : NULL;
+}
+
+static struct neigh *neigh_find_by_mac(struct slave *slave, u8 *mac)
+{
+ struct neigh *neigh;
+ int found = 0;
+
+ list_for_each_entry(neigh, &slave->neigh_list, list) {
+ if (!memcmp(neigh->emac, mac, ETH_ALEN)) {
+ found = 1;
+ break;
+ }
+ }
+
+ return found ? neigh : NULL;
+}
+
+static int neigh_learn(struct slave *slave, struct sk_buff *skb, u8 *remac)
+{
+ struct net_device *dev = slave->dev;
+ struct net_device *parent_dev = dev->master;
+ struct parent *parent = netdev_priv(parent_dev);
+ struct neigh *neigh_cmd;
+ u8 *rimac;
+ int rc;
+
+ /* linearize to easy on reading the arp payload */
+ rc = skb_linearize(skb);
+ if (rc) {
+ pr_err("%s: skb_linearize failed rc %d\n", dev->name, rc);
+ goto out;
+ } else
+ rimac = skb->data + sizeof(struct arphdr);
+
+ /* check if entry is being processed or already exists */
+ if (neigh_find_by_mac(slave, remac))
+ goto out;
+
+ if (neigh_cmd_find_by_mac(slave, remac))
+ goto out;
+
+ neigh_cmd = parent_get_neigh_cmd('+', slave->dev->name, remac, rimac);
+ if (!neigh_cmd) {
+ pr_err("%s cannot build neigh cmd\n", slave->dev->name);
+ rc = -ENOMEM;
+ goto out;
+ }
+
+ list_add_tail(&neigh_cmd->list, &parent->neigh_add_list);
+
+ /* calls neigh_learn_task() */
+ queue_delayed_work(parent->wq, &parent->neigh_learn_work, 0);
+
+out:
+ return rc;
+}
+
+static void neigh_learn_task(struct work_struct *work)
+{
+ struct parent *parent = container_of(work, struct parent,
+ neigh_learn_work.work);
+ struct neigh *neigh_cmd, *neigh_cmd_tmp;
+
+ write_lock_bh(&parent->lock);
+
+ if (parent->kill_timers)
+ goto out;
+
+ list_for_each_entry_safe(neigh_cmd, neigh_cmd_tmp,
+ &parent->neigh_add_list, list) {
+ __parent_store_neighs(&parent->dev->dev, NULL,
+ neigh_cmd->cmd, PAGE_SIZE);
+ list_del(&neigh_cmd->list);
+ kfree(neigh_cmd);
+ }
+
+out:
+ write_unlock_bh(&parent->lock);
+ return;
+}
+
+static void parent_work_cancel_all(struct parent *parent)
+{
+ write_lock_bh(&parent->lock);
+ parent->kill_timers = 1;
+ write_unlock_bh(&parent->lock);
+
+ if (delayed_work_pending(&parent->neigh_learn_work))
+ cancel_delayed_work(&parent->neigh_learn_work);
+
+ if (delayed_work_pending(&parent->emac_ip_work))
+ cancel_delayed_work(&parent->emac_ip_work);
+
+ if (delayed_work_pending(&parent->migrate_out_work))
+ cancel_delayed_work(&parent->migrate_out_work);
+}
+
+static struct parent *get_parent_by_pif_name(char *pif_name)
+{
+ struct parent *parent, *nxt;
+
+ list_for_each_entry_safe(parent, nxt, &parent_dev_list, parent_list) {
+ if (!strcmp(parent->ipoib_main_interface, pif_name))
+ return parent;
+ }
+ return NULL;
+}
+
+static void free_ip_mem_in_rec(struct guest_emac_info *emac_info)
+{
+ struct ip_member *ipm, *tmp_ipm;
+ list_for_each_entry_safe(ipm, tmp_ipm, &emac_info->ip_list, list) {
+ list_del(&ipm->list);
+ kfree(ipm);
+ }
+}
+
+static inline void free_invalid_emac_ip_det(struct parent *parent)
+{
+ struct guest_emac_info *emac_info, *emac_info_tmp;
+
+ list_for_each_entry_safe(emac_info, emac_info_tmp,
+ &parent->emac_ip_list, list) {
+ if (emac_info->rec_state == INVALID) {
+ free_ip_mem_in_rec(emac_info);
+ list_del(&emac_info->list);
+ kfree(emac_info);
+ }
+ }
+}
+
+static void emac_info_clean_task(struct work_struct *work)
+{
+ struct parent *parent = container_of(work, struct parent,
+ emac_ip_work.work);
+
+ write_lock_bh(&parent->lock);
+
+ if (parent->kill_timers)
+ goto out;
+
+ free_invalid_emac_ip_det(parent);
+
+out:
+ write_unlock_bh(&parent->lock);
+ return;
+}
+
+static int migrate_out_gen_arp_req(struct parent *parent, u8 *emac,
+ u16 vlan)
+{
+ struct guest_emac_info *emac_info;
+ struct ip_member *ipm;
+ struct slave *slave;
+ struct sk_buff *nskb;
+ int ret = 0;
+
+ slave = get_slave_by_mac_and_vlan(parent, parent->dev->dev_addr, vlan);
+ if (unlikely(!slave)) {
+ pr_info("%s: Failed to find parent slave !!! %pM\n",
+ __func__, parent->dev->dev_addr);
+ return -ENODEV;
+ }
+
+ emac_info = get_mac_ip_info_by_mac_and_vlan(parent, emac, vlan);
+
+ if (!emac_info)
+ return 0;
+
+ /* go over all ip's attached to that mac */
+ list_for_each_entry(ipm, &emac_info->ip_list, list) {
+ /* create and send arp request to that ip.*/
+ pr_info("%s: Sending arp For migrate_out event, to %pI4 "
+ "from 0.0.0.0\n", parent->dev->name, &(ipm->ip));
+
+ nskb = arp_create(ARPOP_REQUEST,
+ ETH_P_ARP,
+ ipm->ip,
+ slave->dev,
+ 0,
+ slave->dev->broadcast,
+ slave->dev->broadcast,
+ slave->dev->broadcast);
+ if (nskb)
+ arp_xmit(nskb);
+ else {
+ pr_err("%s: %s failed creating skb\n",
+ __func__, slave->dev->name);
+ ret = -ENOMEM;
+ }
+ }
+ return ret;
+}
+
+static void migrate_out_work_task(struct work_struct *work)
+{
+ struct parent *parent = container_of(work, struct parent,
+ migrate_out_work.work);
+ struct guest_emac_info *emac_info;
+ int is_reschedule = 0;
+ int ret;
+
+ write_lock_bh(&parent->lock);
+
+ if (parent->kill_timers)
+ goto out;
+
+ list_for_each_entry(emac_info, &parent->emac_ip_list, list) {
+ if (emac_info->rec_state == MIGRATED_OUT) {
+ if (emac_info->num_of_retries <
+ MIG_OUT_MAX_ARP_RETRIES) {
+ ret = migrate_out_gen_arp_req(parent, emac_info->emac,
+ emac_info->vlan);
+ if (ret)
+ pr_err("%s: migrate_out_gen_arp failed: %d\n",
+ __func__, ret);
+
+ emac_info->num_of_retries =
+ emac_info->num_of_retries + 1;
+ is_reschedule = 1;
+ } else
+ emac_info->rec_state = INVALID;
+ }
+ }
+ /* issue arp request till the device removed that entry from list */
+ if (is_reschedule)
+ queue_delayed_work(parent->wq, &parent->migrate_out_work,
+ MIG_OUT_ARP_REQ_ISSUE_TIME);
+out:
+ write_unlock_bh(&parent->lock);
+ return;
+}
+
+static inline int add_emac_ip_info(struct net_device *slave_dev, __be32 ip,
+ u8 *mac, u16 vlan)
+{
+ struct net_device *parent_dev = slave_dev->master;
+ struct parent *parent = netdev_priv(parent_dev);
+ struct guest_emac_info *emac_info = NULL;
+ struct ip_member *ipm;
+ int ret;
+ int is_just_alloc_emac_info = 0;
+
+ ret = is_mac_info_contain_ip(parent, mac, ip, emac_info, vlan);
+ if (ret)
+ return 0;
+
+ /* new ip add it to the emc_ip obj */
+ if (!emac_info) {
+ emac_info = kzalloc(sizeof *emac_info, GFP_ATOMIC);
+ if (!emac_info) {
+ pr_err("%s: Failed allocating emac_info\n",
+ parent_dev->name);
+ return -ENOMEM;
+ }
+ memcpy(emac_info->emac, mac, ETH_ALEN);
+ INIT_LIST_HEAD(&emac_info->ip_list);
+ emac_info->rec_state = VALID;
+ emac_info->vlan = vlan;
+ emac_info->num_of_retries = 0;
+ list_add_tail(&emac_info->list, &parent->emac_ip_list);
+ is_just_alloc_emac_info = 1;
+ }
+
+ ipm = kzalloc(sizeof *ipm, GFP_ATOMIC);
+ if (!ipm) {
+ pr_err(" %s Failed allocating emac_info (ipm)\n",
+ parent_dev->name);
+ if (is_just_alloc_emac_info)
+ kfree(emac_info);
+ return -ENOMEM;
+ }
+
+ ipm->ip = ip;
+ list_add_tail(&ipm->list, &emac_info->ip_list);
+
+ return 0;
+}
+
+/* build ipoib arp/rarp request/reply packet */
+static struct sk_buff *get_slave_skb_arp(struct slave *slave,
+ struct sk_buff *skb,
+ u8 *rimac, int *ret)
+{
+ struct sk_buff *nskb;
+ struct arphdr *arphdr = (struct arphdr *)
+ (skb->data + sizeof(struct ethhdr));
+ struct eth_arp_data *arp_data = (struct eth_arp_data *)
+ (skb->data + sizeof(struct ethhdr) +
+ sizeof(struct arphdr));
+ u8 t_addr[ETH_ALEN] = {0};
+ int err = 0;
+ /* mark regular packet handling */
+ *ret = 0;
+
+ /*
+ * live-migration support: keeps the new mac/ip address:
+ * In that way each driver knows which mac/vlan - IP's where on the
+ * guests above, whenever migrate_out event comes it will send
+ * arp request for all these IP's.
+ */
+ if (skb->protocol == htons(ETH_P_ARP))
+ err = add_emac_ip_info(slave->dev, arp_data->arp_sip,
+ arp_data->arp_sha, slave->vlan);
+ if (err)
+ pr_warn("%s: Failed creating: emac_ip_info for ip: %pI4",
+ __func__, &arp_data->arp_sip);
+ /*
+ * live migration support:
+ * 1.checck if we are in live migration process
+ * 2.check if the arp response is for the parent
+ * 3.ignore local-administrated bit, which was set to make sure
+ * that the bridge will not drop it.
+ */
+ arp_data->arp_dha[0] = arp_data->arp_dha[0] & 0xFD;
+ if (htons(ARPOP_REPLY) == (arphdr->ar_op) &&
+ !memcmp(arp_data->arp_dha, slave->dev->master->dev_addr, ETH_ALEN)) {
+ /*
+ * when the source is the parent interface, assumes
+ * that we are in the middle of live migration process,
+ * so, we will send gratuitous arp.
+ */
+ pr_info("%s: Arp packet for parent: %s",
+ __func__, slave->dev->master->name);
+ /* create gratuitous ARP on behalf of the guest */
+ nskb = arp_create(ARPOP_REQUEST,
+ be16_to_cpu(skb->protocol),
+ arp_data->arp_sip,
+ slave->dev,
+ arp_data->arp_sip,
+ NULL,
+ slave->dev->dev_addr,
+ t_addr);
+ if (unlikely(!nskb))
+ pr_err("%s: %s live migration: failed creating skb\n",
+ __func__, slave->dev->name);
+ } else {
+ nskb = arp_create(be16_to_cpu(arphdr->ar_op),
+ be16_to_cpu(skb->protocol),
+ arp_data->arp_dip,
+ slave->dev,
+ arp_data->arp_sip,
+ rimac,
+ slave->dev->dev_addr,
+ NULL);
+ }
+
+ return nskb;
+}
+
+/*
+ * build ipoib arp request packet according to ip header.
+ * uses for live-migration, or missing neigh for new vif.
+ */
+static void get_slave_skb_arp_by_ip(struct slave *slave,
+ struct sk_buff *skb)
+{
+ struct sk_buff *nskb = NULL;
+ struct iphdr *iph = ip_hdr(skb);
+
+ pr_info("Sending arp on behalf of slave %s, from %pI4"
+ " to %pI4" , slave->dev->name, &(iph->saddr),
+ &(iph->daddr));
+
+ nskb = arp_create(ARPOP_REQUEST,
+ ETH_P_ARP,
+ iph->daddr,
+ slave->dev,
+ iph->saddr,
+ slave->dev->broadcast,
+ slave->dev->dev_addr,
+ NULL);
+ if (nskb)
+ arp_xmit(nskb);
+ else
+ pr_err("%s: %s failed creating skb\n",
+ __func__, slave->dev->name);
+}
+
+/* build ipoib ipv4/ipv6 packet */
+static struct sk_buff *get_slave_skb_ip(struct slave *slave,
+ struct sk_buff *skb)
+{
+
+ skb_pull(skb, ETH_HLEN);
+ skb_reset_network_header(skb);
+
+ return skb;
+}
+
+/*
+ * get_slave_skb -- called in TX flow
+ * get skb that can be sent thru slave xmit func,
+ * if skb was adjusted (cloned, pulled, etc..) successfully
+ * the old skb (if any) is freed here.
+ */
+static struct sk_buff *get_slave_skb(struct slave *slave, struct sk_buff *skb)
+{
+ struct net_device *dev = slave->dev;
+ struct net_device *parent_dev = dev->master;
+ struct parent *parent = netdev_priv(parent_dev);
+ struct sk_buff *nskb = NULL;
+ struct ethhdr *ethh = (struct ethhdr *)(skb->data);
+ struct neigh *neigh = NULL;
+ u8 rimac[INFINIBAND_ALEN];
+ int ret = 0;
+
+ /* set neigh mac */
+ if (is_multicast_ether_addr(ethh->h_dest)) {
+ memcpy(rimac, dev->broadcast, INFINIBAND_ALEN);
+ } else {
+ neigh = neigh_find_by_mac(slave, ethh->h_dest);
+ if (neigh) {
+ memcpy(rimac, neigh->imac, INFINIBAND_ALEN);
+ } else {
+ ++parent->port_stats.tx_neigh_miss;
+ /*
+ * assume VIF migration, tries to get the neigh by
+ * issue arp request on behalf of the vif.
+ */
+ if (skb->protocol == htons(ETH_P_IP)) {
+ pr_info("Missed neigh for slave: %s,"
+ "issue ARP request\n",
+ slave->dev->name);
+ get_slave_skb_arp_by_ip(slave, skb);
+ goto out_arp_sent_instead;
+ }
+ }
+ }
+
+ if (skb->protocol == htons(ETH_P_ARP) ||
+ skb->protocol == htons(ETH_P_RARP)) {
+ nskb = get_slave_skb_arp(slave, skb, rimac, &ret);
+ if (!nskb && LIVE_MIG_PACKET == ret) {
+ pr_info("%s: live migration packets\n", __func__);
+ goto err;
+ }
+ } else {
+ if (!neigh)
+ goto err;
+ /* pull ethernet header here */
+ nskb = get_slave_skb_ip(slave, skb);
+ }
+
+ /* if new skb could not be adjusted/allocated, abort */
+ if (!nskb) {
+ pr_err("%s get_slave_skb_ip/arp failed 0x%x\n",
+ dev->name, skb->protocol);
+ goto err;
+ }
+
+ if (neigh && nskb == skb) { /* ucast & non-arp/rarp */
+ /* dev_hard_header only for ucast, for arp done already.*/
+ if (dev_hard_header(nskb, dev, ntohs(skb->protocol), rimac,
+ dev->dev_addr, nskb->len) < 0) {
+ pr_warn("%s: dev_hard_header failed\n",
+ dev->name);
+ goto err;
+ }
+ }
+
+ /*
+ * new skb is ready to be sent, clean old skb if we hold a clone
+ * (old skb is not shared, already checked that.)
+ */
+ if ((nskb != skb))
+ dev_kfree_skb(skb);
+
+ nskb->dev = slave->dev;
+ return nskb;
+
+out_arp_sent_instead:/* whenever sent arp instead of ip packet */
+err:
+ /* got error after nskb was adjusted/allocated */
+ if (nskb && (nskb != skb))
+ dev_kfree_skb(nskb);
+
+ return NULL;
+}
+
+static struct sk_buff *get_parent_skb_arp(struct slave *slave,
+ struct sk_buff *skb,
+ u8 *remac)
+{
+ struct net_device *dev = slave->dev->master;
+ struct sk_buff *nskb;
+ struct arphdr *arphdr = (struct arphdr *)(skb->data);
+ struct ipoib_arp_data *arp_data = (struct ipoib_arp_data *)
+ (skb->data + sizeof(struct arphdr));
+ u8 *target_hw = slave->emac;
+ u8 *dst_hw = slave->emac;
+ u8 local_eth_addr[ETH_ALEN];
+
+ /* live migration: gets arp with broadcast src and dst */
+ if (!memcmp(arp_data->arp_sha, slave->dev->broadcast, INFINIBAND_ALEN) &&
+ !memcmp(arp_data->arp_dha, slave->dev->broadcast, INFINIBAND_ALEN)) {
+ pr_info("%s: ARP with bcast src and dest send from src_hw: %pM\n",
+ __func__, slave->dev->master->dev_addr);
+ /* replace the src with the parent src: */
+ memcpy(local_eth_addr, slave->dev->master->dev_addr, ETH_ALEN);
+ /*
+ * set local administrated bit,
+ * that way the bridge will not throws it
+ */
+ local_eth_addr[0] = local_eth_addr[0] | 0x2;
+ memcpy(remac, local_eth_addr, ETH_ALEN);
+ target_hw = NULL;
+ dst_hw = NULL;
+ }
+
+ nskb = arp_create(be16_to_cpu(arphdr->ar_op),
+ be16_to_cpu(skb->protocol),
+ arp_data->arp_dip,
+ dev,
+ arp_data->arp_sip,
+ dst_hw,
+ remac,
+ target_hw);
+
+ /* prepare place for the headers. */
+ if (nskb)
+ skb_reserve(nskb, ETH_HLEN);
+
+ return nskb;
+}
+
+static struct sk_buff *get_parent_skb_ip(struct slave *slave,
+ struct sk_buff *skb)
+{
+ /* nop */
+ return skb;
+}
+
+/* get_parent_skb -- called in RX flow */
+static struct sk_buff *get_parent_skb(struct slave *slave,
+ struct sk_buff *skb, u8 *remac)
+{
+ struct net_device *dev = slave->dev->master;
+ struct sk_buff *nskb = NULL;
+ struct ethhdr *ethh;
+
+ if (skb->protocol == htons(ETH_P_ARP) ||
+ skb->protocol == htons(ETH_P_RARP))
+ nskb = get_parent_skb_arp(slave, skb, remac);
+ else
+ nskb = get_parent_skb_ip(slave, skb);
+
+ /* if new skb could not be adjusted/allocated, abort */
+ if (!nskb)
+ goto err;
+
+ /* at this point, we can free old skb if it was cloned */
+ if (nskb && (nskb != skb))
+ dev_kfree_skb(skb);
+
+ skb = nskb;
+
+ /* build ethernet header */
+ ethh = (struct ethhdr *)skb_push(skb, ETH_HLEN);
+ ethh->h_proto = skb->protocol;
+ memcpy(ethh->h_source, remac, ETH_ALEN);
+ memcpy(ethh->h_dest, slave->emac, ETH_ALEN);
+
+ /* zero padding whenever is needed (arp for example).to ETH_ZLEN size */
+ if (unlikely((skb->len < ETH_ZLEN))) {
+ if ((skb->tail + (ETH_ZLEN - skb->len) > skb->end) ||
+ skb_is_nonlinear(skb))
+ /* nothing */;
+ else
+ memset(skb_put(skb, ETH_ZLEN - skb->len), 0,
+ ETH_ZLEN - skb->len);
+ }
+
+ /* set new skb fields */
+ skb->pkt_type = PACKET_HOST;
+ /*
+ * use master dev, to allow netpoll_receive_skb()
+ * in netif_receive_skb()
+ */
+ skb->dev = dev;
+
+ /* pull the Ethernet header and update other fields */
+ skb->protocol = eth_type_trans(skb, skb->dev);
+
+ return skb;
+
+err:
+ /* got error after nskb was adjusted/allocated */
+ if (nskb && (nskb != skb))
+ dev_kfree_skb(nskb);
+
+ return NULL;
+}
+
+static int parent_rx(struct sk_buff *skb, struct slave *slave)
+{
+ struct net_device *slave_dev = skb->dev;
+ struct net_device *parent_dev = slave_dev->master;
+ struct parent *parent = netdev_priv(parent_dev);
+ struct eipoib_cb_data *data = IPOIB_HANDLER_CB(skb);
+ struct napi_struct *napi = data->rx.napi;
+ struct sk_buff *nskb;
+ int rc = 0;
+ u8 remac[ETH_ALEN];
+ int vlan_tag;
+
+ build_neigh_mac(remac, data->rx.sqpn, data->rx.slid);
+
+ read_lock_bh(&parent->lock);
+
+ if (unlikely(skb_headroom(skb) < ETH_HLEN)) {
+ pr_warn("%s: small headroom %d < %d\n",
+ skb->dev->name, skb_headroom(skb), ETH_HLEN);
+ ++parent->port_stats.rx_skb_errors;
+ goto drop;
+ }
+
+ /* learn neighs based on ARP snooping */
+ if (unlikely(ntohs(skb->protocol) == ETH_P_ARP)) {
+ read_unlock_bh(&parent->lock);
+ write_lock_bh(&parent->lock);
+ neigh_learn(slave, skb, remac);
+ write_unlock_bh(&parent->lock);
+ read_lock_bh(&parent->lock);
+ }
+
+ nskb = get_parent_skb(slave, skb, remac);
+ if (unlikely(!nskb)) {
+ ++parent->port_stats.rx_skb_errors;
+ pr_warn("%s: failed to create parent_skb\n",
+ skb->dev->name);
+ goto drop;
+ } else
+ skb = nskb;
+
+ vlan_tag = slave->vlan & 0xfff;
+ if (vlan_tag) {
+ skb = __vlan_hwaccel_put_tag(skb, vlan_tag);
+ if (!skb) {
+ pr_err("%s failed to insert VLAN tag\n",
+ skb->dev->name);
+ goto drop;
+ }
+ ++parent->port_stats.rx_vlan;
+ }
+
+ if (napi)
+ rc = napi_gro_receive(napi, skb);
+ else
+ rc = netif_receive_skb(skb);
+
+ read_unlock_bh(&parent->lock);
+
+ return rc;
+
+drop:
+ dev_kfree_skb_any(skb);
+ read_unlock_bh(&parent->lock);
+
+ return NET_RX_DROP;
+}
+
+static rx_handler_result_t eipoib_handle_frame(struct sk_buff **pskb)
+{
+ struct sk_buff *skb = *pskb;
+ struct slave *slave;
+
+ slave = eipoib_slave_get_rcu(skb->dev);
+
+ parent_rx(skb, slave);
+
+ return RX_HANDLER_CONSUMED;
+}
+
+static netdev_tx_t parent_tx(struct sk_buff *skb, struct net_device *dev)
+{
+ struct parent *parent = netdev_priv(dev);
+ struct slave *slave = NULL;
+ struct ethhdr *ethh = (struct ethhdr *)(skb->data);
+ struct sk_buff *nskb;
+ int rc;
+ u16 vlan;
+ u8 mac_no_admin_bit[ETH_ALEN];
+
+ read_lock_bh(&parent->lock);
+
+ if (unlikely(!IS_E_IPOIB_PROTO(ethh->h_proto))) {
+ ++parent->port_stats.tx_proto_errors;
+ goto drop;
+ }
+ /* assume: only orphan skb's */
+ if (unlikely(skb_shared(skb))) {
+ ++parent->port_stats.tx_shared;
+ goto drop;
+ }
+
+ /* obtain VLAN information if present */
+ if (vlan_tx_tag_present(skb)) {
+ vlan = vlan_tx_tag_get(skb) & 0xfff;
+ ++parent->port_stats.tx_vlan;
+ } else {
+ vlan = VLAN_N_VID;
+ }
+
+ /*
+ * for live migration: mask the admin bit if exists.
+ * only in ARP packets that came from parent's VIF interface.
+ */
+ if (unlikely((htons(ETH_P_ARP) == ethh->h_proto) &&
+ !memcmp(parent->dev->dev_addr + 1, ethh->h_source + 1, ETH_ALEN - 1))) {
+ /* parent's VIF: */
+ memcpy(mac_no_admin_bit, ethh->h_source, ETH_ALEN);
+ mac_no_admin_bit[0] = mac_no_admin_bit[0] & 0xFD;
+ /* get slave, and queue packet */
+ slave = get_slave_by_mac_and_vlan(parent, mac_no_admin_bit, vlan);
+ }
+ /* get slave, and queue packet */
+ if (!slave)
+ slave = get_slave_by_mac_and_vlan(parent, ethh->h_source, vlan);
+ if (unlikely(!slave)) {
+ pr_info("vif: %pM with vlan: %d miss for parent: %s\n",
+ ethh->h_source, vlan, parent->ipoib_main_interface);
+ ++parent->port_stats.tx_vif_miss;
+ goto drop;
+ }
+
+ nskb = get_slave_skb(slave, skb);
+ if (unlikely(!nskb)) {
+ ++parent->port_stats.tx_skb_errors;
+ goto drop;
+ } else
+ skb = nskb;
+
+ /*
+ * VST mode: removes the vlan tag in the tx (will add it in the rx)
+ * the slave is from IPoIB and it is NETIF_F_VLAN_CHALLENGED,
+ * so must remove the vlan tag.
+ */
+ if (vlan != VLAN_N_VID)
+ skb->vlan_tci = 0;
+
+ /* arp packets: */
+ if (skb->protocol == htons(ETH_P_ARP) ||
+ skb->protocol == htons(ETH_P_RARP)) {
+ arp_xmit(skb);
+ goto out;
+ }
+
+ /* ip packets */
+ skb_record_rx_queue(skb, skb_get_queue_mapping(skb));
+
+ rc = dev_queue_xmit(skb);
+ if (unlikely(rc)) {
+ pr_err("slave tx method failed %d\n", rc);
+ ++parent->port_stats.tx_slave_err;
+ dev_kfree_skb(skb);
+ }
+
+ goto out;
+
+drop:
+ ++parent->port_stats.tx_parent_dropped;
+ dev_kfree_skb(skb);
+
+out:
+ read_unlock_bh(&parent->lock);
+ return NETDEV_TX_OK;
+}
+
+static int parent_open(struct net_device *parent_dev)
+{
+ struct parent *parent = netdev_priv(parent_dev);
+
+ parent->kill_timers = 0;
+ INIT_DELAYED_WORK(&parent->neigh_learn_work, neigh_learn_task);
+ INIT_DELAYED_WORK(&parent->emac_ip_work, emac_info_clean_task);
+ INIT_DELAYED_WORK(&parent->migrate_out_work, migrate_out_work_task);
+ return 0;
+}
+
+static int parent_close(struct net_device *parent_dev)
+{
+ struct parent *parent = netdev_priv(parent_dev);
+
+ write_lock_bh(&parent->lock);
+ parent->kill_timers = 1;
+ write_unlock_bh(&parent->lock);
+
+ cancel_delayed_work(&parent->neigh_learn_work);
+ cancel_delayed_work(&parent->emac_ip_work);
+ cancel_delayed_work(&parent->migrate_out_work);
+
+ return 0;
+}
+
+
+static void parent_deinit(struct net_device *parent_dev)
+{
+ struct parent *parent = netdev_priv(parent_dev);
+
+ list_del(&parent->parent_list);
+
+ parent_work_cancel_all(parent);
+}
+
+static void parent_uninit(struct net_device *parent_dev)
+{
+ struct parent *parent = netdev_priv(parent_dev);
+
+ parent_deinit(parent_dev);
+ parent_destroy_sysfs_entry(parent);
+
+ if (parent->wq)
+ destroy_workqueue(parent->wq);
+}
+
+static struct lock_class_key parent_netdev_xmit_lock_key;
+static struct lock_class_key parent_netdev_addr_lock_key;
+
+static void parent_set_lockdep_class_one(struct net_device *dev,
+ struct netdev_queue *txq,
+ void *_unused)
+{
+ lockdep_set_class(&txq->_xmit_lock,
+ &parent_netdev_xmit_lock_key);
+}
+
+static void parent_set_lockdep_class(struct net_device *dev)
+{
+ lockdep_set_class(&dev->addr_list_lock,
+ &parent_netdev_addr_lock_key);
+ netdev_for_each_tx_queue(dev, parent_set_lockdep_class_one, NULL);
+}
+
+static int parent_init(struct net_device *parent_dev)
+{
+ struct parent *parent = netdev_priv(parent_dev);
+
+ parent->wq = create_singlethread_workqueue(parent_dev->name);
+ if (!parent->wq)
+ return -ENOMEM;
+
+ parent_set_lockdep_class(parent_dev);
+
+ list_add_tail(&parent->parent_list, &parent_dev_list);
+
+ return 0;
+}
+
+static u16 parent_select_q(struct net_device *dev, struct sk_buff *skb)
+{
+ return skb_tx_hash(dev, skb);
+}
+
+static int parent_add_vif_param(struct net_device *parent_dev,
+ struct net_device *new_vif_dev,
+ u16 vlan, u8 *mac)
+{
+ struct parent *parent = netdev_priv(parent_dev);
+ struct slave *new_slave, *slave_tmp;
+ int ret = 0;
+
+ if (!is_valid_ether_addr(mac)) {
+ pr_err("Invalid mac input for slave:%pM \n", mac);
+ return -EINVAL;
+ }
+
+ write_lock_bh(&parent->lock);
+
+ new_slave = get_slave_by_dev(parent, new_vif_dev);
+ if (!new_slave) {
+ pr_err("%s: ERROR no slave:%s.!!!! \n",
+ __func__, new_vif_dev->name);
+ ret = -EINVAL;
+ goto out;
+ }
+
+ if (!is_zero_ether_addr(new_slave->emac)) {
+ pr_err("slave %s mac already set to %pM\n",
+ new_slave->dev->name, new_slave->emac);
+ ret = -EINVAL;
+ goto out;
+ }
+
+ /* check another slave has this mac/vlan */
+ parent_for_each_slave(parent, slave_tmp) {
+ if (!memcmp(slave_tmp->emac, mac, ETH_ALEN) &&
+ slave_tmp->vlan == new_slave->vlan) {
+ pr_err("cannot update %s, slave %s already has"
+ " vlan 0x%x mac %pM\n",
+ parent->dev->name, new_slave->dev->name,
+ slave_tmp->vlan,
+ mac);
+ ret = -EINVAL;
+ goto out;
+ }
+ }
+
+ /* ready to go */
+ pr_info("slave %s mac is set to %pM, vlan set to: %d\n",
+ new_slave->dev->name, mac, vlan);
+
+ memcpy(new_slave->emac, mac, ETH_ALEN);
+
+ new_slave->vlan = vlan;
+
+out:
+ write_unlock_bh(&parent->lock);
+
+ return ret;
+}
+
+static const struct net_device_ops parent_netdev_ops = {
+ .ndo_init = parent_init,
+ .ndo_uninit = parent_uninit,
+ .ndo_open = parent_open,
+ .ndo_stop = parent_close,
+ .ndo_start_xmit = parent_tx,
+ .ndo_select_queue = parent_select_q,
+ /* parnt mtu is min(slaves_mtus) */
+ .ndo_change_mtu = NULL,
+ .ndo_fix_features = parent_fix_features,
+ /*
+ * initial mac address is randomized, can be changed
+ * thru this func later
+ */
+ .ndo_set_mac_address = eth_mac_addr,
+ .ndo_get_stats64 = parent_get_stats,
+ .ndo_add_slave = parent_enslave,
+ .ndo_del_slave = parent_release_slave,
+ .ndo_set_vif_param = parent_add_vif_param,
+};
+
+static void parent_setup(struct net_device *parent_dev)
+{
+ struct parent *parent = netdev_priv(parent_dev);
+
+ /* initialize rwlocks */
+ rwlock_init(&parent->lock);
+
+ /* Initialize pointers */
+ parent->dev = parent_dev;
+ INIT_LIST_HEAD(&parent->neigh_add_list);
+ INIT_LIST_HEAD(&parent->slave_list);
+ INIT_LIST_HEAD(&parent->emac_ip_list);
+ /* Initialize the device entry points */
+ ether_setup(parent_dev);
+ /* parent_dev->hard_header_len is adjusted later */
+ parent_dev->netdev_ops = &parent_netdev_ops;
+ parent_set_ethtool_ops(parent_dev);
+
+ /* Initialize the device options */
+ parent_dev->tx_queue_len = 0;
+ /* mark the parent intf as pif (master of other vifs.) */
+ parent_dev->priv_flags = IFF_EIPOIB_PIF;
+
+ parent_dev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM |
+ NETIF_F_RXCSUM | NETIF_F_GRO | NETIF_F_TSO;
+
+ parent_dev->features = parent_dev->hw_features;
+ parent_dev->vlan_features = parent_dev->hw_features;
+
+ parent_dev->features |= PARENT_VLAN_FEATURES;
+}
+
+/*
+ * Create a new parent based on the specified name and parent parameters.
+ * Caller must NOT hold rtnl_lock; we need to release it here before we
+ * set up our sysfs entries.
+ */
+static struct parent *parent_create(struct net_device *ibd)
+{
+ struct net_device *parent_dev;
+ u32 num_queues;
+ int rc;
+ union ib_gid gid;
+ struct parent *parent = NULL;
+ int i, j;
+
+ memcpy(&gid, ibd->dev_addr + 4, sizeof(union ib_gid));
+ num_queues = num_online_cpus();
+ num_queues = roundup_pow_of_two(num_queues);
+
+ parent_dev = alloc_netdev_mq(sizeof(struct parent), "",
+ parent_setup, num_queues);
+ if (!parent_dev) {
+ pr_err("%s failed to alloc netdev!\n", ibd->name);
+ rc = -ENOMEM;
+ goto out_rtnl;
+ }
+
+ rc = dev_alloc_name(parent_dev, "eth%d");
+ if (rc < 0)
+ goto out_netdev;
+
+ /* eIPoIB interface mac format. */
+ for (i = 0, j = 0; i < 8; i++) {
+ if ((PARENT_MAC_MASK >> i) & 0x1) {
+ if (j < 6) /* only 6 bytes eth address */
+ parent_dev->dev_addr[j] =
+ gid.raw[GUID_LEN + i];
+ j++;
+ }
+ }
+
+ /* assuming that the ibd->dev.parent was alreadey been set. */
+ SET_NETDEV_DEV(parent_dev, ibd->dev.parent);
+
+ rc = register_netdevice(parent_dev);
+ if (rc < 0)
+ goto out_parent;
+
+ dev_net_set(parent_dev, &init_net);
+
+ rc = parent_create_sysfs_entry(netdev_priv(parent_dev));
+ if (rc < 0)
+ goto out_unreg;
+
+ parent = netdev_priv(parent_dev);
+ memcpy(parent->gid.raw, gid.raw, GID_LEN);
+ strncpy(parent->ipoib_main_interface, ibd->name, IFNAMSIZ);
+ parent_dev->dev_id = ibd->dev_id;
+
+ return parent;
+
+out_unreg:
+ unregister_netdevice(parent_dev);
+out_parent:
+ parent_deinit(parent_dev);
+out_netdev:
+ free_netdev(parent_dev);
+out_rtnl:
+ return ERR_PTR(rc);
+}
+
+
+static void parent_free(struct parent *parent)
+{
+ struct net_device *parent_dev = parent->dev;
+
+ parent_work_cancel_all(parent);
+
+ parent_release_all(parent_dev);
+
+ unregister_netdevice(parent_dev);
+}
+
+static void parent_free_all(void)
+{
+ struct parent *parent, *nxt;
+
+ list_for_each_entry_safe(parent, nxt, &parent_dev_list, parent_list)
+ parent_free(parent);
+}
+
+/* netdev events handlers */
+static inline int is_ipoib_pif_intf(struct net_device *dev)
+{
+ if (ARPHRD_INFINIBAND == dev->type && dev->priv_flags & IFF_EIPOIB_PIF)
+ return 1;
+ return 0;
+}
+
+static int parent_event_changename(struct parent *parent)
+{
+ parent_destroy_sysfs_entry(parent);
+
+ parent_create_sysfs_entry(parent);
+
+ return NOTIFY_DONE;
+}
+
+static int parent_master_netdev_event(unsigned long event,
+ struct net_device *parent_dev)
+{
+ struct parent *event_parent = netdev_priv(parent_dev);
+
+ switch (event) {
+ case NETDEV_CHANGENAME:
+ pr_info("%s: got NETDEV_CHANGENAME event", parent_dev->name);
+ return parent_event_changename(event_parent);
+ default:
+ break;
+ }
+
+ return NOTIFY_DONE;
+}
+
+static int parent_slave_netdev_event(unsigned long event,
+ struct net_device *slave_dev)
+{
+ struct net_device *parent_dev = slave_dev->master;
+ struct parent *parent = netdev_priv(parent_dev);
+
+ if (!parent_dev) {
+ pr_err("slave:%s has no parent.\n", slave_dev->name);
+ return NOTIFY_DONE;
+ }
+
+ switch (event) {
+ case NETDEV_UNREGISTER:
+ parent_release_slave(parent_dev, slave_dev);
+ break;
+ case NETDEV_CHANGE:
+ case NETDEV_UP:
+ case NETDEV_DOWN:
+ parent_set_carrier(parent);
+ break;
+ case NETDEV_CHANGEMTU:
+ parent_set_mtu(parent);
+ break;
+ case NETDEV_CHANGENAME:
+ break;
+ case NETDEV_FEAT_CHANGE:
+ parent_compute_features(parent);
+ break;
+ default:
+ break;
+ }
+
+ return NOTIFY_DONE;
+}
+
+static int eipoib_netdev_event(struct notifier_block *this,
+ unsigned long event, void *ptr)
+{
+ struct net_device *event_dev = (struct net_device *)ptr;
+
+ if (dev_net(event_dev) != &init_net)
+ return NOTIFY_DONE;
+
+ if (is_parent(event_dev))
+ return parent_master_netdev_event(event, event_dev);
+
+ if (is_slave(event_dev))
+ return parent_slave_netdev_event(event, event_dev);
+ /*
+ * general network device triggers event, check if it is new
+ * ib interface that we want to enslave.
+ */
+ return eipoib_device_event(this, event, ptr);
+}
+
+static struct notifier_block parent_netdev_notifier = {
+ .notifier_call = eipoib_netdev_event,
+};
+
+static int eipoib_device_event(struct notifier_block *unused,
+ unsigned long event, void *ptr)
+{
+ struct net_device *dev = ptr;
+ struct parent *parent;
+
+ if (!is_ipoib_pif_intf(dev))
+ return NOTIFY_DONE;
+
+ switch (event) {
+ case NETDEV_REGISTER:
+ parent = parent_create(dev);
+ if (IS_ERR(parent)) {
+ pr_warn("failed to create parent for %s\n",
+ dev->name);
+ break;
+ }
+ break;
+ case NETDEV_UNREGISTER:
+ parent = get_parent_by_pif_name(dev->name);
+ if (parent)
+ parent_free(parent);
+ break;
+ default:
+ break;
+ }
+
+ return NOTIFY_DONE;
+}
+
+static int __init mod_init(void)
+{
+ int rc;
+
+ pr_info(DRV_NAME": %s", version);
+
+ rc = register_pernet_subsys(&eipoib_net_ops);
+ if (rc)
+ goto out;
+
+ rc = register_netdevice_notifier(&parent_netdev_notifier);
+ if (rc) {
+ pr_err("%s failed to register_netdevice_notifier, rc: 0x%x\n",
+ __func__, rc);
+ goto unreg_subsys;
+ }
+
+ goto out;
+
+unreg_subsys:
+ unregister_pernet_subsys(&eipoib_net_ops);
+out:
+ return rc;
+
+}
+
+static void __exit mod_exit(void)
+{
+ unregister_netdevice_notifier(&parent_netdev_notifier);
+
+ unregister_pernet_subsys(&eipoib_net_ops);
+
+ rtnl_lock();
+ parent_free_all();
+ rtnl_unlock();
+}
+
+module_init(mod_init);
+module_exit(mod_exit);
+MODULE_LICENSE("Dual BSD/GPL");
+MODULE_VERSION(DRV_VERSION);
+MODULE_DESCRIPTION(DRV_DESCRIPTION ", v" DRV_VERSION);
+MODULE_AUTHOR("Ali Ayoub && Erez Shitrit");
--
1.7.1
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox