* [PATCH] ipvs: Avoid unnecessary calls to skb_is_gso_sctp
@ 2024-05-23 16:54 Ismael Luceno
2024-05-27 17:59 ` Julian Anastasov
2024-06-26 11:29 ` Pablo Neira Ayuso
0 siblings, 2 replies; 4+ messages in thread
From: Ismael Luceno @ 2024-05-23 16:54 UTC (permalink / raw)
To: linux-kernel
Cc: Ismael Luceno, Pablo Neira Ayuso, Michal Kubeček,
Simon Horman, Julian Anastasov, lvs-devel, netfilter-devel,
netdev, coreteam
In the context of the SCTP SNAT/DNAT handler, these calls can only
return true.
Ref: e10d3ba4d434 ("ipvs: Fix checksumming on GSO of SCTP packets")
Signed-off-by: Ismael Luceno <iluceno@suse.de>
CC: Pablo Neira Ayuso <pablo@netfilter.org>
CC: Michal Kubeček <mkubecek@suse.com>
CC: Simon Horman <horms@verge.net.au>
CC: Julian Anastasov <ja@ssi.bg>
CC: lvs-devel@vger.kernel.org
CC: netfilter-devel@vger.kernel.org
CC: netdev@vger.kernel.org
CC: coreteam@netfilter.org
---
net/netfilter/ipvs/ip_vs_proto_sctp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/netfilter/ipvs/ip_vs_proto_sctp.c b/net/netfilter/ipvs/ip_vs_proto_sctp.c
index 1e689c714127..83e452916403 100644
--- a/net/netfilter/ipvs/ip_vs_proto_sctp.c
+++ b/net/netfilter/ipvs/ip_vs_proto_sctp.c
@@ -126,7 +126,7 @@ sctp_snat_handler(struct sk_buff *skb, struct ip_vs_protocol *pp,
if (sctph->source != cp->vport || payload_csum ||
skb->ip_summed == CHECKSUM_PARTIAL) {
sctph->source = cp->vport;
- if (!skb_is_gso(skb) || !skb_is_gso_sctp(skb))
+ if (!skb_is_gso(skb))
sctp_nat_csum(skb, sctph, sctphoff);
} else {
skb->ip_summed = CHECKSUM_UNNECESSARY;
@@ -175,7 +175,7 @@ sctp_dnat_handler(struct sk_buff *skb, struct ip_vs_protocol *pp,
(skb->ip_summed == CHECKSUM_PARTIAL &&
!(skb_dst(skb)->dev->features & NETIF_F_SCTP_CRC))) {
sctph->dest = cp->dport;
- if (!skb_is_gso(skb) || !skb_is_gso_sctp(skb))
+ if (!skb_is_gso(skb))
sctp_nat_csum(skb, sctph, sctphoff);
} else if (skb->ip_summed != CHECKSUM_PARTIAL) {
skb->ip_summed = CHECKSUM_UNNECESSARY;
--
2.44.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] ipvs: Avoid unnecessary calls to skb_is_gso_sctp
2024-05-23 16:54 [PATCH] ipvs: Avoid unnecessary calls to skb_is_gso_sctp Ismael Luceno
@ 2024-05-27 17:59 ` Julian Anastasov
2024-06-01 8:22 ` Simon Horman
2024-06-26 11:29 ` Pablo Neira Ayuso
1 sibling, 1 reply; 4+ messages in thread
From: Julian Anastasov @ 2024-05-27 17:59 UTC (permalink / raw)
To: Ismael Luceno
Cc: linux-kernel, Pablo Neira Ayuso, Michal Kubeček,
Simon Horman, lvs-devel, netfilter-devel, netdev, coreteam
[-- Attachment #1: Type: text/plain, Size: 1997 bytes --]
Hello,
On Thu, 23 May 2024, Ismael Luceno wrote:
> In the context of the SCTP SNAT/DNAT handler, these calls can only
> return true.
>
> Ref: e10d3ba4d434 ("ipvs: Fix checksumming on GSO of SCTP packets")
checkpatch.pl prefers to see the "commit" word:
Ref: commit e10d3ba4d434 ("ipvs: Fix checksumming on GSO of SCTP packets")
> Signed-off-by: Ismael Luceno <iluceno@suse.de>
Looks good to me for nf-next, thanks!
Acked-by: Julian Anastasov <ja@ssi.bg>
> CC: Pablo Neira Ayuso <pablo@netfilter.org>
> CC: Michal Kubeček <mkubecek@suse.com>
> CC: Simon Horman <horms@verge.net.au>
> CC: Julian Anastasov <ja@ssi.bg>
> CC: lvs-devel@vger.kernel.org
> CC: netfilter-devel@vger.kernel.org
> CC: netdev@vger.kernel.org
> CC: coreteam@netfilter.org
> ---
> net/netfilter/ipvs/ip_vs_proto_sctp.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/net/netfilter/ipvs/ip_vs_proto_sctp.c b/net/netfilter/ipvs/ip_vs_proto_sctp.c
> index 1e689c714127..83e452916403 100644
> --- a/net/netfilter/ipvs/ip_vs_proto_sctp.c
> +++ b/net/netfilter/ipvs/ip_vs_proto_sctp.c
> @@ -126,7 +126,7 @@ sctp_snat_handler(struct sk_buff *skb, struct ip_vs_protocol *pp,
> if (sctph->source != cp->vport || payload_csum ||
> skb->ip_summed == CHECKSUM_PARTIAL) {
> sctph->source = cp->vport;
> - if (!skb_is_gso(skb) || !skb_is_gso_sctp(skb))
> + if (!skb_is_gso(skb))
> sctp_nat_csum(skb, sctph, sctphoff);
> } else {
> skb->ip_summed = CHECKSUM_UNNECESSARY;
> @@ -175,7 +175,7 @@ sctp_dnat_handler(struct sk_buff *skb, struct ip_vs_protocol *pp,
> (skb->ip_summed == CHECKSUM_PARTIAL &&
> !(skb_dst(skb)->dev->features & NETIF_F_SCTP_CRC))) {
> sctph->dest = cp->dport;
> - if (!skb_is_gso(skb) || !skb_is_gso_sctp(skb))
> + if (!skb_is_gso(skb))
> sctp_nat_csum(skb, sctph, sctphoff);
> } else if (skb->ip_summed != CHECKSUM_PARTIAL) {
> skb->ip_summed = CHECKSUM_UNNECESSARY;
> --
> 2.44.0
Regards
--
Julian Anastasov <ja@ssi.bg>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] ipvs: Avoid unnecessary calls to skb_is_gso_sctp
2024-05-27 17:59 ` Julian Anastasov
@ 2024-06-01 8:22 ` Simon Horman
0 siblings, 0 replies; 4+ messages in thread
From: Simon Horman @ 2024-06-01 8:22 UTC (permalink / raw)
To: Julian Anastasov
Cc: Ismael Luceno, linux-kernel, Pablo Neira Ayuso,
Michal Kubeček, lvs-devel, netfilter-devel, netdev, coreteam
On Mon, May 27, 2024 at 08:59:37PM +0300, Julian Anastasov wrote:
>
> Hello,
>
> On Thu, 23 May 2024, Ismael Luceno wrote:
>
> > In the context of the SCTP SNAT/DNAT handler, these calls can only
> > return true.
> >
> > Ref: e10d3ba4d434 ("ipvs: Fix checksumming on GSO of SCTP packets")
>
> checkpatch.pl prefers to see the "commit" word:
>
> Ref: commit e10d3ba4d434 ("ipvs: Fix checksumming on GSO of SCTP packets")
>
> > Signed-off-by: Ismael Luceno <iluceno@suse.de>
>
> Looks good to me for nf-next, thanks!
>
> Acked-by: Julian Anastasov <ja@ssi.bg>
Likewise, looks good to me.
Acked-by: Simon Horman <horms@kernel.org>
...
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ipvs: Avoid unnecessary calls to skb_is_gso_sctp
2024-05-23 16:54 [PATCH] ipvs: Avoid unnecessary calls to skb_is_gso_sctp Ismael Luceno
2024-05-27 17:59 ` Julian Anastasov
@ 2024-06-26 11:29 ` Pablo Neira Ayuso
1 sibling, 0 replies; 4+ messages in thread
From: Pablo Neira Ayuso @ 2024-06-26 11:29 UTC (permalink / raw)
To: Ismael Luceno
Cc: linux-kernel, Michal Kubeček, Simon Horman, Julian Anastasov,
lvs-devel, netfilter-devel, netdev, coreteam
Hi,
I have placed this patch in the nf-next tree to be included in the
next pull request.
Thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-06-26 11:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-23 16:54 [PATCH] ipvs: Avoid unnecessary calls to skb_is_gso_sctp Ismael Luceno
2024-05-27 17:59 ` Julian Anastasov
2024-06-01 8:22 ` Simon Horman
2024-06-26 11:29 ` Pablo Neira Ayuso
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).