Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp494268pxb; Wed, 27 Jan 2021 12:58:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJzzhnJgMbO1oSn9cHCucVBLBgIAa84TITIOQjdNbJM96DMnV3+kKZkXpxMWETdgXFI+Z8ZO X-Received: by 2002:a17:906:494c:: with SMTP id f12mr8403816ejt.56.1611781109629; Wed, 27 Jan 2021 12:58:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611781109; cv=none; d=google.com; s=arc-20160816; b=lc2xTTYekFRAX8XpKAtm24abNFPUYZVh+c+cShYo8pa7v+MwcQshcAkLv+W+7GEwwx khfpBva9gyoQpZE8XQ34BAZLQ9mm9Wdi8g02wpN+ARAh+ZnvEawQfmn5wD/5/8uRXlLg 2bYPACodvQf/TFrVQ8ONKa5XSvNySf+8bzXODHAmxjsupVrVsXZz1VHMmmayr4P6yjhR PpllAk+M3U5r21FpRBxFPTXwcJE7HmAERN17LzqjAigt/acpxDFncOh3V7vW+Sgop0+k HHeny0VBtp0CItpYwQyIBPSId/IuG0wXgfLsVFQD2VRKXW2FAXkYpJ/dDjy3pH4LiqOx zS0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=joDhYr4WwYIa6lTFlqLJ0z3vbyBAAz6QSsz7f9MoAT0=; b=IV6ZZC6ocy8RpVCZqiQpV0kAXWiU8JGRe7bbNShLr7cp0dqcS78uuVE17jx6YLrA78 VtE4WwORi2vNGALD8rTubBGSnjjhngKX10x0Qp5e93rDzhvl9ztKJWpb1+tbrYQAIdT5 wkManQe0b/7iOonXXMJ6lZo0rg0LBkQ4eaTd9wVpFi+eDRU7GaD+G/dwLtP93FSZHXWI xagAB/YEUQBnXYDAVCri3uV+YBg4vZUVKZut0iyMvzVAcfFzYpHKfRF+z/+VYbfwsb4s FY5/iqbrULkCOR1QbKyYYMvsWS0zJWtgnofd732dF0r8LOW6OcpRNoKYLVTdmT3q7ZY3 XONw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=IQHJWZYV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b20si1622268edy.183.2021.01.27.12.58.04; Wed, 27 Jan 2021 12:58:29 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=IQHJWZYV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238082AbhA0EFh (ORCPT + 99 others); Tue, 26 Jan 2021 23:05:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232525AbhA0DEW (ORCPT ); Tue, 26 Jan 2021 22:04:22 -0500 Received: from mail-pf1-x441.google.com (mail-pf1-x441.google.com [IPv6:2607:f8b0:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 59D3FC0617A7; Tue, 26 Jan 2021 18:25:20 -0800 (PST) Received: by mail-pf1-x441.google.com with SMTP id o20so229777pfu.0; Tue, 26 Jan 2021 18:25:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=joDhYr4WwYIa6lTFlqLJ0z3vbyBAAz6QSsz7f9MoAT0=; b=IQHJWZYVacOMsK096C8npqb57WhF9GsyIaKrsd2VR5on07xkS3mYrUm7ry3hHTyGzv kslNVsQNyIvsTaXnEpvcqjT3I0LOf1fvW+YbF7eQrE24Ukpd9yvwsQBSS06BGRbnpzpS 3hHH/+yHrTpOKYsmdHmgacKwyxYHtnZ1qgP/5A0EQ80DDUt8lYtg3h7iVya/+gZobnEg hoFiXnYo4FCsSH1J8qiNDIzHPjozqgaGT2Jp5UZNNqDQbpmvGk1jA1oyIauCvvy/J9kD iJ8WEGfdX12W8p9LuuOq8AVT57fWZkfATrteTyNcC4yqp0Xv0uz4Yh0KV1+sr+crVQN3 8guw== 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:mime-version :content-transfer-encoding; bh=joDhYr4WwYIa6lTFlqLJ0z3vbyBAAz6QSsz7f9MoAT0=; b=Ch+XYVk2WE5KCkTr4sPAgeU+mZ8kAjapFiElSWOJIS1uwe9NnZPLv6SOVQqWMbP3DN GWLWQ8teEYOgWQjyDBR7BxNajVli1Ymv80n3kbmz7Dw6n+ztJzBks9qVtz1yPb0R4Dkk MXCalG9ggWw2Gf7wThI5t4ykRPgiEMc3XrH1Rxi3Q2gfZDGr+JueM0dAhrDDxhw/RAMm uDJfbpaPOqZY7uF0uNmjlEbP7TCtO4BuY4z4sfMxezsEZcSWOP1tMZkL1G+vi25IKnzq hS0n8wnHqC11I2qkxn+cgVpIfNfwv46fPH2zmduKmlhu5NG6t9FIMoRiTkiFMRCinmaF ew4w== X-Gm-Message-State: AOAM5334AnLEdkOQjDZ0TeUEXuWmVeymW52FGqNkFReMg4JHQEAPqmmu 2wojYJdUTw8Sk+nDY0pYWgs= X-Received: by 2002:aa7:9ad3:0:b029:1b7:8afc:d9bd with SMTP id x19-20020aa79ad30000b02901b78afcd9bdmr7980137pfp.45.1611714319755; Tue, 26 Jan 2021 18:25:19 -0800 (PST) Received: from localhost ([178.236.46.205]) by smtp.gmail.com with ESMTPSA id b21sm390023pfb.45.2021.01.26.18.25.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Jan 2021 18:25:19 -0800 (PST) From: menglong8.dong@gmail.com X-Google-Original-From: dong.menglong@zte.com.cn To: ast@kernel.org Cc: daniel@iogearbox.net, andrii@kernel.org, kafai@fb.com, songliubraving@fb.com, yhs@fb.com, john.fastabend@gmail.com, kpsingh@kernel.org, jackmanb@google.com, netdev@vger.kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, Menglong Dong Subject: [PATCH bpf-next] bpf: change 'BPF_ADD' to 'BPF_AND' in print_bpf_insn() Date: Tue, 26 Jan 2021 18:25:07 -0800 Message-Id: <20210127022507.23674-1-dong.menglong@zte.com.cn> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Menglong Dong This 'BPF_ADD' is duplicated, and I belive it should be 'BPF_AND'. Fixes: 981f94c3e921 ("bpf: Add bitwise atomic instructions") Signed-off-by: Menglong Dong --- kernel/bpf/disasm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/bpf/disasm.c b/kernel/bpf/disasm.c index 19ff8fed7f4b..3acc7e0b6916 100644 --- a/kernel/bpf/disasm.c +++ b/kernel/bpf/disasm.c @@ -161,7 +161,7 @@ void print_bpf_insn(const struct bpf_insn_cbs *cbs, insn->dst_reg, insn->off, insn->src_reg); else if (BPF_MODE(insn->code) == BPF_ATOMIC && - (insn->imm == BPF_ADD || insn->imm == BPF_ADD || + (insn->imm == BPF_ADD || insn->imm == BPF_AND || insn->imm == BPF_OR || insn->imm == BPF_XOR)) { verbose(cbs->private_data, "(%02x) lock *(%s *)(r%d %+d) %s r%d\n", insn->code, -- 2.25.1