From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B1136C5B57D for ; Tue, 2 Jul 2019 08:12:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7BD4520659 for ; Tue, 2 Jul 2019 08:12:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562055153; bh=8X71bpmRYa3Yx+gOlVC9pX5bTxnVVFLRsTAVsZOIFnQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KgTqzvGU7GZ6a9XWK1P2lOUutik4YoAiKiZ9Y9G2Si0ji/PRsK5/W0WwO5T+OWC3W 2YugaDm/aY2VlxymA70jzPsRiQZbmvrBD9MKiDPECWw/FKAztCHh7d7Ujmh95+kPFs wQa9flLvr65HJeK0YIZ1OOXRCxC/Eh+W1kGXaeJY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727673AbfGBIIs (ORCPT ); Tue, 2 Jul 2019 04:08:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:56430 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727842AbfGBIIq (ORCPT ); Tue, 2 Jul 2019 04:08:46 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C6551206A2; Tue, 2 Jul 2019 08:08:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562054925; bh=8X71bpmRYa3Yx+gOlVC9pX5bTxnVVFLRsTAVsZOIFnQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sQf/WA6gcCY/aCfrjLLuRmuhg90q6J8fqGDtYHDNLxbaXzs9y7sGxxJu9RNJB/T+p QWFt2DmOMGFfvyADD/RLkac9urXxp0OwRnnQN5q058FFIgmmXnT50qje7FBqmspWx+ ssXaDXQ/n2zcgzEWBSeX3U5r4cI2sHBv3A+fI82g= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Martynas Pumputis , Andrii Nakryiko , Daniel Borkmann Subject: [PATCH 4.19 62/72] bpf: simplify definition of BPF_FIB_LOOKUP related flags Date: Tue, 2 Jul 2019 10:02:03 +0200 Message-Id: <20190702080127.840630441@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190702080124.564652899@linuxfoundation.org> References: <20190702080124.564652899@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Martynas Pumputis commit b1d6c15b9d824a58c5415673f374fac19e8eccdf upstream. Previously, the BPF_FIB_LOOKUP_{DIRECT,OUTPUT} flags in the BPF UAPI were defined with the help of BIT macro. This had the following issues: - In order to use any of the flags, a user was required to depend on . - No other flag in bpf.h uses the macro, so it seems that an unwritten convention is to use (1 << (nr)) to define BPF-related flags. Fixes: 87f5fc7e48dd ("bpf: Provide helper to do forwarding lookups in kernel FIB table") Signed-off-by: Martynas Pumputis Acked-by: Andrii Nakryiko Signed-off-by: Daniel Borkmann Signed-off-by: Greg Kroah-Hartman --- include/uapi/linux/bpf.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -2705,8 +2705,8 @@ struct bpf_raw_tracepoint_args { /* DIRECT: Skip the FIB rules and go to FIB table associated with device * OUTPUT: Do lookup from egress perspective; default is ingress */ -#define BPF_FIB_LOOKUP_DIRECT BIT(0) -#define BPF_FIB_LOOKUP_OUTPUT BIT(1) +#define BPF_FIB_LOOKUP_DIRECT (1U << 0) +#define BPF_FIB_LOOKUP_OUTPUT (1U << 1) enum { BPF_FIB_LKUP_RET_SUCCESS, /* lookup successful */