* [PATCH v7] Add payload to be 32-bit aligned to fix dropped packets
@ 2021-11-18 16:03 ` Kumar Thangavel
0 siblings, 0 replies; 13+ messages in thread
From: Kumar Thangavel @ 2021-11-18 16:03 UTC (permalink / raw)
To: Samuel Mendoza-Jonas, David S. Miller, Jakub Kicinski
Cc: openbmc, linux-aspeed, netdev, patrickw3, Amithash Prasad,
sdasari, velumanit
Update NC-SI command handler (both standard and OEM) to take into
account of payload paddings in allocating skb (in case of payload
size is not 32-bit aligned).
The checksum field follows payload field, without taking payload
padding into account can cause checksum being truncated, leading to
dropped packets.
Fixes: fb4ee67529ff ("net/ncsi: Add NCSI OEM command support")
Signed-off-by: Kumar Thangavel <thangavel.k@hcl.com>
Acked-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
Reviewed-by: Paul Menzel <pmenzel@molgen.mpg.de>
---
v7:
- Updated padding_bytes as const static int variable
v6:
- Updated type of padding_bytes variable
- Updated type of payload
- Seperated variable declarations and code
v5:
- Added Fixes tag
- Added const variable for padding_bytes
v4:
- Used existing macro for max function
v3:
- Added Macro for MAX
- Fixed the missed semicolon
v2:
- Added NC-SI spec version and section
- Removed blank line
- corrected spellings
v1:
- Initial draft
---
---
net/ncsi/ncsi-cmd.c | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/net/ncsi/ncsi-cmd.c b/net/ncsi/ncsi-cmd.c
index ba9ae482141b..9a6f10f4833e 100644
--- a/net/ncsi/ncsi-cmd.c
+++ b/net/ncsi/ncsi-cmd.c
@@ -18,6 +18,8 @@
#include "internal.h"
#include "ncsi-pkt.h"
+const static int padding_bytes = 26;
+
u32 ncsi_calculate_checksum(unsigned char *data, int len)
{
u32 checksum = 0;
@@ -213,12 +215,17 @@ static int ncsi_cmd_handler_oem(struct sk_buff *skb,
{
struct ncsi_cmd_oem_pkt *cmd;
unsigned int len;
+ int payload;
+ /* NC-SI spec DSP_0222_1.2.0, section 8.2.2.2
+ * requires payload to be padded with 0 to
+ * 32-bit boundary before the checksum field.
+ * Ensure the padding bytes are accounted for in
+ * skb allocation
+ */
+ payload = ALIGN(nca->payload, 4);
len = sizeof(struct ncsi_cmd_pkt_hdr) + 4;
- if (nca->payload < 26)
- len += 26;
- else
- len += nca->payload;
+ len += max(payload, padding_bytes);
cmd = skb_put_zero(skb, len);
memcpy(&cmd->mfr_id, nca->data, nca->payload);
@@ -272,6 +279,7 @@ static struct ncsi_request *ncsi_alloc_command(struct ncsi_cmd_arg *nca)
struct net_device *dev = nd->dev;
int hlen = LL_RESERVED_SPACE(dev);
int tlen = dev->needed_tailroom;
+ int payload;
int len = hlen + tlen;
struct sk_buff *skb;
struct ncsi_request *nr;
@@ -281,14 +289,14 @@ static struct ncsi_request *ncsi_alloc_command(struct ncsi_cmd_arg *nca)
return NULL;
/* NCSI command packet has 16-bytes header, payload, 4 bytes checksum.
+ * Payload needs padding so that the checksum field following payload is
+ * aligned to 32-bit boundary.
* The packet needs padding if its payload is less than 26 bytes to
* meet 64 bytes minimal ethernet frame length.
*/
len += sizeof(struct ncsi_cmd_pkt_hdr) + 4;
- if (nca->payload < 26)
- len += 26;
- else
- len += nca->payload;
+ payload = ALIGN(nca->payload, 4);
+ len += max(payload, padding_bytes);
/* Allocate skb */
skb = alloc_skb(len, GFP_ATOMIC);
--
2.17.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v7] Add payload to be 32-bit aligned to fix dropped packets
@ 2021-11-18 16:03 ` Kumar Thangavel
0 siblings, 0 replies; 13+ messages in thread
From: Kumar Thangavel @ 2021-11-18 16:03 UTC (permalink / raw)
To: Samuel Mendoza-Jonas, David S. Miller, Jakub Kicinski
Cc: linux-aspeed, netdev, openbmc, Amithash Prasad, velumanit, patrickw3
Update NC-SI command handler (both standard and OEM) to take into
account of payload paddings in allocating skb (in case of payload
size is not 32-bit aligned).
The checksum field follows payload field, without taking payload
padding into account can cause checksum being truncated, leading to
dropped packets.
Fixes: fb4ee67529ff ("net/ncsi: Add NCSI OEM command support")
Signed-off-by: Kumar Thangavel <thangavel.k@hcl.com>
Acked-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
Reviewed-by: Paul Menzel <pmenzel@molgen.mpg.de>
---
v7:
- Updated padding_bytes as const static int variable
v6:
- Updated type of padding_bytes variable
- Updated type of payload
- Seperated variable declarations and code
v5:
- Added Fixes tag
- Added const variable for padding_bytes
v4:
- Used existing macro for max function
v3:
- Added Macro for MAX
- Fixed the missed semicolon
v2:
- Added NC-SI spec version and section
- Removed blank line
- corrected spellings
v1:
- Initial draft
---
---
net/ncsi/ncsi-cmd.c | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/net/ncsi/ncsi-cmd.c b/net/ncsi/ncsi-cmd.c
index ba9ae482141b..9a6f10f4833e 100644
--- a/net/ncsi/ncsi-cmd.c
+++ b/net/ncsi/ncsi-cmd.c
@@ -18,6 +18,8 @@
#include "internal.h"
#include "ncsi-pkt.h"
+const static int padding_bytes = 26;
+
u32 ncsi_calculate_checksum(unsigned char *data, int len)
{
u32 checksum = 0;
@@ -213,12 +215,17 @@ static int ncsi_cmd_handler_oem(struct sk_buff *skb,
{
struct ncsi_cmd_oem_pkt *cmd;
unsigned int len;
+ int payload;
+ /* NC-SI spec DSP_0222_1.2.0, section 8.2.2.2
+ * requires payload to be padded with 0 to
+ * 32-bit boundary before the checksum field.
+ * Ensure the padding bytes are accounted for in
+ * skb allocation
+ */
+ payload = ALIGN(nca->payload, 4);
len = sizeof(struct ncsi_cmd_pkt_hdr) + 4;
- if (nca->payload < 26)
- len += 26;
- else
- len += nca->payload;
+ len += max(payload, padding_bytes);
cmd = skb_put_zero(skb, len);
memcpy(&cmd->mfr_id, nca->data, nca->payload);
@@ -272,6 +279,7 @@ static struct ncsi_request *ncsi_alloc_command(struct ncsi_cmd_arg *nca)
struct net_device *dev = nd->dev;
int hlen = LL_RESERVED_SPACE(dev);
int tlen = dev->needed_tailroom;
+ int payload;
int len = hlen + tlen;
struct sk_buff *skb;
struct ncsi_request *nr;
@@ -281,14 +289,14 @@ static struct ncsi_request *ncsi_alloc_command(struct ncsi_cmd_arg *nca)
return NULL;
/* NCSI command packet has 16-bytes header, payload, 4 bytes checksum.
+ * Payload needs padding so that the checksum field following payload is
+ * aligned to 32-bit boundary.
* The packet needs padding if its payload is less than 26 bytes to
* meet 64 bytes minimal ethernet frame length.
*/
len += sizeof(struct ncsi_cmd_pkt_hdr) + 4;
- if (nca->payload < 26)
- len += 26;
- else
- len += nca->payload;
+ payload = ALIGN(nca->payload, 4);
+ len += max(payload, padding_bytes);
/* Allocate skb */
skb = alloc_skb(len, GFP_ATOMIC);
--
2.17.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH v7] Add payload to be 32-bit aligned to fix dropped packets
2021-11-18 16:03 ` Kumar Thangavel
@ 2021-11-18 17:14 ` Eric Dumazet
-1 siblings, 0 replies; 13+ messages in thread
From: Eric Dumazet @ 2021-11-18 17:14 UTC (permalink / raw)
To: Kumar Thangavel, Samuel Mendoza-Jonas, David S. Miller, Jakub Kicinski
Cc: openbmc, linux-aspeed, netdev, patrickw3, Amithash Prasad,
sdasari, velumanit
On 11/18/21 8:03 AM, Kumar Thangavel wrote:
> Update NC-SI command handler (both standard and OEM) to take into
> account of payload paddings in allocating skb (in case of payload
> size is not 32-bit aligned).
>
> The checksum field follows payload field, without taking payload
> padding into account can cause checksum being truncated, leading to
> dropped packets.
>
Patch title should start with a prefix, identifying which layer/driver is
involved.
Probably in this case
net/ncsi: Add payload to be 32-bit aligned to fix dropped packets
> Fixes: fb4ee67529ff ("net/ncsi: Add NCSI OEM command support")
> Signed-off-by: Kumar Thangavel <thangavel.k@hcl.com>
> Acked-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
> Reviewed-by: Paul Menzel <pmenzel@molgen.mpg.de>
>
> ---
> v7:
> - Updated padding_bytes as const static int variable
>
> v6:
> - Updated type of padding_bytes variable
> - Updated type of payload
> - Seperated variable declarations and code
>
> v5:
> - Added Fixes tag
> - Added const variable for padding_bytes
>
> v4:
> - Used existing macro for max function
>
> v3:
> - Added Macro for MAX
> - Fixed the missed semicolon
>
> v2:
> - Added NC-SI spec version and section
> - Removed blank line
> - corrected spellings
>
> v1:
> - Initial draft
>
> ---
> ---
> net/ncsi/ncsi-cmd.c | 24 ++++++++++++++++--------
> 1 file changed, 16 insertions(+), 8 deletions(-)
>
> diff --git a/net/ncsi/ncsi-cmd.c b/net/ncsi/ncsi-cmd.c
> index ba9ae482141b..9a6f10f4833e 100644
> --- a/net/ncsi/ncsi-cmd.c
> +++ b/net/ncsi/ncsi-cmd.c
> @@ -18,6 +18,8 @@
> #include "internal.h"
> #include "ncsi-pkt.h"
>
> +const static int padding_bytes = 26;
It would be nice to have some kind of reference, to explain
what is this magic value.
Moving the comment [1] here might make sense.
> +
> u32 ncsi_calculate_checksum(unsigned char *data, int len)
> {
> u32 checksum = 0;
> @@ -213,12 +215,17 @@ static int ncsi_cmd_handler_oem(struct sk_buff *skb,
> {
> struct ncsi_cmd_oem_pkt *cmd;
> unsigned int len;
> + int payload;
[1] This comment could be moved before @padding_bytes
> + /* NC-SI spec DSP_0222_1.2.0, section 8.2.2.2
> + * requires payload to be padded with 0 to
> + * 32-bit boundary before the checksum field.
> + * Ensure the padding bytes are accounted for in
> + * skb allocation
> + */
>
> + payload = ALIGN(nca->payload, 4);
> len = sizeof(struct ncsi_cmd_pkt_hdr) + 4;
> - if (nca->payload < 26)
> - len += 26;
> - else
> - len += nca->payload;
> + len += max(payload, padding_bytes);
>
> cmd = skb_put_zero(skb, len);
> memcpy(&cmd->mfr_id, nca->data, nca->payload);
> @@ -272,6 +279,7 @@ static struct ncsi_request *ncsi_alloc_command(struct ncsi_cmd_arg *nca)
> struct net_device *dev = nd->dev;
> int hlen = LL_RESERVED_SPACE(dev);
> int tlen = dev->needed_tailroom;
> + int payload;
> int len = hlen + tlen;
> struct sk_buff *skb;
> struct ncsi_request *nr;
> @@ -281,14 +289,14 @@ static struct ncsi_request *ncsi_alloc_command(struct ncsi_cmd_arg *nca)
> return NULL;
>
> /* NCSI command packet has 16-bytes header, payload, 4 bytes checksum.
> + * Payload needs padding so that the checksum field following payload is
> + * aligned to 32-bit boundary.
> * The packet needs padding if its payload is less than 26 bytes to
> * meet 64 bytes minimal ethernet frame length.
> */
> len += sizeof(struct ncsi_cmd_pkt_hdr) + 4;
> - if (nca->payload < 26)
> - len += 26;
> - else
> - len += nca->payload;
> + payload = ALIGN(nca->payload, 4);
> + len += max(payload, padding_bytes);
>
> /* Allocate skb */
> skb = alloc_skb(len, GFP_ATOMIC);
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v7] Add payload to be 32-bit aligned to fix dropped packets
@ 2021-11-18 17:14 ` Eric Dumazet
0 siblings, 0 replies; 13+ messages in thread
From: Eric Dumazet @ 2021-11-18 17:14 UTC (permalink / raw)
To: Kumar Thangavel, Samuel Mendoza-Jonas, David S. Miller, Jakub Kicinski
Cc: linux-aspeed, netdev, openbmc, Amithash Prasad, velumanit, patrickw3
On 11/18/21 8:03 AM, Kumar Thangavel wrote:
> Update NC-SI command handler (both standard and OEM) to take into
> account of payload paddings in allocating skb (in case of payload
> size is not 32-bit aligned).
>
> The checksum field follows payload field, without taking payload
> padding into account can cause checksum being truncated, leading to
> dropped packets.
>
Patch title should start with a prefix, identifying which layer/driver is
involved.
Probably in this case
net/ncsi: Add payload to be 32-bit aligned to fix dropped packets
> Fixes: fb4ee67529ff ("net/ncsi: Add NCSI OEM command support")
> Signed-off-by: Kumar Thangavel <thangavel.k@hcl.com>
> Acked-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
> Reviewed-by: Paul Menzel <pmenzel@molgen.mpg.de>
>
> ---
> v7:
> - Updated padding_bytes as const static int variable
>
> v6:
> - Updated type of padding_bytes variable
> - Updated type of payload
> - Seperated variable declarations and code
>
> v5:
> - Added Fixes tag
> - Added const variable for padding_bytes
>
> v4:
> - Used existing macro for max function
>
> v3:
> - Added Macro for MAX
> - Fixed the missed semicolon
>
> v2:
> - Added NC-SI spec version and section
> - Removed blank line
> - corrected spellings
>
> v1:
> - Initial draft
>
> ---
> ---
> net/ncsi/ncsi-cmd.c | 24 ++++++++++++++++--------
> 1 file changed, 16 insertions(+), 8 deletions(-)
>
> diff --git a/net/ncsi/ncsi-cmd.c b/net/ncsi/ncsi-cmd.c
> index ba9ae482141b..9a6f10f4833e 100644
> --- a/net/ncsi/ncsi-cmd.c
> +++ b/net/ncsi/ncsi-cmd.c
> @@ -18,6 +18,8 @@
> #include "internal.h"
> #include "ncsi-pkt.h"
>
> +const static int padding_bytes = 26;
It would be nice to have some kind of reference, to explain
what is this magic value.
Moving the comment [1] here might make sense.
> +
> u32 ncsi_calculate_checksum(unsigned char *data, int len)
> {
> u32 checksum = 0;
> @@ -213,12 +215,17 @@ static int ncsi_cmd_handler_oem(struct sk_buff *skb,
> {
> struct ncsi_cmd_oem_pkt *cmd;
> unsigned int len;
> + int payload;
[1] This comment could be moved before @padding_bytes
> + /* NC-SI spec DSP_0222_1.2.0, section 8.2.2.2
> + * requires payload to be padded with 0 to
> + * 32-bit boundary before the checksum field.
> + * Ensure the padding bytes are accounted for in
> + * skb allocation
> + */
>
> + payload = ALIGN(nca->payload, 4);
> len = sizeof(struct ncsi_cmd_pkt_hdr) + 4;
> - if (nca->payload < 26)
> - len += 26;
> - else
> - len += nca->payload;
> + len += max(payload, padding_bytes);
>
> cmd = skb_put_zero(skb, len);
> memcpy(&cmd->mfr_id, nca->data, nca->payload);
> @@ -272,6 +279,7 @@ static struct ncsi_request *ncsi_alloc_command(struct ncsi_cmd_arg *nca)
> struct net_device *dev = nd->dev;
> int hlen = LL_RESERVED_SPACE(dev);
> int tlen = dev->needed_tailroom;
> + int payload;
> int len = hlen + tlen;
> struct sk_buff *skb;
> struct ncsi_request *nr;
> @@ -281,14 +289,14 @@ static struct ncsi_request *ncsi_alloc_command(struct ncsi_cmd_arg *nca)
> return NULL;
>
> /* NCSI command packet has 16-bytes header, payload, 4 bytes checksum.
> + * Payload needs padding so that the checksum field following payload is
> + * aligned to 32-bit boundary.
> * The packet needs padding if its payload is less than 26 bytes to
> * meet 64 bytes minimal ethernet frame length.
> */
> len += sizeof(struct ncsi_cmd_pkt_hdr) + 4;
> - if (nca->payload < 26)
> - len += 26;
> - else
> - len += nca->payload;
> + payload = ALIGN(nca->payload, 4);
> + len += max(payload, padding_bytes);
>
> /* Allocate skb */
> skb = alloc_skb(len, GFP_ATOMIC);
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v7] Add payload to be 32-bit aligned to fix dropped packets
2021-11-18 16:03 ` Kumar Thangavel
(?)
@ 2021-11-19 3:15 ` kernel test robot
-1 siblings, 0 replies; 13+ messages in thread
From: kernel test robot @ 2021-11-19 3:15 UTC (permalink / raw)
To: Kumar Thangavel, Samuel Mendoza-Jonas, David S. Miller, Jakub Kicinski
Cc: kbuild-all, netdev, openbmc, linux-aspeed, patrickw3,
Amithash Prasad, sdasari, velumanit
[-- Attachment #1: Type: text/plain, Size: 1902 bytes --]
Hi Kumar,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on linus/master]
[also build test WARNING on v5.16-rc1 next-20211118]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Kumar-Thangavel/Add-payload-to-be-32-bit-aligned-to-fix-dropped-packets/20211119-000541
base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 42eb8fdac2fc5d62392dcfcf0253753e821a97b0
config: m68k-randconfig-r005-20211118 (attached as .config)
compiler: m68k-linux-gcc (GCC) 11.2.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/f4e0a51f25ba398ad7f2e3efa5076b2e0ad24e3b
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Kumar-Thangavel/Add-payload-to-be-32-bit-aligned-to-fix-dropped-packets/20211119-000541
git checkout f4e0a51f25ba398ad7f2e3efa5076b2e0ad24e3b
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross ARCH=m68k
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All warnings (new ones prefixed by >>):
>> net/ncsi/ncsi-cmd.c:21:1: warning: 'static' is not at beginning of declaration [-Wold-style-declaration]
21 | const static int padding_bytes = 26;
| ^~~~~
vim +/static +21 net/ncsi/ncsi-cmd.c
20
> 21 const static int padding_bytes = 26;
22
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 28516 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v7] Add payload to be 32-bit aligned to fix dropped packets
@ 2021-11-19 3:15 ` kernel test robot
0 siblings, 0 replies; 13+ messages in thread
From: kernel test robot @ 2021-11-19 3:15 UTC (permalink / raw)
To: Kumar Thangavel, Samuel Mendoza-Jonas, David S. Miller, Jakub Kicinski
Cc: kbuild-all, linux-aspeed, netdev, openbmc, Amithash Prasad,
velumanit, patrickw3
[-- Attachment #1: Type: text/plain, Size: 1902 bytes --]
Hi Kumar,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on linus/master]
[also build test WARNING on v5.16-rc1 next-20211118]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Kumar-Thangavel/Add-payload-to-be-32-bit-aligned-to-fix-dropped-packets/20211119-000541
base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 42eb8fdac2fc5d62392dcfcf0253753e821a97b0
config: m68k-randconfig-r005-20211118 (attached as .config)
compiler: m68k-linux-gcc (GCC) 11.2.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/f4e0a51f25ba398ad7f2e3efa5076b2e0ad24e3b
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Kumar-Thangavel/Add-payload-to-be-32-bit-aligned-to-fix-dropped-packets/20211119-000541
git checkout f4e0a51f25ba398ad7f2e3efa5076b2e0ad24e3b
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross ARCH=m68k
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All warnings (new ones prefixed by >>):
>> net/ncsi/ncsi-cmd.c:21:1: warning: 'static' is not at beginning of declaration [-Wold-style-declaration]
21 | const static int padding_bytes = 26;
| ^~~~~
vim +/static +21 net/ncsi/ncsi-cmd.c
20
> 21 const static int padding_bytes = 26;
22
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 28516 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v7] Add payload to be 32-bit aligned to fix dropped packets
@ 2021-11-19 3:15 ` kernel test robot
0 siblings, 0 replies; 13+ messages in thread
From: kernel test robot @ 2021-11-19 3:15 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 1947 bytes --]
Hi Kumar,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on linus/master]
[also build test WARNING on v5.16-rc1 next-20211118]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Kumar-Thangavel/Add-payload-to-be-32-bit-aligned-to-fix-dropped-packets/20211119-000541
base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 42eb8fdac2fc5d62392dcfcf0253753e821a97b0
config: m68k-randconfig-r005-20211118 (attached as .config)
compiler: m68k-linux-gcc (GCC) 11.2.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/f4e0a51f25ba398ad7f2e3efa5076b2e0ad24e3b
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Kumar-Thangavel/Add-payload-to-be-32-bit-aligned-to-fix-dropped-packets/20211119-000541
git checkout f4e0a51f25ba398ad7f2e3efa5076b2e0ad24e3b
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross ARCH=m68k
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All warnings (new ones prefixed by >>):
>> net/ncsi/ncsi-cmd.c:21:1: warning: 'static' is not at beginning of declaration [-Wold-style-declaration]
21 | const static int padding_bytes = 26;
| ^~~~~
vim +/static +21 net/ncsi/ncsi-cmd.c
20
> 21 const static int padding_bytes = 26;
22
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
[-- Attachment #2: config.gz --]
[-- Type: application/gzip, Size: 28516 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v7] Add payload to be 32-bit aligned to fix dropped packets
2021-11-18 16:03 ` Kumar Thangavel
@ 2021-11-19 6:32 ` Jakub Kicinski
-1 siblings, 0 replies; 13+ messages in thread
From: Jakub Kicinski @ 2021-11-19 6:32 UTC (permalink / raw)
To: Kumar Thangavel
Cc: Samuel Mendoza-Jonas, David S. Miller, openbmc, linux-aspeed,
netdev, patrickw3, Amithash Prasad, sdasari, velumanit
On Thu, 18 Nov 2021 21:33:02 +0530 Kumar Thangavel wrote:
> +const static int padding_bytes = 26;
/net/ncsi/ncsi-cmd.c:21:1: warning: ‘static’ is not at beginning of declaration [-Wold-style-declaration]
21 | const static int padding_bytes = 26;
| ^~~~~
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v7] Add payload to be 32-bit aligned to fix dropped packets
@ 2021-11-19 6:32 ` Jakub Kicinski
0 siblings, 0 replies; 13+ messages in thread
From: Jakub Kicinski @ 2021-11-19 6:32 UTC (permalink / raw)
To: Kumar Thangavel
Cc: linux-aspeed, netdev, openbmc, Amithash Prasad, patrickw3,
Samuel Mendoza-Jonas, velumanit, David S. Miller
On Thu, 18 Nov 2021 21:33:02 +0530 Kumar Thangavel wrote:
> +const static int padding_bytes = 26;
/net/ncsi/ncsi-cmd.c:21:1: warning: ‘static’ is not at beginning of declaration [-Wold-style-declaration]
21 | const static int padding_bytes = 26;
| ^~~~~
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v7] Add payload to be 32-bit aligned to fix dropped packets
2021-11-19 6:32 ` Jakub Kicinski
(?)
@ 2021-11-19 8:14 ` Kumar Thangavel
-1 siblings, 0 replies; 13+ messages in thread
From: Kumar Thangavel @ 2021-11-19 8:14 UTC (permalink / raw)
To: Jakub Kicinski
Cc: linux-aspeed, Networking, OpenBMC Maillist, Amithash Prasad,
patrickw3, Samuel Mendoza-Jonas, velumanit, David S. Miller
[-- Attachment #1: Type: text/plain, Size: 380 bytes --]
On Fri, Nov 19, 2021 at 12:02 PM Jakub Kicinski <kuba@kernel.org> wrote:
> On Thu, 18 Nov 2021 21:33:02 +0530 Kumar Thangavel wrote:
> > +const static int padding_bytes = 26;
>
> /net/ncsi/ncsi-cmd.c:21:1: warning: ‘static’ is not at beginning of
> declaration [-Wold-style-declaration]
> 21 | const static int padding_bytes = 26;
>
ACK.
> | ^~~~~
>
[-- Attachment #2: Type: text/html, Size: 848 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v7] Add payload to be 32-bit aligned to fix dropped packets
2021-11-18 17:14 ` Eric Dumazet
(?)
@ 2021-11-19 8:15 ` Kumar Thangavel
-1 siblings, 0 replies; 13+ messages in thread
From: Kumar Thangavel @ 2021-11-19 8:15 UTC (permalink / raw)
To: eric.dumazet
Cc: linux-aspeed, Networking, OpenBMC Maillist, Amithash Prasad,
patrickw3, Jakub Kicinski, Samuel Mendoza-Jonas, velumanit,
David S. Miller
[-- Attachment #1: Type: text/plain, Size: 4247 bytes --]
On Thu, Nov 18, 2021 at 10:44 PM Eric Dumazet <eric.dumazet@gmail.com>
wrote:
>
>
> On 11/18/21 8:03 AM, Kumar Thangavel wrote:
> > Update NC-SI command handler (both standard and OEM) to take into
> > account of payload paddings in allocating skb (in case of payload
> > size is not 32-bit aligned).
> >
> > The checksum field follows payload field, without taking payload
> > padding into account can cause checksum being truncated, leading to
> > dropped packets.
> >
>
> Patch title should start with a prefix, identifying which layer/driver is
> involved.
>
> Probably in this case
>
> net/ncsi: Add payload to be 32-bit aligned to fix dropped packets
>
ACK.
>
> > Fixes: fb4ee67529ff ("net/ncsi: Add NCSI OEM command support")
> > Signed-off-by: Kumar Thangavel <thangavel.k@hcl.com>
> > Acked-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
> > Reviewed-by: Paul Menzel <pmenzel@molgen.mpg.de>
> >
> > ---
> > v7:
> > - Updated padding_bytes as const static int variable
> >
> > v6:
> > - Updated type of padding_bytes variable
> > - Updated type of payload
> > - Seperated variable declarations and code
> >
> > v5:
> > - Added Fixes tag
> > - Added const variable for padding_bytes
> >
> > v4:
> > - Used existing macro for max function
> >
> > v3:
> > - Added Macro for MAX
> > - Fixed the missed semicolon
> >
> > v2:
> > - Added NC-SI spec version and section
> > - Removed blank line
> > - corrected spellings
> >
> > v1:
> > - Initial draft
> >
> > ---
> > ---
> > net/ncsi/ncsi-cmd.c | 24 ++++++++++++++++--------
> > 1 file changed, 16 insertions(+), 8 deletions(-)
> >
> > diff --git a/net/ncsi/ncsi-cmd.c b/net/ncsi/ncsi-cmd.c
> > index ba9ae482141b..9a6f10f4833e 100644
> > --- a/net/ncsi/ncsi-cmd.c
> > +++ b/net/ncsi/ncsi-cmd.c
> > @@ -18,6 +18,8 @@
> > #include "internal.h"
> > #include "ncsi-pkt.h"
> >
> > +const static int padding_bytes = 26;
>
> It would be nice to have some kind of reference, to explain
> what is this magic value.
>
> ACK.
> Moving the comment [1] here might make sense.
>
>
> > +
> > u32 ncsi_calculate_checksum(unsigned char *data, int len)
> > {
> > u32 checksum = 0;
> > @@ -213,12 +215,17 @@ static int ncsi_cmd_handler_oem(struct sk_buff
> *skb,
> > {
> > struct ncsi_cmd_oem_pkt *cmd;
> > unsigned int len;
> > + int payload;
>
> [1] This comment could be moved before @padding_bytes
>
> > + /* NC-SI spec DSP_0222_1.2.0, section 8.2.2.2
> > + * requires payload to be padded with 0 to
> > + * 32-bit boundary before the checksum field.
> > + * Ensure the padding bytes are accounted for in
> > + * skb allocation
> > + */
> >
> > + payload = ALIGN(nca->payload, 4);
> > len = sizeof(struct ncsi_cmd_pkt_hdr) + 4;
> > - if (nca->payload < 26)
> > - len += 26;
> > - else
> > - len += nca->payload;
> > + len += max(payload, padding_bytes);
> >
> > cmd = skb_put_zero(skb, len);
> > memcpy(&cmd->mfr_id, nca->data, nca->payload);
> > @@ -272,6 +279,7 @@ static struct ncsi_request
> *ncsi_alloc_command(struct ncsi_cmd_arg *nca)
> > struct net_device *dev = nd->dev;
> > int hlen = LL_RESERVED_SPACE(dev);
> > int tlen = dev->needed_tailroom;
> > + int payload;
> > int len = hlen + tlen;
> > struct sk_buff *skb;
> > struct ncsi_request *nr;
> > @@ -281,14 +289,14 @@ static struct ncsi_request
> *ncsi_alloc_command(struct ncsi_cmd_arg *nca)
> > return NULL;
> >
> > /* NCSI command packet has 16-bytes header, payload, 4 bytes
> checksum.
> > + * Payload needs padding so that the checksum field following
> payload is
> > + * aligned to 32-bit boundary.
> > * The packet needs padding if its payload is less than 26 bytes to
> > * meet 64 bytes minimal ethernet frame length.
> > */
> > len += sizeof(struct ncsi_cmd_pkt_hdr) + 4;
> > - if (nca->payload < 26)
> > - len += 26;
> > - else
> > - len += nca->payload;
> > + payload = ALIGN(nca->payload, 4);
> > + len += max(payload, padding_bytes);
> >
> > /* Allocate skb */
> > skb = alloc_skb(len, GFP_ATOMIC);
> >
>
[-- Attachment #2: Type: text/html, Size: 6090 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v7] Add payload to be 32-bit aligned to fix dropped packets
@ 2021-11-18 15:33 ` Kumar Thangavel
0 siblings, 0 replies; 13+ messages in thread
From: Kumar Thangavel @ 2021-11-18 15:33 UTC (permalink / raw)
To: Samuel Mendoza-Jonas, David S. Miller, Jakub Kicinski
Cc: openbmc, linux-aspeed, netdev, patrickw3, Amithash Prasad,
sdasari, velumanit
Update NC-SI command handler (both standard and OEM) to take into
account of payload paddings in allocating skb (in case of payload
size is not 32-bit aligned).
The checksum field follows payload field, without taking payload
padding into account can cause checksum being truncated, leading to
dropped packets.
Fixes: fb4ee67529ff ("net/ncsi: Add NCSI OEM command support")
Signed-off-by: Kumar Thangavel <thangavel.k@hcl.com>
Acked-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
Reviewed-by: Paul Menzel <pmenzel@molgen.mpg.de>
---
v7:
- Updated padding_bytes as const static int variable
v6:
- Updated type of padding_bytes variable
- Updated type of payload
- Seperated variable declarations and code
v5:
- Added Fixes tag
- Added const variable for padding_bytes
v4:
- Used existing macro for max function
v3:
- Added Macro for MAX
- Fixed the missed semicolon
v2:
- Added NC-SI spec version and section
- Removed blank line
- corrected spellings
v1:
- Initial draft
---
---
net/ncsi/ncsi-cmd.c | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/net/ncsi/ncsi-cmd.c b/net/ncsi/ncsi-cmd.c
index ba9ae482141b..9a6f10f4833e 100644
--- a/net/ncsi/ncsi-cmd.c
+++ b/net/ncsi/ncsi-cmd.c
@@ -18,6 +18,8 @@
#include "internal.h"
#include "ncsi-pkt.h"
+const static int padding_bytes = 26;
+
u32 ncsi_calculate_checksum(unsigned char *data, int len)
{
u32 checksum = 0;
@@ -213,12 +215,17 @@ static int ncsi_cmd_handler_oem(struct sk_buff *skb,
{
struct ncsi_cmd_oem_pkt *cmd;
unsigned int len;
+ int payload;
+ /* NC-SI spec DSP_0222_1.2.0, section 8.2.2.2
+ * requires payload to be padded with 0 to
+ * 32-bit boundary before the checksum field.
+ * Ensure the padding bytes are accounted for in
+ * skb allocation
+ */
+ payload = ALIGN(nca->payload, 4);
len = sizeof(struct ncsi_cmd_pkt_hdr) + 4;
- if (nca->payload < 26)
- len += 26;
- else
- len += nca->payload;
+ len += max(payload, padding_bytes);
cmd = skb_put_zero(skb, len);
memcpy(&cmd->mfr_id, nca->data, nca->payload);
@@ -272,6 +279,7 @@ static struct ncsi_request *ncsi_alloc_command(struct ncsi_cmd_arg *nca)
struct net_device *dev = nd->dev;
int hlen = LL_RESERVED_SPACE(dev);
int tlen = dev->needed_tailroom;
+ int payload;
int len = hlen + tlen;
struct sk_buff *skb;
struct ncsi_request *nr;
@@ -281,14 +289,14 @@ static struct ncsi_request *ncsi_alloc_command(struct ncsi_cmd_arg *nca)
return NULL;
/* NCSI command packet has 16-bytes header, payload, 4 bytes checksum.
+ * Payload needs padding so that the checksum field following payload is
+ * aligned to 32-bit boundary.
* The packet needs padding if its payload is less than 26 bytes to
* meet 64 bytes minimal ethernet frame length.
*/
len += sizeof(struct ncsi_cmd_pkt_hdr) + 4;
- if (nca->payload < 26)
- len += 26;
- else
- len += nca->payload;
+ payload = ALIGN(nca->payload, 4);
+ len += max(payload, padding_bytes);
/* Allocate skb */
skb = alloc_skb(len, GFP_ATOMIC);
--
2.17.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v7] Add payload to be 32-bit aligned to fix dropped packets
@ 2021-11-18 15:33 ` Kumar Thangavel
0 siblings, 0 replies; 13+ messages in thread
From: Kumar Thangavel @ 2021-11-18 15:33 UTC (permalink / raw)
To: Samuel Mendoza-Jonas, David S. Miller, Jakub Kicinski
Cc: linux-aspeed, netdev, openbmc, Amithash Prasad, velumanit, patrickw3
Update NC-SI command handler (both standard and OEM) to take into
account of payload paddings in allocating skb (in case of payload
size is not 32-bit aligned).
The checksum field follows payload field, without taking payload
padding into account can cause checksum being truncated, leading to
dropped packets.
Fixes: fb4ee67529ff ("net/ncsi: Add NCSI OEM command support")
Signed-off-by: Kumar Thangavel <thangavel.k@hcl.com>
Acked-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
Reviewed-by: Paul Menzel <pmenzel@molgen.mpg.de>
---
v7:
- Updated padding_bytes as const static int variable
v6:
- Updated type of padding_bytes variable
- Updated type of payload
- Seperated variable declarations and code
v5:
- Added Fixes tag
- Added const variable for padding_bytes
v4:
- Used existing macro for max function
v3:
- Added Macro for MAX
- Fixed the missed semicolon
v2:
- Added NC-SI spec version and section
- Removed blank line
- corrected spellings
v1:
- Initial draft
---
---
net/ncsi/ncsi-cmd.c | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/net/ncsi/ncsi-cmd.c b/net/ncsi/ncsi-cmd.c
index ba9ae482141b..9a6f10f4833e 100644
--- a/net/ncsi/ncsi-cmd.c
+++ b/net/ncsi/ncsi-cmd.c
@@ -18,6 +18,8 @@
#include "internal.h"
#include "ncsi-pkt.h"
+const static int padding_bytes = 26;
+
u32 ncsi_calculate_checksum(unsigned char *data, int len)
{
u32 checksum = 0;
@@ -213,12 +215,17 @@ static int ncsi_cmd_handler_oem(struct sk_buff *skb,
{
struct ncsi_cmd_oem_pkt *cmd;
unsigned int len;
+ int payload;
+ /* NC-SI spec DSP_0222_1.2.0, section 8.2.2.2
+ * requires payload to be padded with 0 to
+ * 32-bit boundary before the checksum field.
+ * Ensure the padding bytes are accounted for in
+ * skb allocation
+ */
+ payload = ALIGN(nca->payload, 4);
len = sizeof(struct ncsi_cmd_pkt_hdr) + 4;
- if (nca->payload < 26)
- len += 26;
- else
- len += nca->payload;
+ len += max(payload, padding_bytes);
cmd = skb_put_zero(skb, len);
memcpy(&cmd->mfr_id, nca->data, nca->payload);
@@ -272,6 +279,7 @@ static struct ncsi_request *ncsi_alloc_command(struct ncsi_cmd_arg *nca)
struct net_device *dev = nd->dev;
int hlen = LL_RESERVED_SPACE(dev);
int tlen = dev->needed_tailroom;
+ int payload;
int len = hlen + tlen;
struct sk_buff *skb;
struct ncsi_request *nr;
@@ -281,14 +289,14 @@ static struct ncsi_request *ncsi_alloc_command(struct ncsi_cmd_arg *nca)
return NULL;
/* NCSI command packet has 16-bytes header, payload, 4 bytes checksum.
+ * Payload needs padding so that the checksum field following payload is
+ * aligned to 32-bit boundary.
* The packet needs padding if its payload is less than 26 bytes to
* meet 64 bytes minimal ethernet frame length.
*/
len += sizeof(struct ncsi_cmd_pkt_hdr) + 4;
- if (nca->payload < 26)
- len += 26;
- else
- len += nca->payload;
+ payload = ALIGN(nca->payload, 4);
+ len += max(payload, padding_bytes);
/* Allocate skb */
skb = alloc_skb(len, GFP_ATOMIC);
--
2.17.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
end of thread, other threads:[~2021-11-19 8:14 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-18 16:03 [PATCH v7] Add payload to be 32-bit aligned to fix dropped packets Kumar Thangavel
2021-11-18 16:03 ` Kumar Thangavel
2021-11-18 17:14 ` Eric Dumazet
2021-11-18 17:14 ` Eric Dumazet
2021-11-19 8:15 ` Kumar Thangavel
2021-11-19 3:15 ` kernel test robot
2021-11-19 3:15 ` kernel test robot
2021-11-19 3:15 ` kernel test robot
2021-11-19 6:32 ` Jakub Kicinski
2021-11-19 6:32 ` Jakub Kicinski
2021-11-19 8:14 ` Kumar Thangavel
-- strict thread matches above, loose matches on Subject: below --
2021-11-18 15:33 Kumar Thangavel
2021-11-18 15:33 ` Kumar Thangavel
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.