Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit abf9d537fea225af60762640361af7fb233b3103

Authored by Octavian Purdila
Committed by David S. Miller
1 parent e5cd6fe391
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

llc: add support for SO_BINDTODEVICE 

Using bind(MAC address) with LLC sockets has O(n) complexity, where n
is the number of interfaces. To overcome this, we add support for
SO_BINDTODEVICE which drops the complexity to O(1).

Signed-off-by: Octavian Purdila <opurdila@ixiacom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 27 additions and 2 deletions Side-by-side Diff

... ... @@ -259,7 +259,14 @@
259 259 if (!sock_flag(sk, SOCK_ZAPPED))
260 260 goto out;
261 261 rc = -ENODEV;
262   - llc->dev = dev_getfirstbyhwtype(&init_net, addr->sllc_arphrd);
  262 + if (sk->sk_bound_dev_if) {
  263 + llc->dev = dev_get_by_index(&init_net, sk->sk_bound_dev_if);
  264 + if (llc->dev && addr->sllc_arphrd != llc->dev->type) {
  265 + dev_put(llc->dev);
  266 + llc->dev = NULL;
  267 + }
  268 + } else
  269 + llc->dev = dev_getfirstbyhwtype(&init_net, addr->sllc_arphrd);
263 270 if (!llc->dev)
264 271 goto out;
265 272 rc = -EUSERS;
... ... @@ -310,7 +317,25 @@
310 317 goto out;
311 318 rc = -ENODEV;
312 319 rtnl_lock();
313   - llc->dev = dev_getbyhwaddr(&init_net, addr->sllc_arphrd, addr->sllc_mac);
  320 + if (sk->sk_bound_dev_if) {
  321 + llc->dev = dev_get_by_index(&init_net, sk->sk_bound_dev_if);
  322 + if (llc->dev) {
  323 + if (!addr->sllc_arphrd)
  324 + addr->sllc_arphrd = llc->dev->type;
  325 + if (llc_mac_null(addr->sllc_mac))
  326 + memcpy(addr->sllc_mac, llc->dev->dev_addr,
  327 + IFHWADDRLEN);
  328 + if (addr->sllc_arphrd != llc->dev->type ||
  329 + !llc_mac_match(addr->sllc_mac,
  330 + llc->dev->dev_addr)) {
  331 + rc = -EINVAL;
  332 + dev_put(llc->dev);
  333 + llc->dev = NULL;
  334 + }
  335 + }
  336 + } else
  337 + llc->dev = dev_getbyhwaddr(&init_net, addr->sllc_arphrd,
  338 + addr->sllc_mac);
314 339 rtnl_unlock();
315 340 if (!llc->dev)
316 341 goto out;