From: Bjorn Andersson <bjorn.andersson@linaro.org>
To: Alex Elder <elder@linaro.org>
Cc: subashab@codeaurora.org, stranche@codeaurora.org,
davem@davemloft.net, kuba@kernel.org, sharathv@codeaurora.org,
evgreen@chromium.org, cpratapa@codeaurora.org, elder@kernel.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH net-next 5/6] net: qualcomm: rmnet: don't use C bit-fields in rmnet checksum trailer
Date: Thu, 4 Mar 2021 22:54:19 -0600 [thread overview]
Message-ID: <YEG5e3K/gElI3bSh@builder.lan> (raw)
In-Reply-To: <20210304223431.15045-6-elder@linaro.org>
On Thu 04 Mar 16:34 CST 2021, Alex Elder wrote:
> Replace the use of C bit-fields in the rmnet_map_dl_csum_trailer
> structure with a single one-byte field, using constant field masks
> to encode or get at embedded values.
>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Regards,
Bjorn
> Signed-off-by: Alex Elder <elder@linaro.org>
> ---
> .../ethernet/qualcomm/rmnet/rmnet_map_data.c | 2 +-
> include/linux/if_rmnet.h | 17 +++++++----------
> 2 files changed, 8 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c
> index 3291f252d81b0..29d485b868a65 100644
> --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c
> +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c
> @@ -365,7 +365,7 @@ int rmnet_map_checksum_downlink_packet(struct sk_buff *skb, u16 len)
>
> csum_trailer = (struct rmnet_map_dl_csum_trailer *)(skb->data + len);
>
> - if (!csum_trailer->valid) {
> + if (!u8_get_bits(csum_trailer->flags, MAP_CSUM_DL_VALID_FMASK)) {
> priv->stats.csum_valid_unset++;
> return -EINVAL;
> }
> diff --git a/include/linux/if_rmnet.h b/include/linux/if_rmnet.h
> index 4824c6328a82c..1fbb7531238b6 100644
> --- a/include/linux/if_rmnet.h
> +++ b/include/linux/if_rmnet.h
> @@ -19,21 +19,18 @@ struct rmnet_map_header {
> #define MAP_PAD_LEN_FMASK GENMASK(5, 0)
>
> struct rmnet_map_dl_csum_trailer {
> - u8 reserved1;
> -#if defined(__LITTLE_ENDIAN_BITFIELD)
> - u8 valid:1;
> - u8 reserved2:7;
> -#elif defined (__BIG_ENDIAN_BITFIELD)
> - u8 reserved2:7;
> - u8 valid:1;
> -#else
> -#error "Please fix <asm/byteorder.h>"
> -#endif
> + u8 reserved1;
> + u8 flags; /* MAP_CSUM_DL_*_FMASK */
> __be16 csum_start_offset;
> __be16 csum_length;
> __be16 csum_value;
> } __aligned(1);
>
> +/* rmnet_map_dl_csum_trailer flags field:
> + * VALID: 1 = checksum and length valid; 0 = ignore them
> + */
> +#define MAP_CSUM_DL_VALID_FMASK GENMASK(0, 0)
> +
> struct rmnet_map_ul_csum_header {
> __be16 csum_start_offset;
> #if defined(__LITTLE_ENDIAN_BITFIELD)
> --
> 2.20.1
>
next prev parent reply other threads:[~2021-03-05 4:54 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-04 22:34 [PATCH net-next 0/6] net: qualcomm: rmnet: stop using C bit-fields Alex Elder
2021-03-04 22:34 ` [PATCH net-next 1/6] net: qualcomm: rmnet: mark trailer field endianness Alex Elder
2021-03-05 4:03 ` Bjorn Andersson
2021-03-04 22:34 ` [PATCH net-next 2/6] net: qualcomm: rmnet: simplify some byte order logic Alex Elder
2021-03-05 4:07 ` Bjorn Andersson
2021-03-05 21:02 ` Alex Elder
2021-03-04 22:34 ` [PATCH net-next 3/6] net: qualcomm: rmnet: kill RMNET_MAP_GET_*() accessor macros Alex Elder
2021-03-05 4:16 ` Bjorn Andersson
2021-03-04 22:34 ` [PATCH net-next 4/6] net: qualcomm: rmnet: use field masks instead of C bit-fields Alex Elder
2021-03-05 4:50 ` Bjorn Andersson
2021-03-04 22:34 ` [PATCH net-next 5/6] net: qualcomm: rmnet: don't use C bit-fields in rmnet checksum trailer Alex Elder
2021-03-05 4:54 ` Bjorn Andersson [this message]
2021-03-04 22:34 ` [PATCH net-next 6/6] net: qualcomm: rmnet: don't use C bit-fields in rmnet checksum header Alex Elder
2021-03-05 5:26 ` Bjorn Andersson
2021-03-05 20:48 ` Alex Elder
2021-03-05 6:22 ` kernel test robot
2021-03-05 12:59 ` Alex Elder
2021-03-04 22:43 ` [PATCH net-next 0/6] net: qualcomm: rmnet: stop using C bit-fields Alex Elder
2021-03-05 3:44 ` subashab
2021-03-05 4:51 ` Alex Elder
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=YEG5e3K/gElI3bSh@builder.lan \
--to=bjorn.andersson@linaro.org \
--cc=cpratapa@codeaurora.org \
--cc=davem@davemloft.net \
--cc=elder@kernel.org \
--cc=elder@linaro.org \
--cc=evgreen@chromium.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sharathv@codeaurora.org \
--cc=stranche@codeaurora.org \
--cc=subashab@codeaurora.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).