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=-18.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL 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 73FBAC64E7A for ; Tue, 1 Dec 2020 12:18:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0EFF62085B for ; Tue, 1 Dec 2020 12:18:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="KcwrvHs5" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730708AbgLAMSN (ORCPT ); Tue, 1 Dec 2020 07:18:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728361AbgLAMSN (ORCPT ); Tue, 1 Dec 2020 07:18:13 -0500 Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C719DC0613D2 for ; Tue, 1 Dec 2020 04:17:32 -0800 (PST) Received: by mail-wm1-x341.google.com with SMTP id h21so4515989wmb.2 for ; Tue, 01 Dec 2020 04:17:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=g0cu2xo3t8omk7h4Os6v19y0TCwy8mGGWLP5k1GCMgQ=; b=KcwrvHs5/3AUPjLyRvtTzh5o6y3YII7uhGJzAOCAprPrbdySnDD+0Wvsq6g9I2XlbS K080wgYe7nMSOCN+o1rDVdXFMu9JoNg5HJ4o/KZW2X/8EqORS2Dz6GyhSQd5r3LhOeE3 qLcPqbOzXXfQoKVQN7bDM7Jev2WOOCB5jgTEot0W9e3nv/5Yq5Gu/bZw92L9DdqmTKcy GPyE1KaiTfsnr2wjJHqIfXOG/LgiOYJK7bUr0bTLRCyGnEbrxQzgqWUfcKCiH9kQA9zi IFIr4573HxBCt4Y8/sMExGzo2cZ67Ui1KW9cjwXPVdTgG1RQGLm8o4IgOPHsRvgrLlfZ QusQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=g0cu2xo3t8omk7h4Os6v19y0TCwy8mGGWLP5k1GCMgQ=; b=JZyMhSMN9Y/5Or3Crn/h5hQwH6DdQDGKYKt29Wy04QQp3Pl9E94Ohn8r8oj59LMUCz ehOOjVFctuWW7MfFo8hsqRJ2r2BNrOGOZxpdwjeVk7iQYJQtReRVQtiXogg2sy3XJwpI RMOltwM1t4mSV3+bKRJg9VfkfaNxnSDGB/IK+Ax61Ntif2Ydtolj5ppYlMSmsngmPNwf Yl+lolgjRAAyxM8hc8DeZFaQlXo2GRjvZ1zELjE43FNoSz65dhrPYiH6/hCiBrhsUSV8 kSm4c1mh2ZaZi7s6N+8LHPyzd59qIlvkwcYT8FQeKAzkKHBn+Uk9y9aeCkzCo9uUZ/z+ NIzA== X-Gm-Message-State: AOAM532hog7kj/lW4j6d1lnXmrCr3qTgjns2ZzSYahZJ9z+TCpba/P3K qvuPvfHAAnJmFf6ez5z9tOIRXmhYfZLfrw== X-Google-Smtp-Source: ABdhPJy9EIekG3TlvoW2O3Hz23f+5RM5bW0HXYn6PqrVA8kKOHAzWARThJOoKGZMiaC9bjJDaHHatQ== X-Received: by 2002:a7b:cf08:: with SMTP id l8mr2474685wmg.189.1606825051432; Tue, 01 Dec 2020 04:17:31 -0800 (PST) Received: from google.com (203.75.199.104.bc.googleusercontent.com. [104.199.75.203]) by smtp.gmail.com with ESMTPSA id d8sm3020167wrp.44.2020.12.01.04.17.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Dec 2020 04:17:30 -0800 (PST) Date: Tue, 1 Dec 2020 12:17:26 +0000 From: Brendan Jackman To: Yonghong Song Cc: bpf@vger.kernel.org, Alexei Starovoitov , Daniel Borkmann , KP Singh , Florent Revest , linux-kernel@vger.kernel.org, Jann Horn Subject: Re: [PATCH v2 bpf-next 05/13] bpf: Rename BPF_XADD and prepare to encode other atomics in .imm Message-ID: <20201201121726.GC2114905@google.com> References: <20201127175738.1085417-1-jackmanb@google.com> <20201127175738.1085417-6-jackmanb@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org On Fri, Nov 27, 2020 at 07:43:46PM -0800, Yonghong Song wrote: > > > On 11/27/20 9:57 AM, Brendan Jackman wrote: > > diff --git a/Documentation/networking/filter.rst b/Documentation/networking/filter.rst > [...] > > diff --git a/drivers/net/ethernet/netronome/nfp/bpf/jit.c b/drivers/net/ethernet/netronome/nfp/bpf/jit.c > > index 0a721f6e8676..1c9efc74edfc 100644 > > --- a/drivers/net/ethernet/netronome/nfp/bpf/jit.c > > +++ b/drivers/net/ethernet/netronome/nfp/bpf/jit.c > > @@ -3109,13 +3109,19 @@ mem_xadd(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta, bool is64) > > return 0; > > } > > -static int mem_xadd4(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta) > > +static int mem_atomic4(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta) > > { > > + if (meta->insn.off != BPF_ADD) > > + return -EOPNOTSUPP; > > You probably missed this change. it should be meta->insn.imm != BPF_ADD. > > > + > > return mem_xadd(nfp_prog, meta, false); > > } > > -static int mem_xadd8(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta) > > +static int mem_atomic8(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta) > > { > > + if (meta->insn.off != BPF_ADD) > > same as above. Dang. Many thanks for the careful review!