From patchwork Wed Jan 24 20:54:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 865462 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@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=netdev-owner@vger.kernel.org; receiver=) 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="GI/Ivp8t"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zRcrC1fHKz9s7s for ; Thu, 25 Jan 2018 07:55:23 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932892AbeAXUzW (ORCPT ); Wed, 24 Jan 2018 15:55:22 -0500 Received: from mail-pg0-f68.google.com ([74.125.83.68]:42593 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932507AbeAXUzQ (ORCPT ); Wed, 24 Jan 2018 15:55:16 -0500 Received: by mail-pg0-f68.google.com with SMTP id q67so3549966pga.9 for ; Wed, 24 Jan 2018 12:55:16 -0800 (PST) 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=jipmaDdU/QtZsTEvRQhcedt3TEimog9mN4MqvUr9tiQ=; b=GI/Ivp8to9O+5WOYbagerr5AFoOas8ytCqmo+lonL6MugInopQpf+y8oyuhcUyfiXK TxuMOTR06Vl6XN4wym2mH8/eenjKR0BE2+O2Ls660jbMrIRs/UfSAIGzlBCst2oXWaIG qQwh67JP9fsNe95XZS2CyJxyPpUplmsFKF3l/qhRtJb6B6Jj49LWd1dcpBtAZvQ2lwRg B3uFis7KoDi1RP0lMitZuMt8ox66nj5STlRJUCO+xExz7pIsErfDmd+hOWB22kZL/Ury /Sr8FJDxLUgLbd8FK7kZn0+cU7ko0PZXDQFSkxcnehcoP1oDtFn+IF3T0bKC5PDQyhhW JEow== 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=jipmaDdU/QtZsTEvRQhcedt3TEimog9mN4MqvUr9tiQ=; b=fwhuUkxmGN6kXcsqZ6F3rfABHH/Mk2EonOkBGFQqyLDvmYi9EXYSzgwjaDtT1ehl/S ChXk+YR2UMFxIbgeMlyx/wJ6A2p1YpASh1hJkzgDdFe/MVi6L1MlsUQCm4gpmXI2v4jM P3hyeJAmKodmtldaCOcfZUJQhGG70QgANU1jDv1PZJ4RivF/TspFpP8uZtsFteyl+1ix d8YcBLuMaFjIMUfXB7VLxffBi3cuCOLGFDTnAYNF0fyn3/WNqM4KDERjUoDn+9sbNrGc Hal9rqpfcSY6R6xvfr2pF2cEtlBxnuWJsXqhY5jIIH2ZQ7X2dOhdXBpz59W39VX4ancE /qAw== X-Gm-Message-State: AKwxytcdVO/3d5k6XKglHCb8ch8svwvavUtsD0sRxgXtOJ/xoEc2VoCi o79r2zup8JMzM1taZaWBFu1aew== X-Google-Smtp-Source: AH8x225N1aSjtpo0ZJ2vRaLdbiv0FD+yM43Jjv+sO/L5lNqEDBKIjxM+9WBejdR+sDmQ4jNv0QrR1Q== X-Received: by 10.99.110.205 with SMTP id j196mr11428695pgc.54.1516827316205; Wed, 24 Jan 2018 12:55:16 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([75.53.12.129]) by smtp.gmail.com with ESMTPSA id g13sm15305612pfe.50.2018.01.24.12.55.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 24 Jan 2018 12:55:15 -0800 (PST) From: Jakub Kicinski To: davem@davemloft.net, jiri@resnulli.us, dsahern@gmail.com, daniel@iogearbox.net, john.fastabend@gmail.com Cc: netdev@vger.kernel.org, oss-drivers@netronome.com, aring@mojatatu.com, Jakub Kicinski Subject: [PATCH net-next v2 04/12] cls_bpf: pass offload flags to tc_cls_common_offload_init() Date: Wed, 24 Jan 2018 12:54:16 -0800 Message-Id: <20180124205424.6976-5-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180124205424.6976-1-jakub.kicinski@netronome.com> References: <20180124205424.6976-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Pass offload flags to the new implementation of tc_cls_common_offload_init(). Extack will now only be set if user requested skip_sw. Signed-off-by: Jakub Kicinski Reviewed-by: Simon Horman --- net/sched/cls_bpf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net/sched/cls_bpf.c b/net/sched/cls_bpf.c index b8f953d00c46..323b01f76a4c 100644 --- a/net/sched/cls_bpf.c +++ b/net/sched/cls_bpf.c @@ -159,7 +159,8 @@ static int cls_bpf_offload_cmd(struct tcf_proto *tp, struct cls_bpf_prog *prog, skip_sw = prog && tc_skip_sw(prog->gen_flags); obj = prog ?: oldprog; - tc_cls_common_offload_init_deprecated(&cls_bpf.common, tp, extack); + tc_cls_common_offload_init(&cls_bpf.common, tp, obj->gen_flags, + extack); cls_bpf.command = TC_CLSBPF_OFFLOAD; cls_bpf.exts = &obj->exts; cls_bpf.prog = prog ? prog->filter : NULL; @@ -226,7 +227,7 @@ static void cls_bpf_offload_update_stats(struct tcf_proto *tp, struct tcf_block *block = tp->chain->block; struct tc_cls_bpf_offload cls_bpf = {}; - tc_cls_common_offload_init_deprecated(&cls_bpf.common, tp, NULL); + tc_cls_common_offload_init(&cls_bpf.common, tp, prog->gen_flags, NULL); cls_bpf.command = TC_CLSBPF_STATS; cls_bpf.exts = &prog->exts; cls_bpf.prog = prog->filter;