* [PATCH net-next 05/11] ibmvnic: Non-fatal error handling
From: Nathan Fontenot @ 2017-05-26 14:30 UTC (permalink / raw)
To: netdev, tlfalcon, jallen
In-Reply-To: <20170526142523.63648.62938.stgit@ltcalpine2-lp14.aus.stglabs.ibm.com>
From: John Allen <jallen@linux.vnet.ibm.com>
Handle non-fatal error conditions. The process to do this when
resetting the driver is to just do __ibmvnic_close followed by
__ibmvnic_open.
Signed-off-by: John Allen <jallen@linux.vnet.ibm.com>
---
drivers/net/ethernet/ibm/ibmvnic.c | 56 ++++++++++++++++++++----------------
drivers/net/ethernet/ibm/ibmvnic.h | 1 +
2 files changed, 32 insertions(+), 25 deletions(-)
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index 0f705e6..def867a 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -1225,37 +1225,41 @@ static int do_reset(struct ibmvnic_adapter *adapter,
if (rc)
return rc;
- /* remove the closed state so when we call open it appears
- * we are coming from the probed state.
- */
- adapter->state = VNIC_PROBED;
+ if (adapter->reset_reason != VNIC_RESET_NON_FATAL) {
+ /* remove the closed state so when we call open it appears
+ * we are coming from the probed state.
+ */
+ adapter->state = VNIC_PROBED;
- release_resources(adapter);
- release_sub_crqs(adapter);
- release_crq_queue(adapter);
+ release_resources(adapter);
+ release_sub_crqs(adapter);
+ release_crq_queue(adapter);
- rc = ibmvnic_init(adapter);
- if (rc)
- return 0;
+ rc = ibmvnic_init(adapter);
+ if (rc)
+ return 0;
- /* If the adapter was in PROBE state prior to the reset, exit here. */
- if (reset_state == VNIC_PROBED)
- return 0;
+ /* If the adapter was in PROBE state prior to the reset,
+ * exit here.
+ */
+ if (reset_state == VNIC_PROBED)
+ return 0;
- rc = ibmvnic_login(netdev);
- if (rc) {
- adapter->state = VNIC_PROBED;
- return 0;
- }
+ rc = ibmvnic_login(netdev);
+ if (rc) {
+ adapter->state = VNIC_PROBED;
+ return 0;
+ }
- rtnl_lock();
- rc = init_resources(adapter);
- rtnl_unlock();
- if (rc)
- return rc;
+ rtnl_lock();
+ rc = init_resources(adapter);
+ rtnl_unlock();
+ if (rc)
+ return rc;
- if (reset_state == VNIC_CLOSED)
- return 0;
+ if (reset_state == VNIC_CLOSED)
+ return 0;
+ }
rc = __ibmvnic_open(netdev);
if (rc) {
@@ -2763,6 +2767,8 @@ static void handle_error_indication(union ibmvnic_crq *crq,
if (crq->error_indication.flags & IBMVNIC_FATAL_ERROR)
ibmvnic_reset(adapter, VNIC_RESET_FATAL);
+ else
+ ibmvnic_reset(adapter, VNIC_RESET_NON_FATAL);
}
static void handle_change_mac_rsp(union ibmvnic_crq *crq,
diff --git a/drivers/net/ethernet/ibm/ibmvnic.h b/drivers/net/ethernet/ibm/ibmvnic.h
index fa6ac4e..7e2300e 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.h
+++ b/drivers/net/ethernet/ibm/ibmvnic.h
@@ -925,6 +925,7 @@ enum vnic_state {VNIC_PROBING = 1,
enum ibmvnic_reset_reason {VNIC_RESET_FAILOVER = 1,
VNIC_RESET_MOBILITY,
VNIC_RESET_FATAL,
+ VNIC_RESET_NON_FATAL,
VNIC_RESET_TIMEOUT};
struct ibmvnic_rwi {
^ permalink raw reply related
* [PATCH net-next 04/11] ibmvnic: Fix cleanup of SKB's on driver close
From: Nathan Fontenot @ 2017-05-26 14:30 UTC (permalink / raw)
To: netdev, tlfalcon, jallen
In-Reply-To: <20170526142523.63648.62938.stgit@ltcalpine2-lp14.aus.stglabs.ibm.com>
From: Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
A race condition occurs when closing the driver. Free'ing of skb's
can race between the close routine and ibmvnic_tx_interrupt. To fix
this we move the claenup of tx pools during close to after the
sub-CRQ interrupts are disabled.
Signed-off-by: Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
---
drivers/net/ethernet/ibm/ibmvnic.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index 465a8fa..0f705e6 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -804,7 +804,6 @@ static int __ibmvnic_close(struct net_device *netdev)
adapter->state = VNIC_CLOSING;
netif_tx_stop_all_queues(netdev);
ibmvnic_napi_disable(adapter);
- clean_tx_pools(adapter);
if (adapter->tx_scrq) {
for (i = 0; i < adapter->req_tx_queues; i++)
@@ -833,6 +832,7 @@ static int __ibmvnic_close(struct net_device *netdev)
}
}
+ clean_tx_pools(adapter);
adapter->state = VNIC_CLOSED;
return rc;
}
^ permalink raw reply related
* [PATCH net-next 03/11] ibmvnic: Send gratuitous arp on reset
From: Nathan Fontenot @ 2017-05-26 14:30 UTC (permalink / raw)
To: netdev, tlfalcon, jallen
In-Reply-To: <20170526142523.63648.62938.stgit@ltcalpine2-lp14.aus.stglabs.ibm.com>
From: John Allen <jallen@linux.vnet.ibm.com>
Send gratuitous arp after any reset.
Signed-off-by: John Allen <jallen@linux.vnet.ibm.com>
---
drivers/net/ethernet/ibm/ibmvnic.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index 1f7cf6f..465a8fa 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -1273,6 +1273,7 @@ static int do_reset(struct ibmvnic_adapter *adapter,
for (i = 0; i < adapter->req_rx_queues; i++)
napi_schedule(&adapter->napi[i]);
+ netdev_notify_peers(netdev);
return 0;
}
^ permalink raw reply related
* [PATCH net-next 02/11] ibmvnic: Handle failover after failed init crq
From: Nathan Fontenot @ 2017-05-26 14:30 UTC (permalink / raw)
To: netdev, tlfalcon, jallen
In-Reply-To: <20170526142523.63648.62938.stgit@ltcalpine2-lp14.aus.stglabs.ibm.com>
From: John Allen <jallen@linux.vnet.ibm.com>
Handle case where phyp sends a failover after failing to send the
init crq.
Signed-off-by: John Allen <jallen@linux.vnet.ibm.com>
---
drivers/net/ethernet/ibm/ibmvnic.c | 11 ++++++++++-
drivers/net/ethernet/ibm/ibmvnic.h | 2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index 4997de4..1f7cf6f 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -3167,6 +3167,8 @@ static void ibmvnic_handle_crq(union ibmvnic_crq *crq,
switch (gen_crq->cmd) {
case IBMVNIC_CRQ_INIT:
dev_info(dev, "Partner initialized\n");
+ adapter->from_passive_init = true;
+ complete(&adapter->init_done);
break;
case IBMVNIC_CRQ_INIT_COMPLETE:
dev_info(dev, "Partner initialization complete\n");
@@ -3481,11 +3483,18 @@ static int ibmvnic_init(struct ibmvnic_adapter *adapter)
return rc;
}
+ adapter->from_passive_init = false;
+
init_completion(&adapter->init_done);
ibmvnic_send_crq_init(adapter);
if (!wait_for_completion_timeout(&adapter->init_done, timeout)) {
dev_err(dev, "Initialization sequence timed out\n");
- release_crq_queue(adapter);
+ return -1;
+ }
+
+ if (adapter->from_passive_init) {
+ adapter->state = VNIC_OPEN;
+ adapter->from_passive_init = false;
return -1;
}
diff --git a/drivers/net/ethernet/ibm/ibmvnic.h b/drivers/net/ethernet/ibm/ibmvnic.h
index 4816e04..fa6ac4e 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.h
+++ b/drivers/net/ethernet/ibm/ibmvnic.h
@@ -1031,5 +1031,5 @@ struct ibmvnic_adapter {
struct list_head rwi_list;
struct work_struct ibmvnic_reset;
bool resetting;
- bool napi_enabled;
+ bool napi_enabled, from_passive_init;
};
^ permalink raw reply related
* [PATCH net-next 01/11] ibmvnic: Track state of adapter napis
From: Nathan Fontenot @ 2017-05-26 14:30 UTC (permalink / raw)
To: netdev, tlfalcon, jallen
In-Reply-To: <20170526142523.63648.62938.stgit@ltcalpine2-lp14.aus.stglabs.ibm.com>
From: John Allen <jallen@linux.vnet.ibm.com>
Track the state of ibmvnic napis. The driver can get into states where it
can be reset when napis are already disabled and attempting to disable them
again will cause the driver to hang.
Signed-off-by: John Allen <jallen@linux.vnet.ibm.com>
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
---
drivers/net/ethernet/ibm/ibmvnic.c | 37 +++++++++++++++++++++++++++---------
drivers/net/ethernet/ibm/ibmvnic.h | 1 +
2 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index 27f7933..4997de4 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -518,6 +518,32 @@ static void release_error_buffers(struct ibmvnic_adapter *adapter)
spin_unlock_irqrestore(&adapter->error_list_lock, flags);
}
+static void ibmvnic_napi_enable(struct ibmvnic_adapter *adapter)
+{
+ int i;
+
+ if (adapter->napi_enabled)
+ return;
+
+ for (i = 0; i < adapter->req_rx_queues; i++)
+ napi_enable(&adapter->napi[i]);
+
+ adapter->napi_enabled = true;
+}
+
+static void ibmvnic_napi_disable(struct ibmvnic_adapter *adapter)
+{
+ int i;
+
+ if (!adapter->napi_enabled)
+ return;
+
+ for (i = 0; i < adapter->req_rx_queues; i++)
+ napi_disable(&adapter->napi[i]);
+
+ adapter->napi_enabled = false;
+}
+
static int ibmvnic_login(struct net_device *netdev)
{
struct ibmvnic_adapter *adapter = netdev_priv(netdev);
@@ -674,9 +700,7 @@ static int __ibmvnic_open(struct net_device *netdev)
adapter->state = VNIC_OPENING;
replenish_pools(adapter);
-
- for (i = 0; i < adapter->req_rx_queues; i++)
- napi_enable(&adapter->napi[i]);
+ ibmvnic_napi_enable(adapter);
/* We're ready to receive frames, enable the sub-crq interrupts and
* set the logical link state to up
@@ -779,12 +803,7 @@ static int __ibmvnic_close(struct net_device *netdev)
adapter->state = VNIC_CLOSING;
netif_tx_stop_all_queues(netdev);
-
- if (adapter->napi) {
- for (i = 0; i < adapter->req_rx_queues; i++)
- napi_disable(&adapter->napi[i]);
- }
-
+ ibmvnic_napi_disable(adapter);
clean_tx_pools(adapter);
if (adapter->tx_scrq) {
diff --git a/drivers/net/ethernet/ibm/ibmvnic.h b/drivers/net/ethernet/ibm/ibmvnic.h
index 4702b48..4816e04 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.h
+++ b/drivers/net/ethernet/ibm/ibmvnic.h
@@ -1031,4 +1031,5 @@ struct ibmvnic_adapter {
struct list_head rwi_list;
struct work_struct ibmvnic_reset;
bool resetting;
+ bool napi_enabled;
};
^ permalink raw reply related
* [PATCH net-next 00/11] ibmvnic: Driver updates
From: Nathan Fontenot @ 2017-05-26 14:30 UTC (permalink / raw)
To: netdev, tlfalcon, jallen
This set of patches implements several updates to the ibmvnic driver
to fix issues that have been found in testing. Most of the updates
invovle updating queue handling during driver close and reset
operations.
-Nathan
---
John Allen (4):
ibmvnic: Track state of adapter napis
ibmvnic: Handle failover after failed init crq
ibmvnic: Send gratuitous arp on reset
ibmvnic: Non-fatal error handling
Nathan Fontenot (4):
ibmvnic: Check adapter state during ibmvnic_poll
ibmvnic: Reset the CRQ queue during driver reset
ibmvnic: Reset tx/rx pools on driver reset
ibmvnic: Reset sub-crqs during driver reset
Thomas Falcon (3):
ibmvnic: Fix cleanup of SKB's on driver close
ibmvnic: Halt TX and report carrier off on H_CLOSED return code
ibmvnic: Deactivate RX pool buffer replenishment on H_CLOSED
drivers/net/ethernet/ibm/ibmvnic.c | 259 ++++++++++++++++++++++++++++++------
drivers/net/ethernet/ibm/ibmvnic.h | 2
2 files changed, 220 insertions(+), 41 deletions(-)
^ permalink raw reply
* [PATCH v3] hdlcdrv: Fix divide by zero in hdlcdrv_ioctl
From: Firo Yang @ 2017-05-26 14:37 UTC (permalink / raw)
To: davem, alan
Cc: t.sailer, wharms, andreyknvl, linux-hams, gregkh, netdev, thomas,
javier, dhowells, geliangtang, linux-kernel, Firo Yang
In-Reply-To: <CAAeHK+ya2sAtLmJ0VyP6e=13OXUw98dp1WdRFU=o5+xGFGPtbQ@mail.gmail.com>
syszkaller fuzzer triggered a divide by zero, when set calibration
through ioctl().
To fix it, test 'bitrate' if it is negative or 0, just return -EINVAL.
Reported-by: Andrey Konovalov <andreyknvl@google.com>
Signed-off-by: Firo Yang <firogm@gmail.com>
---
v2->v3:
Just fix divide error and remove netif_running() test.
Refine the testing code as David Miller suggested.
v1->v2:
Change Reported-by to Andrey Konovalov.
Send it to original report thread.
v0->v1:
Reviewed by walter harms <wharms@bfs.de>.
Return ENODEV instead of EPERM if !netif_running(dev)
Check if s->par.bitrate > 0.
drivers/net/hamradio/hdlcdrv.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/hamradio/hdlcdrv.c b/drivers/net/hamradio/hdlcdrv.c
index 8c3633c..97e3bc6 100644
--- a/drivers/net/hamradio/hdlcdrv.c
+++ b/drivers/net/hamradio/hdlcdrv.c
@@ -576,6 +576,8 @@ static int hdlcdrv_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
case HDLCDRVCTL_CALIBRATE:
if(!capable(CAP_SYS_RAWIO))
return -EPERM;
+ if (s->par.bitrate <= 0)
+ return -EINVAL;
if (bi.data.calibrate > INT_MAX / s->par.bitrate)
return -EINVAL;
s->hdlctx.calibrate = bi.data.calibrate * s->par.bitrate / 16;
--
2.9.4
^ permalink raw reply related
* RE: [PATCH v3 1/2] net: phy: Add Cortina CS4340 driver (fwd)
From: Bogdan Purcareata @ 2017-05-26 14:35 UTC (permalink / raw)
To: Julia Lawall
Cc: andrew@lunn.ch, f.fainelli@gmail.com, netdev@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
kbuild-all@01.org
In-Reply-To: <alpine.DEB.2.20.1705261631020.2950@hadrien>
> -----Original Message-----
> From: Julia Lawall [mailto:julia.lawall@lip6.fr]
> Sent: Friday, May 26, 2017 5:32 PM
> To: Bogdan Purcareata <bogdan.purcareata@nxp.com>
> Cc: andrew@lunn.ch; f.fainelli@gmail.com; netdev@vger.kernel.org;
> devicetree@vger.kernel.org; linux-kernel@vger.kernel.org; kbuild-all@01.org
> Subject: Re: [PATCH v3 1/2] net: phy: Add Cortina CS4340 driver (fwd)
>
> The u32 values on lines 73 and 79 will not be less than 0.
Will change to int for proper error checking.
Thanks!
Bogdan P.
^ permalink raw reply
* Re: [PATCH v3 1/2] net: phy: Add Cortina CS4340 driver (fwd)
From: Julia Lawall @ 2017-05-26 14:31 UTC (permalink / raw)
To: Bogdan Purcareata
Cc: andrew-g2DYL2Zd6BY, f.fainelli-Re5JQEeQqe8AvxtiuMwx3w,
netdev-u79uwXL29TY76Z2rM5mHXA, devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, kbuild-all-JC7UmRfGjtg
The u32 values on lines 73 and 79 will not be less than 0.
julia
---------- Forwarded message ----------
Date: Fri, 26 May 2017 19:31:28 +0800
From: kbuild test robot <fengguang.wu-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
To: kbuild-JC7UmRfGjtg@public.gmane.org
Cc: Julia Lawall <julia.lawall-L2FTfq7BK8M@public.gmane.org>
Subject: Re: [PATCH v3 1/2] net: phy: Add Cortina CS4340 driver
CC: kbuild-all-JC7UmRfGjtg@public.gmane.org
In-Reply-To: <1495785519-1468-2-git-send-email-bogdan.purcareata-3arQi8VN3Tc@public.gmane.org>
TO: Bogdan Purcareata <bogdan.purcareata-3arQi8VN3Tc@public.gmane.org>
CC: andrew-g2DYL2Zd6BY@public.gmane.org, f.fainelli-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
CC:
Hi Bogdan,
[auto build test WARNING on net-next/master]
[also build test WARNING on v4.12-rc2 next-20170526]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Bogdan-Purcareata/net-phy-Add-Cortina-CS4340-driver/20170526-170949
:::::: branch date: 2 hours ago
:::::: commit date: 2 hours ago
>> drivers/net/phy/cortina.c:73:5-11: WARNING: Unsigned expression compared with zero: id_lsb < 0
>> drivers/net/phy/cortina.c:79:5-11: WARNING: Unsigned expression compared with zero: id_msb < 0
git remote add linux-review https://github.com/0day-ci/linux
git remote update linux-review
git checkout 84281ef4be227acc6a2f638da7a6842f7f55348d
vim +73 drivers/net/phy/cortina.c
84281ef4 Bogdan Purcareata 2017-05-26 67 static int cortina_probe(struct phy_device *phydev)
84281ef4 Bogdan Purcareata 2017-05-26 68 {
84281ef4 Bogdan Purcareata 2017-05-26 69 u32 phy_id = 0, id_lsb, id_msb;
84281ef4 Bogdan Purcareata 2017-05-26 70
84281ef4 Bogdan Purcareata 2017-05-26 71 /* Read device id from phy registers. */
84281ef4 Bogdan Purcareata 2017-05-26 72 id_lsb = cortina_read_reg(phydev, VILLA_GLOBAL_CHIP_ID_LSB);
84281ef4 Bogdan Purcareata 2017-05-26 @73 if (id_lsb < 0)
84281ef4 Bogdan Purcareata 2017-05-26 74 return -ENXIO;
84281ef4 Bogdan Purcareata 2017-05-26 75
84281ef4 Bogdan Purcareata 2017-05-26 76 phy_id = id_lsb << 16;
84281ef4 Bogdan Purcareata 2017-05-26 77
84281ef4 Bogdan Purcareata 2017-05-26 78 id_msb = cortina_read_reg(phydev, VILLA_GLOBAL_CHIP_ID_MSB);
84281ef4 Bogdan Purcareata 2017-05-26 @79 if (id_msb < 0)
84281ef4 Bogdan Purcareata 2017-05-26 80 return -ENXIO;
84281ef4 Bogdan Purcareata 2017-05-26 81
84281ef4 Bogdan Purcareata 2017-05-26 82 phy_id |= id_msb;
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
--
To unsubscribe from this list: send the line "unsubscribe devicetree" 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: [PATCH net-next 3/4] tls: kernel TLS support
From: Eric Dumazet @ 2017-05-26 14:16 UTC (permalink / raw)
To: Dave Watson
Cc: Ilya Lesokhin, Aviad Yehezkel, Boris Pismenny, Liran Liss,
Matan Barak, David Miller, netdev, Tom Herbert, herbert,
linux-crypto, Hannes Frederic Sowa, Alexei Starovoitov, nmav,
fridolin.pokorny
In-Reply-To: <20170524162708.GA24215@davejwatson-mba.local>
On Wed, 2017-05-24 at 09:27 -0700, Dave Watson wrote:
> Software implementation of transport layer security, implemented using ULP
> infrastructure. tcp proto_ops are replaced with tls equivalents of sendmsg and
> sendpage.
...
> +
> +int tls_sw_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)
> +{
...
> +
> + lock_sock(sk);
> +
> + /* Only one writer at a time is allowed */
> + if (sk->sk_write_pending)
> + return -EBUSY;
Ouch...
^ permalink raw reply
* Re: [PATCH net-next 2/2] net: ndisc.c: minor code improvement
From: Joe Perches @ 2017-05-26 14:05 UTC (permalink / raw)
To: yuan linyu, netdev; +Cc: David S . Miller, David Ahern, yuan linyu
In-Reply-To: <1495805052-2974-1-git-send-email-cugyly@163.com>
On Fri, 2017-05-26 at 21:24 +0800, yuan linyu wrote:
> From: yuan linyu <Linyu.Yuan@alcatel-sbell.com.cn>
>
> on x86_64, text size decrease 80 bytes
You are sending whitespace and code reduction changes.
Please send the object code size reduction changes
as a separate patch from the whitespace only changes.
> Signed-off-by: yuan linyu <Linyu.Yuan@alcatel-sbell.com.cn>
> ---
> net/ipv6/ndisc.c | 32 ++++++++++++++++----------------
> 1 file changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
> index 292c827..ee9b12c 100644
> --- a/net/ipv6/ndisc.c
> +++ b/net/ipv6/ndisc.c
> @@ -147,17 +147,16 @@ void __ndisc_fill_addr_option(struct sk_buff *skb, int type, void *data,
>
> opt[0] = type;
> opt[1] = space >> 3;
> + opt += 2;
>
> - memset(opt + 2, 0, pad);
> + memset(opt, 0, pad);
> opt += pad;
> space -= pad;
>
> - memcpy(opt + 2, data, data_len);
> - data_len += 2;
> + memcpy(opt, data, data_len);
> opt += data_len;
> space -= data_len;
> - if (space > 0)
> - memset(opt, 0, space);
> + memset(opt, 0, space);
> }
> EXPORT_SYMBOL_GPL(__ndisc_fill_addr_option);
>
> @@ -997,6 +996,7 @@ static void ndisc_recv_na(struct sk_buff *skb)
> if (neigh) {
> u8 old_flags = neigh->flags;
> struct net *net = dev_net(dev);
> + u32 flags;
>
> if (neigh->nud_state & NUD_FAILED)
> goto out;
> @@ -1013,13 +1013,14 @@ static void ndisc_recv_na(struct sk_buff *skb)
> goto out;
> }
>
> + flags = NEIGH_UPDATE_F_WEAK_OVERRIDE | NEIGH_UPDATE_F_OVERRIDE_ISROUTER;
> + if (msg->icmph.icmp6_override)
> + flags |= NEIGH_UPDATE_F_OVERRIDE;
> + if (msg->icmph.icmp6_router)
> + flags |= NEIGH_UPDATE_F_ISROUTER;
> ndisc_update(dev, neigh, lladdr,
> msg->icmph.icmp6_solicited ? NUD_REACHABLE : NUD_STALE,
> - NEIGH_UPDATE_F_WEAK_OVERRIDE|
> - (msg->icmph.icmp6_override ? NEIGH_UPDATE_F_OVERRIDE : 0)|
> - NEIGH_UPDATE_F_OVERRIDE_ISROUTER|
> - (msg->icmph.icmp6_router ? NEIGH_UPDATE_F_ISROUTER : 0),
> - NDISC_NEIGHBOUR_ADVERTISEMENT, &ndopts);
> + flags, NDISC_NEIGHBOUR_ADVERTISEMENT, &ndopts);
>
> if ((old_flags & ~neigh->flags) & NTF_ROUTER) {
> /*
> @@ -1217,12 +1218,11 @@ static void ndisc_router_discovery(struct sk_buff *skb)
> * received RA message (RFC 2462) -- yoshfuji
> */
> old_if_flags = in6_dev->if_flags;
> - in6_dev->if_flags = (in6_dev->if_flags & ~(IF_RA_MANAGED |
> - IF_RA_OTHERCONF)) |
> - (ra_msg->icmph.icmp6_addrconf_managed ?
> - IF_RA_MANAGED : 0) |
> - (ra_msg->icmph.icmp6_addrconf_other ?
> - IF_RA_OTHERCONF : 0);
> + in6_dev->if_flags &= ~(IF_RA_MANAGED | IF_RA_OTHERCONF);
> + if (ra_msg->icmph.icmp6_addrconf_managed)
> + in6_dev->if_flags |= IF_RA_MANAGED;
> + if (ra_msg->icmph.icmp6_addrconf_other)
> + in6_dev->if_flags |= IF_RA_OTHERCONF;
>
> if (old_if_flags != in6_dev->if_flags)
> send_ifinfo_notify = true;
^ permalink raw reply
* Re: [patch net-next 01/18] bridge: Export VLAN filtering state
From: Ido Schimmel @ 2017-05-26 14:02 UTC (permalink / raw)
To: Nikolay Aleksandrov; +Cc: Jiri Pirko, netdev, davem, mlxsw, stephen
In-Reply-To: <b2edc91e-d7cf-a667-2b00-5722ed09a2a6@cumulusnetworks.com>
Hi Nik,
On Fri, May 26, 2017 at 11:55:18AM +0300, Nikolay Aleksandrov wrote:
> On 5/26/17 9:37 AM, Jiri Pirko wrote:
> > From: Ido Schimmel <idosch@mellanox.com>
> >
> > It's useful for drivers supporting bridge offload to be able to query
> > the bridge's VLAN filtering state.
> >
> > Currently, upon enslavement to a bridge master, the offloading driver
> > will only learn about the bridge's VLAN filtering state after the bridge
> > device was already linked with its slave.
> >
> > Being able to query the bridge's VLAN filtering state allows such
> > drivers to forbid enslavement in case resource couldn't be allocated for
> > a VLAN-aware bridge and also choose the correct initialization routine
> > for the enslaved port, which is dependent on the bridge type.
> >
> > Signed-off-by: Ido Schimmel <idosch@mellanox.com>
> > Signed-off-by: Jiri Pirko <jiri@mellanox.com>
> > ---
> > include/linux/if_bridge.h | 9 +++++++++
> > net/bridge/br_if.c | 2 +-
> > net/bridge/br_mdb.c | 4 ++--
> > net/bridge/br_netlink.c | 2 +-
> > net/bridge/br_private.h | 9 ---------
> > net/bridge/br_vlan.c | 8 ++++++++
> > 6 files changed, 21 insertions(+), 13 deletions(-)
> >
>
> I must say this bridge -> dev -> bridge looks weird from the bridge POV.
> Since exports like this seem to be increasing I think it'd be nice to
> make some API that can be queried instead of exporting symbols for each
> bridge option or attribute. In this case maybe a simpler solution would've
> been only a new exported symbol for external users.
It seemed more logical to me to export the existing function, but I can
instead leave it as-is and introduce a new symbol. I'll wait for more
comments and send a v2 if deemed necessary.
> The patch itself looks good to me.
>
> Reviewed-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Thanks for reviewing!
^ permalink raw reply
* Re: [PATCH net-next 1/2] net: ndisc.c: fix coding style issue
From: yuan linyu @ 2017-05-26 13:55 UTC (permalink / raw)
To: 吉藤英明
Cc: network dev, David S . Miller, Joe Perches, David Ahern,
yuan linyu, YOSHIFUJI Hideaki
In-Reply-To: <CAPA1RqDqyZicNWM8arSvMfQjmy_A=LLEjtTwH8KTza4WwQ_dsg@mail.gmail.com>
On 五, 2017-05-26 at 22:45 +0900, 吉藤英明 wrote:
> Hi,
>
> 2017-05-26 22:23 GMT+09:00 yuan linyu <cugyly@163.com>:
> >
> > From: yuan linyu <Linyu.Yuan@alcatel-sbell.com.cn>
> >
> > Signed-off-by: yuan linyu <Linyu.Yuan@alcatel-sbell.com.cn>
> > ---
> > net/ipv6/ndisc.c | 109 ++++++++++++++++++++++++++++---------------------------
> > 1 file changed, 55 insertions(+), 54 deletions(-)
> Sorry, I don't think this kind of change for style is good
> bacause this makes effort of backport more difficult.
hi, i can't understand.
if any change of this code you decide to backport, it need effort,
not only important fix.
do I miss your point ?
>
> --yoshfuji
>
^ permalink raw reply
* [PATCH net-next v1 2/2] net: ndisc.c: minor code improvement
From: yuan linyu @ 2017-05-26 13:48 UTC (permalink / raw)
To: netdev; +Cc: David S . Miller, Joe Perches, David Ahern, yuan linyu
From: yuan linyu <Linyu.Yuan@alcatel-sbell.com.cn>
on x86_64, text size decrease 64 bytes
Signed-off-by: yuan linyu <Linyu.Yuan@alcatel-sbell.com.cn>
---
net/ipv6/ndisc.c | 34 ++++++++++++++++++----------------
1 file changed, 18 insertions(+), 16 deletions(-)
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index 292c827..8051b46 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -147,17 +147,18 @@ void __ndisc_fill_addr_option(struct sk_buff *skb, int type, void *data,
opt[0] = type;
opt[1] = space >> 3;
+ opt += 2;
+ space -= 2;
- memset(opt + 2, 0, pad);
+ memset(opt, 0, pad);
opt += pad;
space -= pad;
- memcpy(opt + 2, data, data_len);
- data_len += 2;
+ memcpy(opt, data, data_len);
opt += data_len;
space -= data_len;
- if (space > 0)
- memset(opt, 0, space);
+
+ memset(opt, 0, space);
}
EXPORT_SYMBOL_GPL(__ndisc_fill_addr_option);
@@ -997,6 +998,7 @@ static void ndisc_recv_na(struct sk_buff *skb)
if (neigh) {
u8 old_flags = neigh->flags;
struct net *net = dev_net(dev);
+ u32 flags;
if (neigh->nud_state & NUD_FAILED)
goto out;
@@ -1013,13 +1015,14 @@ static void ndisc_recv_na(struct sk_buff *skb)
goto out;
}
+ flags = NEIGH_UPDATE_F_WEAK_OVERRIDE | NEIGH_UPDATE_F_OVERRIDE_ISROUTER;
+ if (msg->icmph.icmp6_override)
+ flags |= NEIGH_UPDATE_F_OVERRIDE;
+ if (msg->icmph.icmp6_router)
+ flags |= NEIGH_UPDATE_F_ISROUTER;
ndisc_update(dev, neigh, lladdr,
msg->icmph.icmp6_solicited ? NUD_REACHABLE : NUD_STALE,
- NEIGH_UPDATE_F_WEAK_OVERRIDE|
- (msg->icmph.icmp6_override ? NEIGH_UPDATE_F_OVERRIDE : 0)|
- NEIGH_UPDATE_F_OVERRIDE_ISROUTER|
- (msg->icmph.icmp6_router ? NEIGH_UPDATE_F_ISROUTER : 0),
- NDISC_NEIGHBOUR_ADVERTISEMENT, &ndopts);
+ flags, NDISC_NEIGHBOUR_ADVERTISEMENT, &ndopts);
if ((old_flags & ~neigh->flags) & NTF_ROUTER) {
/*
@@ -1217,12 +1220,11 @@ static void ndisc_router_discovery(struct sk_buff *skb)
* received RA message (RFC 2462) -- yoshfuji
*/
old_if_flags = in6_dev->if_flags;
- in6_dev->if_flags = (in6_dev->if_flags & ~(IF_RA_MANAGED |
- IF_RA_OTHERCONF)) |
- (ra_msg->icmph.icmp6_addrconf_managed ?
- IF_RA_MANAGED : 0) |
- (ra_msg->icmph.icmp6_addrconf_other ?
- IF_RA_OTHERCONF : 0);
+ in6_dev->if_flags &= ~(IF_RA_MANAGED | IF_RA_OTHERCONF);
+ if (ra_msg->icmph.icmp6_addrconf_managed)
+ in6_dev->if_flags |= IF_RA_MANAGED;
+ if (ra_msg->icmph.icmp6_addrconf_other)
+ in6_dev->if_flags |= IF_RA_OTHERCONF;
if (old_if_flags != in6_dev->if_flags)
send_ifinfo_notify = true;
--
2.7.4
^ permalink raw reply related
* [PATCH net-next v1 1/2] net: ndisc.c: fix coding style issue
From: yuan linyu @ 2017-05-26 13:47 UTC (permalink / raw)
To: netdev; +Cc: David S . Miller, Joe Perches, David Ahern, yuan linyu
From: yuan linyu <Linyu.Yuan@alcatel-sbell.com.cn>
Signed-off-by: yuan linyu <Linyu.Yuan@alcatel-sbell.com.cn>
---
net/ipv6/ndisc.c | 109 ++++++++++++++++++++++++++++---------------------------
1 file changed, 55 insertions(+), 54 deletions(-)
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index d310dc4..292c827 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -99,7 +99,6 @@ static const struct neigh_ops ndisc_hh_ops = {
.connected_output = neigh_resolve_output,
};
-
static const struct neigh_ops ndisc_direct_ops = {
.family = AF_INET6,
.output = neigh_direct_output,
@@ -147,13 +146,13 @@ void __ndisc_fill_addr_option(struct sk_buff *skb, int type, void *data,
u8 *opt = skb_put(skb, space);
opt[0] = type;
- opt[1] = space>>3;
+ opt[1] = space >> 3;
memset(opt + 2, 0, pad);
opt += pad;
space -= pad;
- memcpy(opt+2, data, data_len);
+ memcpy(opt + 2, data, data_len);
data_len += 2;
opt += data_len;
space -= data_len;
@@ -182,6 +181,7 @@ static struct nd_opt_hdr *ndisc_next_option(struct nd_opt_hdr *cur,
struct nd_opt_hdr *end)
{
int type;
+
if (!cur || !end || cur >= end)
return NULL;
type = cur->nd_opt_type;
@@ -222,6 +222,7 @@ struct ndisc_options *ndisc_parse_options(const struct net_device *dev,
memset(ndopts, 0, sizeof(*ndopts));
while (opt_len) {
int l;
+
if (opt_len < sizeof(struct nd_opt_hdr))
return NULL;
l = nd_opt->nd_opt_len << 3;
@@ -327,9 +328,8 @@ static int ndisc_constructor(struct neighbour *neigh)
bool is_multicast = ipv6_addr_is_multicast(addr);
in6_dev = in6_dev_get(dev);
- if (!in6_dev) {
+ if (!in6_dev)
return -EINVAL;
- }
parms = in6_dev->nd_parms;
__neigh_parms_put(neigh->parms);
@@ -344,12 +344,12 @@ static int ndisc_constructor(struct neighbour *neigh)
if (is_multicast) {
neigh->nud_state = NUD_NOARP;
ndisc_mc_map(addr, neigh->ha, dev, 1);
- } else if (dev->flags&(IFF_NOARP|IFF_LOOPBACK)) {
+ } else if (dev->flags & (IFF_NOARP | IFF_LOOPBACK)) {
neigh->nud_state = NUD_NOARP;
memcpy(neigh->ha, dev->dev_addr, dev->addr_len);
- if (dev->flags&IFF_LOOPBACK)
+ if (dev->flags & IFF_LOOPBACK)
neigh->type = RTN_LOCAL;
- } else if (dev->flags&IFF_POINTOPOINT) {
+ } else if (dev->flags & IFF_POINTOPOINT) {
neigh->nud_state = NUD_NOARP;
memcpy(neigh->ha, dev->broadcast, dev->addr_len);
}
@@ -357,7 +357,7 @@ static int ndisc_constructor(struct neighbour *neigh)
neigh->ops = &ndisc_hh_ops;
else
neigh->ops = &ndisc_generic_ops;
- if (neigh->nud_state&NUD_VALID)
+ if (neigh->nud_state & NUD_VALID)
neigh->output = neigh->ops->connected_output;
else
neigh->output = neigh->ops->output;
@@ -580,7 +580,7 @@ void ndisc_send_ns(struct net_device *dev, const struct in6_addr *solicit,
if (!saddr) {
if (ipv6_get_lladdr(dev, &addr_buf,
- (IFA_F_TENTATIVE|IFA_F_OPTIMISTIC)))
+ (IFA_F_TENTATIVE | IFA_F_OPTIMISTIC)))
return;
saddr = &addr_buf;
}
@@ -641,9 +641,8 @@ void ndisc_send_rs(struct net_device *dev, const struct in6_addr *saddr,
struct inet6_ifaddr *ifp = ipv6_get_ifaddr(dev_net(dev), saddr,
dev, 1);
if (ifp) {
- if (ifp->flags & IFA_F_OPTIMISTIC) {
+ if (ifp->flags & IFA_F_OPTIMISTIC)
send_sllao = 0;
- }
in6_ifa_put(ifp);
} else {
send_sllao = 0;
@@ -672,7 +671,6 @@ void ndisc_send_rs(struct net_device *dev, const struct in6_addr *saddr,
ndisc_send_skb(skb, daddr, saddr);
}
-
static void ndisc_error_report(struct neighbour *neigh, struct sk_buff *skb)
{
/*
@@ -695,7 +693,7 @@ static void ndisc_solicit(struct neighbour *neigh, struct sk_buff *skb)
if (skb && ipv6_chk_addr_and_flags(dev_net(dev), &ipv6_hdr(skb)->saddr,
dev, 1,
- IFA_F_TENTATIVE|IFA_F_OPTIMISTIC))
+ IFA_F_TENTATIVE | IFA_F_OPTIMISTIC))
saddr = &ipv6_hdr(skb)->saddr;
probes -= NEIGH_VAR(neigh->parms, UCAST_PROBES);
if (probes < 0) {
@@ -806,7 +804,7 @@ static void ndisc_recv_ns(struct sk_buff *skb)
ifp = ipv6_get_ifaddr(dev_net(dev), &msg->target, dev, 1);
if (ifp) {
have_ifp:
- if (ifp->flags & (IFA_F_TENTATIVE|IFA_F_OPTIMISTIC)) {
+ if (ifp->flags & (IFA_F_TENTATIVE | IFA_F_OPTIMISTIC)) {
if (dad) {
if (nonce != 0 && ifp->dad_nonce == nonce) {
u8 *np = (u8 *)&nonce;
@@ -824,16 +822,15 @@ static void ndisc_recv_ns(struct sk_buff *skb)
*/
addrconf_dad_failure(ifp);
return;
- } else {
- /*
- * This is not a dad solicitation.
- * If we are an optimistic node,
- * we should respond.
- * Otherwise, we should ignore it.
- */
- if (!(ifp->flags & IFA_F_OPTIMISTIC))
- goto out;
}
+ /*
+ * This is not a dad solicitation.
+ * If we are an optimistic node,
+ * we should respond.
+ * Otherwise, we should ignore it.
+ */
+ if (!(ifp->flags & IFA_F_OPTIMISTIC))
+ goto out;
}
idev = ifp->idev;
@@ -874,6 +871,7 @@ static void ndisc_recv_ns(struct sk_buff *skb)
* (RFC2461) -- yoshfuji
*/
struct sk_buff *n = skb_clone(skb, GFP_ATOMIC);
+
if (n)
pneigh_enqueue(&nd_tbl, idev->nd_parms, n);
goto out;
@@ -904,7 +902,7 @@ static void ndisc_recv_ns(struct sk_buff *skb)
!inc || lladdr || !dev->addr_len);
if (neigh)
ndisc_update(dev, neigh, lladdr, NUD_STALE,
- NEIGH_UPDATE_F_WEAK_OVERRIDE|
+ NEIGH_UPDATE_F_WEAK_OVERRIDE |
NEIGH_UPDATE_F_OVERRIDE,
NDISC_NEIGHBOUR_SOLICITATION, &ndopts);
if (neigh || !dev->header_ops) {
@@ -973,10 +971,10 @@ static void ndisc_recv_na(struct sk_buff *skb)
}
ifp = ipv6_get_ifaddr(dev_net(dev), &msg->target, dev, 1);
if (ifp) {
- if (skb->pkt_type != PACKET_LOOPBACK
- && (ifp->flags & IFA_F_TENTATIVE)) {
- addrconf_dad_failure(ifp);
- return;
+ if (skb->pkt_type != PACKET_LOOPBACK &&
+ (ifp->flags & IFA_F_TENTATIVE)) {
+ addrconf_dad_failure(ifp);
+ return;
}
/* What should we make now? The advertisement
is invalid, but ndisc specs say nothing
@@ -1081,8 +1079,8 @@ static void ndisc_recv_rs(struct sk_buff *skb)
neigh = __neigh_lookup(&nd_tbl, saddr, skb->dev, 1);
if (neigh) {
ndisc_update(skb->dev, neigh, lladdr, NUD_STALE,
- NEIGH_UPDATE_F_WEAK_OVERRIDE|
- NEIGH_UPDATE_F_OVERRIDE|
+ NEIGH_UPDATE_F_WEAK_OVERRIDE |
+ NEIGH_UPDATE_F_OVERRIDE |
NEIGH_UPDATE_F_OVERRIDE_ISROUTER,
NDISC_ROUTER_SOLICITATION, &ndopts);
neigh_release(neigh);
@@ -1110,9 +1108,8 @@ static void ndisc_ra_useropt(struct sk_buff *ra, struct nd_opt_hdr *opt)
}
nlh = nlmsg_put(skb, 0, 0, RTM_NEWNDUSEROPT, base_size, 0);
- if (!nlh) {
+ if (!nlh)
goto nla_put_failure;
- }
ndmsg = nlmsg_data(nlh);
ndmsg->nduseropt_family = AF_INET6;
@@ -1325,21 +1322,21 @@ static void ndisc_router_discovery(struct sk_buff *skb)
if (in6_dev->nd_parms) {
unsigned long rtime = ntohl(ra_msg->retrans_timer);
- if (rtime && rtime/1000 < MAX_SCHEDULE_TIMEOUT/HZ) {
- rtime = (rtime*HZ)/1000;
- if (rtime < HZ/10)
- rtime = HZ/10;
+ if (rtime && rtime / 1000 < MAX_SCHEDULE_TIMEOUT / HZ) {
+ rtime = (rtime * HZ) / 1000;
+ if (rtime < HZ / 10)
+ rtime = HZ / 10;
NEIGH_VAR_SET(in6_dev->nd_parms, RETRANS_TIME, rtime);
in6_dev->tstamp = jiffies;
send_ifinfo_notify = true;
}
rtime = ntohl(ra_msg->reachable_time);
- if (rtime && rtime/1000 < MAX_SCHEDULE_TIMEOUT/(3*HZ)) {
- rtime = (rtime*HZ)/1000;
+ if (rtime && rtime / 1000 < MAX_SCHEDULE_TIMEOUT / (3 * HZ)) {
+ rtime = (rtime * HZ) / 1000;
- if (rtime < HZ/10)
- rtime = HZ/10;
+ if (rtime < HZ / 10)
+ rtime = HZ / 10;
if (rtime != NEIGH_VAR(in6_dev->nd_parms, BASE_REACHABLE_TIME)) {
NEIGH_VAR_SET(in6_dev->nd_parms,
@@ -1370,6 +1367,7 @@ static void ndisc_router_discovery(struct sk_buff *skb)
skb->dev, 1);
if (neigh) {
u8 *lladdr = NULL;
+
if (ndopts.nd_opts_src_lladdr) {
lladdr = ndisc_opt_addr_data(ndopts.nd_opts_src_lladdr,
skb->dev);
@@ -1380,9 +1378,9 @@ static void ndisc_router_discovery(struct sk_buff *skb)
}
}
ndisc_update(skb->dev, neigh, lladdr, NUD_STALE,
- NEIGH_UPDATE_F_WEAK_OVERRIDE|
- NEIGH_UPDATE_F_OVERRIDE|
- NEIGH_UPDATE_F_OVERRIDE_ISROUTER|
+ NEIGH_UPDATE_F_WEAK_OVERRIDE |
+ NEIGH_UPDATE_F_OVERRIDE |
+ NEIGH_UPDATE_F_OVERRIDE_ISROUTER |
NEIGH_UPDATE_F_ISROUTER,
NDISC_ROUTER_ADVERTISEMENT, &ndopts);
}
@@ -1406,6 +1404,7 @@ static void ndisc_router_discovery(struct sk_buff *skb)
if (in6_dev->cnf.accept_ra_rtr_pref && ndopts.nd_opts_ri) {
struct nd_opt_hdr *p;
+
for (p = ndopts.nd_opts_ri;
p;
p = ndisc_next_option(p, ndopts.nd_opts_ri_end)) {
@@ -1442,6 +1441,7 @@ static void ndisc_router_discovery(struct sk_buff *skb)
if (in6_dev->cnf.accept_ra_pinfo && ndopts.nd_opts_pi) {
struct nd_opt_hdr *p;
+
for (p = ndopts.nd_opts_pi;
p;
p = ndisc_next_option(p, ndopts.nd_opts_pi_end)) {
@@ -1455,7 +1455,7 @@ static void ndisc_router_discovery(struct sk_buff *skb)
__be32 n;
u32 mtu;
- memcpy(&n, ((u8 *)(ndopts.nd_opts_mtu+1))+2, sizeof(mtu));
+ memcpy(&n, ((u8 *)(ndopts.nd_opts_mtu + 1)) + 2, sizeof(mtu));
mtu = ntohl(n);
if (mtu < IPV6_MIN_MTU || mtu > skb->dev->mtu) {
@@ -1472,6 +1472,7 @@ static void ndisc_router_discovery(struct sk_buff *skb)
if (ndopts.nd_useropts) {
struct nd_opt_hdr *p;
+
for (p = ndopts.nd_useropts;
p;
p = ndisc_next_useropt(skb->dev, p,
@@ -1480,9 +1481,8 @@ static void ndisc_router_discovery(struct sk_buff *skb)
}
}
- if (ndopts.nd_opts_tgt_lladdr || ndopts.nd_opts_rh) {
+ if (ndopts.nd_opts_tgt_lladdr || ndopts.nd_opts_rh)
ND_PRINTK(2, warn, "RA: invalid RA options\n");
- }
out:
ip6_rt_put(rt);
if (neigh)
@@ -1518,7 +1518,7 @@ static void ndisc_redirect_rcv(struct sk_buff *skb)
if (!ndopts.nd_opts_rh) {
ip6_redirect_no_header(skb, dev_net(skb->dev),
- skb->dev->ifindex, 0);
+ skb->dev->ifindex, 0);
return;
}
@@ -1569,7 +1569,7 @@ void ndisc_send_redirect(struct sk_buff *skb, const struct in6_addr *target)
}
if (!ipv6_addr_equal(&ipv6_hdr(skb)->daddr, target) &&
- ipv6_addr_type(target) != (IPV6_ADDR_UNICAST|IPV6_ADDR_LINKLOCAL)) {
+ ipv6_addr_type(target) != (IPV6_ADDR_UNICAST | IPV6_ADDR_LINKLOCAL)) {
ND_PRINTK(2, warn,
"Redirect: target address is not link-local unicast\n");
return;
@@ -1587,7 +1587,7 @@ void ndisc_send_redirect(struct sk_buff *skb, const struct in6_addr *target)
if (IS_ERR(dst))
return;
- rt = (struct rt6_info *) dst;
+ rt = (struct rt6_info *)dst;
if (rt->rt6i_flags & RTF_GATEWAY) {
ND_PRINTK(2, warn,
@@ -1595,7 +1595,7 @@ void ndisc_send_redirect(struct sk_buff *skb, const struct in6_addr *target)
goto release;
}
peer = inet_getpeer_v6(net->ipv6.peers, &ipv6_hdr(skb)->saddr, 1);
- ret = inet_peer_xrlim_allow(peer, 1*HZ);
+ ret = inet_peer_xrlim_allow(peer, 1 * HZ);
if (peer)
inet_putpeer(peer);
if (!ret)
@@ -1603,6 +1603,7 @@ void ndisc_send_redirect(struct sk_buff *skb, const struct in6_addr *target)
if (dev->addr_len) {
struct neighbour *neigh = dst_neigh_lookup(skb_dst(skb), target);
+
if (!neigh) {
ND_PRINTK(2, warn,
"Redirect: no neigh for target address\n");
@@ -1787,6 +1788,7 @@ static void ndisc_warn_deprecated_sysctl(struct ctl_table *ctl,
{
static char warncomm[TASK_COMM_LEN];
static int warned;
+
if (strcmp(warncomm, current->comm) && warned < 5) {
strcpy(warncomm, current->comm);
pr_warn("process `%s' is using deprecated sysctl (%s) net.ipv6.neigh.%s.%s - use net.ipv6.neigh.%s.%s_ms instead\n",
@@ -1797,7 +1799,8 @@ static void ndisc_warn_deprecated_sysctl(struct ctl_table *ctl,
}
}
-int ndisc_ifinfo_sysctl_change(struct ctl_table *ctl, int write, void __user *buffer, size_t *lenp, loff_t *ppos)
+int ndisc_ifinfo_sysctl_change(struct ctl_table *ctl, int write,
+ void __user *buffer, size_t *lenp, loff_t *ppos)
{
struct net_device *dev = ctl->extra1;
struct inet6_dev *idev;
@@ -1831,8 +1834,6 @@ int ndisc_ifinfo_sysctl_change(struct ctl_table *ctl, int write, void __user *bu
}
return ret;
}
-
-
#endif
static int __net_init ndisc_net_init(struct net *net)
--
2.7.4
^ permalink raw reply related
* [PATCH net-next v1 0/2] ndisc.c minor clean and improvement
From: yuan linyu @ 2017-05-26 13:46 UTC (permalink / raw)
To: netdev; +Cc: David S . Miller, Joe Perches, David Ahern, yuan linyu
From: yuan linyu <Linyu.Yuan@alcatel-sbell.com.cn>
1. fix part of checkpatch issue which I like to fix
2. __ndisc_fill_addr_option() clean
v1:
correct space value
yuan linyu (2):
net: ndisc.c: fix coding style issue
net: ndisc.c: minor code improvement
net/ipv6/ndisc.c | 141 ++++++++++++++++++++++++++++---------------------------
1 file changed, 72 insertions(+), 69 deletions(-)
--
2.7.4
^ permalink raw reply
* Re: [PATCH net-next 1/2] net: ndisc.c: fix coding style issue
From: 吉藤英明 @ 2017-05-26 13:45 UTC (permalink / raw)
To: yuan linyu
Cc: network dev, David S . Miller, Joe Perches, David Ahern,
yuan linyu, YOSHIFUJI Hideaki
In-Reply-To: <1495805019-2919-1-git-send-email-cugyly@163.com>
Hi,
2017-05-26 22:23 GMT+09:00 yuan linyu <cugyly@163.com>:
> From: yuan linyu <Linyu.Yuan@alcatel-sbell.com.cn>
>
> Signed-off-by: yuan linyu <Linyu.Yuan@alcatel-sbell.com.cn>
> ---
> net/ipv6/ndisc.c | 109 ++++++++++++++++++++++++++++---------------------------
> 1 file changed, 55 insertions(+), 54 deletions(-)
Sorry, I don't think this kind of change for style is good
bacause this makes effort of backport more difficult.
--yoshfuji
>
> diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
> index d310dc4..292c827 100644
> --- a/net/ipv6/ndisc.c
> +++ b/net/ipv6/ndisc.c
> @@ -99,7 +99,6 @@ static const struct neigh_ops ndisc_hh_ops = {
> .connected_output = neigh_resolve_output,
> };
>
> -
> static const struct neigh_ops ndisc_direct_ops = {
> .family = AF_INET6,
> .output = neigh_direct_output,
> @@ -147,13 +146,13 @@ void __ndisc_fill_addr_option(struct sk_buff *skb, int type, void *data,
> u8 *opt = skb_put(skb, space);
>
> opt[0] = type;
> - opt[1] = space>>3;
> + opt[1] = space >> 3;
>
> memset(opt + 2, 0, pad);
> opt += pad;
> space -= pad;
>
> - memcpy(opt+2, data, data_len);
> + memcpy(opt + 2, data, data_len);
> data_len += 2;
> opt += data_len;
> space -= data_len;
> @@ -182,6 +181,7 @@ static struct nd_opt_hdr *ndisc_next_option(struct nd_opt_hdr *cur,
> struct nd_opt_hdr *end)
> {
> int type;
> +
> if (!cur || !end || cur >= end)
> return NULL;
> type = cur->nd_opt_type;
> @@ -222,6 +222,7 @@ struct ndisc_options *ndisc_parse_options(const struct net_device *dev,
> memset(ndopts, 0, sizeof(*ndopts));
> while (opt_len) {
> int l;
> +
> if (opt_len < sizeof(struct nd_opt_hdr))
> return NULL;
> l = nd_opt->nd_opt_len << 3;
> @@ -327,9 +328,8 @@ static int ndisc_constructor(struct neighbour *neigh)
> bool is_multicast = ipv6_addr_is_multicast(addr);
>
> in6_dev = in6_dev_get(dev);
> - if (!in6_dev) {
> + if (!in6_dev)
> return -EINVAL;
> - }
>
> parms = in6_dev->nd_parms;
> __neigh_parms_put(neigh->parms);
> @@ -344,12 +344,12 @@ static int ndisc_constructor(struct neighbour *neigh)
> if (is_multicast) {
> neigh->nud_state = NUD_NOARP;
> ndisc_mc_map(addr, neigh->ha, dev, 1);
> - } else if (dev->flags&(IFF_NOARP|IFF_LOOPBACK)) {
> + } else if (dev->flags & (IFF_NOARP | IFF_LOOPBACK)) {
> neigh->nud_state = NUD_NOARP;
> memcpy(neigh->ha, dev->dev_addr, dev->addr_len);
> - if (dev->flags&IFF_LOOPBACK)
> + if (dev->flags & IFF_LOOPBACK)
> neigh->type = RTN_LOCAL;
> - } else if (dev->flags&IFF_POINTOPOINT) {
> + } else if (dev->flags & IFF_POINTOPOINT) {
> neigh->nud_state = NUD_NOARP;
> memcpy(neigh->ha, dev->broadcast, dev->addr_len);
> }
> @@ -357,7 +357,7 @@ static int ndisc_constructor(struct neighbour *neigh)
> neigh->ops = &ndisc_hh_ops;
> else
> neigh->ops = &ndisc_generic_ops;
> - if (neigh->nud_state&NUD_VALID)
> + if (neigh->nud_state & NUD_VALID)
> neigh->output = neigh->ops->connected_output;
> else
> neigh->output = neigh->ops->output;
> @@ -580,7 +580,7 @@ void ndisc_send_ns(struct net_device *dev, const struct in6_addr *solicit,
>
> if (!saddr) {
> if (ipv6_get_lladdr(dev, &addr_buf,
> - (IFA_F_TENTATIVE|IFA_F_OPTIMISTIC)))
> + (IFA_F_TENTATIVE | IFA_F_OPTIMISTIC)))
> return;
> saddr = &addr_buf;
> }
> @@ -641,9 +641,8 @@ void ndisc_send_rs(struct net_device *dev, const struct in6_addr *saddr,
> struct inet6_ifaddr *ifp = ipv6_get_ifaddr(dev_net(dev), saddr,
> dev, 1);
> if (ifp) {
> - if (ifp->flags & IFA_F_OPTIMISTIC) {
> + if (ifp->flags & IFA_F_OPTIMISTIC)
> send_sllao = 0;
> - }
> in6_ifa_put(ifp);
> } else {
> send_sllao = 0;
> @@ -672,7 +671,6 @@ void ndisc_send_rs(struct net_device *dev, const struct in6_addr *saddr,
> ndisc_send_skb(skb, daddr, saddr);
> }
>
> -
> static void ndisc_error_report(struct neighbour *neigh, struct sk_buff *skb)
> {
> /*
> @@ -695,7 +693,7 @@ static void ndisc_solicit(struct neighbour *neigh, struct sk_buff *skb)
>
> if (skb && ipv6_chk_addr_and_flags(dev_net(dev), &ipv6_hdr(skb)->saddr,
> dev, 1,
> - IFA_F_TENTATIVE|IFA_F_OPTIMISTIC))
> + IFA_F_TENTATIVE | IFA_F_OPTIMISTIC))
> saddr = &ipv6_hdr(skb)->saddr;
> probes -= NEIGH_VAR(neigh->parms, UCAST_PROBES);
> if (probes < 0) {
> @@ -806,7 +804,7 @@ static void ndisc_recv_ns(struct sk_buff *skb)
> ifp = ipv6_get_ifaddr(dev_net(dev), &msg->target, dev, 1);
> if (ifp) {
> have_ifp:
> - if (ifp->flags & (IFA_F_TENTATIVE|IFA_F_OPTIMISTIC)) {
> + if (ifp->flags & (IFA_F_TENTATIVE | IFA_F_OPTIMISTIC)) {
> if (dad) {
> if (nonce != 0 && ifp->dad_nonce == nonce) {
> u8 *np = (u8 *)&nonce;
> @@ -824,16 +822,15 @@ static void ndisc_recv_ns(struct sk_buff *skb)
> */
> addrconf_dad_failure(ifp);
> return;
> - } else {
> - /*
> - * This is not a dad solicitation.
> - * If we are an optimistic node,
> - * we should respond.
> - * Otherwise, we should ignore it.
> - */
> - if (!(ifp->flags & IFA_F_OPTIMISTIC))
> - goto out;
> }
> + /*
> + * This is not a dad solicitation.
> + * If we are an optimistic node,
> + * we should respond.
> + * Otherwise, we should ignore it.
> + */
> + if (!(ifp->flags & IFA_F_OPTIMISTIC))
> + goto out;
> }
>
> idev = ifp->idev;
> @@ -874,6 +871,7 @@ static void ndisc_recv_ns(struct sk_buff *skb)
> * (RFC2461) -- yoshfuji
> */
> struct sk_buff *n = skb_clone(skb, GFP_ATOMIC);
> +
> if (n)
> pneigh_enqueue(&nd_tbl, idev->nd_parms, n);
> goto out;
> @@ -904,7 +902,7 @@ static void ndisc_recv_ns(struct sk_buff *skb)
> !inc || lladdr || !dev->addr_len);
> if (neigh)
> ndisc_update(dev, neigh, lladdr, NUD_STALE,
> - NEIGH_UPDATE_F_WEAK_OVERRIDE|
> + NEIGH_UPDATE_F_WEAK_OVERRIDE |
> NEIGH_UPDATE_F_OVERRIDE,
> NDISC_NEIGHBOUR_SOLICITATION, &ndopts);
> if (neigh || !dev->header_ops) {
> @@ -973,10 +971,10 @@ static void ndisc_recv_na(struct sk_buff *skb)
> }
> ifp = ipv6_get_ifaddr(dev_net(dev), &msg->target, dev, 1);
> if (ifp) {
> - if (skb->pkt_type != PACKET_LOOPBACK
> - && (ifp->flags & IFA_F_TENTATIVE)) {
> - addrconf_dad_failure(ifp);
> - return;
> + if (skb->pkt_type != PACKET_LOOPBACK &&
> + (ifp->flags & IFA_F_TENTATIVE)) {
> + addrconf_dad_failure(ifp);
> + return;
> }
> /* What should we make now? The advertisement
> is invalid, but ndisc specs say nothing
> @@ -1081,8 +1079,8 @@ static void ndisc_recv_rs(struct sk_buff *skb)
> neigh = __neigh_lookup(&nd_tbl, saddr, skb->dev, 1);
> if (neigh) {
> ndisc_update(skb->dev, neigh, lladdr, NUD_STALE,
> - NEIGH_UPDATE_F_WEAK_OVERRIDE|
> - NEIGH_UPDATE_F_OVERRIDE|
> + NEIGH_UPDATE_F_WEAK_OVERRIDE |
> + NEIGH_UPDATE_F_OVERRIDE |
> NEIGH_UPDATE_F_OVERRIDE_ISROUTER,
> NDISC_ROUTER_SOLICITATION, &ndopts);
> neigh_release(neigh);
> @@ -1110,9 +1108,8 @@ static void ndisc_ra_useropt(struct sk_buff *ra, struct nd_opt_hdr *opt)
> }
>
> nlh = nlmsg_put(skb, 0, 0, RTM_NEWNDUSEROPT, base_size, 0);
> - if (!nlh) {
> + if (!nlh)
> goto nla_put_failure;
> - }
>
> ndmsg = nlmsg_data(nlh);
> ndmsg->nduseropt_family = AF_INET6;
> @@ -1325,21 +1322,21 @@ static void ndisc_router_discovery(struct sk_buff *skb)
> if (in6_dev->nd_parms) {
> unsigned long rtime = ntohl(ra_msg->retrans_timer);
>
> - if (rtime && rtime/1000 < MAX_SCHEDULE_TIMEOUT/HZ) {
> - rtime = (rtime*HZ)/1000;
> - if (rtime < HZ/10)
> - rtime = HZ/10;
> + if (rtime && rtime / 1000 < MAX_SCHEDULE_TIMEOUT / HZ) {
> + rtime = (rtime * HZ) / 1000;
> + if (rtime < HZ / 10)
> + rtime = HZ / 10;
> NEIGH_VAR_SET(in6_dev->nd_parms, RETRANS_TIME, rtime);
> in6_dev->tstamp = jiffies;
> send_ifinfo_notify = true;
> }
>
> rtime = ntohl(ra_msg->reachable_time);
> - if (rtime && rtime/1000 < MAX_SCHEDULE_TIMEOUT/(3*HZ)) {
> - rtime = (rtime*HZ)/1000;
> + if (rtime && rtime / 1000 < MAX_SCHEDULE_TIMEOUT / (3 * HZ)) {
> + rtime = (rtime * HZ) / 1000;
>
> - if (rtime < HZ/10)
> - rtime = HZ/10;
> + if (rtime < HZ / 10)
> + rtime = HZ / 10;
>
> if (rtime != NEIGH_VAR(in6_dev->nd_parms, BASE_REACHABLE_TIME)) {
> NEIGH_VAR_SET(in6_dev->nd_parms,
> @@ -1370,6 +1367,7 @@ static void ndisc_router_discovery(struct sk_buff *skb)
> skb->dev, 1);
> if (neigh) {
> u8 *lladdr = NULL;
> +
> if (ndopts.nd_opts_src_lladdr) {
> lladdr = ndisc_opt_addr_data(ndopts.nd_opts_src_lladdr,
> skb->dev);
> @@ -1380,9 +1378,9 @@ static void ndisc_router_discovery(struct sk_buff *skb)
> }
> }
> ndisc_update(skb->dev, neigh, lladdr, NUD_STALE,
> - NEIGH_UPDATE_F_WEAK_OVERRIDE|
> - NEIGH_UPDATE_F_OVERRIDE|
> - NEIGH_UPDATE_F_OVERRIDE_ISROUTER|
> + NEIGH_UPDATE_F_WEAK_OVERRIDE |
> + NEIGH_UPDATE_F_OVERRIDE |
> + NEIGH_UPDATE_F_OVERRIDE_ISROUTER |
> NEIGH_UPDATE_F_ISROUTER,
> NDISC_ROUTER_ADVERTISEMENT, &ndopts);
> }
> @@ -1406,6 +1404,7 @@ static void ndisc_router_discovery(struct sk_buff *skb)
>
> if (in6_dev->cnf.accept_ra_rtr_pref && ndopts.nd_opts_ri) {
> struct nd_opt_hdr *p;
> +
> for (p = ndopts.nd_opts_ri;
> p;
> p = ndisc_next_option(p, ndopts.nd_opts_ri_end)) {
> @@ -1442,6 +1441,7 @@ static void ndisc_router_discovery(struct sk_buff *skb)
>
> if (in6_dev->cnf.accept_ra_pinfo && ndopts.nd_opts_pi) {
> struct nd_opt_hdr *p;
> +
> for (p = ndopts.nd_opts_pi;
> p;
> p = ndisc_next_option(p, ndopts.nd_opts_pi_end)) {
> @@ -1455,7 +1455,7 @@ static void ndisc_router_discovery(struct sk_buff *skb)
> __be32 n;
> u32 mtu;
>
> - memcpy(&n, ((u8 *)(ndopts.nd_opts_mtu+1))+2, sizeof(mtu));
> + memcpy(&n, ((u8 *)(ndopts.nd_opts_mtu + 1)) + 2, sizeof(mtu));
> mtu = ntohl(n);
>
> if (mtu < IPV6_MIN_MTU || mtu > skb->dev->mtu) {
> @@ -1472,6 +1472,7 @@ static void ndisc_router_discovery(struct sk_buff *skb)
>
> if (ndopts.nd_useropts) {
> struct nd_opt_hdr *p;
> +
> for (p = ndopts.nd_useropts;
> p;
> p = ndisc_next_useropt(skb->dev, p,
> @@ -1480,9 +1481,8 @@ static void ndisc_router_discovery(struct sk_buff *skb)
> }
> }
>
> - if (ndopts.nd_opts_tgt_lladdr || ndopts.nd_opts_rh) {
> + if (ndopts.nd_opts_tgt_lladdr || ndopts.nd_opts_rh)
> ND_PRINTK(2, warn, "RA: invalid RA options\n");
> - }
> out:
> ip6_rt_put(rt);
> if (neigh)
> @@ -1518,7 +1518,7 @@ static void ndisc_redirect_rcv(struct sk_buff *skb)
>
> if (!ndopts.nd_opts_rh) {
> ip6_redirect_no_header(skb, dev_net(skb->dev),
> - skb->dev->ifindex, 0);
> + skb->dev->ifindex, 0);
> return;
> }
>
> @@ -1569,7 +1569,7 @@ void ndisc_send_redirect(struct sk_buff *skb, const struct in6_addr *target)
> }
>
> if (!ipv6_addr_equal(&ipv6_hdr(skb)->daddr, target) &&
> - ipv6_addr_type(target) != (IPV6_ADDR_UNICAST|IPV6_ADDR_LINKLOCAL)) {
> + ipv6_addr_type(target) != (IPV6_ADDR_UNICAST | IPV6_ADDR_LINKLOCAL)) {
> ND_PRINTK(2, warn,
> "Redirect: target address is not link-local unicast\n");
> return;
> @@ -1587,7 +1587,7 @@ void ndisc_send_redirect(struct sk_buff *skb, const struct in6_addr *target)
> if (IS_ERR(dst))
> return;
>
> - rt = (struct rt6_info *) dst;
> + rt = (struct rt6_info *)dst;
>
> if (rt->rt6i_flags & RTF_GATEWAY) {
> ND_PRINTK(2, warn,
> @@ -1595,7 +1595,7 @@ void ndisc_send_redirect(struct sk_buff *skb, const struct in6_addr *target)
> goto release;
> }
> peer = inet_getpeer_v6(net->ipv6.peers, &ipv6_hdr(skb)->saddr, 1);
> - ret = inet_peer_xrlim_allow(peer, 1*HZ);
> + ret = inet_peer_xrlim_allow(peer, 1 * HZ);
> if (peer)
> inet_putpeer(peer);
> if (!ret)
> @@ -1603,6 +1603,7 @@ void ndisc_send_redirect(struct sk_buff *skb, const struct in6_addr *target)
>
> if (dev->addr_len) {
> struct neighbour *neigh = dst_neigh_lookup(skb_dst(skb), target);
> +
> if (!neigh) {
> ND_PRINTK(2, warn,
> "Redirect: no neigh for target address\n");
> @@ -1787,6 +1788,7 @@ static void ndisc_warn_deprecated_sysctl(struct ctl_table *ctl,
> {
> static char warncomm[TASK_COMM_LEN];
> static int warned;
> +
> if (strcmp(warncomm, current->comm) && warned < 5) {
> strcpy(warncomm, current->comm);
> pr_warn("process `%s' is using deprecated sysctl (%s) net.ipv6.neigh.%s.%s - use net.ipv6.neigh.%s.%s_ms instead\n",
> @@ -1797,7 +1799,8 @@ static void ndisc_warn_deprecated_sysctl(struct ctl_table *ctl,
> }
> }
>
> -int ndisc_ifinfo_sysctl_change(struct ctl_table *ctl, int write, void __user *buffer, size_t *lenp, loff_t *ppos)
> +int ndisc_ifinfo_sysctl_change(struct ctl_table *ctl, int write,
> + void __user *buffer, size_t *lenp, loff_t *ppos)
> {
> struct net_device *dev = ctl->extra1;
> struct inet6_dev *idev;
> @@ -1831,8 +1834,6 @@ int ndisc_ifinfo_sysctl_change(struct ctl_table *ctl, int write, void __user *bu
> }
> return ret;
> }
> -
> -
> #endif
>
> static int __net_init ndisc_net_init(struct net *net)
> --
> 2.7.4
>
>
^ permalink raw reply
* RE: [PATCH v3 2/2] dt-bindings: net: Add Cortina device tree bindings
From: Bogdan Purcareata @ 2017-05-26 13:41 UTC (permalink / raw)
To: Andrew Lunn
Cc: f.fainelli@gmail.com, netdev@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
In-Reply-To: <20170526133554.GD31389@lunn.ch>
> -----Original Message-----
> From: Andrew Lunn [mailto:andrew@lunn.ch]
> Sent: Friday, May 26, 2017 4:36 PM
> To: Bogdan Purcareata <bogdan.purcareata@nxp.com>
> Cc: f.fainelli@gmail.com; netdev@vger.kernel.org;
> devicetree@vger.kernel.org; linux-kernel@vger.kernel.org
> Subject: Re: [PATCH v3 2/2] dt-bindings: net: Add Cortina device tree
> bindings
>
> > + cs4340_phy@1 {
> > + compatible = "ethernet-phy-id13e5.1002";
> > + reg = <0x10>;
>
> The @1 and the reg value should be the same. Please change it to
> cs4340_phy@10.
Will do, thanks!
Bogdan
^ permalink raw reply
* Re: [PATCH v3 2/2] dt-bindings: net: Add Cortina device tree bindings
From: Andrew Lunn @ 2017-05-26 13:35 UTC (permalink / raw)
To: Bogdan Purcareata
Cc: f.fainelli-Re5JQEeQqe8AvxtiuMwx3w, netdev-u79uwXL29TY76Z2rM5mHXA,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <1495785519-1468-3-git-send-email-bogdan.purcareata-3arQi8VN3Tc@public.gmane.org>
> + cs4340_phy@1 {
> + compatible = "ethernet-phy-id13e5.1002";
> + reg = <0x10>;
The @1 and the reg value should be the same. Please change it to
cs4340_phy@10.
Andrew
--
To unsubscribe from this list: send the line "unsubscribe devicetree" 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 net-next 2/2] net: ndisc.c: minor code improvement
From: yuan linyu @ 2017-05-26 13:24 UTC (permalink / raw)
To: netdev; +Cc: David S . Miller, Joe Perches, David Ahern, yuan linyu
From: yuan linyu <Linyu.Yuan@alcatel-sbell.com.cn>
on x86_64, text size decrease 80 bytes
Signed-off-by: yuan linyu <Linyu.Yuan@alcatel-sbell.com.cn>
---
net/ipv6/ndisc.c | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index 292c827..ee9b12c 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -147,17 +147,16 @@ void __ndisc_fill_addr_option(struct sk_buff *skb, int type, void *data,
opt[0] = type;
opt[1] = space >> 3;
+ opt += 2;
- memset(opt + 2, 0, pad);
+ memset(opt, 0, pad);
opt += pad;
space -= pad;
- memcpy(opt + 2, data, data_len);
- data_len += 2;
+ memcpy(opt, data, data_len);
opt += data_len;
space -= data_len;
- if (space > 0)
- memset(opt, 0, space);
+ memset(opt, 0, space);
}
EXPORT_SYMBOL_GPL(__ndisc_fill_addr_option);
@@ -997,6 +996,7 @@ static void ndisc_recv_na(struct sk_buff *skb)
if (neigh) {
u8 old_flags = neigh->flags;
struct net *net = dev_net(dev);
+ u32 flags;
if (neigh->nud_state & NUD_FAILED)
goto out;
@@ -1013,13 +1013,14 @@ static void ndisc_recv_na(struct sk_buff *skb)
goto out;
}
+ flags = NEIGH_UPDATE_F_WEAK_OVERRIDE | NEIGH_UPDATE_F_OVERRIDE_ISROUTER;
+ if (msg->icmph.icmp6_override)
+ flags |= NEIGH_UPDATE_F_OVERRIDE;
+ if (msg->icmph.icmp6_router)
+ flags |= NEIGH_UPDATE_F_ISROUTER;
ndisc_update(dev, neigh, lladdr,
msg->icmph.icmp6_solicited ? NUD_REACHABLE : NUD_STALE,
- NEIGH_UPDATE_F_WEAK_OVERRIDE|
- (msg->icmph.icmp6_override ? NEIGH_UPDATE_F_OVERRIDE : 0)|
- NEIGH_UPDATE_F_OVERRIDE_ISROUTER|
- (msg->icmph.icmp6_router ? NEIGH_UPDATE_F_ISROUTER : 0),
- NDISC_NEIGHBOUR_ADVERTISEMENT, &ndopts);
+ flags, NDISC_NEIGHBOUR_ADVERTISEMENT, &ndopts);
if ((old_flags & ~neigh->flags) & NTF_ROUTER) {
/*
@@ -1217,12 +1218,11 @@ static void ndisc_router_discovery(struct sk_buff *skb)
* received RA message (RFC 2462) -- yoshfuji
*/
old_if_flags = in6_dev->if_flags;
- in6_dev->if_flags = (in6_dev->if_flags & ~(IF_RA_MANAGED |
- IF_RA_OTHERCONF)) |
- (ra_msg->icmph.icmp6_addrconf_managed ?
- IF_RA_MANAGED : 0) |
- (ra_msg->icmph.icmp6_addrconf_other ?
- IF_RA_OTHERCONF : 0);
+ in6_dev->if_flags &= ~(IF_RA_MANAGED | IF_RA_OTHERCONF);
+ if (ra_msg->icmph.icmp6_addrconf_managed)
+ in6_dev->if_flags |= IF_RA_MANAGED;
+ if (ra_msg->icmph.icmp6_addrconf_other)
+ in6_dev->if_flags |= IF_RA_OTHERCONF;
if (old_if_flags != in6_dev->if_flags)
send_ifinfo_notify = true;
--
2.7.4
^ permalink raw reply related
* [PATCH net-next 1/2] net: ndisc.c: fix coding style issue
From: yuan linyu @ 2017-05-26 13:23 UTC (permalink / raw)
To: netdev; +Cc: David S . Miller, Joe Perches, David Ahern, yuan linyu
From: yuan linyu <Linyu.Yuan@alcatel-sbell.com.cn>
Signed-off-by: yuan linyu <Linyu.Yuan@alcatel-sbell.com.cn>
---
net/ipv6/ndisc.c | 109 ++++++++++++++++++++++++++++---------------------------
1 file changed, 55 insertions(+), 54 deletions(-)
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index d310dc4..292c827 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -99,7 +99,6 @@ static const struct neigh_ops ndisc_hh_ops = {
.connected_output = neigh_resolve_output,
};
-
static const struct neigh_ops ndisc_direct_ops = {
.family = AF_INET6,
.output = neigh_direct_output,
@@ -147,13 +146,13 @@ void __ndisc_fill_addr_option(struct sk_buff *skb, int type, void *data,
u8 *opt = skb_put(skb, space);
opt[0] = type;
- opt[1] = space>>3;
+ opt[1] = space >> 3;
memset(opt + 2, 0, pad);
opt += pad;
space -= pad;
- memcpy(opt+2, data, data_len);
+ memcpy(opt + 2, data, data_len);
data_len += 2;
opt += data_len;
space -= data_len;
@@ -182,6 +181,7 @@ static struct nd_opt_hdr *ndisc_next_option(struct nd_opt_hdr *cur,
struct nd_opt_hdr *end)
{
int type;
+
if (!cur || !end || cur >= end)
return NULL;
type = cur->nd_opt_type;
@@ -222,6 +222,7 @@ struct ndisc_options *ndisc_parse_options(const struct net_device *dev,
memset(ndopts, 0, sizeof(*ndopts));
while (opt_len) {
int l;
+
if (opt_len < sizeof(struct nd_opt_hdr))
return NULL;
l = nd_opt->nd_opt_len << 3;
@@ -327,9 +328,8 @@ static int ndisc_constructor(struct neighbour *neigh)
bool is_multicast = ipv6_addr_is_multicast(addr);
in6_dev = in6_dev_get(dev);
- if (!in6_dev) {
+ if (!in6_dev)
return -EINVAL;
- }
parms = in6_dev->nd_parms;
__neigh_parms_put(neigh->parms);
@@ -344,12 +344,12 @@ static int ndisc_constructor(struct neighbour *neigh)
if (is_multicast) {
neigh->nud_state = NUD_NOARP;
ndisc_mc_map(addr, neigh->ha, dev, 1);
- } else if (dev->flags&(IFF_NOARP|IFF_LOOPBACK)) {
+ } else if (dev->flags & (IFF_NOARP | IFF_LOOPBACK)) {
neigh->nud_state = NUD_NOARP;
memcpy(neigh->ha, dev->dev_addr, dev->addr_len);
- if (dev->flags&IFF_LOOPBACK)
+ if (dev->flags & IFF_LOOPBACK)
neigh->type = RTN_LOCAL;
- } else if (dev->flags&IFF_POINTOPOINT) {
+ } else if (dev->flags & IFF_POINTOPOINT) {
neigh->nud_state = NUD_NOARP;
memcpy(neigh->ha, dev->broadcast, dev->addr_len);
}
@@ -357,7 +357,7 @@ static int ndisc_constructor(struct neighbour *neigh)
neigh->ops = &ndisc_hh_ops;
else
neigh->ops = &ndisc_generic_ops;
- if (neigh->nud_state&NUD_VALID)
+ if (neigh->nud_state & NUD_VALID)
neigh->output = neigh->ops->connected_output;
else
neigh->output = neigh->ops->output;
@@ -580,7 +580,7 @@ void ndisc_send_ns(struct net_device *dev, const struct in6_addr *solicit,
if (!saddr) {
if (ipv6_get_lladdr(dev, &addr_buf,
- (IFA_F_TENTATIVE|IFA_F_OPTIMISTIC)))
+ (IFA_F_TENTATIVE | IFA_F_OPTIMISTIC)))
return;
saddr = &addr_buf;
}
@@ -641,9 +641,8 @@ void ndisc_send_rs(struct net_device *dev, const struct in6_addr *saddr,
struct inet6_ifaddr *ifp = ipv6_get_ifaddr(dev_net(dev), saddr,
dev, 1);
if (ifp) {
- if (ifp->flags & IFA_F_OPTIMISTIC) {
+ if (ifp->flags & IFA_F_OPTIMISTIC)
send_sllao = 0;
- }
in6_ifa_put(ifp);
} else {
send_sllao = 0;
@@ -672,7 +671,6 @@ void ndisc_send_rs(struct net_device *dev, const struct in6_addr *saddr,
ndisc_send_skb(skb, daddr, saddr);
}
-
static void ndisc_error_report(struct neighbour *neigh, struct sk_buff *skb)
{
/*
@@ -695,7 +693,7 @@ static void ndisc_solicit(struct neighbour *neigh, struct sk_buff *skb)
if (skb && ipv6_chk_addr_and_flags(dev_net(dev), &ipv6_hdr(skb)->saddr,
dev, 1,
- IFA_F_TENTATIVE|IFA_F_OPTIMISTIC))
+ IFA_F_TENTATIVE | IFA_F_OPTIMISTIC))
saddr = &ipv6_hdr(skb)->saddr;
probes -= NEIGH_VAR(neigh->parms, UCAST_PROBES);
if (probes < 0) {
@@ -806,7 +804,7 @@ static void ndisc_recv_ns(struct sk_buff *skb)
ifp = ipv6_get_ifaddr(dev_net(dev), &msg->target, dev, 1);
if (ifp) {
have_ifp:
- if (ifp->flags & (IFA_F_TENTATIVE|IFA_F_OPTIMISTIC)) {
+ if (ifp->flags & (IFA_F_TENTATIVE | IFA_F_OPTIMISTIC)) {
if (dad) {
if (nonce != 0 && ifp->dad_nonce == nonce) {
u8 *np = (u8 *)&nonce;
@@ -824,16 +822,15 @@ static void ndisc_recv_ns(struct sk_buff *skb)
*/
addrconf_dad_failure(ifp);
return;
- } else {
- /*
- * This is not a dad solicitation.
- * If we are an optimistic node,
- * we should respond.
- * Otherwise, we should ignore it.
- */
- if (!(ifp->flags & IFA_F_OPTIMISTIC))
- goto out;
}
+ /*
+ * This is not a dad solicitation.
+ * If we are an optimistic node,
+ * we should respond.
+ * Otherwise, we should ignore it.
+ */
+ if (!(ifp->flags & IFA_F_OPTIMISTIC))
+ goto out;
}
idev = ifp->idev;
@@ -874,6 +871,7 @@ static void ndisc_recv_ns(struct sk_buff *skb)
* (RFC2461) -- yoshfuji
*/
struct sk_buff *n = skb_clone(skb, GFP_ATOMIC);
+
if (n)
pneigh_enqueue(&nd_tbl, idev->nd_parms, n);
goto out;
@@ -904,7 +902,7 @@ static void ndisc_recv_ns(struct sk_buff *skb)
!inc || lladdr || !dev->addr_len);
if (neigh)
ndisc_update(dev, neigh, lladdr, NUD_STALE,
- NEIGH_UPDATE_F_WEAK_OVERRIDE|
+ NEIGH_UPDATE_F_WEAK_OVERRIDE |
NEIGH_UPDATE_F_OVERRIDE,
NDISC_NEIGHBOUR_SOLICITATION, &ndopts);
if (neigh || !dev->header_ops) {
@@ -973,10 +971,10 @@ static void ndisc_recv_na(struct sk_buff *skb)
}
ifp = ipv6_get_ifaddr(dev_net(dev), &msg->target, dev, 1);
if (ifp) {
- if (skb->pkt_type != PACKET_LOOPBACK
- && (ifp->flags & IFA_F_TENTATIVE)) {
- addrconf_dad_failure(ifp);
- return;
+ if (skb->pkt_type != PACKET_LOOPBACK &&
+ (ifp->flags & IFA_F_TENTATIVE)) {
+ addrconf_dad_failure(ifp);
+ return;
}
/* What should we make now? The advertisement
is invalid, but ndisc specs say nothing
@@ -1081,8 +1079,8 @@ static void ndisc_recv_rs(struct sk_buff *skb)
neigh = __neigh_lookup(&nd_tbl, saddr, skb->dev, 1);
if (neigh) {
ndisc_update(skb->dev, neigh, lladdr, NUD_STALE,
- NEIGH_UPDATE_F_WEAK_OVERRIDE|
- NEIGH_UPDATE_F_OVERRIDE|
+ NEIGH_UPDATE_F_WEAK_OVERRIDE |
+ NEIGH_UPDATE_F_OVERRIDE |
NEIGH_UPDATE_F_OVERRIDE_ISROUTER,
NDISC_ROUTER_SOLICITATION, &ndopts);
neigh_release(neigh);
@@ -1110,9 +1108,8 @@ static void ndisc_ra_useropt(struct sk_buff *ra, struct nd_opt_hdr *opt)
}
nlh = nlmsg_put(skb, 0, 0, RTM_NEWNDUSEROPT, base_size, 0);
- if (!nlh) {
+ if (!nlh)
goto nla_put_failure;
- }
ndmsg = nlmsg_data(nlh);
ndmsg->nduseropt_family = AF_INET6;
@@ -1325,21 +1322,21 @@ static void ndisc_router_discovery(struct sk_buff *skb)
if (in6_dev->nd_parms) {
unsigned long rtime = ntohl(ra_msg->retrans_timer);
- if (rtime && rtime/1000 < MAX_SCHEDULE_TIMEOUT/HZ) {
- rtime = (rtime*HZ)/1000;
- if (rtime < HZ/10)
- rtime = HZ/10;
+ if (rtime && rtime / 1000 < MAX_SCHEDULE_TIMEOUT / HZ) {
+ rtime = (rtime * HZ) / 1000;
+ if (rtime < HZ / 10)
+ rtime = HZ / 10;
NEIGH_VAR_SET(in6_dev->nd_parms, RETRANS_TIME, rtime);
in6_dev->tstamp = jiffies;
send_ifinfo_notify = true;
}
rtime = ntohl(ra_msg->reachable_time);
- if (rtime && rtime/1000 < MAX_SCHEDULE_TIMEOUT/(3*HZ)) {
- rtime = (rtime*HZ)/1000;
+ if (rtime && rtime / 1000 < MAX_SCHEDULE_TIMEOUT / (3 * HZ)) {
+ rtime = (rtime * HZ) / 1000;
- if (rtime < HZ/10)
- rtime = HZ/10;
+ if (rtime < HZ / 10)
+ rtime = HZ / 10;
if (rtime != NEIGH_VAR(in6_dev->nd_parms, BASE_REACHABLE_TIME)) {
NEIGH_VAR_SET(in6_dev->nd_parms,
@@ -1370,6 +1367,7 @@ static void ndisc_router_discovery(struct sk_buff *skb)
skb->dev, 1);
if (neigh) {
u8 *lladdr = NULL;
+
if (ndopts.nd_opts_src_lladdr) {
lladdr = ndisc_opt_addr_data(ndopts.nd_opts_src_lladdr,
skb->dev);
@@ -1380,9 +1378,9 @@ static void ndisc_router_discovery(struct sk_buff *skb)
}
}
ndisc_update(skb->dev, neigh, lladdr, NUD_STALE,
- NEIGH_UPDATE_F_WEAK_OVERRIDE|
- NEIGH_UPDATE_F_OVERRIDE|
- NEIGH_UPDATE_F_OVERRIDE_ISROUTER|
+ NEIGH_UPDATE_F_WEAK_OVERRIDE |
+ NEIGH_UPDATE_F_OVERRIDE |
+ NEIGH_UPDATE_F_OVERRIDE_ISROUTER |
NEIGH_UPDATE_F_ISROUTER,
NDISC_ROUTER_ADVERTISEMENT, &ndopts);
}
@@ -1406,6 +1404,7 @@ static void ndisc_router_discovery(struct sk_buff *skb)
if (in6_dev->cnf.accept_ra_rtr_pref && ndopts.nd_opts_ri) {
struct nd_opt_hdr *p;
+
for (p = ndopts.nd_opts_ri;
p;
p = ndisc_next_option(p, ndopts.nd_opts_ri_end)) {
@@ -1442,6 +1441,7 @@ static void ndisc_router_discovery(struct sk_buff *skb)
if (in6_dev->cnf.accept_ra_pinfo && ndopts.nd_opts_pi) {
struct nd_opt_hdr *p;
+
for (p = ndopts.nd_opts_pi;
p;
p = ndisc_next_option(p, ndopts.nd_opts_pi_end)) {
@@ -1455,7 +1455,7 @@ static void ndisc_router_discovery(struct sk_buff *skb)
__be32 n;
u32 mtu;
- memcpy(&n, ((u8 *)(ndopts.nd_opts_mtu+1))+2, sizeof(mtu));
+ memcpy(&n, ((u8 *)(ndopts.nd_opts_mtu + 1)) + 2, sizeof(mtu));
mtu = ntohl(n);
if (mtu < IPV6_MIN_MTU || mtu > skb->dev->mtu) {
@@ -1472,6 +1472,7 @@ static void ndisc_router_discovery(struct sk_buff *skb)
if (ndopts.nd_useropts) {
struct nd_opt_hdr *p;
+
for (p = ndopts.nd_useropts;
p;
p = ndisc_next_useropt(skb->dev, p,
@@ -1480,9 +1481,8 @@ static void ndisc_router_discovery(struct sk_buff *skb)
}
}
- if (ndopts.nd_opts_tgt_lladdr || ndopts.nd_opts_rh) {
+ if (ndopts.nd_opts_tgt_lladdr || ndopts.nd_opts_rh)
ND_PRINTK(2, warn, "RA: invalid RA options\n");
- }
out:
ip6_rt_put(rt);
if (neigh)
@@ -1518,7 +1518,7 @@ static void ndisc_redirect_rcv(struct sk_buff *skb)
if (!ndopts.nd_opts_rh) {
ip6_redirect_no_header(skb, dev_net(skb->dev),
- skb->dev->ifindex, 0);
+ skb->dev->ifindex, 0);
return;
}
@@ -1569,7 +1569,7 @@ void ndisc_send_redirect(struct sk_buff *skb, const struct in6_addr *target)
}
if (!ipv6_addr_equal(&ipv6_hdr(skb)->daddr, target) &&
- ipv6_addr_type(target) != (IPV6_ADDR_UNICAST|IPV6_ADDR_LINKLOCAL)) {
+ ipv6_addr_type(target) != (IPV6_ADDR_UNICAST | IPV6_ADDR_LINKLOCAL)) {
ND_PRINTK(2, warn,
"Redirect: target address is not link-local unicast\n");
return;
@@ -1587,7 +1587,7 @@ void ndisc_send_redirect(struct sk_buff *skb, const struct in6_addr *target)
if (IS_ERR(dst))
return;
- rt = (struct rt6_info *) dst;
+ rt = (struct rt6_info *)dst;
if (rt->rt6i_flags & RTF_GATEWAY) {
ND_PRINTK(2, warn,
@@ -1595,7 +1595,7 @@ void ndisc_send_redirect(struct sk_buff *skb, const struct in6_addr *target)
goto release;
}
peer = inet_getpeer_v6(net->ipv6.peers, &ipv6_hdr(skb)->saddr, 1);
- ret = inet_peer_xrlim_allow(peer, 1*HZ);
+ ret = inet_peer_xrlim_allow(peer, 1 * HZ);
if (peer)
inet_putpeer(peer);
if (!ret)
@@ -1603,6 +1603,7 @@ void ndisc_send_redirect(struct sk_buff *skb, const struct in6_addr *target)
if (dev->addr_len) {
struct neighbour *neigh = dst_neigh_lookup(skb_dst(skb), target);
+
if (!neigh) {
ND_PRINTK(2, warn,
"Redirect: no neigh for target address\n");
@@ -1787,6 +1788,7 @@ static void ndisc_warn_deprecated_sysctl(struct ctl_table *ctl,
{
static char warncomm[TASK_COMM_LEN];
static int warned;
+
if (strcmp(warncomm, current->comm) && warned < 5) {
strcpy(warncomm, current->comm);
pr_warn("process `%s' is using deprecated sysctl (%s) net.ipv6.neigh.%s.%s - use net.ipv6.neigh.%s.%s_ms instead\n",
@@ -1797,7 +1799,8 @@ static void ndisc_warn_deprecated_sysctl(struct ctl_table *ctl,
}
}
-int ndisc_ifinfo_sysctl_change(struct ctl_table *ctl, int write, void __user *buffer, size_t *lenp, loff_t *ppos)
+int ndisc_ifinfo_sysctl_change(struct ctl_table *ctl, int write,
+ void __user *buffer, size_t *lenp, loff_t *ppos)
{
struct net_device *dev = ctl->extra1;
struct inet6_dev *idev;
@@ -1831,8 +1834,6 @@ int ndisc_ifinfo_sysctl_change(struct ctl_table *ctl, int write, void __user *bu
}
return ret;
}
-
-
#endif
static int __net_init ndisc_net_init(struct net *net)
--
2.7.4
^ permalink raw reply related
* [PATCH net-next 0/2] ndisc.c minor clean and improvement
From: yuan linyu @ 2017-05-26 13:21 UTC (permalink / raw)
To: netdev; +Cc: David S . Miller, Joe Perches, David Ahern, yuan linyu
From: yuan linyu <Linyu.Yuan@alcatel-sbell.com.cn>
1. fix part of checkpatch issue which I like to fix
2. __ndisc_fill_addr_option() clean
yuan linyu (2):
net: ndisc.c: fix coding style issue
net: ndisc.c: minor code improvement
net/ipv6/ndisc.c | 139 ++++++++++++++++++++++++++++---------------------------
1 file changed, 70 insertions(+), 69 deletions(-)
--
2.7.4
^ permalink raw reply
* Re: [for-next 5/6] net/mlx5: Bump driver version
From: Dennis Dalessandro @ 2017-05-26 12:56 UTC (permalink / raw)
To: Saeed Mahameed, David S. Miller, Doug Ledford
Cc: netdev-u79uwXL29TY76Z2rM5mHXA, linux-rdma-u79uwXL29TY76Z2rM5mHXA,
Ilan Tayari, Tariq Toukan
In-Reply-To: <20170523114404.20387-6-saeedm-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
On 5/23/2017 7:44 AM, Saeed Mahameed wrote:
> From: Tariq Toukan <tariqt-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
>
> Remove date and bump version for mlx5_core driver.
>
> Signed-off-by: Tariq Toukan <tariqt-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
> Signed-off-by: Saeed Mahameed <saeedm-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
So I just complained about the bnxt_re doing this. I guess I need to
raise a flag here too. Now to be clear I'm not against doing this
version stuff. I'm against using it for some internal tracking that is
meaningless to the kernel community.
There is no detail in your commit message as to what this driver version
is used for. Can you please explain how your use of driver version is
valid while theirs is not?
I realize Dave has already pulled this and I'm not asking for it to be
reverted but maybe some discussion will help guide future patch
submissions which do this stuff.
-Denny
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" 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: [PATCH v2 net-next 1/3] perf, bpf: Add BPF support to all perf_event types
From: kbuild test robot @ 2017-05-26 11:04 UTC (permalink / raw)
To: Alexei Starovoitov
Cc: kbuild-all, David S . Miller, Peter Zijlstra, Brendan Gregg,
Daniel Borkmann, Teng Qin, netdev, linux-kernel
In-Reply-To: <20170526055549.557818-2-ast@fb.com>
[-- Attachment #1: Type: text/plain, Size: 1274 bytes --]
Hi Teng,
[auto build test ERROR on net-next/master]
url: https://github.com/0day-ci/linux/commits/Alexei-Starovoitov/bpf-Add-BPF-support-to-all-perf_event/20170526-171542
config: ia64-allmodconfig (attached as .config)
compiler: ia64-linux-gcc (GCC) 6.2.0
reproduce:
wget https://raw.githubusercontent.com/01org/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=ia64
All errors (new ones prefixed by >>):
kernel//bpf/arraymap.c: In function 'perf_event_fd_array_get_ptr':
>> kernel//bpf/arraymap.c:466:11: error: 'struct perf_event' has no member named 'attach_state'
if (event->attach_state & PERF_ATTACH_TASK)
^~
vim +466 kernel//bpf/arraymap.c
460 if (IS_ERR(perf_file))
461 return perf_file;
462
463 event = perf_file->private_data;
464 ee = ERR_PTR(-EINVAL);
465 /* Per-task events are not supported */
> 466 if (event->attach_state & PERF_ATTACH_TASK)
467 goto err_out;
468
469 attr = perf_event_attrs(event);
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 47722 bytes --]
^ permalink raw reply
* running an eBPF program
From: Adel Fuchs @ 2017-05-26 11:00 UTC (permalink / raw)
To: netdev
Hi
I'm trying to run this eBPF program:
https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git/tree/examples/bpf
and I get this error:
:~/iproute2/examples/bpf$sudo tc filter add dev enx00e11100329b parent
1: bpf obj bpf.o exp /tmp/bpf-uds flowid 1:1 action bpf obj bpf.o sec
action-mark action bpf obj bpf.o sec action-rand ok
[sudo] password for adel:
Prog section 'classifier' rejected: Permission denied (13)!
- Type: 3
- Instructions: 218 (0 over limit)
- License: GPL
Verifier analysis:
0: (bf) r6 = r1
1: (18) r9 = 0xffe0000e
3: (69) r0 = *(u16 *)(r6 +16)
invalid bpf_context access off=16 size=2
Error fetching program/map!
Failed to retrieve (e)BPF data!
Any suggestions?
Thanks,
Adel
^ permalink raw reply
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