From: Wenzel, Marco <hidden> Date: 2021-02-22 14:14:57
On Fri, Feb 19, 2021 at 2:14 PM : George McCollister [off-list ref] wrote:
On Fri, Feb 19, 2021 at 2:27 AM Wenzel, Marco <Marco.Wenzel@a-
eberle.de> wrote:
quoted
On Thu, Feb 18, 2021 at 6:06 PM : George McCollister
[off-list ref] wrote:
quoted
quoted
On Thu, Feb 18, 2021 at 9:01 AM Marco Wenzel <marco.wenzel@a-
eberle.de> wrote:
quoted
In IEC 62439-3 EntryForgetTime is defined with a value of 400 ms.
When a node does not send any frame within this time, the sequence
number check for can be ignored. This solves communication issues
with Cisco IE 2000 in Redbox mode.
Fixes: f421436a591d ("net/hsr: Add support for the
High-availability Seamless Redundancy protocol (HSRv0)")
Signed-off-by: Marco Wenzel <redacted>
---
net/hsr/hsr_framereg.c | 9 +++++++-- net/hsr/hsr_framereg.h | 1
+
net/hsr/hsr_main.h | 1 +
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/net/hsr/hsr_framereg.c b/net/hsr/hsr_framereg.c index
* as initialization. (0 could trigger an spurious ring error warning).
*/
now = jiffies;
- for (i = 0; i < HSR_PT_PORTS; i++)
+ for (i = 0; i < HSR_PT_PORTS; i++) {
new_node->time_in[i] = now;
+ new_node->time_out[i] = now;
+ }
for (i = 0; i < HSR_PT_PORTS; i++)
new_node->seq_out[i] = seq_out;
@@ -75,6 +75,7 @@ struct hsr_node {enumhsr_port_typeaddr_B_port;unsignedlongtime_in[HSR_PT_PORTS];booltime_in_stale[HSR_PT_PORTS];+unsignedlongtime_out[HSR_PT_PORTS];/* if the node is a SAN */boolsan_a;boolsan_b;
diff --git a/net/hsr/hsr_main.h b/net/hsr/hsr_main.h index
7dc92ce5a134..f79ca55d6986 100644
--- a/net/hsr/hsr_main.h+++ b/net/hsr/hsr_main.h
@@ -21,6 +21,7 @@#define HSR_LIFE_CHECK_INTERVAL 2000 /* ms */#define HSR_NODE_FORGET_TIME 60000 /* ms */#define HSR_ANNOUNCE_INTERVAL 100 /* ms */+#define HSR_ENTRY_FORGET_TIME 400 /* ms *//* By how much may slave1 and slave2 timestamps of latest
received
frame from
quoted
* each node differ before we notify of communication problem?
--
2.30.0
scripts/checkpatch.pl gives errors about DOS line endings but once
that is resolved this looks good. I tested it on an HSR network with
the software implementation and the xrs700x which uses offloading
and everything still works. I don't have a way to force anything on
the HSR network to reuse sequence numbers after 400ms.
Reviewed-by: George McCollister <george.mccollister@gmail.com
Tested-by: George McCollister <george.mccollister@gmail.com
Thank you very much for reviewing, testing and supporting!
Where do you see the incorrect line endings? I just ran scripts/checkpath.pl
as git commit hook and it did not report any errors. When I run it again
manually, it also does not report any errors:
quoted
# ./scripts/checkpatch.pl --strict
/tmp/0001-net-hsr-add-support-for-EntryForgetTime.patch
total: 0 errors, 0 warnings, 0 checks, 38 lines checked
/tmp/0001-net-hsr-add-support-for-EntryForgetTime.patch has no obvious
style problems and is ready for submission.
Sorry about this. It seems when I downloaded the patch with Chromium
from gmail in Linux it added DOS new lines (this is unexpected). When I
downloaded it from lore.kernel.org it's fine.
Reviewed-by: George McCollister <george.mccollister@gmail.com>
Tested-by: George McCollister <george.mccollister@gmail.com>
Thank you for reviewing again! Is there any operation needed from my side in order to officially apply this patch?
From: George McCollister <george.mccollister@gmail.com> Date: 2021-02-22 16:50:49
On Mon, Feb 22, 2021 at 7:38 AM Wenzel, Marco [off-list ref] wrote:
On Fri, Feb 19, 2021 at 2:14 PM : George McCollister [off-list ref] wrote:
quoted
On Fri, Feb 19, 2021 at 2:27 AM Wenzel, Marco <Marco.Wenzel@a-
eberle.de> wrote:
quoted
On Thu, Feb 18, 2021 at 6:06 PM : George McCollister
[off-list ref] wrote:
quoted
quoted
On Thu, Feb 18, 2021 at 9:01 AM Marco Wenzel <marco.wenzel@a-
eberle.de> wrote:
quoted
In IEC 62439-3 EntryForgetTime is defined with a value of 400 ms.
When a node does not send any frame within this time, the sequence
number check for can be ignored. This solves communication issues
with Cisco IE 2000 in Redbox mode.
Fixes: f421436a591d ("net/hsr: Add support for the
High-availability Seamless Redundancy protocol (HSRv0)")
Signed-off-by: Marco Wenzel <redacted>
---
net/hsr/hsr_framereg.c | 9 +++++++-- net/hsr/hsr_framereg.h | 1
+
net/hsr/hsr_main.h | 1 +
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/net/hsr/hsr_framereg.c b/net/hsr/hsr_framereg.c index
* as initialization. (0 could trigger an spurious ring error warning).
*/
now = jiffies;
- for (i = 0; i < HSR_PT_PORTS; i++)
+ for (i = 0; i < HSR_PT_PORTS; i++) {
new_node->time_in[i] = now;
+ new_node->time_out[i] = now;
+ }
for (i = 0; i < HSR_PT_PORTS; i++)
new_node->seq_out[i] = seq_out;
@@ -75,6 +75,7 @@ struct hsr_node {enumhsr_port_typeaddr_B_port;unsignedlongtime_in[HSR_PT_PORTS];booltime_in_stale[HSR_PT_PORTS];+unsignedlongtime_out[HSR_PT_PORTS];/* if the node is a SAN */boolsan_a;boolsan_b;
diff --git a/net/hsr/hsr_main.h b/net/hsr/hsr_main.h index
7dc92ce5a134..f79ca55d6986 100644
--- a/net/hsr/hsr_main.h+++ b/net/hsr/hsr_main.h
@@ -21,6 +21,7 @@#define HSR_LIFE_CHECK_INTERVAL 2000 /* ms */#define HSR_NODE_FORGET_TIME 60000 /* ms */#define HSR_ANNOUNCE_INTERVAL 100 /* ms */+#define HSR_ENTRY_FORGET_TIME 400 /* ms *//* By how much may slave1 and slave2 timestamps of latest
received
frame from
quoted
* each node differ before we notify of communication problem?
--
2.30.0
scripts/checkpatch.pl gives errors about DOS line endings but once
that is resolved this looks good. I tested it on an HSR network with
the software implementation and the xrs700x which uses offloading
and everything still works. I don't have a way to force anything on
the HSR network to reuse sequence numbers after 400ms.
Reviewed-by: George McCollister <george.mccollister@gmail.com
Tested-by: George McCollister <george.mccollister@gmail.com
Thank you very much for reviewing, testing and supporting!
Where do you see the incorrect line endings? I just ran scripts/checkpath.pl
as git commit hook and it did not report any errors. When I run it again
manually, it also does not report any errors:
quoted
# ./scripts/checkpatch.pl --strict
/tmp/0001-net-hsr-add-support-for-EntryForgetTime.patch
total: 0 errors, 0 warnings, 0 checks, 38 lines checked
/tmp/0001-net-hsr-add-support-for-EntryForgetTime.patch has no obvious
style problems and is ready for submission.
Sorry about this. It seems when I downloaded the patch with Chromium
from gmail in Linux it added DOS new lines (this is unexpected). When I
downloaded it from lore.kernel.org it's fine.
Reviewed-by: George McCollister <george.mccollister@gmail.com>
Tested-by: George McCollister <george.mccollister@gmail.com>
Thank you for reviewing again! Is there any operation needed from my side in order to officially apply this patch?
Looks like the patch is showing as deferred in patchwork because it's
not targeting either net or net-next.
From https://www.kernel.org/doc/Documentation/networking/netdev-FAQ.txt
There are always two trees (git repositories) in play. Both are driven
by David Miller, the main network maintainer. There is the "net" tree,
and the "net-next" tree. As you can probably guess from the names, the
net tree is for fixes to existing code already in the mainline tree from
Linus, and net-next is where the new code goes for the future release.
You can find the trees here:
https://git.kernel.org/pub/scm/linux/kernel/git/davem/net.githttps://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git
You must decide if you want to send it for net or net-next. If you
want to send it for net-next you must wait Linus has closed the merge
window and this shows open:
http://vger.kernel.org/~davem/net-next.html
To send for net use the subject prefix "[PATCH net]".
To send for net-next use the subject prefix "[PATCH net-next]".
If you're using git format-patch you can use the following:
git format-patch --subject-prefix='PATCH net-next'
If you're just using git send-email you can use the --annotate option
to edit the patch subject manually.
Thanks and sorry for not mentioning this before,
George McCollister
From: Wenzel, Marco <hidden> Date: 2021-02-24 09:53:27
On Mon, Feb 22, 2021 at 5:49 PM : George McCollister [off-list ref] wrote:
On Mon, Feb 22, 2021 at 7:38 AM Wenzel, Marco <Marco.Wenzel@a-
eberle.de> wrote:
quoted
On Fri, Feb 19, 2021 at 2:14 PM : George McCollister
[off-list ref] wrote:
quoted
quoted
On Fri, Feb 19, 2021 at 2:27 AM Wenzel, Marco <Marco.Wenzel@a-
eberle.de> wrote:
quoted
On Thu, Feb 18, 2021 at 6:06 PM : George McCollister
[off-list ref] wrote:
quoted
quoted
On Thu, Feb 18, 2021 at 9:01 AM Marco Wenzel <marco.wenzel@a-
eberle.de> wrote:
quoted
In IEC 62439-3 EntryForgetTime is defined with a value of 400 ms.
When a node does not send any frame within this time, the
sequence number check for can be ignored. This solves
communication issues with Cisco IE 2000 in Redbox mode.
Fixes: f421436a591d ("net/hsr: Add support for the
High-availability Seamless Redundancy protocol (HSRv0)")
Signed-off-by: Marco Wenzel <redacted>
---
net/hsr/hsr_framereg.c | 9 +++++++-- net/hsr/hsr_framereg.h
| 1
+
net/hsr/hsr_main.h | 1 +
3 files changed, 9 insertions(+), 2 deletions(-)
* as initialization. (0 could trigger an spurious ring error
warning).
quoted
quoted
quoted
quoted
quoted
*/
now = jiffies;
- for (i = 0; i < HSR_PT_PORTS; i++)
+ for (i = 0; i < HSR_PT_PORTS; i++) {
new_node->time_in[i] = now;
+ new_node->time_out[i] = now;
+ }
for (i = 0; i < HSR_PT_PORTS; i++)
new_node->seq_out[i] = seq_out;
@@ -75,6 +75,7 @@ struct hsr_node {enumhsr_port_typeaddr_B_port;unsignedlongtime_in[HSR_PT_PORTS];booltime_in_stale[HSR_PT_PORTS];+unsignedlongtime_out[HSR_PT_PORTS];/* if the node is a SAN */boolsan_a;boolsan_b;
diff --git a/net/hsr/hsr_main.h b/net/hsr/hsr_main.h index
7dc92ce5a134..f79ca55d6986 100644
--- a/net/hsr/hsr_main.h+++ b/net/hsr/hsr_main.h
@@ -21,6 +21,7 @@#define HSR_LIFE_CHECK_INTERVAL 2000 /* ms */#define HSR_NODE_FORGET_TIME 60000 /* ms */#define HSR_ANNOUNCE_INTERVAL 100 /* ms */+#define HSR_ENTRY_FORGET_TIME 400 /* ms *//* By how much may slave1 and slave2 timestamps of latest
received
frame from
quoted
* each node differ before we notify of communication problem?
--
2.30.0
scripts/checkpatch.pl gives errors about DOS line endings but
once that is resolved this looks good. I tested it on an HSR
network with the software implementation and the xrs700x which
uses offloading and everything still works. I don't have a way
to force anything on the HSR network to reuse sequence numbers
after 400ms.
quoted
quoted
quoted
quoted
Reviewed-by: George McCollister <george.mccollister@gmail.com
Tested-by: George McCollister <george.mccollister@gmail.com
Thank you very much for reviewing, testing and supporting!
Where do you see the incorrect line endings? I just ran
scripts/checkpath.pl
as git commit hook and it did not report any errors. When I run it
again manually, it also does not report any errors:
quoted
# ./scripts/checkpatch.pl --strict
/tmp/0001-net-hsr-add-support-for-EntryForgetTime.patch
total: 0 errors, 0 warnings, 0 checks, 38 lines checked
/tmp/0001-net-hsr-add-support-for-EntryForgetTime.patch has no
obvious
style problems and is ready for submission.
Sorry about this. It seems when I downloaded the patch with Chromium
from gmail in Linux it added DOS new lines (this is unexpected).
When I downloaded it from lore.kernel.org it's fine.
Reviewed-by: George McCollister <george.mccollister@gmail.com>
Tested-by: George McCollister <george.mccollister@gmail.com>
Thank you for reviewing again! Is there any operation needed from my side
in order to officially apply this patch?
Looks like the patch is showing as deferred in patchwork because it's not
targeting either net or net-next.
From https://www.kernel.org/doc/Documentation/networking/netdev-
FAQ.txt
There are always two trees (git repositories) in play. Both are driven
by David Miller, the main network maintainer. There is the "net" tree,
and the "net-next" tree. As you can probably guess from the names, the
net tree is for fixes to existing code already in the mainline tree from
Linus, and net-next is where the new code goes for the future release.
You can find the trees here:
https://git.kernel.org/pub/scm/linux/kernel/git/davem/net.githttps://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git
You must decide if you want to send it for net or net-next. If you want to
send it for net-next you must wait Linus has closed the merge window and
this shows open:
http://vger.kernel.org/~davem/net-next.html
To send for net use the subject prefix "[PATCH net]".
To send for net-next use the subject prefix "[PATCH net-next]".
If you're using git format-patch you can use the following:
git format-patch --subject-prefix='PATCH net-next'
If you're just using git send-email you can use the --annotate option to edit
the patch subject manually.
Thanks and sorry for not mentioning this before, George McCollister
Thanks again for the very helpful hints. I hope the patch will be correct now.
From: Marco Wenzel <hidden> Date: 2021-02-24 09:56:57
In IEC 62439-3 EntryForgetTime is defined with a value of 400 ms. When a
node does not send any frame within this time, the sequence number check
for can be ignored. This solves communication issues with Cisco IE 2000
in Redbox mode.
Fixes: f421436a591d ("net/hsr: Add support for the High-availability Seamless Redundancy protocol (HSRv0)")
Signed-off-by: Marco Wenzel <redacted>
Reviewed-by: George McCollister <george.mccollister@gmail.com>
Tested-by: George McCollister <george.mccollister@gmail.com>
---
net/hsr/hsr_framereg.c | 9 +++++++--
net/hsr/hsr_framereg.h | 1 +
net/hsr/hsr_main.h | 1 +
3 files changed, 9 insertions(+), 2 deletions(-)
@@ -75,6 +75,7 @@ struct hsr_node {enumhsr_port_typeaddr_B_port;unsignedlongtime_in[HSR_PT_PORTS];booltime_in_stale[HSR_PT_PORTS];+unsignedlongtime_out[HSR_PT_PORTS];/* if the node is a SAN */boolsan_a;boolsan_b;
@@ -22,6 +22,7 @@#define HSR_LIFE_CHECK_INTERVAL 2000 /* ms */#define HSR_NODE_FORGET_TIME 60000 /* ms */#define HSR_ANNOUNCE_INTERVAL 100 /* ms */+#define HSR_ENTRY_FORGET_TIME 400 /* ms *//* By how much may slave1 and slave2 timestamps of latest received frame from*eachnodedifferbeforewenotifyofcommunicationproblem?
From: Andrew Lunn <andrew@lunn.ch> Date: 2021-02-24 14:57:25
quoted
You must decide if you want to send it for net or net-next. If you want to
send it for net-next you must wait Linus has closed the merge window and
this shows open:
http://vger.kernel.org/~davem/net-next.html
To send for net use the subject prefix "[PATCH net]".
To send for net-next use the subject prefix "[PATCH net-next]".
If you're using git format-patch you can use the following:
git format-patch --subject-prefix='PATCH net-next'
If you're just using git send-email you can use the --annotate option to edit
the patch subject manually.
Thanks and sorry for not mentioning this before, George McCollister
Thanks again for the very helpful hints. I hope the patch will be correct now.
Hi Marco
I know there is a lot of learn, doing the submission correct can be
harder than writing the code, at least for the first few patches.
One thing you missed is the patch version number in the Subject:
line. When there are multiple versions of a patch flying around, it
makes it easier to keep track of, if there is a version number.
Please try to remember this for you next patch. No need to resend just
because of this.
Andrew
From: Andrew Lunn <andrew@lunn.ch> Date: 2021-02-24 15:00:50
On Wed, Feb 24, 2021 at 10:46:49AM +0100, Marco Wenzel wrote:
In IEC 62439-3 EntryForgetTime is defined with a value of 400 ms. When a
node does not send any frame within this time, the sequence number check
for can be ignored. This solves communication issues with Cisco IE 2000
in Redbox mode.
Fixes: f421436a591d ("net/hsr: Add support for the High-availability Seamless Redundancy protocol (HSRv0)")
Signed-off-by: Marco Wenzel <redacted>
Reviewed-by: George McCollister <george.mccollister@gmail.com>
Tested-by: George McCollister <george.mccollister@gmail.com>
From: Jakub Kicinski <kuba@kernel.org> Date: 2021-02-25 17:49:54
On Wed, 24 Feb 2021 14:55:17 +0100 Andrew Lunn wrote:
On Wed, Feb 24, 2021 at 10:46:49AM +0100, Marco Wenzel wrote:
quoted
In IEC 62439-3 EntryForgetTime is defined with a value of 400 ms. When a
node does not send any frame within this time, the sequence number check
for can be ignored. This solves communication issues with Cisco IE 2000
in Redbox mode.
Fixes: f421436a591d ("net/hsr: Add support for the High-availability Seamless Redundancy protocol (HSRv0)")
Signed-off-by: Marco Wenzel <redacted>
Reviewed-by: George McCollister <george.mccollister@gmail.com>
Tested-by: George McCollister <george.mccollister@gmail.com>
From: Wenzel, Marco <hidden> Date: 2021-02-26 07:26:49
On Thu, Feb 25, 2021 at 6:49 PM Jakub Kicinski [off-list ref] wrote:
On Wed, 24 Feb 2021 14:55:17 +0100 Andrew Lunn wrote:
quoted
On Wed, Feb 24, 2021 at 10:46:49AM +0100, Marco Wenzel wrote:
quoted
In IEC 62439-3 EntryForgetTime is defined with a value of 400 ms.
When a node does not send any frame within this time, the sequence
number check for can be ignored. This solves communication issues
with Cisco IE 2000 in Redbox mode.
Fixes: f421436a591d ("net/hsr: Add support for the High-availability
Seamless Redundancy protocol (HSRv0)")
Signed-off-by: Marco Wenzel <redacted>
Reviewed-by: George McCollister <george.mccollister@gmail.com>
Tested-by: George McCollister <george.mccollister@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Applied, thanks!
Thank you all for supporting me during the submission of my first kernel patch!
Best regards,
Marco