From patchwork Tue Jan 16 23:51:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 861959 X-Patchwork-Delegate: bpf@iogearbox.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="SdkX1w1w"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zLn9B1XbYz9sNV for ; Wed, 17 Jan 2018 10:53:18 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751963AbeAPXw4 (ORCPT ); Tue, 16 Jan 2018 18:52:56 -0500 Received: from mail-pf0-f194.google.com ([209.85.192.194]:39688 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751810AbeAPXwy (ORCPT ); Tue, 16 Jan 2018 18:52:54 -0500 Received: by mail-pf0-f194.google.com with SMTP id e11so10534966pff.6 for ; Tue, 16 Jan 2018 15:52:54 -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=/wbLEENL8PBDlDwWnNxZusY9vkj/wWbH0TddyLunB/s=; b=SdkX1w1wowETRaJGBhlHZ01n7gIhiWVW4hbZV4EDSi1DMtHaCZibw0PFTkmMTf3Qrj 6fQRVfIOHt0SHqcDBpdCKr2Jy/CoRqYNVPGDQ7XkRmROVfzkorsVL3yqpRPH022UF11Z lvBW9wcfnQ5F74aBiN9rNDid+Lxvl0emdwrGi9xWCfzeQTVueocuo0W17z+anM6oY0mS vhG3ClGgrepO90jrSz+R5mBEwy8EdZc4/ARxzBJHB+nv/NCUTIoqRO1q4ilHvy4h3Njl lKaN63lEbXlCGIvcCS291ZYsqY2PZq49eXg8pXY0Q1e8nPDiqneVOG1WjHXjLic+JUMt tHaQ== 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=/wbLEENL8PBDlDwWnNxZusY9vkj/wWbH0TddyLunB/s=; b=puOMd5sqhoLo0l4JuGhQ1BQcLRPZwqIpPVb8KwmE431k+Hp3fFYBYxMgIpAFIa6D8d XP+sTJPUFnKj16CzoZzPm44oXaBxkZcPXQQwPVhRjSTqdacR5cYGPrEezfPFczMfUDEV HHID29PFghiWHSvjgnll/ZtuoSnUngM12wCP4qeaf/tcgJPxu8+Y7OKZz2YPJLjpPjv6 jHDwOEQtdCt2eksvpU+B2K+mrkza0qV8FFt/k0em74seUvLiMx9dOOvH6cFM9D2vnmSr zgY2/Jzf8sFPKpCMg/5g6xceXjMjhuFTeIQ7MVrKTb2GH46iPAp2a9toVaFIlOxKMCyP hlbA== X-Gm-Message-State: AKwxytfwx1QU2dsIgry7wBmynvnnlyl0p49n0k/MtSZeL2APF23R2eCy qWfNMTR+YbEDy5mNZ+WeS5a+BQ== X-Google-Smtp-Source: ACJfBouihkQDeYlZfMxfG0LjHl0G2I5nIAZoJTNWQ/zw3dZBqggA5ev5z5ZMADuBDwIURGsgoXAhfw== X-Received: by 10.99.115.82 with SMTP id d18mr5449779pgn.312.1516146774029; Tue, 16 Jan 2018 15:52:54 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([75.53.12.129]) by smtp.gmail.com with ESMTPSA id t1sm5044119pgs.73.2018.01.16.15.52.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 16 Jan 2018 15:52:53 -0800 (PST) From: Jakub Kicinski To: daniel@iogearbox.net, alexei.starovoitov@gmail.com Cc: netdev@vger.kernel.org, oss-drivers@netronome.com, Jakub Kicinski Subject: [PATCH bpf-next 1/6] bpf: offload: make bpf_offload_dev_match() reject host+host case Date: Tue, 16 Jan 2018 15:51:45 -0800 Message-Id: <20180116235150.28651-2-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180116235150.28651-1-jakub.kicinski@netronome.com> References: <20180116235150.28651-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Daniel suggests it would be more logical for bpf_offload_dev_match() to return false is either the program or the map are not offloaded, rather than treating the both not offloaded case as a "matching CPU/host device". This makes no functional difference today, since verifier only calls bpf_offload_dev_match() when one of the objects is offloaded. Signed-off-by: Jakub Kicinski --- kernel/bpf/offload.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/kernel/bpf/offload.c b/kernel/bpf/offload.c index 453785fa1881..a88cebf368bf 100644 --- a/kernel/bpf/offload.c +++ b/kernel/bpf/offload.c @@ -395,10 +395,8 @@ bool bpf_offload_dev_match(struct bpf_prog *prog, struct bpf_map *map) struct bpf_prog_offload *offload; bool ret; - if (!!bpf_prog_is_dev_bound(prog->aux) != !!bpf_map_is_dev_bound(map)) + if (!bpf_prog_is_dev_bound(prog->aux) || !bpf_map_is_dev_bound(map)) return false; - if (!bpf_prog_is_dev_bound(prog->aux)) - return true; down_read(&bpf_devs_lock); offload = prog->aux->offload;