| Message ID | 20230215094102.36844-2-gavinl@nvidia.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net/mlx5e: Add GBP VxLAN HW offload support | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/fixes_present | success | Fixes tag not required for -next series |
| netdev/subject_prefix | success | Link |
| netdev/cover_letter | success | Series has a cover letter |
| netdev/patch_count | success | Link |
| netdev/header_inline | success | No static functions without inline keyword in header files |
| netdev/build_32bit | success | Errors and warnings before: 29 this patch: 29 |
| netdev/cc_maintainers | success | CCed 6 of 6 maintainers |
| netdev/build_clang | success | Errors and warnings before: 4 this patch: 4 |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Signed-off-by tag matches author and committer |
| netdev/check_selftest | success | No net selftest shell script |
| netdev/verify_fixes | success | No Fixes tag |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 43 this patch: 43 |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 50 lines checked |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/source_inline | success | Was 0 now: 0 |
On Wed, 2023-02-15 at 11:41 +0200, Gavin Li wrote: > vxlan_build_gbp_hdr will be used by other modules to build gbp option in > vxlan header according to gbp flags. > > Signed-off-by: Gavin Li <gavinl@nvidia.com> > Reviewed-by: Gavi Teitz <gavi@nvidia.com> > Reviewed-by: Roi Dayan <roid@nvidia.com> > Reviewed-by: Maor Dickman <maord@nvidia.com> > Acked-by: Saeed Mahameed <saeedm@nvidia.com> > --- > drivers/net/vxlan/vxlan_core.c | 20 -------------------- > include/net/vxlan.h | 20 ++++++++++++++++++++ > 2 files changed, 20 insertions(+), 20 deletions(-) > > diff --git a/drivers/net/vxlan/vxlan_core.c b/drivers/net/vxlan/vxlan_core.c > index b1b179effe2a..bd44467a5a39 100644 > --- a/drivers/net/vxlan/vxlan_core.c > +++ b/drivers/net/vxlan/vxlan_core.c > @@ -2140,26 +2140,6 @@ static bool route_shortcircuit(struct net_device *dev, struct sk_buff *skb) > return false; > } > > -static void vxlan_build_gbp_hdr(struct vxlanhdr *vxh, u32 vxflags, > - struct vxlan_metadata *md) > -{ > - struct vxlanhdr_gbp *gbp; > - > - if (!md->gbp) > - return; > - > - gbp = (struct vxlanhdr_gbp *)vxh; > - vxh->vx_flags |= VXLAN_HF_GBP; > - > - if (md->gbp & VXLAN_GBP_DONT_LEARN) > - gbp->dont_learn = 1; > - > - if (md->gbp & VXLAN_GBP_POLICY_APPLIED) > - gbp->policy_applied = 1; > - > - gbp->policy_id = htons(md->gbp & VXLAN_GBP_ID_MASK); > -} > - > static int vxlan_build_gpe_hdr(struct vxlanhdr *vxh, u32 vxflags, > __be16 protocol) > { > diff --git a/include/net/vxlan.h b/include/net/vxlan.h > index bca5b01af247..02b01a6034a2 100644 > --- a/include/net/vxlan.h > +++ b/include/net/vxlan.h > @@ -566,4 +566,24 @@ static inline bool vxlan_fdb_nh_path_select(struct nexthop *nh, > return true; > } > > +static inline void vxlan_build_gbp_hdr(struct vxlanhdr *vxh, u32 vxflags, > + const struct vxlan_metadata *md) Calling this helper causes a warning on patch 3 due to different types for the 2nd argument. The warning could be addressed there with an explicit cast but it looks like 'vxflags' is not used at all here. I suggest to add a preparation patch dropping such argument (and the same for vxlan_build_gpe_hdr(), still in the same patch), should be cleaner. Thanks, Paolo
On 2/16/2023 7:57 PM, Paolo Abeni wrote: > External email: Use caution opening links or attachments > > > On Wed, 2023-02-15 at 11:41 +0200, Gavin Li wrote: >> vxlan_build_gbp_hdr will be used by other modules to build gbp option in >> vxlan header according to gbp flags. >> >> Signed-off-by: Gavin Li <gavinl@nvidia.com> >> Reviewed-by: Gavi Teitz <gavi@nvidia.com> >> Reviewed-by: Roi Dayan <roid@nvidia.com> >> Reviewed-by: Maor Dickman <maord@nvidia.com> >> Acked-by: Saeed Mahameed <saeedm@nvidia.com> >> --- >> drivers/net/vxlan/vxlan_core.c | 20 -------------------- >> include/net/vxlan.h | 20 ++++++++++++++++++++ >> 2 files changed, 20 insertions(+), 20 deletions(-) >> >> diff --git a/drivers/net/vxlan/vxlan_core.c b/drivers/net/vxlan/vxlan_core.c >> index b1b179effe2a..bd44467a5a39 100644 >> --- a/drivers/net/vxlan/vxlan_core.c >> +++ b/drivers/net/vxlan/vxlan_core.c >> @@ -2140,26 +2140,6 @@ static bool route_shortcircuit(struct net_device *dev, struct sk_buff *skb) >> return false; >> } >> >> -static void vxlan_build_gbp_hdr(struct vxlanhdr *vxh, u32 vxflags, >> - struct vxlan_metadata *md) >> -{ >> - struct vxlanhdr_gbp *gbp; >> - >> - if (!md->gbp) >> - return; >> - >> - gbp = (struct vxlanhdr_gbp *)vxh; >> - vxh->vx_flags |= VXLAN_HF_GBP; >> - >> - if (md->gbp & VXLAN_GBP_DONT_LEARN) >> - gbp->dont_learn = 1; >> - >> - if (md->gbp & VXLAN_GBP_POLICY_APPLIED) >> - gbp->policy_applied = 1; >> - >> - gbp->policy_id = htons(md->gbp & VXLAN_GBP_ID_MASK); >> -} >> - >> static int vxlan_build_gpe_hdr(struct vxlanhdr *vxh, u32 vxflags, >> __be16 protocol) >> { >> diff --git a/include/net/vxlan.h b/include/net/vxlan.h >> index bca5b01af247..02b01a6034a2 100644 >> --- a/include/net/vxlan.h >> +++ b/include/net/vxlan.h >> @@ -566,4 +566,24 @@ static inline bool vxlan_fdb_nh_path_select(struct nexthop *nh, >> return true; >> } >> >> +static inline void vxlan_build_gbp_hdr(struct vxlanhdr *vxh, u32 vxflags, >> + const struct vxlan_metadata *md) > Calling this helper causes a warning on patch 3 due to different types > for the 2nd argument. The warning could be addressed there with an > explicit cast but it looks like 'vxflags' is not used at all here. > > I suggest to add a preparation patch dropping such argument (and the > same for vxlan_build_gpe_hdr(), still in the same patch), should be > cleaner. ACK > > Thanks, > > Paolo >
diff --git a/drivers/net/vxlan/vxlan_core.c b/drivers/net/vxlan/vxlan_core.c index b1b179effe2a..bd44467a5a39 100644 --- a/drivers/net/vxlan/vxlan_core.c +++ b/drivers/net/vxlan/vxlan_core.c @@ -2140,26 +2140,6 @@ static bool route_shortcircuit(struct net_device *dev, struct sk_buff *skb) return false; } -static void vxlan_build_gbp_hdr(struct vxlanhdr *vxh, u32 vxflags, - struct vxlan_metadata *md) -{ - struct vxlanhdr_gbp *gbp; - - if (!md->gbp) - return; - - gbp = (struct vxlanhdr_gbp *)vxh; - vxh->vx_flags |= VXLAN_HF_GBP; - - if (md->gbp & VXLAN_GBP_DONT_LEARN) - gbp->dont_learn = 1; - - if (md->gbp & VXLAN_GBP_POLICY_APPLIED) - gbp->policy_applied = 1; - - gbp->policy_id = htons(md->gbp & VXLAN_GBP_ID_MASK); -} - static int vxlan_build_gpe_hdr(struct vxlanhdr *vxh, u32 vxflags, __be16 protocol) { diff --git a/include/net/vxlan.h b/include/net/vxlan.h index bca5b01af247..02b01a6034a2 100644 --- a/include/net/vxlan.h +++ b/include/net/vxlan.h @@ -566,4 +566,24 @@ static inline bool vxlan_fdb_nh_path_select(struct nexthop *nh, return true; } +static inline void vxlan_build_gbp_hdr(struct vxlanhdr *vxh, u32 vxflags, + const struct vxlan_metadata *md) +{ + struct vxlanhdr_gbp *gbp; + + if (!md->gbp) + return; + + gbp = (struct vxlanhdr_gbp *)vxh; + vxh->vx_flags |= VXLAN_HF_GBP; + + if (md->gbp & VXLAN_GBP_DONT_LEARN) + gbp->dont_learn = 1; + + if (md->gbp & VXLAN_GBP_POLICY_APPLIED) + gbp->policy_applied = 1; + + gbp->policy_id = htons(md->gbp & VXLAN_GBP_ID_MASK); +} + #endif