History

skbuff: Move conditional preprocessor directives out of struct sk_buff

In preparation for using the struct_group() macro in struct sk_buff, move the conditional preprocessor directives out of the region of struct sk_buff that will be enclosed by struct_group(). While GCC and Clang are happy with conditional preprocessor directives here, sparse is not, even under -Wno-directive-within-macro[1], as would be seen under a C=1 build: net/core/filter.c: note: in included file (through include/linux/netlink.h, include/linux/sock_diag.h): ./include/linux/skbuff.h:820:1: warning: directive in macro's argument list ./include/linux/skbuff.h:822:1: warning: directive in macro's argument list ./include/linux/skbuff.h:846:1: warning: directive in macro's argument list ./include/linux/skbuff.h:848:1: warning: directive in macro's argument list Additionally remove empty macro argument definitions and usage. "objdump -d" shows no object code differences. [1] https://www.spinics.net/lists/linux-sparse/msg10857.html

Kees Cook committed 4 years ago

Commit fba84951 parent cb902b32 files · +24 −22Browse files

Unified · Split

2 files
  1. include/linux/skbuff.h +19 −17
  2. net/core/filter.c +5 −5
include/linux/skbuff.h+19−17
@@ -795,7 +795,7 @@ struct sk_buff { · 794 unmodified lines
795795 #else
796796 #define CLONED_MASK 1
797797 #endif
798−#define CLONED_OFFSET() offsetof(struct sk_buff, __cloned_offset)
798+#define CLONED_OFFSET offsetof(struct sk_buff, __cloned_offset)
799799
800800 /* private: */
801801 __u8 __cloned_offset[0];
@@ -818,18 +818,10 @@ struct sk_buff { · 16 unmodified lines
818818 __u32 headers_start[0];
819819 /* public: */
820820
821−/* if you move pkt_type around you also must adapt those constants */
822−#ifdef __BIG_ENDIAN_BITFIELD
823−#define PKT_TYPE_MAX (7 << 5)
824−#else
825−#define PKT_TYPE_MAX 7
826−#endif
827−#define PKT_TYPE_OFFSET() offsetof(struct sk_buff, __pkt_type_offset)
828−
829821 /* private: */
830822 __u8 __pkt_type_offset[0];
831823 /* public: */
832− __u8 pkt_type:3;
824+ __u8 pkt_type:3; /* see PKT_TYPE_MAX */
833825 __u8 ignore_df:1;
834826 __u8 nf_trace:1;
835827 __u8 ip_summed:2;
@@ -845,16 +837,10 @@ struct sk_buff { · 9 unmodified lines
845837 __u8 encap_hdr_csum:1;
846838 __u8 csum_valid:1;
847839
848−#ifdef __BIG_ENDIAN_BITFIELD
849−#define PKT_VLAN_PRESENT_BIT 7
850−#else
851−#define PKT_VLAN_PRESENT_BIT 0
852−#endif
853−#define PKT_VLAN_PRESENT_OFFSET() offsetof(struct sk_buff, __pkt_vlan_present_offset)
854840 /* private: */
855841 __u8 __pkt_vlan_present_offset[0];
856842 /* public: */
857− __u8 vlan_present:1;
843+ __u8 vlan_present:1; /* See PKT_VLAN_PRESENT_BIT */
858844 __u8 csum_complete_sw:1;
859845 __u8 csum_level:2;
860846 __u8 csum_not_inet:1;
@@ -953,6 +939,22 @@ struct sk_buff { · 92 unmodified lines
953939 #endif
954940 };
955941
942+/* if you move pkt_type around you also must adapt those constants */
943+#ifdef __BIG_ENDIAN_BITFIELD
944+#define PKT_TYPE_MAX (7 << 5)
945+#else
946+#define PKT_TYPE_MAX 7
947+#endif
948+#define PKT_TYPE_OFFSET offsetof(struct sk_buff, __pkt_type_offset)
949+
950+/* if you move pkt_vlan_present around you also must adapt these constants */
951+#ifdef __BIG_ENDIAN_BITFIELD
952+#define PKT_VLAN_PRESENT_BIT 7
953+#else
954+#define PKT_VLAN_PRESENT_BIT 0
955+#endif
956+#define PKT_VLAN_PRESENT_OFFSET offsetof(struct sk_buff, __pkt_vlan_present_offset)
957+
956958 #ifdef __KERNEL__
957959 /*
958960 * Handling routines are only of interest to the kernel
net/core/filter.c+5−5
@@ -301,7 +301,7 @@ static u32 convert_skb_access(int skb_field, int dst_reg, int src_reg, · 300 unmodified lines
301301 break;
302302
303303 case SKF_AD_PKTTYPE:
304− *insn++ = BPF_LDX_MEM(BPF_B, dst_reg, src_reg, PKT_TYPE_OFFSET());
304+ *insn++ = BPF_LDX_MEM(BPF_B, dst_reg, src_reg, PKT_TYPE_OFFSET);
305305 *insn++ = BPF_ALU32_IMM(BPF_AND, dst_reg, PKT_TYPE_MAX);
306306 #ifdef __BIG_ENDIAN_BITFIELD
307307 *insn++ = BPF_ALU32_IMM(BPF_RSH, dst_reg, 5);
@@ -323,7 +323,7 @@ static u32 convert_skb_access(int skb_field, int dst_reg, int src_reg, · 15 unmodified lines
323323 offsetof(struct sk_buff, vlan_tci));
324324 break;
325325 case SKF_AD_VLAN_TAG_PRESENT:
326− *insn++ = BPF_LDX_MEM(BPF_B, dst_reg, src_reg, PKT_VLAN_PRESENT_OFFSET());
326+ *insn++ = BPF_LDX_MEM(BPF_B, dst_reg, src_reg, PKT_VLAN_PRESENT_OFFSET);
327327 if (PKT_VLAN_PRESENT_BIT)
328328 *insn++ = BPF_ALU32_IMM(BPF_RSH, dst_reg, PKT_VLAN_PRESENT_BIT);
329329 if (PKT_VLAN_PRESENT_BIT < 7)
@@ -8029,7 +8029,7 @@ static int bpf_unclone_prologue(struct bpf_insn *insn_buf, bool direct_write, · 7699 unmodified lines
80298029 * (Fast-path, otherwise approximation that we might be
80308030 * a clone, do the rest in helper.)
80318031 */
8032− *insn++ = BPF_LDX_MEM(BPF_B, BPF_REG_6, BPF_REG_1, CLONED_OFFSET());
8032+ *insn++ = BPF_LDX_MEM(BPF_B, BPF_REG_6, BPF_REG_1, CLONED_OFFSET);
80338033 *insn++ = BPF_ALU32_IMM(BPF_AND, BPF_REG_6, CLONED_MASK);
80348034 *insn++ = BPF_JMP_IMM(BPF_JEQ, BPF_REG_6, 0, 7);
80358035
@@ -8617,7 +8617,7 @@ static u32 bpf_convert_ctx_access(enum bpf_access_type type, · 581 unmodified lines
86178617 case offsetof(struct __sk_buff, pkt_type):
86188618 *target_size = 1;
86198619 *insn++ = BPF_LDX_MEM(BPF_B, si->dst_reg, si->src_reg,
8620− PKT_TYPE_OFFSET());
8620+ PKT_TYPE_OFFSET);
86218621 *insn++ = BPF_ALU32_IMM(BPF_AND, si->dst_reg, PKT_TYPE_MAX);
86228622 #ifdef __BIG_ENDIAN_BITFIELD
86238623 *insn++ = BPF_ALU32_IMM(BPF_RSH, si->dst_reg, 5);
@@ -8642,7 +8642,7 @@ static u32 bpf_convert_ctx_access(enum bpf_access_type type, · 18 unmodified lines
86428642 case offsetof(struct __sk_buff, vlan_present):
86438643 *target_size = 1;
86448644 *insn++ = BPF_LDX_MEM(BPF_B, si->dst_reg, si->src_reg,
8645− PKT_VLAN_PRESENT_OFFSET());
8645+ PKT_VLAN_PRESENT_OFFSET);
86468646 if (PKT_VLAN_PRESENT_BIT)
86478647 *insn++ = BPF_ALU32_IMM(BPF_RSH, si->dst_reg, PKT_VLAN_PRESENT_BIT);
86488648 if (PKT_VLAN_PRESENT_BIT < 7)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t