Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp1335235pxj; Sat, 12 Jun 2021 05:39:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxDxklshgNmc8WBupmngv/eQT+2vk4XyO+SoJjjVgphxf+EdyYnUXIAWEcOgr6d/TSSoC+j X-Received: by 2002:a05:6402:101a:: with SMTP id c26mr8586768edu.19.1623501589740; Sat, 12 Jun 2021 05:39:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623501589; cv=none; d=google.com; s=arc-20160816; b=qjVeWa9TByU4vv95wjUNlWN5Ig84TqA182cL6r80GmDqhjijAaRPMXqaFDaw3lHKvC oIaLvfdZFQwJhMbhGZw2qQ25nbjYmYdvLvAchVUn2751lD7iZY3uIlUQn6v1qBvMUyJ+ CPyj3IUjdoQXldUnZ6A3f1clBun0OG/5Gal+xMRVdQNIg4JB52adhs4299+Q8kN5Yuqu bZSxebKZ5kWRfdqLnvHJfwxyEC9xqVvKZeVEJNfAVOw894v1hXEhIddB2UMMn+uU8fth pOlNZWW8/w6+kAsGIoC7tUDTrue/iML1a0+vhm/oWczJfhv67nNZPthaKGERDiOfJ+SV j19g== 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=ePETh8kwkGe12QJMmZ+B2awIq/2ssnWj8Y7wAoShBSs=; b=Fv3YYJx5Xbzm9c7+sRnvZ/tQPhjZ2XbD44L4F/sugXFj0Rz2pTT+QH2Ijqz5rdAi3o xyl0nBxJPPNdECrirZjYbESJYA/MSZ8cIXMPhocH49jZADHDmxEwI67kYlYlfabXfznP pyLyV0nERSDiBlgYR4dIh/2kxwnkdHuXHkSiyacRba588MOSzpa9aESVozN4vco5fXR0 73hgZRQR37OWBl+BoPUpad6v7byUtYTQjo3S5ndMI1wTgr7S8vxR54J7VmcLaZ6M0YMv P9eFw1npDlqZ+Mmvyt+LmGeCJShEfAzjRTpso3OWd5iljRShlDZ/D+HeJj4Pt9SCRE0y HIgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amazon.co.jp header.s=amazon201209 header.b=Sxfma6Qy; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amazon.co.jp Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id be25si7432365edb.359.2021.06.12.05.39.27; Sat, 12 Jun 2021 05:39:49 -0700 (PDT) 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=@amazon.co.jp header.s=amazon201209 header.b=Sxfma6Qy; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amazon.co.jp Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231453AbhFLMhT (ORCPT + 99 others); Sat, 12 Jun 2021 08:37:19 -0400 Received: from smtp-fw-6002.amazon.com ([52.95.49.90]:13637 "EHLO smtp-fw-6002.amazon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230526AbhFLMhS (ORCPT ); Sat, 12 Jun 2021 08:37:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.co.jp; i=@amazon.co.jp; q=dns/txt; s=amazon201209; t=1623501320; x=1655037320; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ePETh8kwkGe12QJMmZ+B2awIq/2ssnWj8Y7wAoShBSs=; b=Sxfma6QyQKp+qyT7/3ke8DVpimRLYXWsHx2gprirBx9JYTePO9rxFHMv NDjHzACkdc0FtdcW+sTeXNCYM/yQzdvNlNTRyTAfP84sw46t6e1GaTwwh QljduOyodBBzr0P5Z8KuYL1lpHN/7QNqLCHp8MfjzBjZM1geIgnw5v8Ef Q=; X-IronPort-AV: E=Sophos;i="5.83,268,1616457600"; d="scan'208";a="118356126" Received: from iad12-co-svc-p1-lb1-vlan2.amazon.com (HELO email-inbound-relay-2c-456ef9c9.us-west-2.amazon.com) ([10.43.8.2]) by smtp-border-fw-6002.iad6.amazon.com with ESMTP; 12 Jun 2021 12:35:18 +0000 Received: from EX13MTAUWB001.ant.amazon.com (pdx1-ws-svc-p6-lb9-vlan3.pdx.amazon.com [10.236.137.198]) by email-inbound-relay-2c-456ef9c9.us-west-2.amazon.com (Postfix) with ESMTPS id 91BA5A1D57; Sat, 12 Jun 2021 12:35:16 +0000 (UTC) Received: from EX13D04ANC001.ant.amazon.com (10.43.157.89) by EX13MTAUWB001.ant.amazon.com (10.43.161.249) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Sat, 12 Jun 2021 12:35:15 +0000 Received: from 88665a182662.ant.amazon.com (10.43.160.55) by EX13D04ANC001.ant.amazon.com (10.43.157.89) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Sat, 12 Jun 2021 12:35:04 +0000 From: Kuniyuki Iwashima To: "David S . Miller" , Jakub Kicinski , Eric Dumazet , Neal Cardwell , Yuchung Cheng , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau CC: Benjamin Herrenschmidt , Kuniyuki Iwashima , Kuniyuki Iwashima , , , Subject: [PATCH v8 bpf-next 10/11] libbpf: Set expected_attach_type for BPF_PROG_TYPE_SK_REUSEPORT. Date: Sat, 12 Jun 2021 21:32:23 +0900 Message-ID: <20210612123224.12525-11-kuniyu@amazon.co.jp> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210612123224.12525-1-kuniyu@amazon.co.jp> References: <20210612123224.12525-1-kuniyu@amazon.co.jp> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.43.160.55] X-ClientProxiedBy: EX13D04UWB002.ant.amazon.com (10.43.161.133) To EX13D04ANC001.ant.amazon.com (10.43.157.89) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This commit introduces a new section (sk_reuseport/migrate) and sets expected_attach_type to two each section in BPF_PROG_TYPE_SK_REUSEPORT program. Signed-off-by: Kuniyuki Iwashima Acked-by: Martin KaFai Lau --- tools/lib/bpf/libbpf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 128715b8794b..f6b91fb0c857 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -9075,7 +9075,10 @@ static struct bpf_link *attach_iter(const struct bpf_sec_def *sec, static const struct bpf_sec_def section_defs[] = { BPF_PROG_SEC("socket", BPF_PROG_TYPE_SOCKET_FILTER), - BPF_PROG_SEC("sk_reuseport", BPF_PROG_TYPE_SK_REUSEPORT), + BPF_EAPROG_SEC("sk_reuseport/migrate", BPF_PROG_TYPE_SK_REUSEPORT, + BPF_SK_REUSEPORT_SELECT_OR_MIGRATE), + BPF_EAPROG_SEC("sk_reuseport", BPF_PROG_TYPE_SK_REUSEPORT, + BPF_SK_REUSEPORT_SELECT), SEC_DEF("kprobe/", KPROBE, .attach_fn = attach_kprobe), BPF_PROG_SEC("uprobe/", BPF_PROG_TYPE_KPROBE), -- 2.30.2