From patchwork Thu Jul 26 02:31:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Safonov X-Patchwork-Id: 949432 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=arista.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=arista.com header.i=@arista.com header.b="GFasW/3r"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41bbj85J91z9s29 for ; Thu, 26 Jul 2018 12:32:28 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729892AbeGZDq7 (ORCPT ); Wed, 25 Jul 2018 23:46:59 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:35906 "EHLO mail-ed1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729204AbeGZDqj (ORCPT ); Wed, 25 Jul 2018 23:46:39 -0400 Received: by mail-ed1-f68.google.com with SMTP id k15-v6so341856edr.3 for ; Wed, 25 Jul 2018 19:32:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arista.com; s=googlenew; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=wmvEwHXGrv0tUfQuAGw1QAVTFm4+aPV+0zO5SRaH9Dc=; b=GFasW/3rpCfEDxx869JZ2gMOa0aGVdQ+Xp0AqFkV79sxenfv/FofBLpJY3EEsyq0LK F8Bn1JqlHZl/ouwO81Xe503uYa0xMxvYkYogN+K5IAja14NM6XZmVUxf0MQVRSkJT7t1 z4HgQpG2dgafxwArde4dGK/5qkL5BBUtFrHE9otFocSvl3xG1PTpQro1+vBB6d4DAa4E hZvxmrnXnYeJBRV4vzUVNof4nKYA4ecopviyT+CA78y/BcupZawgo1/308JKRwu+RCLz alUSjDEar4cnlaPdCJrt76XRNGnx5Coe3Yd2HCugGvXsTNkvF5JOKvzVb+iJx7KTXn6X ARYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=wmvEwHXGrv0tUfQuAGw1QAVTFm4+aPV+0zO5SRaH9Dc=; b=qAzYOczUew092SCjT6fpZ2DrCdGCJGlFvPtBuV/4vm7DW1O0Iv8qEm2dq5S5ZpF4Xf Y3p8lo0/7AYmPAZ+MUTt/szSORxJPtPqZ7yPWEqSNi4E2To01t4MsRvwbVziCqXLSSNJ +vr2+LVEB26FE60p2SV9v+PpPH36b6KDeWZF18Li5eGvOZx5ZInQJp9Lp+RqrFdCXKcE oVf2dMHel9cRONndKKrd3s6GEgCgk1eEyRCHGCKr0pPRABqKorlHN/mtdxiKPgY35XqD WYX3vb3fKyLsZiLaX59cBEBaZPxbZ2DdqBtqxkMeLQHwZ6vCDpCrHWPmJSQyJLB9wkdQ E0ZQ== X-Gm-Message-State: AOUpUlG+/D98VZYb20PuwO0bo5+04HLTkCgunUShdxTeCYct+Eg7/zIb 2zzXlSI7rL7uWom1UjSwioBz5Q== X-Google-Smtp-Source: AAOMgpfkBuqpE8+D8EBdkD0A7vQZAIZnwXxzZjXqBv6iDNeecHhwaeurNGBc5vP8YHSUooX2yiRT/Q== X-Received: by 2002:a50:9a02:: with SMTP id o2-v6mr517551edb.236.1532572325870; Wed, 25 Jul 2018 19:32:05 -0700 (PDT) Received: from dhcp.ire.aristanetworks.com ([217.173.96.166]) by smtp.gmail.com with ESMTPSA id x13-v6sm241024edx.17.2018.07.25.19.32.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 25 Jul 2018 19:32:05 -0700 (PDT) From: Dmitry Safonov To: linux-kernel@vger.kernel.org Cc: Dmitry Safonov , "David S. Miller" , Herbert Xu , Steffen Klassert , Dmitry Safonov <0x7f454c46@gmail.com>, netdev@vger.kernel.org Subject: [PATCH 17/18] xfrm: Notify compat listeners about state flush Date: Thu, 26 Jul 2018 03:31:43 +0100 Message-Id: <20180726023144.31066-18-dima@arista.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180726023144.31066-1-dima@arista.com> References: <20180726023144.31066-1-dima@arista.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Notify two groups of listeners: XFRMNLGRP_SA - applications that uses native UABI for messages; XFRMNLGRP_COMPAT_SA - applications that uses compat UABI for messages; Cc: "David S. Miller" Cc: Herbert Xu Cc: Steffen Klassert Cc: netdev@vger.kernel.org Signed-off-by: Dmitry Safonov --- net/xfrm/xfrm_user.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index 7bba0638c014..7e3a132b76fb 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c @@ -2879,7 +2879,7 @@ static int xfrm_aevent_state_notify(struct xfrm_state *x, const struct km_event return xfrm_nlmsg_multicast(net, skb, 0, XFRMNLGRP_AEVENTS); } -static int xfrm_notify_sa_flush(const struct km_event *c) +static int __xfrm_notify_sa_flush(const struct km_event *c, unsigned int group) { struct net *net = c->net; struct xfrm_usersa_flush *p; @@ -2902,7 +2902,16 @@ static int xfrm_notify_sa_flush(const struct km_event *c) nlmsg_end(skb, nlh); - return xfrm_nlmsg_multicast(net, skb, 0, XFRMNLGRP_SA); + return xfrm_nlmsg_multicast(net, skb, 0, group); +} + +static int xfrm_notify_sa_flush(const struct km_event *c) +{ + int ret = __xfrm_notify_sa_flush(c, XFRMNLGRP_SA); + + if ((ret && ret != -ESRCH) || !IS_ENABLED(CONFIG_COMPAT)) + return ret; + return __xfrm_notify_sa_flush(c, XFRMNLGRP_COMPAT_SA); } static inline unsigned int xfrm_sa_len(struct xfrm_state *x)