From: Radhey Shyam Pandey <radheys@xilinx.com> To: Andre Przywara <andre.przywara@arm.com>, "David S . Miller" <davem@davemloft.net> Cc: Michal Simek <michals@xilinx.com>, Robert Hancock <hancock@sedsystems.ca>, "netdev@vger.kernel.org" <netdev@vger.kernel.org>, "linux-arm-kernel@lists.infradead.org" <linux-arm-kernel@lists.infradead.org>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org> Subject: RE: [PATCH 02/14] net: axienet: Propagate failure of DMA descriptor setup Date: Fri, 10 Jan 2020 17:53:08 +0000 [thread overview] Message-ID: <CH2PR02MB70007946C760D524D56B6F64C7380@CH2PR02MB7000.namprd02.prod.outlook.com> (raw) In-Reply-To: <CH2PR02MB7000063BD3CFC30D18B06FDFC7380@CH2PR02MB7000.namprd02.prod.outlook.com> > -----Original Message----- > From: Radhey Shyam Pandey > Sent: Friday, January 10, 2020 8:25 PM > To: Andre Przywara <andre.przywara@arm.com>; David S . Miller > <davem@davemloft.net> > Cc: Michal Simek <michals@xilinx.com>; Robert Hancock > <hancock@sedsystems.ca>; netdev@vger.kernel.org; linux-arm- > kernel@lists.infradead.org; linux-kernel@vger.kernel.org > Subject: RE: [PATCH 02/14] net: axienet: Propagate failure of DMA descriptor > setup > > > -----Original Message----- > > From: Andre Przywara <andre.przywara@arm.com> > > Sent: Friday, January 10, 2020 5:24 PM > > To: David S . Miller <davem@davemloft.net>; Radhey Shyam Pandey > > <radheys@xilinx.com> > > Cc: Michal Simek <michals@xilinx.com>; Robert Hancock > > <hancock@sedsystems.ca>; netdev@vger.kernel.org; linux-arm- > > kernel@lists.infradead.org; linux-kernel@vger.kernel.org > > Subject: [PATCH 02/14] net: axienet: Propagate failure of DMA > > descriptor setup > > > > When we fail allocating the DMA buffers in axienet_dma_bd_init(), we > > report this error, but carry on with initialisation nevertheless. > > > > This leads to a kernel panic when the driver later wants to send a > > packet, as it uses uninitialised data structures. > > > > Make the axienet_device_reset() routine return an error value, as it > > contains the DMA buffer initialisation. Make sure we propagate the > > error up the chain and eventually fail the driver initialisation, to > > avoid relying on non-initialised buffers. > > > > Signed-off-by: Andre Przywara <andre.przywara@arm.com> > Reviewed-by: Radhey Shyam Pandey <radhey.shyam.pandey@xilinx.com> > > > --- > > .../net/ethernet/xilinx/xilinx_axienet_main.c | 25 > > +++++++++++++------ > > 1 file changed, 18 insertions(+), 7 deletions(-) > > > > diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c > > b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c > > index 20746b801959..97482cf093ce 100644 > > --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c > > +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c > > @@ -437,9 +437,10 @@ static void axienet_setoptions(struct net_device > > *ndev, u32 options) > > lp->options |= options; > > } > > > > -static void __axienet_device_reset(struct axienet_local *lp) > > +static int __axienet_device_reset(struct axienet_local *lp) > > { > > u32 timeout; > > + > > /* Reset Axi DMA. This would reset Axi Ethernet core as well. The > > reset > > * process of Axi DMA takes a while to complete as all pending > > * commands/transfers will be flushed or completed during this @@ > > -455,9 +456,11 @@ static void __axienet_device_reset(struct > > axienet_local *lp) > > if (--timeout == 0) { > > netdev_err(lp->ndev, "%s: DMA reset timeout!\n", > > __func__); > > - break; > > + return -ETIMEDOUT; > > } > > } > > + > > + return 0; > > } > > > > /** > > @@ -471,12 +474,15 @@ static void __axienet_device_reset(struct > > axienet_local *lp) > > * Ethernet core. No separate hardware reset is done for the Axi Ethernet > > * core. > > */ Minor nit- we need to add descripton for return value. drivers/net/ethernet/xilinx/xilinx_axienet_main.c:491: warning: No description found for return value of 'axienet_device_reset' > > -static void axienet_device_reset(struct net_device *ndev) > > +static int axienet_device_reset(struct net_device *ndev) > > { > > u32 axienet_status; > > struct axienet_local *lp = netdev_priv(ndev); > > + int ret; > > > > - __axienet_device_reset(lp); > > + ret = __axienet_device_reset(lp); > > + if (ret) > > + return ret; > > > > lp->max_frm_size = XAE_MAX_VLAN_FRAME_SIZE; > > lp->options |= XAE_OPTION_VLAN; > > @@ -491,9 +497,11 @@ static void axienet_device_reset(struct > > net_device > > *ndev) > > lp->options |= XAE_OPTION_JUMBO; > > } > > > > - if (axienet_dma_bd_init(ndev)) { > > + ret = axienet_dma_bd_init(ndev); > > + if (ret) { > > netdev_err(ndev, "%s: descriptor allocation failed\n", > > __func__); > > + return ret; > > } > > > > axienet_status = axienet_ior(lp, XAE_RCW1_OFFSET); @@ -518,6 > +526,8 > > @@ static void axienet_device_reset(struct net_device > > *ndev) > > axienet_setoptions(ndev, lp->options); > > > > netif_trans_update(ndev); > > + > > + return 0; > > } > > > > /** > > @@ -921,8 +931,9 @@ static int axienet_open(struct net_device *ndev) > > */ > > mutex_lock(&lp->mii_bus->mdio_lock); > > axienet_mdio_disable(lp); > > - axienet_device_reset(ndev); > > - ret = axienet_mdio_enable(lp); > > + ret = axienet_device_reset(ndev); > > + if (ret == 0) > > + ret = axienet_mdio_enable(lp); > > mutex_unlock(&lp->mii_bus->mdio_lock); > > if (ret < 0) > > return ret; > > -- > > 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Radhey Shyam Pandey <radheys@xilinx.com> To: Andre Przywara <andre.przywara@arm.com>, "David S . Miller" <davem@davemloft.net> Cc: Robert Hancock <hancock@sedsystems.ca>, "netdev@vger.kernel.org" <netdev@vger.kernel.org>, Michal Simek <michals@xilinx.com>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, "linux-arm-kernel@lists.infradead.org" <linux-arm-kernel@lists.infradead.org> Subject: RE: [PATCH 02/14] net: axienet: Propagate failure of DMA descriptor setup Date: Fri, 10 Jan 2020 17:53:08 +0000 [thread overview] Message-ID: <CH2PR02MB70007946C760D524D56B6F64C7380@CH2PR02MB7000.namprd02.prod.outlook.com> (raw) In-Reply-To: <CH2PR02MB7000063BD3CFC30D18B06FDFC7380@CH2PR02MB7000.namprd02.prod.outlook.com> > -----Original Message----- > From: Radhey Shyam Pandey > Sent: Friday, January 10, 2020 8:25 PM > To: Andre Przywara <andre.przywara@arm.com>; David S . Miller > <davem@davemloft.net> > Cc: Michal Simek <michals@xilinx.com>; Robert Hancock > <hancock@sedsystems.ca>; netdev@vger.kernel.org; linux-arm- > kernel@lists.infradead.org; linux-kernel@vger.kernel.org > Subject: RE: [PATCH 02/14] net: axienet: Propagate failure of DMA descriptor > setup > > > -----Original Message----- > > From: Andre Przywara <andre.przywara@arm.com> > > Sent: Friday, January 10, 2020 5:24 PM > > To: David S . Miller <davem@davemloft.net>; Radhey Shyam Pandey > > <radheys@xilinx.com> > > Cc: Michal Simek <michals@xilinx.com>; Robert Hancock > > <hancock@sedsystems.ca>; netdev@vger.kernel.org; linux-arm- > > kernel@lists.infradead.org; linux-kernel@vger.kernel.org > > Subject: [PATCH 02/14] net: axienet: Propagate failure of DMA > > descriptor setup > > > > When we fail allocating the DMA buffers in axienet_dma_bd_init(), we > > report this error, but carry on with initialisation nevertheless. > > > > This leads to a kernel panic when the driver later wants to send a > > packet, as it uses uninitialised data structures. > > > > Make the axienet_device_reset() routine return an error value, as it > > contains the DMA buffer initialisation. Make sure we propagate the > > error up the chain and eventually fail the driver initialisation, to > > avoid relying on non-initialised buffers. > > > > Signed-off-by: Andre Przywara <andre.przywara@arm.com> > Reviewed-by: Radhey Shyam Pandey <radhey.shyam.pandey@xilinx.com> > > > --- > > .../net/ethernet/xilinx/xilinx_axienet_main.c | 25 > > +++++++++++++------ > > 1 file changed, 18 insertions(+), 7 deletions(-) > > > > diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c > > b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c > > index 20746b801959..97482cf093ce 100644 > > --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c > > +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c > > @@ -437,9 +437,10 @@ static void axienet_setoptions(struct net_device > > *ndev, u32 options) > > lp->options |= options; > > } > > > > -static void __axienet_device_reset(struct axienet_local *lp) > > +static int __axienet_device_reset(struct axienet_local *lp) > > { > > u32 timeout; > > + > > /* Reset Axi DMA. This would reset Axi Ethernet core as well. The > > reset > > * process of Axi DMA takes a while to complete as all pending > > * commands/transfers will be flushed or completed during this @@ > > -455,9 +456,11 @@ static void __axienet_device_reset(struct > > axienet_local *lp) > > if (--timeout == 0) { > > netdev_err(lp->ndev, "%s: DMA reset timeout!\n", > > __func__); > > - break; > > + return -ETIMEDOUT; > > } > > } > > + > > + return 0; > > } > > > > /** > > @@ -471,12 +474,15 @@ static void __axienet_device_reset(struct > > axienet_local *lp) > > * Ethernet core. No separate hardware reset is done for the Axi Ethernet > > * core. > > */ Minor nit- we need to add descripton for return value. drivers/net/ethernet/xilinx/xilinx_axienet_main.c:491: warning: No description found for return value of 'axienet_device_reset' > > -static void axienet_device_reset(struct net_device *ndev) > > +static int axienet_device_reset(struct net_device *ndev) > > { > > u32 axienet_status; > > struct axienet_local *lp = netdev_priv(ndev); > > + int ret; > > > > - __axienet_device_reset(lp); > > + ret = __axienet_device_reset(lp); > > + if (ret) > > + return ret; > > > > lp->max_frm_size = XAE_MAX_VLAN_FRAME_SIZE; > > lp->options |= XAE_OPTION_VLAN; > > @@ -491,9 +497,11 @@ static void axienet_device_reset(struct > > net_device > > *ndev) > > lp->options |= XAE_OPTION_JUMBO; > > } > > > > - if (axienet_dma_bd_init(ndev)) { > > + ret = axienet_dma_bd_init(ndev); > > + if (ret) { > > netdev_err(ndev, "%s: descriptor allocation failed\n", > > __func__); > > + return ret; > > } > > > > axienet_status = axienet_ior(lp, XAE_RCW1_OFFSET); @@ -518,6 > +526,8 > > @@ static void axienet_device_reset(struct net_device > > *ndev) > > axienet_setoptions(ndev, lp->options); > > > > netif_trans_update(ndev); > > + > > + return 0; > > } > > > > /** > > @@ -921,8 +931,9 @@ static int axienet_open(struct net_device *ndev) > > */ > > mutex_lock(&lp->mii_bus->mdio_lock); > > axienet_mdio_disable(lp); > > - axienet_device_reset(ndev); > > - ret = axienet_mdio_enable(lp); > > + ret = axienet_device_reset(ndev); > > + if (ret == 0) > > + ret = axienet_mdio_enable(lp); > > mutex_unlock(&lp->mii_bus->mdio_lock); > > if (ret < 0) > > return ret; > > -- > > 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-01-10 17:53 UTC|newest] Thread overview: 130+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-01-10 11:54 [PATCH 00/14] net: axienet: Error handling, SGMII and 64-bit DMA fixes Andre Przywara 2020-01-10 11:54 ` Andre Przywara 2020-01-10 11:54 ` [PATCH 01/14] net: xilinx: temac: Relax Kconfig dependencies Andre Przywara 2020-01-10 11:54 ` Andre Przywara 2020-01-10 14:19 ` Radhey Shyam Pandey 2020-01-10 14:19 ` Radhey Shyam Pandey 2020-01-10 11:54 ` [PATCH 02/14] net: axienet: Propagate failure of DMA descriptor setup Andre Przywara 2020-01-10 11:54 ` Andre Przywara 2020-01-10 14:54 ` Radhey Shyam Pandey 2020-01-10 14:54 ` Radhey Shyam Pandey 2020-01-10 17:53 ` Radhey Shyam Pandey [this message] 2020-01-10 17:53 ` Radhey Shyam Pandey 2020-01-10 11:54 ` [PATCH 03/14] net: axienet: Fix DMA descriptor cleanup path Andre Przywara 2020-01-10 11:54 ` Andre Przywara 2020-01-10 15:14 ` Radhey Shyam Pandey 2020-01-10 15:14 ` Radhey Shyam Pandey 2020-01-10 15:43 ` Andre Przywara 2020-01-10 15:43 ` Andre Przywara 2020-01-10 17:05 ` Radhey Shyam Pandey 2020-01-10 17:05 ` Radhey Shyam Pandey 2020-01-16 18:03 ` Andre Przywara 2020-01-16 18:03 ` Andre Przywara 2020-01-20 18:32 ` Radhey Shyam Pandey 2020-01-20 18:32 ` Radhey Shyam Pandey 2020-01-10 11:54 ` [PATCH 04/14] net: axienet: Improve DMA error handling Andre Przywara 2020-01-10 11:54 ` Andre Przywara 2020-01-10 15:26 ` Radhey Shyam Pandey 2020-01-10 15:26 ` Radhey Shyam Pandey 2020-01-10 11:54 ` [PATCH 05/14] net: axienet: Factor out TX descriptor chain cleanup Andre Przywara 2020-01-10 11:54 ` Andre Przywara 2020-01-10 18:04 ` Radhey Shyam Pandey 2020-01-10 18:04 ` Radhey Shyam Pandey 2020-01-10 11:54 ` [PATCH 06/14] net: axienet: Check for DMA mapping errors Andre Przywara 2020-01-10 11:54 ` Andre Przywara 2020-01-13 5:54 ` Radhey Shyam Pandey 2020-01-13 5:54 ` Radhey Shyam Pandey 2020-01-10 11:54 ` [PATCH 07/14] net: axienet: Fix SGMII support Andre Przywara 2020-01-10 11:54 ` Andre Przywara 2020-01-10 14:04 ` Andrew Lunn 2020-01-10 14:04 ` Andrew Lunn 2020-01-10 14:20 ` Andre Przywara 2020-01-10 14:20 ` Andre Przywara 2020-01-10 14:26 ` Andrew Lunn 2020-01-10 14:26 ` Andrew Lunn 2020-01-10 15:04 ` Russell King - ARM Linux admin 2020-01-10 15:04 ` Russell King - ARM Linux admin 2020-01-10 15:22 ` Russell King - ARM Linux admin 2020-01-10 15:22 ` Russell King - ARM Linux admin 2020-01-10 17:04 ` Russell King - ARM Linux admin 2020-01-10 17:04 ` Russell King - ARM Linux admin 2020-01-18 11:22 ` Russell King - ARM Linux admin 2020-01-18 11:22 ` Russell King - ARM Linux admin 2020-01-20 14:50 ` Andre Przywara 2020-01-20 14:50 ` Andre Przywara 2020-01-20 15:45 ` Russell King - ARM Linux admin 2020-01-20 15:45 ` Russell King - ARM Linux admin 2020-01-27 17:04 ` Andre Przywara 2020-01-27 17:04 ` Andre Przywara 2020-01-27 17:20 ` Radhey Shyam Pandey 2020-01-27 17:20 ` Radhey Shyam Pandey 2020-01-27 18:53 ` Russell King - ARM Linux admin 2020-01-27 18:53 ` Russell King - ARM Linux admin 2020-04-22 1:45 ` Xilinx axienet 1000BaseX support (was: Re: [PATCH 07/14] net: axienet: Fix SGMII support) Robert Hancock 2020-04-22 1:45 ` Robert Hancock 2020-04-22 7:51 ` Russell King - ARM Linux admin 2020-04-22 7:51 ` Russell King - ARM Linux admin 2020-04-22 16:31 ` Xilinx axienet 1000BaseX support Robert Hancock 2020-04-22 16:31 ` Robert Hancock 2020-04-28 21:59 ` Robert Hancock 2020-04-28 21:59 ` Robert Hancock 2020-04-28 23:01 ` Russell King - ARM Linux admin 2020-04-28 23:01 ` Russell King - ARM Linux admin 2020-04-28 23:51 ` Robert Hancock 2020-04-28 23:51 ` Robert Hancock 2020-04-29 8:21 ` Russell King - ARM Linux admin 2020-04-29 8:21 ` Russell King - ARM Linux admin 2020-01-10 14:58 ` [PATCH 07/14] net: axienet: Fix SGMII support Russell King - ARM Linux admin 2020-01-10 14:58 ` Russell King - ARM Linux admin 2020-01-10 17:32 ` Andre Przywara 2020-01-10 17:32 ` Andre Przywara 2020-01-10 18:05 ` Russell King - ARM Linux admin 2020-01-10 18:05 ` Russell King - ARM Linux admin 2020-01-10 19:33 ` Andrew Lunn 2020-01-10 19:33 ` Andrew Lunn 2020-01-10 11:54 ` [PATCH 08/14] net: axienet: Drop MDIO interrupt registers from ethtools dump Andre Przywara 2020-01-10 11:54 ` Andre Przywara 2020-01-13 6:02 ` Radhey Shyam Pandey 2020-01-13 6:02 ` Radhey Shyam Pandey 2020-01-10 11:54 ` [PATCH 09/14] net: axienet: Add mii-tool support Andre Przywara 2020-01-10 11:54 ` Andre Przywara 2020-01-13 6:12 ` Radhey Shyam Pandey 2020-01-13 6:12 ` Radhey Shyam Pandey 2020-03-12 11:41 ` Andre Przywara 2020-03-12 11:41 ` Andre Przywara 2020-01-10 11:54 ` [PATCH 10/14] net: axienet: Wrap DMA pointer writes to prepare for 64 bit Andre Przywara 2020-01-10 11:54 ` Andre Przywara 2020-01-10 11:54 ` [PATCH 11/14] net: axienet: Upgrade descriptors to hold 64-bit addresses Andre Przywara 2020-01-10 11:54 ` Andre Przywara 2020-01-14 16:35 ` Radhey Shyam Pandey 2020-01-14 16:35 ` Radhey Shyam Pandey 2020-01-14 17:29 ` Andre Przywara 2020-01-14 17:29 ` Andre Przywara 2020-01-10 11:54 ` [PATCH 12/14] net: axienet: Autodetect 64-bit DMA capability Andre Przywara 2020-01-10 11:54 ` Andre Przywara 2020-01-10 14:08 ` Andrew Lunn 2020-01-10 14:08 ` Andrew Lunn 2020-01-10 14:13 ` Andre Przywara 2020-01-10 14:13 ` Andre Przywara 2020-01-10 14:22 ` Andrew Lunn 2020-01-10 14:22 ` Andrew Lunn 2020-01-10 15:08 ` Andre Przywara 2020-01-10 15:08 ` Andre Przywara 2020-01-10 15:22 ` Andrew Lunn 2020-01-10 15:22 ` Andrew Lunn 2020-01-14 17:03 ` Radhey Shyam Pandey 2020-01-14 17:03 ` Radhey Shyam Pandey 2020-01-14 17:41 ` Andre Przywara 2020-01-14 17:41 ` Andre Przywara 2020-01-15 6:02 ` Radhey Shyam Pandey 2020-01-15 6:02 ` Radhey Shyam Pandey 2020-01-10 11:54 ` [PATCH 13/14] net: axienet: Allow DMA to beyond 4GB Andre Przywara 2020-01-10 11:54 ` Andre Przywara 2020-01-10 11:54 ` [PATCH 14/14] net: axienet: Update devicetree binding documentation Andre Przywara 2020-01-10 11:54 ` Andre Przywara 2020-01-21 21:51 ` Rob Herring 2020-01-21 21:51 ` Rob Herring 2020-01-24 16:29 ` Andre Przywara 2020-01-24 16:29 ` Andre Przywara 2020-01-27 9:28 ` Radhey Shyam Pandey 2020-01-27 9:28 ` Radhey Shyam Pandey
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=CH2PR02MB70007946C760D524D56B6F64C7380@CH2PR02MB7000.namprd02.prod.outlook.com \ --to=radheys@xilinx.com \ --cc=andre.przywara@arm.com \ --cc=davem@davemloft.net \ --cc=hancock@sedsystems.ca \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=michals@xilinx.com \ --cc=netdev@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.