1 files changed, 34 insertions, 0 deletions
diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
index 33643a8bcbbb..520d2bd0b9c5 100644
--- a/arch/x86/net/bpf_jit_comp.c
+++ b/arch/x86/net/bpf_jit_comp.c
@@ -280,6 +280,31 @@ void bpf_jit_compile(struct sk_filter *fp)
                                }
                                EMIT4(0x31, 0xd2, 0xf7, 0xf3); /* xor %edx,%edx; div %ebx */
                                break;
+                        case BPF_S_ALU_MOD_X: /* A %= X; */
+                                seen |= SEEN_XREG;
+                                EMIT2(0x85, 0xdb);      /* test %ebx,%ebx */
+                                if (pc_ret0 > 0) {
+                                        /* addrs[pc_ret0 - 1] is start address of target
+                                         * (addrs[i] - 6) is the address following this jmp
+                                         * ("xor %edx,%edx; div %ebx;mov %edx,%eax" being 6 bytes long)
+                                         */
+                                        EMIT_COND_JMP(X86_JE, addrs[pc_ret0 - 1] -
+                                                                (addrs[i] - 6));
+                                } else {
+                                        EMIT_COND_JMP(X86_JNE, 2 + 5);
+                                        CLEAR_A();
+                                        EMIT1_off32(0xe9, cleanup_addr - (addrs[i] - 6)); /* jmp .+off32 */
+                                }
+                                EMIT2(0x31, 0xd2);      /* xor %edx,%edx */
+                                EMIT2(0xf7, 0xf3);      /* div %ebx */
+                                EMIT2(0x89, 0xd0);      /* mov %edx,%eax */
+                                break;
+                        case BPF_S_ALU_MOD_K: /* A %= K; */
+                                EMIT2(0x31, 0xd2);      /* xor %edx,%edx */
+                                EMIT1(0xb9);EMIT(K, 4); /* mov imm32,%ecx */
+                                EMIT2(0xf7, 0xf1);      /* div %ecx */
+                                EMIT2(0x89, 0xd0);      /* mov %edx,%eax */
+                                break;
                        case BPF_S_ALU_DIV_K: /* A = reciprocal_divide(A, K); */
                                EMIT3(0x48, 0x69, 0xc0); /* imul imm32,%rax,%rax */
                                EMIT(K, 4);
@@ -310,9 +335,18 @@ void bpf_jit_compile(struct sk_filter *fp)
                                        EMIT1_off32(0x0d, K);   /* or imm32,%eax */
                                break;
                        case BPF_S_ANC_ALU_XOR_X: /* A ^= X; */
+                        case BPF_S_ALU_XOR_X:
                                seen |= SEEN_XREG;
                                EMIT2(0x31, 0xd8);              /* xor %ebx,%eax */
                                break;
+                        case BPF_S_ALU_XOR_K: /* A ^= K; */
+                                if (K == 0)
+                                        break;
+                                if (is_imm8(K))
+                                        EMIT3(0x83, 0xf0, K);   /* xor imm8,%eax */
+                                else
+                                        EMIT1_off32(0x35, K);   /* xor imm32,%eax */
+                                break;
                        case BPF_S_ALU_LSH_X: /* A <<= X; */
                                seen |= SEEN_XREG;
                                EMIT4(0x89, 0xd9, 0xd3, 0xe0);  /* mov %ebx,%ecx; shl %cl,%eax */

diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c index 33643a8bcbbb..520d2bd0b9c5 100644 --- a/arch/x86/net/bpf_jit_comp.c +++ b/arch/x86/net/bpf_jit_comp.c
@@ -280,6 +280,31 @@ void bpf_jit_compile(struct sk_filter *fp)
280	}	280	}
281	EMIT4(0x31, 0xd2, 0xf7, 0xf3); /* xor %edx,%edx; div %ebx */	281	EMIT4(0x31, 0xd2, 0xf7, 0xf3); /* xor %edx,%edx; div %ebx */
282	break;	282	break;
		283	case BPF_S_ALU_MOD_X: /* A %= X; */
		284	seen \|= SEEN_XREG;
		285	EMIT2(0x85, 0xdb); /* test %ebx,%ebx */
		286	if (pc_ret0 > 0) {
		287	/* addrs[pc_ret0 - 1] is start address of target
		288	* (addrs[i] - 6) is the address following this jmp
		289	* ("xor %edx,%edx; div %ebx;mov %edx,%eax" being 6 bytes long)
		290	*/
		291	EMIT_COND_JMP(X86_JE, addrs[pc_ret0 - 1] -
		292	(addrs[i] - 6));
		293	} else {
		294	EMIT_COND_JMP(X86_JNE, 2 + 5);
		295	CLEAR_A();
		296	EMIT1_off32(0xe9, cleanup_addr - (addrs[i] - 6)); /* jmp .+off32 */
		297	}
		298	EMIT2(0x31, 0xd2); /* xor %edx,%edx */
		299	EMIT2(0xf7, 0xf3); /* div %ebx */
		300	EMIT2(0x89, 0xd0); /* mov %edx,%eax */
		301	break;
		302	case BPF_S_ALU_MOD_K: /* A %= K; */
		303	EMIT2(0x31, 0xd2); /* xor %edx,%edx */
		304	EMIT1(0xb9);EMIT(K, 4); /* mov imm32,%ecx */
		305	EMIT2(0xf7, 0xf1); /* div %ecx */
		306	EMIT2(0x89, 0xd0); /* mov %edx,%eax */
		307	break;
283	case BPF_S_ALU_DIV_K: /* A = reciprocal_divide(A, K); */	308	case BPF_S_ALU_DIV_K: /* A = reciprocal_divide(A, K); */
284	EMIT3(0x48, 0x69, 0xc0); /* imul imm32,%rax,%rax */	309	EMIT3(0x48, 0x69, 0xc0); /* imul imm32,%rax,%rax */
285	EMIT(K, 4);	310	EMIT(K, 4);
@@ -310,9 +335,18 @@ void bpf_jit_compile(struct sk_filter *fp)
310	EMIT1_off32(0x0d, K); /* or imm32,%eax */	335	EMIT1_off32(0x0d, K); /* or imm32,%eax */
311	break;	336	break;
312	case BPF_S_ANC_ALU_XOR_X: /* A ^= X; */	337	case BPF_S_ANC_ALU_XOR_X: /* A ^= X; */
		338	case BPF_S_ALU_XOR_X:
313	seen \|= SEEN_XREG;	339	seen \|= SEEN_XREG;
314	EMIT2(0x31, 0xd8); /* xor %ebx,%eax */	340	EMIT2(0x31, 0xd8); /* xor %ebx,%eax */
315	break;	341	break;
		342	case BPF_S_ALU_XOR_K: /* A ^= K; */
		343	if (K == 0)
		344	break;
		345	if (is_imm8(K))
		346	EMIT3(0x83, 0xf0, K); /* xor imm8,%eax */
		347	else
		348	EMIT1_off32(0x35, K); /* xor imm32,%eax */
		349	break;
316	case BPF_S_ALU_LSH_X: /* A <<= X; */	350	case BPF_S_ALU_LSH_X: /* A <<= X; */
317	seen \|= SEEN_XREG;	351	seen \|= SEEN_XREG;
318	EMIT4(0x89, 0xd9, 0xd3, 0xe0); /* mov %ebx,%ecx; shl %cl,%eax */	352	EMIT4(0x89, 0xd9, 0xd3, 0xe0); /* mov %ebx,%ecx; shl %cl,%eax */