From patchwork Wed May 1 14:43:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiong Wang X-Patchwork-Id: 1093711 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: incoming-bpf@patchwork.ozlabs.org Delivered-To: patchwork-incoming-bpf@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=bpf-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=netronome.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="QcXKkEk0"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44vLlF3tBGz9s9y for ; Thu, 2 May 2019 00:44:41 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727031AbfEAOog (ORCPT ); Wed, 1 May 2019 10:44:36 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:37230 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726999AbfEAOoZ (ORCPT ); Wed, 1 May 2019 10:44:25 -0400 Received: by mail-wr1-f66.google.com with SMTP id k23so1861308wrd.4 for ; Wed, 01 May 2019 07:44:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=joNuxe7IewAhULLQxwVh9/tfbzqOYrkKWgT6M7s6hWk=; b=QcXKkEk0C4gWttQJGTofhFx0XEn2bA0RK9lob1vQz1K0o6rowmPOzx8uU9n5AWXWir wqXGn9O2XYry0oW7U4lHOykGVGsutCBaqjlV/BHs4O2kpc1o1+P8ZbZIlLnFL4NFvI3q dW7XOg7VVdxktkcm0Q+dRBJMvtQYiP6f+vte41RS6soeXvQfJ6MIHlTGRR2HP/5/gjPj XSzd/zZ8fEIW5AqXlHvMYvy9SI9BbKObVTs4b9ZEG1tGMMEnmrxGaTijEKOPQdgFEPiu p4Pw9pVRPBmWOTjFlm3sT9BcouR1TjwFk16pL/2q+LPHEHcEyuYmhlRAWeeutqzVPsii bWyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=joNuxe7IewAhULLQxwVh9/tfbzqOYrkKWgT6M7s6hWk=; b=ZKgNX66XrKr621PPevPGUu0BPBcsdNZqay/KK9BqNeHRQh4JmbGETgvaul2E0eDXfa /iprhGedGoYr6i6V951UEu/Uk3lMc7cEcIfRaMwtmJr1HvOmldULdkzg8iNKIoK+wPzq 6Aczi5iou3gG/cB2pYUlTugRMy6eMvxFMdw9+zD/4U2qYBDYhNedvCT8ejOHidoIrCnI X7FtNxfaeurhNIaYP3oHLqnIhpNxyRmqra2wWXDh4Zm8AozCM2vlq7unw04Z6K4yVZM3 U3SHgxFD1hvXs2PZwwR2tAfxboVlwVUJrCytVvp9plHFVkPdniqvDj6rMXqZMWFgH9Ns G4Bg== X-Gm-Message-State: APjAAAWJxr7+TEK4Iyj/oJKqlo6Bs6UNacCdeyJBP4pNoFjVfF5NRv1c FHDW2GVBXomf/oMV/ZqojXmBKw== X-Google-Smtp-Source: APXvYqx8ZLu7wJtWde+/8xzoJIbmHWNWdoJ77LX5n9ZJaPpf0NXW0HRohj8XZPpmyKhK+7LVhTztyw== X-Received: by 2002:adf:b64e:: with SMTP id i14mr26853964wre.72.1556721863633; Wed, 01 May 2019 07:44:23 -0700 (PDT) Received: from cbtest28.netronome.com ([217.38.71.146]) by smtp.gmail.com with ESMTPSA id g10sm36164976wrq.2.2019.05.01.07.44.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 May 2019 07:44:22 -0700 (PDT) From: Jiong Wang To: alexei.starovoitov@gmail.com, daniel@iogearbox.net Cc: bpf@vger.kernel.org, netdev@vger.kernel.org, oss-drivers@netronome.com, Jiong Wang , Martin Schwidefsky , Heiko Carstens Subject: [PATCH v5 bpf-next 13/17] s390: bpf: eliminate zero extension code-gen Date: Wed, 1 May 2019 15:43:58 +0100 Message-Id: <1556721842-29836-14-git-send-email-jiong.wang@netronome.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1556721842-29836-1-git-send-email-jiong.wang@netronome.com> References: <1556721842-29836-1-git-send-email-jiong.wang@netronome.com> Sender: bpf-owner@vger.kernel.org Precedence: bulk List-Id: netdev.vger.kernel.org Cc: Martin Schwidefsky Cc: Heiko Carstens Signed-off-by: Jiong Wang --- arch/s390/net/bpf_jit_comp.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c index 51dd026..45ee379 100644 --- a/arch/s390/net/bpf_jit_comp.c +++ b/arch/s390/net/bpf_jit_comp.c @@ -299,9 +299,11 @@ static inline void reg_set_seen(struct bpf_jit *jit, u32 b1) #define EMIT_ZERO(b1) \ ({ \ - /* llgfr %dst,%dst (zero extend to 64 bit) */ \ - EMIT4(0xb9160000, b1, b1); \ - REG_SET_SEEN(b1); \ + if (!fp->aux->verifier_zext) { \ + /* llgfr %dst,%dst (zero extend to 64 bit) */ \ + EMIT4(0xb9160000, b1, b1); \ + REG_SET_SEEN(b1); \ + } \ }) /* @@ -515,6 +517,13 @@ static noinline int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp, int i jit->seen |= SEEN_REG_AX; switch (insn->code) { /* + * BPF_ZEXT + */ + case BPF_ALU | BPF_ZEXT: /* dst = (u32) src + always does zext */ + /* llgfr %dst,%dst (zero extend to 64 bit) */ + EMIT4(0xb9160000, b1, b1); + break; + /* * BPF_MOV */ case BPF_ALU | BPF_MOV | BPF_X: /* dst = (u32) src */ @@ -1282,6 +1291,11 @@ static int bpf_jit_prog(struct bpf_jit *jit, struct bpf_prog *fp) return 0; } +bool bpf_jit_hardware_zext(void) +{ + return false; +} + /* * Compile eBPF program "fp" */