Message ID | 20230407122344.4059-4-saikrishnag@marvell.com (mailing list archive) |
---|---|
State | Superseded |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | octeontx2: Miscellaneous fixes | expand |
Context | Check | Description |
---|---|---|
netdev/series_format | success | Posting correctly formatted |
netdev/tree_selection | success | Clearly marked for net |
netdev/fixes_present | success | Fixes tag present in non-next series |
netdev/header_inline | success | No static functions without inline keyword in header files |
netdev/build_32bit | success | Errors and warnings before: 18 this patch: 18 |
netdev/cc_maintainers | success | CCed 11 of 11 maintainers |
netdev/build_clang | success | Errors and warnings before: 18 this patch: 18 |
netdev/verify_signedoff | success | Signed-off-by tag matches author and committer |
netdev/deprecated_api | success | None detected |
netdev/check_selftest | success | No net selftest shell script |
netdev/verify_fixes | success | Fixes tag looks correct |
netdev/build_allmodconfig_warn | success | Errors and warnings before: 18 this patch: 18 |
netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 14 lines checked |
netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
netdev/source_inline | success | Was 0 now: 0 |
On Fri, Apr 07, 2023 at 05:53:40PM +0530, Sai Krishna wrote: > From: Hariprasad Kelam <hkelam@marvell.com> > > Upon physical link change, firmware reports to the kernel about the > change along with the details like speed, lmac_type_id, etc. > Kernel derives lmac_type based on lmac_type_id received from firmware. > > In a few scenarios, firmware returns an invalid lmac_type_id, which > is resulting in below kernel panic. This patch adds the missing > validation of the lmac_type_id field. > > Internal error: Oops: 96000005 [#1] PREEMPT SMP > [ 35.321595] Modules linked in: > [ 35.328982] CPU: 0 PID: 31 Comm: kworker/0:1 Not tainted > 5.4.210-g2e3169d8e1bc-dirty #17 > [ 35.337014] Hardware name: Marvell CN103XX board (DT) > [ 35.344297] Workqueue: events work_for_cpu_fn > [ 35.352730] pstate: 40400089 (nZcv daIf +PAN -UAO) > [ 35.360267] pc : strncpy+0x10/0x30 > [ 35.366595] lr : cgx_link_change_handler+0x90/0x180 > > Fixes: 61071a871ea6 ("octeontx2-af: Forward CGX link notifications to PFs") > Signed-off-by: Hariprasad Kelam <hkelam@marvell.com> > Signed-off-by: Sunil Kovvuri Goutham <sgoutham@marvell.com> > Signed-off-by: Sai Krishna <saikrishnag@marvell.com> > > drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 8 ++++++++ > 1 file changed, 8 insertions(+) Reviewed-by: Simon Horman <simon.horman@corigine.com>
On Fri, Apr 07, 2023 at 05:53:40PM +0530, Sai Krishna wrote: > From: Hariprasad Kelam <hkelam@marvell.com> > > Upon physical link change, firmware reports to the kernel about the > change along with the details like speed, lmac_type_id, etc. > Kernel derives lmac_type based on lmac_type_id received from firmware. > > In a few scenarios, firmware returns an invalid lmac_type_id, which > is resulting in below kernel panic. This patch adds the missing > validation of the lmac_type_id field. > > Internal error: Oops: 96000005 [#1] PREEMPT SMP > [ 35.321595] Modules linked in: > [ 35.328982] CPU: 0 PID: 31 Comm: kworker/0:1 Not tainted > 5.4.210-g2e3169d8e1bc-dirty #17 > [ 35.337014] Hardware name: Marvell CN103XX board (DT) > [ 35.344297] Workqueue: events work_for_cpu_fn > [ 35.352730] pstate: 40400089 (nZcv daIf +PAN -UAO) > [ 35.360267] pc : strncpy+0x10/0x30 > [ 35.366595] lr : cgx_link_change_handler+0x90/0x180 > > Fixes: 61071a871ea6 ("octeontx2-af: Forward CGX link notifications to PFs") > Signed-off-by: Hariprasad Kelam <hkelam@marvell.com> > Signed-off-by: Sunil Kovvuri Goutham <sgoutham@marvell.com> > Signed-off-by: Sai Krishna <saikrishnag@marvell.com> > Your patch missing --- trailers and probably won't apply correctly. Thanks > drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/drivers/net/ethernet/marvell/octeontx2/af/cgx.c b/drivers/net/ethernet/marvell/octeontx2/af/cgx.c > index 724df6398bbe..bd77152bb8d7 100644 > --- a/drivers/net/ethernet/marvell/octeontx2/af/cgx.c > +++ b/drivers/net/ethernet/marvell/octeontx2/af/cgx.c > @@ -1231,6 +1231,14 @@ static inline void link_status_user_format(u64 lstat, > linfo->an = FIELD_GET(RESP_LINKSTAT_AN, lstat); > linfo->fec = FIELD_GET(RESP_LINKSTAT_FEC, lstat); > linfo->lmac_type_id = FIELD_GET(RESP_LINKSTAT_LMAC_TYPE, lstat); > + > + if (linfo->lmac_type_id >= LMAC_MODE_MAX) { > + dev_err(&cgx->pdev->dev, "Unknown lmac_type_id %d reported by firmware on cgx port%d:%d", > + linfo->lmac_type_id, cgx->cgx_id, lmac_id); > + strncpy(linfo->lmac_type, "Unknown", LMACTYPE_STR_LEN - 1); > + return; > + } > + > lmac_string = cgx_lmactype_string[linfo->lmac_type_id]; > strncpy(linfo->lmac_type, lmac_string, LMACTYPE_STR_LEN - 1); > } > -- > 2.25.1 >
Please see inline, > -----Original Message----- > From: Leon Romanovsky <leon@kernel.org> > Sent: Sunday, April 9, 2023 11:00 PM > To: Sai Krishna Gajula <saikrishnag@marvell.com> > Cc: davem@davemloft.net; edumazet@google.com; kuba@kernel.org; > pabeni@redhat.com; netdev@vger.kernel.org; linux- > kernel@vger.kernel.org; Sunil Kovvuri Goutham <sgoutham@marvell.com>; > Geethasowjanya Akula <gakula@marvell.com>; richardcochran@gmail.com; > Linu Cherian <lcherian@marvell.com>; Jerin Jacob Kollanukkaran > <jerinj@marvell.com>; Hariprasad Kelam <hkelam@marvell.com>; > Subbaraya Sundeep Bhatta <sbhatta@marvell.com> > Subject: Re: [net PATCH v2 3/7] octeontx2-af: Add validation for lmac > type > On Fri, Apr 07, 2023 at 05:53:40PM +0530, Sai Krishna wrote: > > From: Hariprasad Kelam <hkelam@marvell.com> > > > > Upon physical link change, firmware reports to the kernel about the > > change along with the details like speed, lmac_type_id, etc. > > Kernel derives lmac_type based on lmac_type_id received from firmware. > > > > In a few scenarios, firmware returns an invalid lmac_type_id, which is > > resulting in below kernel panic. This patch adds the missing > > validation of the lmac_type_id field. > > > > Internal error: Oops: 96000005 [#1] PREEMPT SMP > > [ 35.321595] Modules linked in: > > [ 35.328982] CPU: 0 PID: 31 Comm: kworker/0:1 Not tainted > > 5.4.210-g2e3169d8e1bc-dirty #17 > > [ 35.337014] Hardware name: Marvell CN103XX board (DT) > > [ 35.344297] Workqueue: events work_for_cpu_fn > > [ 35.352730] pstate: 40400089 (nZcv daIf +PAN -UAO) > > [ 35.360267] pc : strncpy+0x10/0x30 > > [ 35.366595] lr : cgx_link_change_handler+0x90/0x180 > > > > Fixes: 61071a871ea6 ("octeontx2-af: Forward CGX link notifications to > > PFs") > > Signed-off-by: Hariprasad Kelam <hkelam@marvell.com> > > Signed-off-by: Sunil Kovvuri Goutham <sgoutham@marvell.com> > > Signed-off-by: Sai Krishna <saikrishnag@marvell.com> > > > > Your patch missing --- trailers and probably won't apply correctly. > We will fix trailers errors in V3 patch. Thanks, Sai > Thanks > > > drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 8 ++++++++ > > 1 file changed, 8 insertions(+) > > > > diff --git a/drivers/net/ethernet/marvell/octeontx2/af/cgx.c > > b/drivers/net/ethernet/marvell/octeontx2/af/cgx.c > > index 724df6398bbe..bd77152bb8d7 100644 > > --- a/drivers/net/ethernet/marvell/octeontx2/af/cgx.c > > +++ b/drivers/net/ethernet/marvell/octeontx2/af/cgx.c > > @@ -1231,6 +1231,14 @@ static inline void link_status_user_format(u64 > lstat, > > linfo->an = FIELD_GET(RESP_LINKSTAT_AN, lstat); > > linfo->fec = FIELD_GET(RESP_LINKSTAT_FEC, lstat); > > linfo->lmac_type_id = FIELD_GET(RESP_LINKSTAT_LMAC_TYPE, > lstat); > > + > > + if (linfo->lmac_type_id >= LMAC_MODE_MAX) { > > + dev_err(&cgx->pdev->dev, "Unknown lmac_type_id %d > reported by firmware on cgx port%d:%d", > > + linfo->lmac_type_id, cgx->cgx_id, lmac_id); > > + strncpy(linfo->lmac_type, "Unknown", LMACTYPE_STR_LEN - > 1); > > + return; > > + } > > + > > lmac_string = cgx_lmactype_string[linfo->lmac_type_id]; > > strncpy(linfo->lmac_type, lmac_string, LMACTYPE_STR_LEN - 1); } > > -- > > 2.25.1 > >
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/cgx.c b/drivers/net/ethernet/marvell/octeontx2/af/cgx.c index 724df6398bbe..bd77152bb8d7 100644 --- a/drivers/net/ethernet/marvell/octeontx2/af/cgx.c +++ b/drivers/net/ethernet/marvell/octeontx2/af/cgx.c @@ -1231,6 +1231,14 @@ static inline void link_status_user_format(u64 lstat, linfo->an = FIELD_GET(RESP_LINKSTAT_AN, lstat); linfo->fec = FIELD_GET(RESP_LINKSTAT_FEC, lstat); linfo->lmac_type_id = FIELD_GET(RESP_LINKSTAT_LMAC_TYPE, lstat); + + if (linfo->lmac_type_id >= LMAC_MODE_MAX) { + dev_err(&cgx->pdev->dev, "Unknown lmac_type_id %d reported by firmware on cgx port%d:%d", + linfo->lmac_type_id, cgx->cgx_id, lmac_id); + strncpy(linfo->lmac_type, "Unknown", LMACTYPE_STR_LEN - 1); + return; + } + lmac_string = cgx_lmactype_string[linfo->lmac_type_id]; strncpy(linfo->lmac_type, lmac_string, LMACTYPE_STR_LEN - 1); }