From patchwork Fri Oct 6 10:07:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muhammad Usama Anjum X-Patchwork-Id: 149177 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp210361vqo; Fri, 6 Oct 2023 03:08:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGIXChbi6dFgTMNVRF/K7V4G5grkcPdfMRrf1UsD7KL6wFnuPmz+eBi52TCLIcfl322S+NY X-Received: by 2002:a17:902:dac1:b0:1c7:8783:8dae with SMTP id q1-20020a170902dac100b001c787838daemr7925191plx.17.1696586910489; Fri, 06 Oct 2023 03:08:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696586910; cv=none; d=google.com; s=arc-20160816; b=tVvtLB6Ss7+iLEhS6tup9x8p2Qpi69WDIgq1CHeZROQHhpiF8WXBTM1+821a2ZlEPS eXepWIKtztmSiG+Y5V9+4Ly3igtqEhc8EjxflwKMAxfD1P9jsHVHt8r/AbcGjYP/QuM8 +GFoYlC+vq43GmXgCHh4PviQqsnFR4OT79fL2eo7EJAWuhbANBGib/d5Okodg0+ETNQN GnZ+2maNUYhg0xK6N9d4DSw+q9/ETP3g8LkwGiPqQsyy3VCvRXfdufWn11MAl0MntPDQ Ze+ycDN2XBh34SS272ibrRj2OTBEzBdsMdB85v8F70M6NffX2RHiK/GFDbIqJpk65EM1 lJnw== 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=AYEOFevh8dzn09wV3YUqaz1Wg7ArG+bdHXuFbRTpk6k=; fh=3ITA+hG5KH7F/YE3za0C4YE3vOQC6OhXaAYfDI4ufbk=; b=xg5u9yK1xEcd7eIFViPuntJquR1osGRaRb8ZTAUF4kXC7EuROEtgNQIgAc2FJfhDnw psaqAQzzoVQX9/LnEjNRZ7zv5S4JRx3mj71gRxdvo/Lqni8BvL2ynC+MTy8maEDCZmvU zzUFxszgeT8s0nlX86lP2Jupbk6jbDDoWk1YRS8M+7zBcjALEjpk9QrvBKqRegCDcA2Q rWXj863Om3L84j+FYEYWFz44uVYkEC2yrFxyNUq9Iu4QREREav2Iy/ekOfi9td/iO0dM G0DP+83FZVwtNoM4I/msmJMuTkdOqruwCMEY24anC1UGJrNn2wnY7ArwMvsjNv47oO5+ v6bQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=jrP5aWqx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id l10-20020a170902f68a00b001c60ee79b6esi3501597plg.0.2023.10.06.03.08.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 03:08:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=jrP5aWqx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 4AB5A839DC3A; Fri, 6 Oct 2023 03:08:24 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231594AbjJFKIG (ORCPT + 18 others); Fri, 6 Oct 2023 06:08:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40928 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231207AbjJFKIE (ORCPT ); Fri, 6 Oct 2023 06:08:04 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD3EF9F; Fri, 6 Oct 2023 03:08:02 -0700 (PDT) Received: from localhost.localdomain (unknown [39.34.184.141]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: usama.anjum) by madras.collabora.co.uk (Postfix) with ESMTPSA id 54FB96612212; Fri, 6 Oct 2023 11:07:59 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1696586880; bh=/P0lxjquv/ZpR7Ni5SUJUUznYG0dkXXtdTFeHTzDUQo=; h=From:To:Cc:Subject:Date:From; b=jrP5aWqxBLjtDs2aLqN/U/f8VbG2WqcULJYTBjKFFBLvQDcjBxW9tvMx6p7w+1JAI YuIUBqH82skD1jce04v3XMOqMpvQuJti0FPhIq7t4WmHefpTEs8zenu2WlkPt5t3hs xqkLrHYJWvUwuG823jb8wcDLQHpHWaQxG7GuEw1dj0ZCNPCFEOqygjGknF1ymBKqUV RARjFl5dV3h89NAmZJJJwK6YyUbgHuOXt4sGsEvfUHctB9Hug6dgMbl8LfyMsI4+8r 1G/0/hdMZjLgeobtBZQEPNbfhDueSeGxy3rXvbyYgceMhjNZHbGoBmcNsi1WoIbEFC ZsT5y5Q6PwJXg== From: Muhammad Usama Anjum To: Shuah Khan , Muhammad Usama Anjum Cc: kernel@collabora.com, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/4] selftests: capabilities: remove duplicate unneeded defines Date: Fri, 6 Oct 2023 15:07:35 +0500 Message-Id: <20231006100743.1631334-1-usama.anjum@collabora.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Spam-Status: No, score=2.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.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 (pete.vger.email [0.0.0.0]); Fri, 06 Oct 2023 03:08:24 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773381279338899635 X-GMAIL-MSGID: 1779000316080470955 These duplicate defines should automatically be picked up from kernel headers. Use KHDR_INCLUDES to add kernel header files. Signed-off-by: Muhammad Usama Anjum --- tools/testing/selftests/capabilities/Makefile | 2 +- tools/testing/selftests/capabilities/test_execve.c | 8 -------- tools/testing/selftests/capabilities/validate_cap.c | 8 -------- 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/tools/testing/selftests/capabilities/Makefile b/tools/testing/selftests/capabilities/Makefile index 6e9d98d457d5b..411ac098308f1 100644 --- a/tools/testing/selftests/capabilities/Makefile +++ b/tools/testing/selftests/capabilities/Makefile @@ -2,7 +2,7 @@ TEST_GEN_FILES := validate_cap TEST_GEN_PROGS := test_execve -CFLAGS += -O2 -g -std=gnu99 -Wall +CFLAGS += -O2 -g -std=gnu99 -Wall $(KHDR_INCLUDES) LDLIBS += -lcap-ng -lrt -ldl include ../lib.mk diff --git a/tools/testing/selftests/capabilities/test_execve.c b/tools/testing/selftests/capabilities/test_execve.c index df0ef02b40367..e3a352b020a79 100644 --- a/tools/testing/selftests/capabilities/test_execve.c +++ b/tools/testing/selftests/capabilities/test_execve.c @@ -20,14 +20,6 @@ #include "../kselftest.h" -#ifndef PR_CAP_AMBIENT -#define PR_CAP_AMBIENT 47 -# define PR_CAP_AMBIENT_IS_SET 1 -# define PR_CAP_AMBIENT_RAISE 2 -# define PR_CAP_AMBIENT_LOWER 3 -# define PR_CAP_AMBIENT_CLEAR_ALL 4 -#endif - static int nerrs; static pid_t mpid; /* main() pid is used to avoid duplicate test counts */ diff --git a/tools/testing/selftests/capabilities/validate_cap.c b/tools/testing/selftests/capabilities/validate_cap.c index cdfc94268fe6e..60b4e7b716a75 100644 --- a/tools/testing/selftests/capabilities/validate_cap.c +++ b/tools/testing/selftests/capabilities/validate_cap.c @@ -9,14 +9,6 @@ #include "../kselftest.h" -#ifndef PR_CAP_AMBIENT -#define PR_CAP_AMBIENT 47 -# define PR_CAP_AMBIENT_IS_SET 1 -# define PR_CAP_AMBIENT_RAISE 2 -# define PR_CAP_AMBIENT_LOWER 3 -# define PR_CAP_AMBIENT_CLEAR_ALL 4 -#endif - #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 19) # define HAVE_GETAUXVAL #endif From patchwork Fri Oct 6 10:07:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muhammad Usama Anjum X-Patchwork-Id: 149175 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp210284vqo; Fri, 6 Oct 2023 03:08:22 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGMns2mnX3RB3ZJEOao+gGCMFP6ES4x82dFXwatheKuWwNuRQMhyU8xT/HVzTAjxZP1F7rT X-Received: by 2002:a17:90b:2015:b0:27b:2459:6ae4 with SMTP id hs21-20020a17090b201500b0027b24596ae4mr3363104pjb.40.1696586902012; Fri, 06 Oct 2023 03:08:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696586901; cv=none; d=google.com; s=arc-20160816; b=senlg7R43PdIhanfFiD5BQTAlz4n8sHCHWI+DovJwHAFtC1v80YLQzy+DUeIDgamLi WJ0AnvGOt3oubXLkbU0Rhkyd+Hb1LHGGw5V54gQW9KpESja8Xw0GradtlGsvB0Oh4Elm IGKcThUQY8JGKk/83rnVE6YygNfDfbwIKDsO5SFyJZrvu7fZXLNltS5BVBJVKUxJxI7N wSzyQWNEjFntCdwA8mOfVDdRXxcci5tmLQ4tYcEEe0uKbEEmFIin/w8GI2ZM8IX6pZq6 mK1f+E016J7CS2CjVECBTmJTTtKSL1a/F3eK3i87zL5ble4RgelvFL6rxIBV6RwayFRy VlHQ== 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 :dkim-signature; bh=2YOrnLtNZGWFBO5cGLCQgZvU9+JbUzwdEza7LHxZvyQ=; fh=ijZ3U32BA5Rs1/+dnliQiw6wgeGLXVl2qIkpsXvfDSE=; b=xED8GLCaqrmHNt/rfAGMxjTUNqXhL93jcGhbj8/bt8MF9seqM86wAmQKWl1OBm2je7 JkAazQ2qPU3rfhOk8b9Iu5Ex/tSKZobPGnUKji+asbI1fOsyTdqNeukzb2uVYx7NvR92 chgDKCIAfjeQ3FXnDDdhunLhJigHjRwt0u6Mm/YSArHUz2f+CqMQuNNUivozKHW1sc+M p+inJQ4aW3icdOrRyf+bv685sjRjjarxMAeUO5TsN2Fv1NrQIoS2Sjq5hF6CFe80jZs5 VCs1lSH1UMTRWUWoRTK4jxgXAw1zDoM4gW6KgIzYRJb56jtitbNIjumk603L0Ov3EZsI UEsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=fmiejCJs; 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; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id v4-20020a17090ad58400b0027728f01512si3383060pju.167.2023.10.06.03.08.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 03:08:21 -0700 (PDT) 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; dkim=pass header.i=@collabora.com header.s=mail header.b=fmiejCJs; 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; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id E637C831334E; Fri, 6 Oct 2023 03:08:20 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231631AbjJFKII (ORCPT + 18 others); Fri, 6 Oct 2023 06:08:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41938 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231583AbjJFKIF (ORCPT ); Fri, 6 Oct 2023 06:08:05 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B159DAD; Fri, 6 Oct 2023 03:08:04 -0700 (PDT) Received: from localhost.localdomain (unknown [39.34.184.141]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: usama.anjum) by madras.collabora.co.uk (Postfix) with ESMTPSA id DC83D66125F2; Fri, 6 Oct 2023 11:08:01 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1696586883; bh=aWtDH3Z6axZxgatd0itj89C7sRFa6SKxitusc/fajtc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fmiejCJszjjw+LeJC/lWDS1EKkRjW9s39EVwxYN4hhbVE3b9/OYiGxsjHUFQaRw0s POqNcVXNhyaYBvZs+gNcrjvqshzzeqmnKzEyIEYUhuemESiC6ZBo7vDfkOcz/z4hVH 6NdzdLzd07543vw+/eYchs4pzrdQP41xxD5Eb4x9qO9hFIMEV8ome2TR8XDmLLvgNJ yrb9PsD8nmnZJey6pueoGTvLwhcyXWTsb14OSIBR6rCqvI45ISKNm28thw75p8eCVN XuoLSMox4yiuQjLltZpf49aE4mNGjnQ1kj53FmMRZhBZGB/pFI7D1qQzmBog3xqPAq oZdExzsJxq8Ag== From: Muhammad Usama Anjum To: Christian Brauner , Shuah Khan Cc: Muhammad Usama Anjum , kernel@collabora.com, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH v2 2/4] selftests: clone3: remove duplicate defines Date: Fri, 6 Oct 2023 15:07:36 +0500 Message-Id: <20231006100743.1631334-2-usama.anjum@collabora.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231006100743.1631334-1-usama.anjum@collabora.com> References: <20231006100743.1631334-1-usama.anjum@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS 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]); Fri, 06 Oct 2023 03:08:20 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779000306871702543 X-GMAIL-MSGID: 1779000306871702543 Remove duplicate defines which are already included in kernel headers. MAX_PID_NS_LEVEL macro is used inside kernel only. It isn't exposed to userspace. So it is never defined in test application. Remove #ifndef in this case. Signed-off-by: Muhammad Usama Anjum --- Changes since v1: - Make patch explanation better --- .../clone3/clone3_cap_checkpoint_restore.c | 2 -- .../testing/selftests/clone3/clone3_clear_sighand.c | 4 ---- tools/testing/selftests/clone3/clone3_selftests.h | 13 ------------- tools/testing/selftests/clone3/clone3_set_tid.c | 2 -- 4 files changed, 21 deletions(-) diff --git a/tools/testing/selftests/clone3/clone3_cap_checkpoint_restore.c b/tools/testing/selftests/clone3/clone3_cap_checkpoint_restore.c index 52d3f0364bdaa..31b56d6256550 100644 --- a/tools/testing/selftests/clone3/clone3_cap_checkpoint_restore.c +++ b/tools/testing/selftests/clone3/clone3_cap_checkpoint_restore.c @@ -27,9 +27,7 @@ #include "../kselftest_harness.h" #include "clone3_selftests.h" -#ifndef MAX_PID_NS_LEVEL #define MAX_PID_NS_LEVEL 32 -#endif static void child_exit(int ret) { diff --git a/tools/testing/selftests/clone3/clone3_clear_sighand.c b/tools/testing/selftests/clone3/clone3_clear_sighand.c index 47a8c0fc3676b..54a8b2445be99 100644 --- a/tools/testing/selftests/clone3/clone3_clear_sighand.c +++ b/tools/testing/selftests/clone3/clone3_clear_sighand.c @@ -16,10 +16,6 @@ #include "../kselftest.h" #include "clone3_selftests.h" -#ifndef CLONE_CLEAR_SIGHAND -#define CLONE_CLEAR_SIGHAND 0x100000000ULL -#endif - static void nop_handler(int signo) { } diff --git a/tools/testing/selftests/clone3/clone3_selftests.h b/tools/testing/selftests/clone3/clone3_selftests.h index e81ffaaee02ba..3d2663fe50ba5 100644 --- a/tools/testing/selftests/clone3/clone3_selftests.h +++ b/tools/testing/selftests/clone3/clone3_selftests.h @@ -15,10 +15,6 @@ #define ptr_to_u64(ptr) ((__u64)((uintptr_t)(ptr))) -#ifndef CLONE_INTO_CGROUP -#define CLONE_INTO_CGROUP 0x200000000ULL /* Clone into a specific cgroup given the right permissions. */ -#endif - #ifndef __NR_clone3 #define __NR_clone3 -1 #endif @@ -32,18 +28,9 @@ struct __clone_args { __aligned_u64 stack; __aligned_u64 stack_size; __aligned_u64 tls; -#ifndef CLONE_ARGS_SIZE_VER0 -#define CLONE_ARGS_SIZE_VER0 64 /* sizeof first published struct */ -#endif __aligned_u64 set_tid; __aligned_u64 set_tid_size; -#ifndef CLONE_ARGS_SIZE_VER1 -#define CLONE_ARGS_SIZE_VER1 80 /* sizeof second published struct */ -#endif __aligned_u64 cgroup; -#ifndef CLONE_ARGS_SIZE_VER2 -#define CLONE_ARGS_SIZE_VER2 88 /* sizeof third published struct */ -#endif }; static pid_t sys_clone3(struct __clone_args *args, size_t size) diff --git a/tools/testing/selftests/clone3/clone3_set_tid.c b/tools/testing/selftests/clone3/clone3_set_tid.c index 0229e9ebb995e..ed785afb60770 100644 --- a/tools/testing/selftests/clone3/clone3_set_tid.c +++ b/tools/testing/selftests/clone3/clone3_set_tid.c @@ -23,9 +23,7 @@ #include "../kselftest.h" #include "clone3_selftests.h" -#ifndef MAX_PID_NS_LEVEL #define MAX_PID_NS_LEVEL 32 -#endif static int pipe_1[2]; static int pipe_2[2]; From patchwork Fri Oct 6 10:07:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muhammad Usama Anjum X-Patchwork-Id: 149178 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp210364vqo; Fri, 6 Oct 2023 03:08:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEcumVfTrfGYQeLy20SWVelWCujpSJVd9isKq1V7kyIwEHNH63zrvuX8XHvWY/qPj0GPgGi X-Received: by 2002:a05:6808:13ca:b0:3a6:fb16:c782 with SMTP id d10-20020a05680813ca00b003a6fb16c782mr9188520oiw.30.1696586910626; Fri, 06 Oct 2023 03:08:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696586910; cv=none; d=google.com; s=arc-20160816; b=VU31kbKTNwFyonh2ljq/OBhkFXJ0lvrSvc4ivuWBtQsrp19ikSIlDu10r5m7rlglAY H34xkH4K0pgp9OLP79HtCHndioZaO1yr8Vnou125TNiafX4fyNwW3u6QQqciwhedJcBF srI0x2VHDZQZLwP82pvahcxmo7+0u84APR35WubDm//9p88TupH7m2TAWCqTxX5tH98e +B8oFUm6FX5kxMAeVttSpGareyNdfzH7+wCx765VfCMhS4eH4+nnmwzQmNzHZDrWJ85k 3AYuspMhfGTzHXIk3bogpCVefS+MHa48lp3X2Q/SlhhhacMpnxa205AWm7hlM55sQvwi Ot/w== 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 :dkim-signature; bh=+dl3gBZqn183AFr2BmQt64hqEPCIN590R0UsnLWxNhk=; fh=3ITA+hG5KH7F/YE3za0C4YE3vOQC6OhXaAYfDI4ufbk=; b=Bj3I2WWLLuMTv6P5DMxyqQJHk4YlyPeDvwfrq5wwE2ICLHN/RyUV7fsddNKbpmGWqH iZ8IBFBP7+CsRk/o/qPuN+9zCstlz8YepPoavNBRthCOdWYFcXXftMH2FVL4RipYvFvV A0ML8i6dU/WFXn2YUNPIDPpknbn9E3DovYrsEj2eKSSPARfX2afDGmPX4ncs21PLSold /6UZHtgjcVy4YS41NX9obkxwnaV+0k3faSLkCuQPJY5lCsyBsSjIcz0w64unhOE17RsJ B6Vmqx2YKpmWYJvuAf3kVGeG4GAbiLdWEO2i/7NEUyAvbwW017Ase0HY7GwV0tBg+JkH 1W4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=PSdpbnTz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id c64-20020a633543000000b0058991991a8dsi545062pga.773.2023.10.06.03.08.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 03:08:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=PSdpbnTz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id D6310805F2E3; Fri, 6 Oct 2023 03:08:28 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231664AbjJFKIO (ORCPT + 18 others); Fri, 6 Oct 2023 06:08:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41954 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231645AbjJFKIK (ORCPT ); Fri, 6 Oct 2023 06:08:10 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B2D069F; Fri, 6 Oct 2023 03:08:08 -0700 (PDT) Received: from localhost.localdomain (unknown [39.34.184.141]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: usama.anjum) by madras.collabora.co.uk (Postfix) with ESMTPSA id 195576612668; Fri, 6 Oct 2023 11:08:05 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1696586887; bh=4T9UXJjURToNqR+AwgGUF57UmbiY2XyHR2+7wjgiYfA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PSdpbnTzRpB4wSE1JUUgxic4WBB0M4IDzSoUqPM1e0KtnWHcUcLoyTN1bBRqaRjEv xBCwLaXzupFElpWgiiErGmMiTEoiPGS0NRVaH2uthzINxw524gQg1NJpmA8IYurv5b eZdtw+YuF2tR44ThgTxB9d2Y2w1KLo/tFcv8g8vq7JyvwYyl4ebOB1WL7Qao/vANHq wnW7W6tM1zJMYKeBpvL7nnEmjxx6/HcxLS649Wj8ZEre7nTZP4AfXcS+OPOxHtpvpB sk1bgObTiuDxNeuhO3bPDG/yYhbmrISyimblMQkFdqz2iem4D0FYb87kmUGD19mgq4 sQqAS8/7puwZg== From: Muhammad Usama Anjum To: Shuah Khan , Muhammad Usama Anjum Cc: kernel@collabora.com, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/4] selftests: core: remove duplicate defines Date: Fri, 6 Oct 2023 15:07:37 +0500 Message-Id: <20231006100743.1631334-3-usama.anjum@collabora.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231006100743.1631334-1-usama.anjum@collabora.com> References: <20231006100743.1631334-1-usama.anjum@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=2.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.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 (morse.vger.email [0.0.0.0]); Fri, 06 Oct 2023 03:08:28 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779000316176163335 X-GMAIL-MSGID: 1779000316176163335 Remove duplicate defines which are already defined in kernel headers and re-definition isn't required. Signed-off-by: Muhammad Usama Anjum --- .../testing/selftests/core/close_range_test.c | 28 ------------------- 1 file changed, 28 deletions(-) diff --git a/tools/testing/selftests/core/close_range_test.c b/tools/testing/selftests/core/close_range_test.c index 749239930ca83..534576f06df1c 100644 --- a/tools/testing/selftests/core/close_range_test.c +++ b/tools/testing/selftests/core/close_range_test.c @@ -16,34 +16,6 @@ #include "../kselftest_harness.h" #include "../clone3/clone3_selftests.h" -#ifndef __NR_close_range - #if defined __alpha__ - #define __NR_close_range 546 - #elif defined _MIPS_SIM - #if _MIPS_SIM == _MIPS_SIM_ABI32 /* o32 */ - #define __NR_close_range (436 + 4000) - #endif - #if _MIPS_SIM == _MIPS_SIM_NABI32 /* n32 */ - #define __NR_close_range (436 + 6000) - #endif - #if _MIPS_SIM == _MIPS_SIM_ABI64 /* n64 */ - #define __NR_close_range (436 + 5000) - #endif - #elif defined __ia64__ - #define __NR_close_range (436 + 1024) - #else - #define __NR_close_range 436 - #endif -#endif - -#ifndef CLOSE_RANGE_UNSHARE -#define CLOSE_RANGE_UNSHARE (1U << 1) -#endif - -#ifndef CLOSE_RANGE_CLOEXEC -#define CLOSE_RANGE_CLOEXEC (1U << 2) -#endif - static inline int sys_close_range(unsigned int fd, unsigned int max_fd, unsigned int flags) { From patchwork Fri Oct 6 10:07:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muhammad Usama Anjum X-Patchwork-Id: 149176 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp210328vqo; Fri, 6 Oct 2023 03:08:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHQxEd81cYXlpVUWq26FUy9v+9L7lM97T6yFnV8iS95+nEe15pWt6+ryQ4Id4+PU8nclUa+ X-Received: by 2002:a17:90a:ce8c:b0:268:fc26:73a9 with SMTP id g12-20020a17090ace8c00b00268fc2673a9mr6884725pju.40.1696586907577; Fri, 06 Oct 2023 03:08:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696586907; cv=none; d=google.com; s=arc-20160816; b=shcdiYkA7rKz7zni0tX4H7g1Ykyxqas8xkMZo5dSIFTvg19sdX7EnWQfrxL9MKl7YN E+f++T/WTY+VhSNRrwgDRA/22CXk9GY4Mb0FKCQLyGHTz6DdgPlIFzm9HIQwH1AbUKz0 oNa91IoLntMUBEnHNDCjNCp4E9oykCj3a1wHzkgjB2Z9te3E+8+JxwNdxzgAVAV+OHak 819uVdlpv57M52G7EjdTjutKdmCmfz70mN/LF5Ihy5eINWQtXWaldWE5v4fHiCx7lKq4 q6k/j+4hroT5zQ2XMUAN/X6WmAU9aqPoo3HI6+S08ALaswFMfIjKBKTIlCBSbcpiJ6Y5 KCMw== 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 :dkim-signature; bh=8Fhhv2QNgOQWx6ozhPOx/j7/1Du6kd2Bc/NN6U5qhqQ=; fh=3ITA+hG5KH7F/YE3za0C4YE3vOQC6OhXaAYfDI4ufbk=; b=mFoc2ItqvQSlumpM81H/GwLIvF/aapo74TT1NDEKBWXrP0PuGk7mgek7KiC+0k2z0u xmhUUJrcnptagsVGdniCF8313M57pRcddpenOYsPjHdx8pRfYmHETfLODWbiLJxka8p+ nrLtt5WvQBiQmOcDohoMhbvNusoY+Wiz5rm8xDaJGLr7i8Eyz3SV07fJKD7lJVCowa0S zyUB/vZPRH4sOWXzD+2xAmJoe0IohAbv9X6uEK65CMQBFqADlUr4xLa1jZGtl7GH6zfz oRVs+LDKeDSFt4S8UNehxG9fvnPvnGzGNN22gZvjXpID9HR+OzibKw8hwbIKmjLYzm0N MTnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=iJpMoqgA; 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; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id ie14-20020a17090b400e00b0027460ba24bfsi5569320pjb.65.2023.10.06.03.08.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 03:08:27 -0700 (PDT) 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; dkim=pass header.i=@collabora.com header.s=mail header.b=iJpMoqgA; 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; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id B8FCE831337E; Fri, 6 Oct 2023 03:08:26 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231659AbjJFKIV (ORCPT + 18 others); Fri, 6 Oct 2023 06:08:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40368 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231670AbjJFKIQ (ORCPT ); Fri, 6 Oct 2023 06:08:16 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 66CF9FA; Fri, 6 Oct 2023 03:08:12 -0700 (PDT) Received: from localhost.localdomain (unknown [39.34.184.141]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: usama.anjum) by madras.collabora.co.uk (Postfix) with ESMTPSA id C0AA96612212; Fri, 6 Oct 2023 11:08:09 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1696586891; bh=d3OOu4X1+6LdLbtOeqh4zt3O5EoMiW32b7riykuvMiE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iJpMoqgARKxlrxvE+GxBvcWAtc7MbgXZS71nppsrKEBpUPlc0R5bdKyRHV/l501fg P83sEu77FZ15rDbNb/9cXn8isvhZiqqFHXaSIL9DK/VEOsCtDYdGzQAUK+CimYP/5J meytARV872FUCZVx2xt6bHcUdeiFiPogWMEuI763LFoTOJySY1oyy/GJvO7zMDejuC nBHAFTLJfPLSVKUstw039itQgjks6Y8tMU++eAQ0zZSLigkh3KVxIq0zbOhC/0fBuS VnBbT2XKN/QAQs9tojmzw9MFRbr81Z1YwlrCrgzGplOxrJhiOWa8Z2BZqanh0UBmnC 1JunAiyfke/kA== From: Muhammad Usama Anjum To: Shuah Khan , Muhammad Usama Anjum Cc: kernel@collabora.com, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/4] selftests: firmware: remove duplicate unneeded defines Date: Fri, 6 Oct 2023 15:07:38 +0500 Message-Id: <20231006100743.1631334-4-usama.anjum@collabora.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231006100743.1631334-1-usama.anjum@collabora.com> References: <20231006100743.1631334-1-usama.anjum@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS 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]); Fri, 06 Oct 2023 03:08:26 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779000312940733926 X-GMAIL-MSGID: 1779000312940733926 These duplicate defines should automatically be picked up from kernel headers. Signed-off-by: Muhammad Usama Anjum --- Changes since v1: - Make the patch explanation better --- tools/testing/selftests/firmware/fw_namespace.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/testing/selftests/firmware/fw_namespace.c b/tools/testing/selftests/firmware/fw_namespace.c index 4c6f0cd83c5b0..04757dc7e5467 100644 --- a/tools/testing/selftests/firmware/fw_namespace.c +++ b/tools/testing/selftests/firmware/fw_namespace.c @@ -17,10 +17,6 @@ #include #include -#ifndef CLONE_NEWNS -# define CLONE_NEWNS 0x00020000 -#endif - static char *fw_path = NULL; static void die(char *fmt, ...)