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;
From:   Alan Maguire <alan.maguire@oracle.com>
To:     ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org
Cc:     kafai@fb.com, songliubraving@fb.com, yhs@fb.com,
        john.fastabend@gmail.com, kpsingh@kernel.org, morbo@google.com,
        shuah@kernel.org, bpf@vger.kernel.org, netdev@vger.kernel.org,
        linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org,
        Alan Maguire <alan.maguire@oracle.com>
Subject: [PATCH v2 bpf-next 2/3] libbpf: fix compilation errors on ppc64le for btf dump typed data
Date:   Fri, 16 Jul 2021 23:46:56 +0100
Message-Id: <1626475617-25984-3-git-send-email-alan.maguire@oracle.com>
In-Reply-To: <1626475617-25984-1-git-send-email-alan.maguire@oracle.com>
References: <1626475617-25984-1-git-send-email-alan.maguire@oracle.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from localhost.uk.oracle.com (95.45.14.174) by AM4PR0501CA0058.eurprd05.prod.outlook.com (2603:10a6:200:68::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4331.21 via Frontend Transport; Fri, 16 Jul 2021 22:47:12 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: ae4df6ce-cbbb-4075-3703-08d948aba7d2
X-MS-TrafficTypeDiagnostic: BLAPR10MB5378:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <BLAPR10MB5378B60C740DB42988D57B38EF119@BLAPR10MB5378.namprd10.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:4303;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: iwql+Gl/ASsR8kiHFoblWzXrsUG29jGBFHhec7IC7CyfomjIzJSjijUhLQS+dBZZoIaTcwIjG38s6QiD8qw2MY5X1nkL3GxiqVr/01vx7xpUh23VbGI8fqKxSZttH3LJX0os681xCLNZPMfDuGXAqVaapJ1rwQ9/WRdimdd/c1eMTyRg+xgB6PQf4TP9mSXE/5dB4ScsN0D1C7HLIrgf753o+Qo89dYOJCw6BgEYDGhy3nNKDCKmydMQJ7WmhHGDTiQa3CNRIKeZvQDi/BcM4P+ljT2EHWakpSMKTIZy7Ujj678Kx5C5+LNyFUdo+hvL1lF+o6ZAS4YzfmiotVS3ErSw1MziKSZ6xVj/B/4s3qAcL0i8HiBsjIpcB6tYbkqHFY/gETaRYqaD1N7oaMqHcvEYQuxjglo9RKYenRtIpmdvmEOQxqcB8t+ycFS50Vlyg8HShQNVbxBbC39Svb5vre9T4Zi5VjFcWPTYz865MRV4jUNGW/qA3guShAGoIyMdX1UrSSt18Bv8TibRKrIGvIbMYZOxKdirtPYOX1MKJZX7LLsoACzBQWC5eF1KlSK6YhVBj3aWWjz0hn3QDZkjg0WkXmzSVxDbeSGy3IV1vpMRfIHvjPf0Vm3gjWkX51E9RVJWwrtWP0Pxy1C9+yPbFGf0s33EPFsPRh3n81EfPArCpCWqaepgFj9nZmy5QR8mbd7U58nvRsYYtJbIWUCezw==
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BLAPR10MB5267.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(346002)(366004)(376002)(396003)(136003)(39860400002)(83380400001)(2906002)(6486002)(8936002)(36756003)(107886003)(6666004)(4326008)(5660300002)(316002)(44832011)(86362001)(38100700002)(478600001)(38350700002)(2616005)(7696005)(956004)(52116002)(8676002)(186003)(26005)(7416002)(66946007)(66556008)(66476007);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?MNsc2FaWMtt1nCU+Zg7C3zNcx735NL0H/SA7qOJLgxCkb+99kxP3XgRZ/qkV?=
 =?us-ascii?Q?20u8xJmr7iQxqyUKbZAmVyfs5ZSUM1ywtAmay1y/awRPA2sEcabbdT5406fk?=
 =?us-ascii?Q?G37/uL2SUeAGKLFJbNt2vvCrBsIcVQ7rQ5NUuHUkH7hTUdhLtLzwtlwTb9kL?=
 =?us-ascii?Q?T5VhXnH8uThY/igmLdh13iA9qdM5RrbVsQV+cEse+w5W0RXcxC1EHZNwjrg6?=
 =?us-ascii?Q?tJtJMf+/zEzoEFIT2F99PqKdJZ2EL+aENeqDmsrTCUOqF227F42UWVqkiyDz?=
 =?us-ascii?Q?sntRw0cHA3sT1YCOoHexyLPM8wEzcKZLFOGiHzhHsvpLZZdrr7RFegR1mcGS?=
 =?us-ascii?Q?V2VPgdcQ8IptdHPVBbzaFuU3nSlrbkXVUWDQT7iYjKVjwYjDeBbQClbXQ2Uq?=
 =?us-ascii?Q?Wqj2ZpYYXZvUdYcOg19JqTyLcdHK4Gs/hJXfoTbVm+KGEmYxOs/QXLQoMEqB?=
 =?us-ascii?Q?4g7DuA8NafnTiFZd6Kt0fhoQrf2ifcA1zOPlNvKC3+JzqQaPbPTlHIjgiGoW?=
 =?us-ascii?Q?VWypUBX/EHVGzmwQ+avR45wrTvdGrAXq0dZVOj6Wk8gIIcyHhuq3ZzUQPXOx?=
 =?us-ascii?Q?r/AzpORPY7RL64miShTchN7UwoI1qjjsHmihKfk/28Um/+i0emIKidz+hZ7Z?=
 =?us-ascii?Q?VNQj8e+FVbm3aJCovJ7L2Q2PgVOJpUPnHSN6pQ4MWbCt5HDYx5bElErk3DNq?=
 =?us-ascii?Q?IPeRaxtV/Bl5P3THjH6/bYKUvkNIIAQD0NjC4wBHJFRc69SB4y9Mh7JGTfWn?=
 =?us-ascii?Q?z6If2ZoWirG2wT8V7icoY5KrEiCRc4GC36fPHlVPqKS154yaI8wgwDD+jAn2?=
 =?us-ascii?Q?3kAjNoUyMVPKzQPfLprYPG6WUMGfwXqXhYv+IuI5XI+DiiLonFP2ceVynLv6?=
 =?us-ascii?Q?S14JUMzUW2Y05qL4RsNaPVo4mG2XFVMvAwBo+txqrC+xjpW0+pik3yr/GCi9?=
 =?us-ascii?Q?fwBOnjqVuZPnEX9lROCVRU9LjODPEifNIBG9Hk+2HnU6eVAsLtQEgtGJ4RKO?=
 =?us-ascii?Q?OyW/owL6FBQvEy/Q9jxIumuZF1+948nPO5G3Iwy7U47XpMi8Ggwi+dgf5Dpl?=
 =?us-ascii?Q?1xlVfndOrA+fQ21jLzl/eCu6FdeMXMraiCJXasEJFIES4pVbUaYI9qnLN5BD?=
 =?us-ascii?Q?DcgAc4CbQngzOlm8NufPUfO4T1dA28vXHzrTHgy8NeHJ91OJGvWg/LG69odL?=
 =?us-ascii?Q?ndvG/U/GohwPWeSJuPU/70ICsjmSUr9QAgDva7Ultnqv728djlHoZGeruG23?=
 =?us-ascii?Q?RzE4dfqzfiCkHm7N6l5JPcYQd8ejx9ET5uZKCusGgQ8t03552DXmkdwQ07LQ?=
 =?us-ascii?Q?i5B2dyqjTe1VDKGswYUZ0xlq?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ae4df6ce-cbbb-4075-3703-08d948aba7d2
X-MS-Exchange-CrossTenant-AuthSource: BLAPR10MB5267.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jul 2021 22:47:14.3806
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: tYN76g9iq+qHligNcBGRg8EuGd5QL7oOTyfbzjrasQz2rfG+G6zrLVwhUJSXHE9q4nztAeELUQ4m0bpReUXD8w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR10MB5378
X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=10047 signatures=668682
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 bulkscore=0 mlxscore=0
 adultscore=0 phishscore=0 mlxlogscore=999 malwarescore=0 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000
 definitions=main-2107160145
X-Proofpoint-GUID: sMz9LGtBvGNgX9sPzKeXxc5SELJyURGE
X-Proofpoint-ORIG-GUID: sMz9LGtBvGNgX9sPzKeXxc5SELJyURGE
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Andrii reports:

"ppc64le arch doesn't like the %lld:

 In file included from btf_dump.c:22:
btf_dump.c: In function 'btf_dump_type_data_check_overflow':
libbpf_internal.h:111:22: error: format '%lld' expects argument of
type 'long long int', but argument 3 has type '__s64' {aka 'long int'}
[-Werror=format=]
  111 |  libbpf_print(level, "libbpf: " fmt, ##__VA_ARGS__); \
      |                      ^~~~~~~~~~
libbpf_internal.h:114:27: note: in expansion of macro '__pr'
  114 | #define pr_warn(fmt, ...) __pr(LIBBPF_WARN, fmt, ##__VA_ARGS__)
      |                           ^~~~
btf_dump.c:1992:3: note: in expansion of macro 'pr_warn'
 1992 |   pr_warn("unexpected size [%lld] for id [%u]\n",
      |   ^~~~~~~
btf_dump.c:1992:32: note: format string is defined here
 1992 |   pr_warn("unexpected size [%lld] for id [%u]\n",
      |                             ~~~^
      |                                |
      |                                long long int
      |                             %ld

Cast to size_t and use %zu."

Reported-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Alan Maguire <alan.maguire@oracle.com>
---
 tools/lib/bpf/btf_dump.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/lib/bpf/btf_dump.c b/tools/lib/bpf/btf_dump.c
index 814a538..e5fbfb8 100644
--- a/tools/lib/bpf/btf_dump.c
+++ b/tools/lib/bpf/btf_dump.c
@@ -2011,8 +2011,8 @@ static int btf_dump_type_data_check_overflow(struct btf_dump *d,
 	__s64 size = btf__resolve_size(d->btf, id);
 
 	if (size < 0 || size >= INT_MAX) {
-		pr_warn("unexpected size [%lld] for id [%u]\n",
-			size, id);
+		pr_warn("unexpected size [%zu] for id [%u]\n",
+			(size_t)size, id);
 		return -EINVAL;
 	}
 
-- 
1.8.3.1