From patchwork Thu Dec 7 18:09:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Trofimovich X-Patchwork-Id: 175322 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp4969848vqy; Thu, 7 Dec 2023 10:09:40 -0800 (PST) X-Google-Smtp-Source: AGHT+IEWYYYaHhbqhOtM0GdMr3IigIWBd8hjd+YsPIvAwiwbY0XW/i9uPcqlsLaeXQPotcOV0Pq1 X-Received: by 2002:a92:d6ca:0:b0:35d:59a2:2da with SMTP id z10-20020a92d6ca000000b0035d59a202damr3409878ilp.122.1701972580682; Thu, 07 Dec 2023 10:09:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701972580; cv=none; d=google.com; s=arc-20160816; b=QiLge9hZcvOA8i4RrnJUHdSvBl+wO2Sry4Vmf5DNQawvoJQxJnxu110sWHJiQ3MMJ2 4jB8IfarwPOg8eB+fRNIBXFG/xE62U1aB48cT5pz+kU2T55l/jFWvplTqe3DOH7w3/PF ghnohlS0BaEa+ywTORC3s1l9XpaL+luuIQGnH3rYGnC8ceMZFivjjjnjbNDIbNukeyx3 saBZcoT7DV4sWW0LIYPR+Kef3zUcPbUgdI8y2LoKjlDdQpHfsk1pS4L2KEKpSnrCPfOL lN1nxd5dB1535qNVm1684Gjir27HP1Q8BfRGEur1eeTVbjSfUvulf9GJTDSckmcS12R3 t+9g== 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=n5ZRbFTxvl5gVQWRXKJWEF7nKXIu01Clbw3olLA/fCQ=; fh=25f0hzBp88ECtmBurHfdEoi+Cgqbrn9zr88vbncdLz0=; b=nWXzvxOPeNgaaV51cvk8B0+ms8oqYAInpRpAVpJ5qoucHXhUrUYQdH3ccfmhzaTsqq z5HPLNoX6HShIahRP+xqYurpvGDSluGkYpi5EUQqNPphGjbyt+pKXkgUyzeLKheYQYx+ S3jpA6tte4/bvJM6CRCIsKDqFGkMtx3kaT3CUl+eM3i/hwTaUmMclWevdFE4/Cx8vFTm CWsH090H28AhnGNI1km9pTqBVu+e4D/Zz71D8epztUPBIy2ZnqKaHD3AeLEu4n6gQwOo EJg3pHV5J5WoP5yon0pcD0R5UjK5PC5fCYk/aTdBS3ps+HjgqKedNXiPQfEmVmBSM2Uy IKkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=RyFdm3yz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id bw42-20020a056a0204aa00b005be00212aa7si73993pgb.663.2023.12.07.10.09.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Dec 2023 10:09:40 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=RyFdm3yz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 99A5283EB33E; Thu, 7 Dec 2023 10:09:37 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1443509AbjLGSJ2 (ORCPT + 99 others); Thu, 7 Dec 2023 13:09:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54406 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230071AbjLGSJ1 (ORCPT ); Thu, 7 Dec 2023 13:09:27 -0500 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 33BB510EF; Thu, 7 Dec 2023 10:09:33 -0800 (PST) Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-40c2d50bfbfso3463175e9.0; Thu, 07 Dec 2023 10:09:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701972571; x=1702577371; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=n5ZRbFTxvl5gVQWRXKJWEF7nKXIu01Clbw3olLA/fCQ=; b=RyFdm3yzSsl960UwhIGewoEz9GFnQayU/vHKRTxhQhEKfZfBtACNg6LPPteLmQ6nzG zrrA6tIlmET/SGgpdH2mVsIaQ/R70vMN43w8oJKcPZF8iZEX4aoI/WuNbcv6XLuUUYhv fYeAA4q4dwfTNbxTd51QX/Bg2mEsm7/E5uyLnQr7nbLoXs7kfEddHRtAjTQygAHIRkP7 m6MzaZv5VR4fws7C7ERlhnoI+vRFC7svBjXpAUo1PmBtAbzpbKdospha9iAJtbSanqPa LtFG7r8xcc4qWDS3PtyeNzqDxLdagqJrkrd2ESAPCG+lh/Fkumx7mrVW3bXMW2Ahr9K1 LyvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701972571; x=1702577371; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=n5ZRbFTxvl5gVQWRXKJWEF7nKXIu01Clbw3olLA/fCQ=; b=elVx6moT+4seluOtyEw/uk5ar3xo8jgNqNwUTtckhz/toXpczAiafpotG8fY/pjZZS H2fBi+XTJutOWoHku/MxfIbF0nRpHEgJPRKAIC0TzrU00f8pyFv5E8ptcB6U/r11GALH 87pWWfZ+hkkbYzGofZk/XiUqPPHgdczFBj6wLFdjdDvsMUzPMuqeDCH8ool+JjBNv1XA pkwHySpxhAPuhseURyppwyaiwLLIw6hfQgK2bY98wyCfIXPexglpfFNYUYUz3HmmZvS/ PutPQzWwMMAdSDMwizkzUspsk1j5Pl0cvB3njzX7Q5IBMSWuIRdpfZr4R8NwRHN9yuNR wzkw== X-Gm-Message-State: AOJu0YyFyk7GbZENKdUZRdlwxGPG5IAoiE0VMoaRvOakrDbN8CwTVJk8 SltpnMfUKOAxNo1wX/qra7I= X-Received: by 2002:a7b:c4da:0:b0:40b:5e4a:234d with SMTP id g26-20020a7bc4da000000b0040b5e4a234dmr2876477wmk.79.1701972571228; Thu, 07 Dec 2023 10:09:31 -0800 (PST) Received: from nz.home ([2a00:23c8:a613:101:600:de73:7edb:4f76]) by smtp.gmail.com with ESMTPSA id s12-20020adf978c000000b003333a0da243sm218359wrb.81.2023.12.07.10.09.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Dec 2023 10:09:30 -0800 (PST) Received: by nz.home (Postfix, from userid 1000) id 9608F139EC7060; Thu, 7 Dec 2023 18:09:29 +0000 (GMT) From: Sergei Trofimovich To: bpf@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Sergei Trofimovich , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa Subject: [PATCH] tools/lib/bpf: add pr_warn() to more -EINVAL cases Date: Thu, 7 Dec 2023 18:09:19 +0000 Message-ID: <20231207180919.2379718-1-slyich@gmail.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, 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 howler.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 (howler.vger.email [0.0.0.0]); Thu, 07 Dec 2023 10:09:37 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784647600606603957 X-GMAIL-MSGID: 1784647600606603957 Before the change on `i686-linux` `systemd` build failed as: $ bpftool gen object src/core/bpf/socket_bind/socket-bind.bpf.o src/core/bpf/socket_bind/socket-bind.bpf.unstripped.o Error: failed to link 'src/core/bpf/socket_bind/socket-bind.bpf.unstripped.o': Invalid argument (22) After the change it fails as: $ bpftool gen object src/core/bpf/socket_bind/socket-bind.bpf.o src/core/bpf/socket_bind/socket-bind.bpf.unstripped.o libbpf: ELF section #9 has inconsistent alignment in src/core/bpf/socket_bind/socket-bind.bpf.unstripped.o Error: failed to link 'src/core/bpf/socket_bind/socket-bind.bpf.unstripped.o': Invalid argument (22) Now it's slightly easier to figure out what is wrong with an ELF file. CC: Alexei Starovoitov CC: Daniel Borkmann CC: Andrii Nakryiko CC: Martin KaFai Lau CC: Song Liu CC: Yonghong Song CC: John Fastabend CC: KP Singh CC: Stanislav Fomichev CC: Hao Luo CC: Jiri Olsa CC: bpf@vger.kernel.org Signed-off-by: Sergei Trofimovich --- tools/lib/bpf/linker.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/tools/lib/bpf/linker.c b/tools/lib/bpf/linker.c index 5ced96d99f8c..71bb4916b762 100644 --- a/tools/lib/bpf/linker.c +++ b/tools/lib/bpf/linker.c @@ -719,13 +719,22 @@ static int linker_sanity_check_elf(struct src_obj *obj) return -EINVAL; } - if (sec->shdr->sh_addralign && !is_pow_of_2(sec->shdr->sh_addralign)) + if (sec->shdr->sh_addralign && !is_pow_of_2(sec->shdr->sh_addralign)) { + pr_warn("ELF section #%zu alignment is non pow-of-2 alignment in %s\n", + sec->sec_idx, obj->filename); return -EINVAL; - if (sec->shdr->sh_addralign != sec->data->d_align) + } + if (sec->shdr->sh_addralign != sec->data->d_align) { + pr_warn("ELF section #%zu has inconsistent alignment in %s\n", + sec->sec_idx, obj->filename); return -EINVAL; + } - if (sec->shdr->sh_size != sec->data->d_size) + if (sec->shdr->sh_size != sec->data->d_size) { + pr_warn("ELF section #%zu has inconsistent section size in %s\n", + sec->sec_idx, obj->filename); return -EINVAL; + } switch (sec->shdr->sh_type) { case SHT_SYMTAB: