CVS commit: src/sys/netinet

[Jonathan A. Kollasch]

Module Name:    src
Committed By:   jakllsch
Date:           Mon Oct  7 23:17:00 UTC 2024

Modified Files:
        src/sys/netinet: tcp_vtw.c tcp_vtw.h

Log Message:
Allow CACHE_LINE_SIZE 256 with uint64_t fatp_word_t


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/netinet/tcp_vtw.c
cvs rdiff -u -r1.10 -r1.11 src/sys/netinet/tcp_vtw.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/netinet/tcp_vtw.c
diff -u src/sys/netinet/tcp_vtw.c:1.24 src/sys/netinet/tcp_vtw.c:1.25
--- src/sys/netinet/tcp_vtw.c:1.24	Fri Nov  4 09:00:58 2022
+++ src/sys/netinet/tcp_vtw.c	Mon Oct  7 23:17:00 2024
@@ -121,7 +121,7 @@
 
 #include <netinet/tcp_vtw.h>
 
-__KERNEL_RCSID(0, "$NetBSD: tcp_vtw.c,v 1.24 2022/11/04 09:00:58 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_vtw.c,v 1.25 2024/10/07 23:17:00 jakllsch Exp $");
 
 #define db_trace(__a, __b)	do { } while (/*CONSTCOND*/0)
 
@@ -258,7 +258,8 @@ fatp_key(fatp_ctl_t *fat, fatp_t *fp, ui
 {
 	CTASSERT(CACHE_LINE_SIZE == 32 ||
 	         CACHE_LINE_SIZE == 64 ||
-		 CACHE_LINE_SIZE == 128);
+	         CACHE_LINE_SIZE == 128 ||
+		 CACHE_LINE_SIZE == 256);
 
 	switch (fatp_ntags()) {
 	case 7:
@@ -278,7 +279,8 @@ fatp_slot_from_key(fatp_ctl_t *fat, uint
 {
 	CTASSERT(CACHE_LINE_SIZE == 32 ||
 	         CACHE_LINE_SIZE == 64 ||
-		 CACHE_LINE_SIZE == 128);
+	         CACHE_LINE_SIZE == 128 ||
+		 CACHE_LINE_SIZE == 256);
 
 	switch (fatp_ntags()) {
 	case 7:
@@ -298,7 +300,8 @@ fatp_from_key(fatp_ctl_t *fat, uint32_t 
 {
 	CTASSERT(CACHE_LINE_SIZE == 32 ||
 	         CACHE_LINE_SIZE == 64 ||
-		 CACHE_LINE_SIZE == 128);
+	         CACHE_LINE_SIZE == 128 ||
+		 CACHE_LINE_SIZE == 256);
 
 	switch (fatp_ntags()) {
 	case 7:

Index: src/sys/netinet/tcp_vtw.h
diff -u src/sys/netinet/tcp_vtw.h:1.10 src/sys/netinet/tcp_vtw.h:1.11
--- src/sys/netinet/tcp_vtw.h:1.10	Sun Dec 11 08:09:20 2022
+++ src/sys/netinet/tcp_vtw.h	Mon Oct  7 23:17:00 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: tcp_vtw.h,v 1.10 2022/12/11 08:09:20 mlelstv Exp $	*/
+/*	$NetBSD: tcp_vtw.h,v 1.11 2024/10/07 23:17:00 jakllsch Exp $	*/
 /*
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -151,7 +151,7 @@
  */
 struct fatp_mi;
 
-#if CACHE_LINE_SIZE == 128
+#if CACHE_LINE_SIZE >= 128
 typedef uint64_t fatp_word_t;
 #else
 typedef uint32_t fatp_word_t;