From patchwork Sat Apr 27 02:17:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xi Wang X-Patchwork-Id: 240073 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 76B612C00C8 for ; Sat, 27 Apr 2013 12:19:34 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756817Ab3D0CSy (ORCPT ); Fri, 26 Apr 2013 22:18:54 -0400 Received: from mail-qa0-f47.google.com ([209.85.216.47]:37764 "EHLO mail-qa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756448Ab3D0CSt (ORCPT ); Fri, 26 Apr 2013 22:18:49 -0400 Received: by mail-qa0-f47.google.com with SMTP id bn16so423025qab.13 for ; Fri, 26 Apr 2013 19:18:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=wcSDJiVld4eYQtsMRQV+f/wJRKjWnfu1bx3ByKvLMx0=; b=kCn+wum57IxSb2eVsZdAy47CceyKfb0brPBMg024RLNisgMmphzUAUQhN4cuwGvePt +E4jB9xHqc1h7o06hihEmHy98ekMlY9BhcAxy0o0ovMfxRjeRl9OhtAOF3aHzZHdN7zH oQi2StnTm4YdO/jFMsecaKd/L9PbrWHyj/cbNtS9geuXBjFAtf7ZDHNFtH6vlJQjBudP SBYHMjJu5LhZTblbN6AZYDcDbCxxCwhKIOQ7Evxwhum+zouZGHd9WLrhClG3/nnURt35 xEA1XY4vKWtBcn52+BckPyBf+EUsZOSRgKeVkFwT/6ZNG+0prrt82uwyBgkc+tlMk41t uZMw== X-Received: by 10.224.17.72 with SMTP id r8mr14207132qaa.48.1367029129018; Fri, 26 Apr 2013 19:18:49 -0700 (PDT) Received: from hchen.csail.mit.edu (hchen.csail.mit.edu. [18.26.5.5]) by mx.google.com with ESMTPSA id m8sm20823928qav.8.2013.04.26.19.18.47 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 26 Apr 2013 19:18:48 -0700 (PDT) From: Xi Wang To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Daniel Borkmann , Heiko Carstens , Will Drewry , Eric Dumazet , Russell King , David Laight , "David S. Miller" , Andrew Morton , Nicolas Schichan , Xi Wang Subject: [PATCH v2 net-next 2/3] x86: bpf_jit_comp: support BPF_S_ANC_SECCOMP_LD_W instruction Date: Fri, 26 Apr 2013 22:17:26 -0400 Message-Id: <1367029047-14830-3-git-send-email-xi.wang@gmail.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1367029047-14830-1-git-send-email-xi.wang@gmail.com> References: <1367029047-14830-1-git-send-email-xi.wang@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch implements the seccomp BPF_S_ANC_SECCOMP_LD_W instruction in x86 JIT. Signed-off-by: Xi Wang Cc: Daniel Borkmann Cc: Heiko Carstens Cc: Will Drewry Cc: Eric Dumazet Cc: Russell King Cc: David Laight Cc: "David S. Miller" Cc: Andrew Morton Cc: Nicolas Schichan --- arch/x86/net/bpf_jit_comp.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c index 8898680..5f1dafb 100644 --- a/arch/x86/net/bpf_jit_comp.c +++ b/arch/x86/net/bpf_jit_comp.c @@ -683,6 +683,17 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i]; } EMIT_COND_JMP(f_op, f_offset); break; +#ifdef CONFIG_SECCOMP_FILTER + case BPF_S_ANC_SECCOMP_LD_W: + func = (u8 *)seccomp_bpf_load; + t_offset = func - (image + addrs[i]); + /* seccomp filters don't use %rdi, %r8, %r9 + * it is safe to not save these registers + */ + EMIT1_off32(0xbf, K); /* mov imm32,%edi */ + EMIT1_off32(0xe8, t_offset); /* call seccomp_bpf_load */ + break; +#endif default: /* hmm, too complex filter, give up with jit compiler */ goto out;