Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp90584pxu; Tue, 1 Dec 2020 06:50:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJyN1r5MmvII4cPAZcSx9OaAecMGgsaxZIOWhxN0ONmXYmwITAjSizHoSdAvaMsh2tgcaFZm X-Received: by 2002:a17:906:74c1:: with SMTP id z1mr3493963ejl.182.1606834247461; Tue, 01 Dec 2020 06:50:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606834247; cv=none; d=google.com; s=arc-20160816; b=Kbl7jG2UZrnaeRnOEv01V0bi3+RduTKuQv4tbhkK8ShEYSfjT//pe8LtNycD6Wsfu5 II7n92VnrzJlzxI7uRvBJh7MB67HqiCjdxR/H5BTsb2M24piyNuZkI1XriOEUibqjQ5U Pw6TkIRW5DhTaLASUUMgw8fOv4Bf10lL5mfejgeHfCs3ltvObDZV3g/ZANZCzLwDC6Tp +6APfdItMLnL4GtlzzDDlpP830NKOUF7UCcIbnQvOG0af0DW28Fg+ikNOsUY9fGAsDlo hBdr5oTYWDu+D8u6cZFDaZPizVyfGR6CgeII+UB73zdcch/tcH6GLjNHdtXJF9u2gRxp PEjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=TmovmZFg0uGwgULxNT+qzpNNcmmliehv0wNj2j0+gi0=; b=F6K769NObpKWz7rbKDi9jnbQxpkUcyKJrX8Y/EZIVWJ+XD449JPZsql8hNgQQsgxkF PmGkoK7YpAATcXW7U6uDwW+q05E1oZXeJRKCWrgi7FF9j1w0584epfrpb5sBtZ6aJ9mR Mns2olXg4nl67ZBNrB+CNWkTq4ilFdcJbO4mJwJwypEL6Qsz2XAZnCdhJrL+8/zgYG97 DozA4lQvfhp0SfzbK7CI5TR4fy0BysH8UWxW5GQYwiF3UQO1vrQNVg6Ijiz1EOYs/iK9 IuEZQ2A1Z7kxUK4Ih1I9IbS58A6RI27mKHkpLMsMX+Ny5n8n0V10ZvqKGjC2LlAnQ/Mr aqow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amazon.co.jp header.s=amazon201209 header.b=KvAw6aUC; 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 m7si1452694edq.549.2020.12.01.06.50.24; Tue, 01 Dec 2020 06:50:47 -0800 (PST) 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=KvAw6aUC; 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 S2404001AbgLAOr2 (ORCPT + 99 others); Tue, 1 Dec 2020 09:47:28 -0500 Received: from smtp-fw-2101.amazon.com ([72.21.196.25]:5495 "EHLO smtp-fw-2101.amazon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2403991AbgLAOr2 (ORCPT ); Tue, 1 Dec 2020 09:47:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.co.jp; i=@amazon.co.jp; q=dns/txt; s=amazon201209; t=1606834047; x=1638370047; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=TmovmZFg0uGwgULxNT+qzpNNcmmliehv0wNj2j0+gi0=; b=KvAw6aUCHc/716dOdupPYvAJtlZ+wQEQGdqJbFKMXRbKg0NWowF3Eoh8 hS6RPxUyI9sGz/SjUrV6AhGJi8or9v5KGLczAHz5OT2HaH3kI0OYSt7ie JohLu7mvwZ0xpyJ9/+uMZ0Kgu34Ninwel72QIfs/RzcBtm4k9tiwS1s3v Y=; X-IronPort-AV: E=Sophos;i="5.78,384,1599523200"; d="scan'208";a="66687217" Received: from iad12-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-2a-41350382.us-west-2.amazon.com) ([10.43.8.6]) by smtp-border-fw-out-2101.iad2.amazon.com with ESMTP; 01 Dec 2020 14:46:43 +0000 Received: from EX13MTAUWB001.ant.amazon.com (pdx1-ws-svc-p6-lb9-vlan3.pdx.amazon.com [10.236.137.198]) by email-inbound-relay-2a-41350382.us-west-2.amazon.com (Postfix) with ESMTPS id D4D33C2CDA; Tue, 1 Dec 2020 14:46:42 +0000 (UTC) Received: from EX13D04ANC001.ant.amazon.com (10.43.157.89) by EX13MTAUWB001.ant.amazon.com (10.43.161.207) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 1 Dec 2020 14:46:42 +0000 Received: from 38f9d3582de7.ant.amazon.com (10.43.162.146) by EX13D04ANC001.ant.amazon.com (10.43.157.89) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 1 Dec 2020 14:46:37 +0000 From: Kuniyuki Iwashima To: "David S . Miller" , Jakub Kicinski , Eric Dumazet , Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau CC: Benjamin Herrenschmidt , Kuniyuki Iwashima , Kuniyuki Iwashima , , , , Subject: [PATCH v1 bpf-next 07/11] libbpf: Set expected_attach_type for BPF_PROG_TYPE_SK_REUSEPORT. Date: Tue, 1 Dec 2020 23:44:14 +0900 Message-ID: <20201201144418.35045-8-kuniyu@amazon.co.jp> X-Mailer: git-send-email 2.17.2 (Apple Git-113) In-Reply-To: <20201201144418.35045-1-kuniyu@amazon.co.jp> References: <20201201144418.35045-1-kuniyu@amazon.co.jp> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.43.162.146] X-ClientProxiedBy: EX13D36UWA004.ant.amazon.com (10.43.160.175) 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 --- 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 28baee7ba1ca..bbb3902a0e41 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -8237,7 +8237,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.17.2 (Apple Git-113)