Page MenuHomeFreeBSD
Differential D45178

linuxkpi: sk_buff: Resize the control buffer in struct sk_buff.
Needs ReviewPublic
Actions

Authored by cc on May 13 2024, 4:31 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Mar 8, 6:30 AM
Unknown Object (File)
Mon, Mar 3, 7:30 AM
Unknown Object (File)
Dec 17 2024, 11:27 PM
Unknown Object (File)
Nov 26 2024, 11:28 AM
Unknown Object (File)
Nov 24 2024, 1:51 PM
Unknown Object (File)
Nov 22 2024, 10:42 PM
Unknown Object (File)
Nov 3 2024, 1:59 PM
Unknown Object (File)
Oct 6 2024, 3:50 AM
View All 22 Files
Subscribers
emaste
imp
linuxkpi

Details

Reviewers
bz
Summary

Add aligned attribute to struct ieee80211_tx_rate so that the size of
skb->cb can be shrunk to 48 bytes.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 57682
Build 54570: arc lint + arc unit

Event Timeline

cc created this revision.May 13 2024, 4:31 PM
Herald added subscribers: linuxkpi, emaste, imp. · View Herald TranscriptMay 13 2024, 4:31 PM
cc requested review of this revision.May 13 2024, 4:31 PM
Harbormaster completed remote builds in B57682: Diff 138477.May 13 2024, 4:31 PM
cc added inline comments.May 13 2024, 4:34 PM
sys/compat/linuxkpi/common/include/linux/skbuff.h
164

Please let me know if the comment for this control buffer needs to be updated.

Revision Contents
Changeset List

PathSize
sys/
compat/
linuxkpi/
common/
include/
linux/
2 lines
net/
2 lines

Diff 138477

View Options

sys/compat/linuxkpi/common/include/linux/skbuff.h

Show All 38 Lines
#include <unistd.h> #include <unistd.h>
enum { enum {
MODE_ASLR, MODE_ASLR,
MODE_INVALID, MODE_INVALID,
MODE_TRACE, MODE_TRACE,
MODE_TRAPCAP, MODE_TRAPCAP,
MODE_PROTMAX, MODE_PROTMAX,
MODE_STACKGAP,
#ifdef PROC_KPTI_CTL #ifdef PROC_KPTI_CTL
MODE_KPTI, MODE_KPTI,
#endif #endif
}; };
static pid_t static pid_t
str2pid(const char *str) str2pid(const char *str)
{ {
Show All 13 Lines
#else #else
#define KPTI_USAGE #define KPTI_USAGE
#endif #endif
static void __dead2 static void __dead2
usage(void) usage(void)
{ {
fprintf(stderr, "Usage: proccontrol -m (aslr|protmax|trace|trapcap" fprintf(stderr, "Usage: proccontrol -m (aslr|protmax|trace|trapcap|"
KPTI_USAGE") [-q] " "stackgap"KPTI_USAGE") [-q] "
"[-s (enable|disable)] [-p pid | command]\n"); "[-s (enable|disable)] [-p pid | command]\n");
exit(1); exit(1);
} }
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
int arg, ch, error, mode; int arg, ch, error, mode;
Show All 10 Lines case 'm':
if (strcmp(optarg, "aslr") == 0) if (strcmp(optarg, "aslr") == 0)
mode = MODE_ASLR; mode = MODE_ASLR;
else if (strcmp(optarg, "protmax") == 0) else if (strcmp(optarg, "protmax") == 0)
mode = MODE_PROTMAX; mode = MODE_PROTMAX;
else if (strcmp(optarg, "trace") == 0) else if (strcmp(optarg, "trace") == 0)
mode = MODE_TRACE; mode = MODE_TRACE;
else if (strcmp(optarg, "trapcap") == 0) else if (strcmp(optarg, "trapcap") == 0)
mode = MODE_TRAPCAP; mode = MODE_TRAPCAP;
else if (strcmp(optarg, "stackgap") == 0)
mode = MODE_STACKGAP;
#ifdef PROC_KPTI_CTL #ifdef PROC_KPTI_CTL
else if (strcmp(optarg, "kpti") == 0) else if (strcmp(optarg, "kpti") == 0)
mode = MODE_KPTI; mode = MODE_KPTI;
#endif #endif
else else
usage(); usage();
break; break;
case 's': case 's':
Show All 36 Lines case MODE_TRACE:
error = procctl(P_PID, pid, PROC_TRACE_STATUS, &arg); error = procctl(P_PID, pid, PROC_TRACE_STATUS, &arg);
break; break;
case MODE_TRAPCAP: case MODE_TRAPCAP:
error = procctl(P_PID, pid, PROC_TRAPCAP_STATUS, &arg); error = procctl(P_PID, pid, PROC_TRAPCAP_STATUS, &arg);
break; break;
case MODE_PROTMAX: case MODE_PROTMAX:
error = procctl(P_PID, pid, PROC_PROTMAX_STATUS, &arg); error = procctl(P_PID, pid, PROC_PROTMAX_STATUS, &arg);
break; break;
case MODE_STACKGAP:
error = procctl(P_PID, pid, PROC_STACKGAP_STATUS, &arg);
break;
#ifdef PROC_KPTI_CTL #ifdef PROC_KPTI_CTL
case MODE_KPTI: case MODE_KPTI:
error = procctl(P_PID, pid, PROC_KPTI_STATUS, &arg); error = procctl(P_PID, pid, PROC_KPTI_STATUS, &arg);
break; break;
#endif #endif
default: default:
usage(); usage();
break; break;
▲ Show 20 Lines • Show All 48 Lines • ▼ Show 20 Lines case MODE_PROTMAX:
printf("not forced"); printf("not forced");
break; break;
} }
if ((arg & PROC_PROTMAX_ACTIVE) != 0) if ((arg & PROC_PROTMAX_ACTIVE) != 0)
printf(", active\n"); printf(", active\n");
else else
printf(", not active\n"); printf(", not active\n");
break; break;
case MODE_STACKGAP:
switch (arg) {
case PROC_STACKGAP_ENABLE:
printf("enabled\n");
break;
case PROC_STACKGAP_DISABLE:
printf("disabled\n");
break;
}
break;
#ifdef PROC_KPTI_CTL #ifdef PROC_KPTI_CTL
case MODE_KPTI: case MODE_KPTI:
switch (arg & ~PROC_KPTI_STATUS_ACTIVE) { switch (arg & ~PROC_KPTI_STATUS_ACTIVE) {
case PROC_KPTI_CTL_ENABLE_ON_EXEC: case PROC_KPTI_CTL_ENABLE_ON_EXEC:
printf("enabled"); printf("enabled");
break; break;
case PROC_KPTI_CTL_DISABLE_ON_EXEC: case PROC_KPTI_CTL_DISABLE_ON_EXEC:
printf("disabled"); printf("disabled");
Show All 22 Lines case MODE_TRAPCAP:
arg = enable ? PROC_TRAPCAP_CTL_ENABLE : arg = enable ? PROC_TRAPCAP_CTL_ENABLE :
PROC_TRAPCAP_CTL_DISABLE; PROC_TRAPCAP_CTL_DISABLE;
error = procctl(P_PID, pid, PROC_TRAPCAP_CTL, &arg); error = procctl(P_PID, pid, PROC_TRAPCAP_CTL, &arg);
break; break;
case MODE_PROTMAX: case MODE_PROTMAX:
arg = enable ? PROC_PROTMAX_FORCE_ENABLE : arg = enable ? PROC_PROTMAX_FORCE_ENABLE :
PROC_PROTMAX_FORCE_DISABLE; PROC_PROTMAX_FORCE_DISABLE;
error = procctl(P_PID, pid, PROC_PROTMAX_CTL, &arg); error = procctl(P_PID, pid, PROC_PROTMAX_CTL, &arg);
break;
case MODE_STACKGAP:
arg = enable ? PROC_STACKGAP_ENABLE :
PROC_STACKGAP_DISABLE;
error = procctl(P_PID, pid, PROC_STACKGAP_CTL, &arg);
break; break;
#ifdef PROC_KPTI_CTL #ifdef PROC_KPTI_CTL
case MODE_KPTI: case MODE_KPTI:
arg = enable ? PROC_KPTI_CTL_ENABLE_ON_EXEC : arg = enable ? PROC_KPTI_CTL_ENABLE_ON_EXEC :
PROC_KPTI_CTL_DISABLE_ON_EXEC; PROC_KPTI_CTL_DISABLE_ON_EXEC;
error = procctl(P_PID, pid, PROC_KPTI_CTL, &arg); error = procctl(P_PID, pid, PROC_KPTI_CTL, &arg);
break; break;
#endif #endif
Show All 13 Lines
View Options

sys/compat/linuxkpi/common/include/net/mac80211.h

Show All 38 Lines
#include <unistd.h> #include <unistd.h>
enum { enum {
MODE_ASLR, MODE_ASLR,
MODE_INVALID, MODE_INVALID,
MODE_TRACE, MODE_TRACE,
MODE_TRAPCAP, MODE_TRAPCAP,
MODE_PROTMAX, MODE_PROTMAX,
MODE_STACKGAP,
#ifdef PROC_KPTI_CTL #ifdef PROC_KPTI_CTL
MODE_KPTI, MODE_KPTI,
#endif #endif
}; };
static pid_t static pid_t
str2pid(const char *str) str2pid(const char *str)
{ {
Show All 13 Lines
#else #else
#define KPTI_USAGE #define KPTI_USAGE
#endif #endif
static void __dead2 static void __dead2
usage(void) usage(void)
{ {
fprintf(stderr, "Usage: proccontrol -m (aslr|protmax|trace|trapcap" fprintf(stderr, "Usage: proccontrol -m (aslr|protmax|trace|trapcap|"
KPTI_USAGE") [-q] " "stackgap"KPTI_USAGE") [-q] "
"[-s (enable|disable)] [-p pid | command]\n"); "[-s (enable|disable)] [-p pid | command]\n");
exit(1); exit(1);
} }
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
int arg, ch, error, mode; int arg, ch, error, mode;
Show All 10 Lines case 'm':
if (strcmp(optarg, "aslr") == 0) if (strcmp(optarg, "aslr") == 0)
mode = MODE_ASLR; mode = MODE_ASLR;
else if (strcmp(optarg, "protmax") == 0) else if (strcmp(optarg, "protmax") == 0)
mode = MODE_PROTMAX; mode = MODE_PROTMAX;
else if (strcmp(optarg, "trace") == 0) else if (strcmp(optarg, "trace") == 0)
mode = MODE_TRACE; mode = MODE_TRACE;
else if (strcmp(optarg, "trapcap") == 0) else if (strcmp(optarg, "trapcap") == 0)
mode = MODE_TRAPCAP; mode = MODE_TRAPCAP;
else if (strcmp(optarg, "stackgap") == 0)
mode = MODE_STACKGAP;
#ifdef PROC_KPTI_CTL #ifdef PROC_KPTI_CTL
else if (strcmp(optarg, "kpti") == 0) else if (strcmp(optarg, "kpti") == 0)
mode = MODE_KPTI; mode = MODE_KPTI;
#endif #endif
else else
usage(); usage();
break; break;
case 's': case 's':
Show All 36 Lines case MODE_TRACE:
error = procctl(P_PID, pid, PROC_TRACE_STATUS, &arg); error = procctl(P_PID, pid, PROC_TRACE_STATUS, &arg);
break; break;
case MODE_TRAPCAP: case MODE_TRAPCAP:
error = procctl(P_PID, pid, PROC_TRAPCAP_STATUS, &arg); error = procctl(P_PID, pid, PROC_TRAPCAP_STATUS, &arg);
break; break;
case MODE_PROTMAX: case MODE_PROTMAX:
error = procctl(P_PID, pid, PROC_PROTMAX_STATUS, &arg); error = procctl(P_PID, pid, PROC_PROTMAX_STATUS, &arg);
break; break;
case MODE_STACKGAP:
error = procctl(P_PID, pid, PROC_STACKGAP_STATUS, &arg);
break;
#ifdef PROC_KPTI_CTL #ifdef PROC_KPTI_CTL
case MODE_KPTI: case MODE_KPTI:
error = procctl(P_PID, pid, PROC_KPTI_STATUS, &arg); error = procctl(P_PID, pid, PROC_KPTI_STATUS, &arg);
break; break;
#endif #endif
default: default:
usage(); usage();
break; break;
▲ Show 20 Lines • Show All 48 Lines • ▼ Show 20 Lines case MODE_PROTMAX:
printf("not forced"); printf("not forced");
break; break;
} }
if ((arg & PROC_PROTMAX_ACTIVE) != 0) if ((arg & PROC_PROTMAX_ACTIVE) != 0)
printf(", active\n"); printf(", active\n");
else else
printf(", not active\n"); printf(", not active\n");
break; break;
case MODE_STACKGAP:
switch (arg) {
case PROC_STACKGAP_ENABLE:
printf("enabled\n");
break;
case PROC_STACKGAP_DISABLE:
printf("disabled\n");
break;
}
break;
#ifdef PROC_KPTI_CTL #ifdef PROC_KPTI_CTL
case MODE_KPTI: case MODE_KPTI:
switch (arg & ~PROC_KPTI_STATUS_ACTIVE) { switch (arg & ~PROC_KPTI_STATUS_ACTIVE) {
case PROC_KPTI_CTL_ENABLE_ON_EXEC: case PROC_KPTI_CTL_ENABLE_ON_EXEC:
printf("enabled"); printf("enabled");
break; break;
case PROC_KPTI_CTL_DISABLE_ON_EXEC: case PROC_KPTI_CTL_DISABLE_ON_EXEC:
printf("disabled"); printf("disabled");
Show All 22 Lines case MODE_TRAPCAP:
arg = enable ? PROC_TRAPCAP_CTL_ENABLE : arg = enable ? PROC_TRAPCAP_CTL_ENABLE :
PROC_TRAPCAP_CTL_DISABLE; PROC_TRAPCAP_CTL_DISABLE;
error = procctl(P_PID, pid, PROC_TRAPCAP_CTL, &arg); error = procctl(P_PID, pid, PROC_TRAPCAP_CTL, &arg);
break; break;
case MODE_PROTMAX: case MODE_PROTMAX:
arg = enable ? PROC_PROTMAX_FORCE_ENABLE : arg = enable ? PROC_PROTMAX_FORCE_ENABLE :
PROC_PROTMAX_FORCE_DISABLE; PROC_PROTMAX_FORCE_DISABLE;
error = procctl(P_PID, pid, PROC_PROTMAX_CTL, &arg); error = procctl(P_PID, pid, PROC_PROTMAX_CTL, &arg);
break;
case MODE_STACKGAP:
arg = enable ? PROC_STACKGAP_ENABLE :
PROC_STACKGAP_DISABLE;
error = procctl(P_PID, pid, PROC_STACKGAP_CTL, &arg);
break; break;
#ifdef PROC_KPTI_CTL #ifdef PROC_KPTI_CTL
case MODE_KPTI: case MODE_KPTI:
arg = enable ? PROC_KPTI_CTL_ENABLE_ON_EXEC : arg = enable ? PROC_KPTI_CTL_ENABLE_ON_EXEC :
PROC_KPTI_CTL_DISABLE_ON_EXEC; PROC_KPTI_CTL_DISABLE_ON_EXEC;
error = procctl(P_PID, pid, PROC_KPTI_CTL, &arg); error = procctl(P_PID, pid, PROC_KPTI_CTL, &arg);
break; break;
#endif #endif
Show All 13 Lines