From patchwork Thu Dec 7 03:29:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tiezhu Yang X-Patchwork-Id: 174894 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp4531573vqy; Wed, 6 Dec 2023 19:31:09 -0800 (PST) X-Google-Smtp-Source: AGHT+IGYtDR6BWs9TB92ucstkKq8EboysSbUMrd83ESuyAXprvI1P/xXNCFx+Loajy3XHSjlJEfp X-Received: by 2002:a17:90a:d990:b0:286:6cc0:b91a with SMTP id d16-20020a17090ad99000b002866cc0b91amr1496891pjv.81.1701919869606; Wed, 06 Dec 2023 19:31:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701919869; cv=none; d=google.com; s=arc-20160816; b=gJW6IbRrvnK2VIp+9elvBXg26P8GoB1/cjMIeAQUVsRyAaPpESGU90VJIhmuGnmaGa Mm2PsjsYTVa4z9oNMvU8LBZcz10Vqhmj/OIugpam9okn5GSYILaQdu8twHgtH4pRQb3F FNgGcp+G8Kh+pqUZKCGqr22hfI/oAGbBcdJkl7biULHmpmsGi7vaV4cqwo9jGK122fiq LL9FgnRK68jzPxNDy/WgAzhPOX7XmtbcvwBiVqTXTUb+H7ize2GtsonUrphO1DYAprqr Lp3WU8AaHa+P1B1TTpHDGU7MMzEa0LtSe3tRjHgCYc1gvfDAOmiI8y8HnVlqHzBiwNqx 04Ew== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=psWp9ZGziS6DEDuf46muszygwU1SWGqA1VGcMZfQht4=; fh=rhAzQACCVZpS1CK29G5xZwkbUQyn+xde1MjVhKmnPwA=; b=W6DdiYEwifZ0TvSFh8w72eba64Agjw3rxB7yR1s1Mge6pufOoAAwe3UO+j6ifoiq+0 8ARVKoHf89PflMdkd7COQ10AhY1m6WF+VsA4/rEqn5JWsGtjI8phM3yEexEvivzMU3sI zWR2XAOzPhWjLIO2VEzY4OKxqDyZ+nXwk1v16RRtGut+BvUE/lErcmyJ0nn+mCeMHGcs 1eGhGZeOIwrE0/S0bzYN5dEJiESoHJTxOECRIorE82ECcS7klMtz6o1IMRSC/Owkv6cW MbB7EE4rP7h4tZFesAO/DHgxlzWcWF857cObr58yeOLJoQhGfB8ul3ZHV+gG7uWCKmNE wKcA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id v14-20020a170903238e00b001cf8be14168si326640plh.552.2023.12.06.19.31.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Dec 2023 19:31:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 5755A802A6FA; Wed, 6 Dec 2023 19:30:21 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229552AbjLGDaE (ORCPT + 99 others); Wed, 6 Dec 2023 22:30:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57168 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229460AbjLGD36 (ORCPT ); Wed, 6 Dec 2023 22:29:58 -0500 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 1D31819E for ; Wed, 6 Dec 2023 19:30:02 -0800 (PST) Received: from loongson.cn (unknown [113.200.148.30]) by gateway (Coremail) with SMTP id _____8CxfOo4PHFl+oQ_AA--.34214S3; Thu, 07 Dec 2023 11:30:00 +0800 (CST) Received: from linux.localdomain (unknown [113.200.148.30]) by localhost.localdomain (Coremail) with SMTP id AQAAf8Ax3tw0PHFlBCFXAA--.60649S3; Thu, 07 Dec 2023 11:29:59 +0800 (CST) From: Tiezhu Yang To: Huacai Chen Cc: Hengqi Chen , loongarch@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v1 1/2] LoongArch: BPF: Fix sign-extension mov instructions Date: Thu, 7 Dec 2023 11:29:50 +0800 Message-ID: <20231207032951.16334-2-yangtiezhu@loongson.cn> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231207032951.16334-1-yangtiezhu@loongson.cn> References: <20231207032951.16334-1-yangtiezhu@loongson.cn> MIME-Version: 1.0 X-CM-TRANSID: AQAAf8Ax3tw0PHFlBCFXAA--.60649S3 X-CM-SenderInfo: p1dqw3xlh2x3gn0dqz5rrqw2lrqou0/ X-Coremail-Antispam: 1Uk129KBj93XoW7Ar48Xr47uw47ZF15Xw4kKrX_yoW8WF1rpr s8Crs5KrWxX3yI9a4kA3y7XF4qkFs5Gr13Ga4aqay8WwsxXryUXF1xKw1Utan5JrZYvFW8 ua4Skwn09a4kXagCm3ZEXasCq-sJn29KB7ZKAUJUUUU5529EdanIXcx71UUUUU7KY7ZEXa sCq-sGcSsGvfJ3Ic02F40EFcxC0VAKzVAqx4xG6I80ebIjqfuFe4nvWSU5nxnvy29KBjDU 0xBIdaVrnRJUUUkYb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2 IYs7xG6rWj6s0DM7CIcVAFz4kK6r126r13M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48v e4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Gr0_Xr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI 0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVWxJVW8Jr1l84ACjcxK6I8E87Iv6xkF7I0E14v2 6r4UJVWxJr1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqjxCEc2xF0cIa020Ex4CE44I27w Aqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_JF0_Jw1lYx0Ex4A2jsIE 14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x 0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E 7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcV C0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF 04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7 CjxVAFwI0_Jr0_GrUvcSsGvfC2KfnxnUUI43ZEXa7IU8niSPUUUUU== X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 06 Dec 2023 19:30:21 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784592329288045707 X-GMAIL-MSGID: 1784592329288045707 We can see that "Short form of movsx, dst_reg = (s8,s16,s32)src_reg" in include/linux/filter.h, additionally, for BPF_ALU64 the value of the destination register is unchanged whereas for BPF_ALU the upper 32 bits of the destination register are zeroed, so it should clear the upper 32 bits for BPF_ALU. [root@linux fedora]# echo 1 > /proc/sys/net/core/bpf_jit_enable [root@linux fedora]# modprobe test_bpf Before: test_bpf: #81 ALU_MOVSX | BPF_B jited:1 ret 2 != 1 (0x2 != 0x1)FAIL (1 times) test_bpf: #82 ALU_MOVSX | BPF_H jited:1 ret 2 != 1 (0x2 != 0x1)FAIL (1 times) After: test_bpf: #81 ALU_MOVSX | BPF_B jited:1 6 PASS test_bpf: #82 ALU_MOVSX | BPF_H jited:1 6 PASS By the way, the bpf selftest case "./test_progs -t verifier_movsx" can also be fixed with this patch. Fixes: f48012f16150 ("LoongArch: BPF: Support sign-extension mov instructions") Signed-off-by: Tiezhu Yang Acked-by: Hengqi Chen --- arch/loongarch/net/bpf_jit.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/loongarch/net/bpf_jit.c b/arch/loongarch/net/bpf_jit.c index 169ff8b3915e..8c907c2c42f7 100644 --- a/arch/loongarch/net/bpf_jit.c +++ b/arch/loongarch/net/bpf_jit.c @@ -480,10 +480,12 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx, bool ext case 8: move_reg(ctx, t1, src); emit_insn(ctx, extwb, dst, t1); + emit_zext_32(ctx, dst, is32); break; case 16: move_reg(ctx, t1, src); emit_insn(ctx, extwh, dst, t1); + emit_zext_32(ctx, dst, is32); break; case 32: emit_insn(ctx, addw, dst, src, LOONGARCH_GPR_ZERO); From patchwork Thu Dec 7 03:29:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tiezhu Yang X-Patchwork-Id: 174893 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp4531353vqy; Wed, 6 Dec 2023 19:30:29 -0800 (PST) X-Google-Smtp-Source: AGHT+IG27etwMvk/25owGN9uFYxxBhI1JjFpl3JZlzkFEHjhafufhBj3dx3wm12UFRPJ3voh8Ufl X-Received: by 2002:a17:902:eed2:b0:1d0:48cf:bbe1 with SMTP id h18-20020a170902eed200b001d048cfbbe1mr1933497plb.56.1701919829225; Wed, 06 Dec 2023 19:30:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701919829; cv=none; d=google.com; s=arc-20160816; b=vUjK7yGCAAphudfygDPIK/okn4Pungjy9oR4FK7EAlBVUhYKBQJpdJmAHyjb0nWFV4 Ck3ZhUO138oKaI/28zJ4expXjdYCHMy+dpKPU4YHKTKczIkuCFGGI46dNCV/+ir3wUT/ It/xneWwpUcAymrKRS/P++SjESuGWb5ma9EHywmhsPhAkoJQPMwW//RARaVAzkZS884l 9M+2qAhAEfqG43WMg/BuYRufNIHP9+wIL5KuDDiW8GQagtJSqKabdXDxFe2AdSfbtt// UqyvlBz1SS3RKG57ShKo8rQ3a7tdlJv0SrGi+3ss7e4xGbmFPsMyFGc0OTkvI6QxeJxo 7/2A== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=lbOyxRnhwZ4MeDWQb5iMWcOPIQ/4lxodxa6WV9yvgjU=; fh=rhAzQACCVZpS1CK29G5xZwkbUQyn+xde1MjVhKmnPwA=; b=Y66JQVoZhQ/ELIDr9YZAko1DF8/4DRYFXv4EbLT3Mu1nfAnURQV4O47VbDGQkSBhx7 6ZgDGC97PEVKuOgLJXZiOTEdx5iPQAKnIXe7q93/2fziq+YXXuDwUEyv3QgwNSbx/8yy PXAS6bD6EdQ4GZrmPJckqXJt6IkuCBg6Hp5G1dToBe4BQ22hmJR/UhYi0td0hrKBU14A nIWX8PM4jcMF6kU0Av2USriGvSNJhOVx/WJCcL/mgP+64B/dkmaPnhWmK1z8cssmrFPj x9d1MklDYEIkstZlZuA9kyJ3984by0GptPSY+RV0a1tjpGpmMzPV8XKi7fsRmR0gnFyx Aa+g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id l6-20020a170903244600b001cfc2da926bsi351164pls.378.2023.12.06.19.30.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Dec 2023 19:30:29 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 774D380789D8; Wed, 6 Dec 2023 19:30:14 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229507AbjLGDaA (ORCPT + 99 others); Wed, 6 Dec 2023 22:30:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57158 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229459AbjLGD35 (ORCPT ); Wed, 6 Dec 2023 22:29:57 -0500 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 07F7018D for ; Wed, 6 Dec 2023 19:30:02 -0800 (PST) Received: from loongson.cn (unknown [113.200.148.30]) by gateway (Coremail) with SMTP id _____8Cxrus5PHFl_YQ_AA--.58501S3; Thu, 07 Dec 2023 11:30:01 +0800 (CST) Received: from linux.localdomain (unknown [113.200.148.30]) by localhost.localdomain (Coremail) with SMTP id AQAAf8Ax3tw0PHFlBCFXAA--.60649S4; Thu, 07 Dec 2023 11:30:00 +0800 (CST) From: Tiezhu Yang To: Huacai Chen Cc: Hengqi Chen , loongarch@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v1 2/2] LoongArch: BPF: Fix unconditional bswap instructions Date: Thu, 7 Dec 2023 11:29:51 +0800 Message-ID: <20231207032951.16334-3-yangtiezhu@loongson.cn> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231207032951.16334-1-yangtiezhu@loongson.cn> References: <20231207032951.16334-1-yangtiezhu@loongson.cn> MIME-Version: 1.0 X-CM-TRANSID: AQAAf8Ax3tw0PHFlBCFXAA--.60649S4 X-CM-SenderInfo: p1dqw3xlh2x3gn0dqz5rrqw2lrqou0/ X-Coremail-Antispam: 1Uk129KBj93XoW7Zw45KrW7Gw4DJr1DWw1fZrc_yoW8Ww1Dpr sFyrs5KrW0gFy7Xa4UX3yxJr4jkan5A3WUJF1av34rGa9Fqw1UWF18Kw1YvasIy3yvva40 qa1jkFnIgF1UuagCm3ZEXasCq-sJn29KB7ZKAUJUUUU5529EdanIXcx71UUUUU7KY7ZEXa sCq-sGcSsGvfJ3Ic02F40EFcxC0VAKzVAqx4xG6I80ebIjqfuFe4nvWSU5nxnvy29KBjDU 0xBIdaVrnRJUUUkYb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2 IYs7xG6rWj6s0DM7CIcVAFz4kK6r126r13M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48v e4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI 0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVWxJVW8Jr1l84ACjcxK6I8E87Iv6xkF7I0E14v2 6r4UJVWxJr1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqjxCEc2xF0cIa020Ex4CE44I27w Aqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jw0_WrylYx0Ex4A2jsIE 14v26r4j6F4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x 0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E 7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcV C0I7IYx2IY67AKxVWUCVW8JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF 04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7 CjxVAFwI0_Jr0_GrUvcSsGvfC2KfnxnUUI43ZEXa7IU8gAw7UUUUU== X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Wed, 06 Dec 2023 19:30:14 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784592287076205552 X-GMAIL-MSGID: 1784592287076205552 We can see that "bswap32: Takes an unsigned 32-bit number in either big- or little-endian format and returns the equivalent number with the same bit width but opposite endianness" in BPF Instruction Set Specification, so it should clear the upper 32 bits in the case 32 for BPF_ALU and BPF_ALU64. [root@linux fedora]# echo 1 > /proc/sys/net/core/bpf_jit_enable [root@linux fedora]# modprobe test_bpf Before: test_bpf: #313 BSWAP 32: 0x0123456789abcdef -> 0xefcdab89 jited:1 ret 1460850314 != -271733879 (0x5712ce8a != 0xefcdab89)FAIL (1 times) test_bpf: #317 BSWAP 32: 0xfedcba9876543210 -> 0x10325476 jited:1 ret -1460850316 != 271733878 (0xa8ed3174 != 0x10325476)FAIL (1 times) After: test_bpf: #313 BSWAP 32: 0x0123456789abcdef -> 0xefcdab89 jited:1 4 PASS test_bpf: #317 BSWAP 32: 0xfedcba9876543210 -> 0x10325476 jited:1 4 PASS Fixes: 4ebf9216e7df ("LoongArch: BPF: Support unconditional bswap instructions") Signed-off-by: Tiezhu Yang Acked-by: Hengqi Chen --- arch/loongarch/net/bpf_jit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/loongarch/net/bpf_jit.c b/arch/loongarch/net/bpf_jit.c index 8c907c2c42f7..da48398e8794 100644 --- a/arch/loongarch/net/bpf_jit.c +++ b/arch/loongarch/net/bpf_jit.c @@ -774,8 +774,8 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx, bool ext break; case 32: emit_insn(ctx, revb2w, dst, dst); - /* zero-extend 32 bits into 64 bits */ - emit_zext_32(ctx, dst, is32); + /* clear the upper 32 bits */ + emit_zext_32(ctx, dst, true); break; case 64: emit_insn(ctx, revbd, dst, dst);